mprins / dokuwiki-yalist-plugin

syntax.php

Switch Indentation +169 added lines, -169 removed lines

@@ -55,11 +55,11 @@ 
         $output = array();
         $level = 0;
         switch ($state) {
-        case DOKU_LEXER_ENTER:
-            $frame = $this->_interpret_match($match);
-            $level = $frame['level'] = 1;
-            array_push($output,
-                       "${frame['list']}_open",
+            case DOKU_LEXER_ENTER:
+                $frame = $this->_interpret_match($match);
+                $level = $frame['level'] = 1;
+                array_push($output,
+                           "${frame['list']}_open",
                        "${frame['item']}_open",
                        "${frame['item']}_content_open");
             if ($frame['paras'])
@@ -236,26 +236,26 @@ 
     function render_xhtml_item(Doku_Renderer $renderer, $item) {
         $markup = '';
         switch ($item) {
-        case 'ol_open':
-            $markup = "<ol>\n";
-            break;
-        case 'ol_close':
-            $markup = "</ol>\n";
-            break;
-        case 'ul_open':
-            $markup = "<ul>\n";
-            break;
-        case 'ul_close':
-            $markup = "</ul>\n";
-            break;
-        case 'dl_open':
-            $markup = "<dl>\n";
-            break;
-        case 'dl_close':
-            $markup = "</dl>\n";
-            break;
-        case 'li_open':
-            $markup = "<li class=\"level${data['level']}\">";
+            case 'ol_open':
+                $markup = "<ol>\n";
+                break;
+            case 'ol_close':
+                $markup = "</ol>\n";
+                break;
+            case 'ul_open':
+                $markup = "<ul>\n";
+                break;
+            case 'ul_close':
+                $markup = "</ul>\n";
+                break;
+            case 'dl_open':
+                $markup = "<dl>\n";
+                break;
+            case 'dl_close':
+                $markup = "</dl>\n";
+                break;
+            case 'li_open':
+                $markup = "<li class=\"level${data['level']}\">";
             break;
         case 'li_content_open':
             $markup = "<div class=\"li\">\n";
@@ -303,59 +303,59 @@ 
     function render_latex_item(Doku_Renderer $renderer, $item) {
         $markup = '';
         switch ($i) {
-        case 'ol_open':
-            $markup = "\\begin{enumerate}\n";
-            break;
-        case 'ol_close':
-            $markup = "\\end{enumerate}\n";
-            break;
-        case 'ul_open':
-            $markup = "\\begin{itemize}\n";
-            break;
-        case 'ul_close':
-            $markup = "\\end{itemize}\n";
-            break;
-        case 'dl_open':
-            $markup = "\\begin{description}\n";
-            break;
-        case 'dl_close':
-            $markup = "\\end{description}\n";
-            break;
-        case 'li_open':
-            $markup = "\item ";
-            break;
-        case 'li_content_open':
-            break;
-        case 'li_content_close':
-            break;
-        case 'li_close':
-            $markup = "\n";
-            break;
-        case 'dt_open':
-            $markup = "\item[";
-            break;
-        case 'dt_content_open':
-            break;
-        case 'dt_content_close':
-            break;
-        case 'dt_close':
-            $markup = "] ";
-            break;
-        case 'dd_open':
-            break;
-        case 'dd_content_open':
-            break;
-        case 'dd_content_close':
-            break;
-        case 'dd_close':
-            $markup = "\n";
-            break;
-        case 'p_open':
-            $markup = "\n";
-            break;
-        case 'p_close':
-            $markup = "\n";
-            break;
+            case 'ol_open':
+                $markup = "\\begin{enumerate}\n";
+                break;
+            case 'ol_close':
+                $markup = "\\end{enumerate}\n";
+                break;
+            case 'ul_open':
+                $markup = "\\begin{itemize}\n";
+                break;
+            case 'ul_close':
+                $markup = "\\end{itemize}\n";
+                break;
+            case 'dl_open':
+                $markup = "\\begin{description}\n";
+                break;
+            case 'dl_close':
+                $markup = "\\end{description}\n";
+                break;
+            case 'li_open':
+                $markup = "\item ";
+                break;
+            case 'li_content_open':
+                break;
+            case 'li_content_close':
+                break;
+            case 'li_close':
+                $markup = "\n";
+                break;
+            case 'dt_open':
+                $markup = "\item[";
+                break;
+            case 'dt_content_open':
+                break;
+            case 'dt_content_close':
+                break;
+            case 'dt_close':
+                $markup = "] ";
+                break;
+            case 'dd_open':
+                break;
+            case 'dd_content_open':
+                break;
+            case 'dd_content_close':
+                break;
+            case 'dd_close':
+                $markup = "\n";
+                break;
+            case 'p_open':
+                $markup = "\n";
+                break;
+            case 'p_close':
+                $markup = "\n";
+                break;
         }
         $renderer->doc .= $markup;
     }
@@ -370,75 +370,75 @@ 
      */
     function render_odt_item(Doku_Renderer $renderer, $item) {
         switch ($item) {
-        case 'ol_open':
-            $renderer->listo_open();
-            break;
-        case 'ul_open':
-            $renderer->listu_open();
-            break;
-        case 'dl_open':
-            if ($this->getConf('def_list_odt_export') != 'table') {
+            case 'ol_open':
+                $renderer->listo_open();
+                break;
+            case 'ul_open':
                 $renderer->listu_open();
-            } else {
-                $renderer->table_open(2);
-            }
-            self::$odt_table_stack [self::$odt_table_stack_index] = array();
-            self::$odt_table_stack [self::$odt_table_stack_index]['itemOpen'] = false;
-            self::$odt_table_stack [self::$odt_table_stack_index]['dtState'] = 0;
-            self::$odt_table_stack [self::$odt_table_stack_index]['ddState'] = 0;
-            self::$odt_table_stack_index++;
-            break;
-        case 'ol_close':
-        case 'ul_close':
-            $renderer->list_close();
-            break;
-        case 'dl_close':
-            $config = $this->getConf('def_list_odt_export');
-            if ($config != 'table') {
-                if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] != 2) {
-                    if ($config == 'listheader' && method_exists ($renderer, 'listheader_close')) {
-                        $renderer->listheader_close();
-                    } else {
-                        $renderer->listitem_close();
-                    }
+                break;
+            case 'dl_open':
+                if ($this->getConf('def_list_odt_export') != 'table') {
+                    $renderer->listu_open();
+                } else {
+                    $renderer->table_open(2);
                 }
-                self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0;
+                self::$odt_table_stack [self::$odt_table_stack_index] = array();
+                self::$odt_table_stack [self::$odt_table_stack_index]['itemOpen'] = false;
+                self::$odt_table_stack [self::$odt_table_stack_index]['dtState'] = 0;
+                self::$odt_table_stack [self::$odt_table_stack_index]['ddState'] = 0;
+                self::$odt_table_stack_index++;
+                break;
+            case 'ol_close':
+            case 'ul_close':
                 $renderer->list_close();
-            } else {
-                if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] == 0) {
-                    $properties = array();
-                    $properties ['border'] = 'none';
-                    $renderer->_odtTableCellOpenUseProperties($properties);
-                    $renderer->tablecell_close();
+                break;
+            case 'dl_close':
+                $config = $this->getConf('def_list_odt_export');
+                if ($config != 'table') {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] != 2) {
+                        if ($config == 'listheader' && method_exists ($renderer, 'listheader_close')) {
+                            $renderer->listheader_close();
+                        } else {
+                            $renderer->listitem_close();
+                        }
+                    }
+                    self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0;
+                    $renderer->list_close();
+                } else {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] == 0) {
+                        $properties = array();
+                        $properties ['border'] = 'none';
+                        $renderer->_odtTableCellOpenUseProperties($properties);
+                        $renderer->tablecell_close();
+                    }
+                    self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0;
+                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) {
+                        $renderer->tablerow_close(1);
+                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false;
+                    }
+                    $renderer->table_close();
                 }
-                self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0;
-                if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) {
-                    $renderer->tablerow_close(1);
-                    self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false;
+                if (self::$odt_table_stack_index > 0) {
+                    self::$odt_table_stack_index--;
+                    unset(self::$odt_table_stack [self::$odt_table_stack_index]);
                 }
-                $renderer->table_close();
-            }
-            if (self::$odt_table_stack_index > 0) {
-                self::$odt_table_stack_index--;
-                unset(self::$odt_table_stack [self::$odt_table_stack_index]);
-            }
-            break;
+                break;
 
-        case 'li_open':             
-            $renderer->listitem_open(1);
-            break;
-        case 'li_content_open':
-            $renderer->listcontent_open();
-            break;
-        case 'li_content_close':    
-            $renderer->listcontent_close();
-            break;
-        case 'li_close':
-            $renderer->listitem_close();
-            break;
+            case 'li_open':             
+                $renderer->listitem_open(1);
+                break;
+            case 'li_content_open':
+                $renderer->listcontent_open();
+                break;
+            case 'li_content_close':    
+                $renderer->listcontent_close();
+                break;
+            case 'li_close':
+                $renderer->listitem_close();
+                break;
 
-        case 'dt_open': // unconditional: DT tags can't contain paragraphs. That would not be legal XHTML.
-            switch ($this->getConf('def_list_odt_export')) {
+            case 'dt_open': // unconditional: DT tags can't contain paragraphs. That would not be legal XHTML.
+                switch ($this->getConf('def_list_odt_export')) {
                 case 'listheader':
                     if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) {
                         if (method_exists ($renderer, 'listheader_close')) {
@@ -487,12 +487,12 @@ 
                         self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true;
                     }
                 break;
-            }
+                }
             self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 1;
             self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0;
             break;
-        case 'dd_open':
-            switch ($this->getConf('def_list_odt_export')) {
+            case 'dd_open':
+                switch ($this->getConf('def_list_odt_export')) {
                 case 'listheader':
                     if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) {
                         if (method_exists ($renderer, 'listheader_open')) {
@@ -528,54 +528,54 @@ 
                         self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true;
                     }
                 break;
-            }
+                }
             self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 0;
             self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 1;
             break;
-        case 'dt_content_open':
-            switch ($this->getConf('def_list_odt_export')) {
+            case 'dt_content_open':
+                switch ($this->getConf('def_list_odt_export')) {
                 case 'table':
                     $renderer->p_open();
                 break;
                 default:
                     $renderer->listcontent_open();
                 break;
-            }
+                }
             $this->renderODTOpenSpan($renderer);
             break;
-        case 'dd_content_open':
-            switch ($this->getConf('def_list_odt_export')) {
+            case 'dd_content_open':
+                switch ($this->getConf('def_list_odt_export')) {
                 case 'table':
                     $renderer->p_open();
                 break;
                 default:
                     $renderer->listcontent_open();
                 break;
-            }
+                }
             break;
-        case 'dt_content_close':
-            $this->renderODTCloseSpan($renderer);
-            switch ($this->getConf('def_list_odt_export')) {
+            case 'dt_content_close':
+                $this->renderODTCloseSpan($renderer);
+                switch ($this->getConf('def_list_odt_export')) {
                 case 'table':
                     $renderer->p_close();
                 break;
                 default:
                     $renderer->listcontent_close();
                 break;
-            }
+                }
             break;
-        case 'dd_content_close':
-            switch ($this->getConf('def_list_odt_export')) {
+            case 'dd_content_close':
+                switch ($this->getConf('def_list_odt_export')) {
                 case 'table':
                     $renderer->p_close();
                 break;
                 default:
                     $renderer->listcontent_close();
                 break;
-            }
+                }
             break;
-        case 'dt_close':
-            switch ($this->getConf('def_list_odt_export')) {
+            case 'dt_close':
+                switch ($this->getConf('def_list_odt_export')) {
                 case 'listheader':
                     $renderer->linebreak();
                     break;
@@ -586,11 +586,11 @@ 
                 default:
                     $renderer->linebreak();
                     break;
-            }
+                }
             break;
 
-        case 'dd_close':
-            switch ($this->getConf('def_list_odt_export')) {
+            case 'dd_close':
+                switch ($this->getConf('def_list_odt_export')) {
                 case 'listheader':
                     if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) {
                         if (method_exists ($renderer, 'listheader_close')) {
@@ -614,17 +614,17 @@ 
                         self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false;
                     }
                     break;
-            }
+                }
             self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 0;
             self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 2;
             break;
 
-        case 'p_open':
-            $renderer->p_open();
-            break;
-        case 'p_close':
-            $renderer->p_close();
-            break;
+            case 'p_open':
+                $renderer->p_open();
+                break;
+            case 'p_close':
+                $renderer->p_close();
+                break;
         }
     }
 

Spacing +53 added lines, -53 removed lines

@@ -21,9 +21,9 @@ 
  * @author     Ben Slusky <sluskyb@paranoiacs.org>
  *
  */
-if (!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
-if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
-require_once(DOKU_PLUGIN.'syntax.php');
+if (!defined('DOKU_INC')) define('DOKU_INC', realpath(dirname(__FILE__) . '/../../') . '/');
+if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
+require_once(DOKU_PLUGIN . 'syntax.php');
 class syntax_plugin_yalist extends DokuWiki_Syntax_Plugin {
     var $stack = array();
     static $odt_table_stack = array();
@@ -395,26 +395,26 @@ 
         case 'dl_close':
             $config = $this->getConf('def_list_odt_export');
             if ($config != 'table') {
-                if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] != 2) {
-                    if ($config == 'listheader' && method_exists ($renderer, 'listheader_close')) {
+                if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] != 2) {
+                    if ($config == 'listheader' && method_exists($renderer, 'listheader_close')) {
                         $renderer->listheader_close();
                     } else {
                         $renderer->listitem_close();
                     }
                 }
-                self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0;
+                self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0;
                 $renderer->list_close();
             } else {
-                if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] == 0) {
+                if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] == 0) {
                     $properties = array();
                     $properties ['border'] = 'none';
                     $renderer->_odtTableCellOpenUseProperties($properties);
                     $renderer->tablecell_close();
                 }
-                self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0;
-                if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) {
+                self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0;
+                if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
                     $renderer->tablerow_close(1);
-                    self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false;
+                    self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                 }
                 $renderer->table_close();
             }
@@ -440,78 +440,78 @@ 
         case 'dt_open': // unconditional: DT tags can't contain paragraphs. That would not be legal XHTML.
             switch ($this->getConf('def_list_odt_export')) {
                 case 'listheader':
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) {
-                        if (method_exists ($renderer, 'listheader_close')) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
+                        if (method_exists($renderer, 'listheader_close')) {
                             $renderer->listheader_close();
                         } else {
                             $renderer->listitem_close();
                         }
-                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false;
+                        self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                     }
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) {
-                        if (method_exists ($renderer, 'listheader_open')) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
+                        if (method_exists($renderer, 'listheader_open')) {
                             $renderer->listheader_open(1);
                         } else {
                             $renderer->listitem_open(1);
                         }
-                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true;
+                        self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true;
                     }
                 break;
                 case 'table':
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] == 0) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] == 0) {
                         $properties = array();
                         $properties ['border'] = 'none';
                         $renderer->_odtTableCellOpenUseProperties($properties);
                         $renderer->tablecell_close();
                     }
 
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
                         $renderer->tablerow_close();
-                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false;
+                        self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                     }
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
                         $renderer->tablerow_open(1);
-                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true;
+                        self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true;
                     }
                     $properties = array();
                     $properties ['border'] = 'none';
                     $renderer->_odtTableCellOpenUseProperties($properties);
                 break;
                 default:
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
                         $renderer->listitem_close();
-                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false;
+                        self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                     }
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
                         $renderer->listitem_open(1);
-                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true;
+                        self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true;
                     }
                 break;
             }
-            self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 1;
-            self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0;
+            self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 1;
+            self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0;
             break;
         case 'dd_open':
             switch ($this->getConf('def_list_odt_export')) {
                 case 'listheader':
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) {
-                        if (method_exists ($renderer, 'listheader_open')) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
+                        if (method_exists($renderer, 'listheader_open')) {
                             $renderer->listheader_open(1);
                         } else {
                             $renderer->listitem_open(1);
                         }
-                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true;
+                        self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true;
                     }
                 break;
                 case 'table':
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
                         $renderer->tablerow_open(1);
-                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true;
+                        self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true;
                     }
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] == 1) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] == 1) {
                         $renderer->tablecell_close();
                     }
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] == 0) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] == 0) {
                         $properties = array();
                         $properties ['border'] = 'none';
                         $renderer->_odtTableCellOpenUseProperties($properties);
@@ -523,14 +523,14 @@ 
                     $renderer->_odtTableCellOpenUseProperties($properties);
                 break;
                 default:
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
                         $renderer->listitem_open(1);
-                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true;
+                        self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true;
                     }
                 break;
             }
-            self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 0;
-            self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 1;
+            self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 0;
+            self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 1;
             break;
         case 'dt_content_open':
             switch ($this->getConf('def_list_odt_export')) {
@@ -581,7 +581,7 @@ 
                     break;
                 case 'table':
                     $renderer->tablecell_close();
-                    self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 2;
+                    self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 2;
                     break;
                 default:
                     $renderer->linebreak();
@@ -592,31 +592,31 @@ 
         case 'dd_close':
             switch ($this->getConf('def_list_odt_export')) {
                 case 'listheader':
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) {
-                        if (method_exists ($renderer, 'listheader_close')) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
+                        if (method_exists($renderer, 'listheader_close')) {
                             $renderer->listheader_close();
                         } else {
                             $renderer->listitem_close();
                         }
-                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false;
+                        self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                     }
                     break;
                 case 'table':
                     $renderer->tablecell_close();
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
                         $renderer->tablerow_close(1);
-                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false;
+                        self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                     }
                     break;
                 default:
-                    if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
                         $renderer->listitem_close(1);
-                        self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false;
+                        self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                     }
                     break;
             }
-            self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 0;
-            self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 2;
+            self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 0;
+            self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 2;
             break;
 
         case 'p_open':
@@ -635,11 +635,11 @@ 
      *
      * @author LarsDW223
      */
-    function renderODTOpenSpan ($renderer) {
-        $properties = array ();
+    function renderODTOpenSpan($renderer) {
+        $properties = array();
 
         // Get CSS properties for ODT export.
-        $renderer->getODTProperties ($properties, 'div', 'dokuwiki dt', NULL);
+        $renderer->getODTProperties($properties, 'div', 'dokuwiki dt', NULL);
 
         $renderer->_odtSpanOpenUseProperties($properties);
     }
@@ -651,8 +651,8 @@ 
      *
      * @author LarsDW223
      */
-    function renderODTCloseSpan ($renderer) {
-        if ( method_exists ($renderer, '_odtSpanClose') === false ) {
+    function renderODTCloseSpan($renderer) {
+        if (method_exists($renderer, '_odtSpanClose') === false) {
             // Function is not supported by installed ODT plugin version, return.
             return;
         }

Braces +35 added lines, -22 removed lines

@@ -21,8 +21,12 @@ 
  * @author     Ben Slusky <sluskyb@paranoiacs.org>
  *
  */
-if (!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
-if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+if (!defined('DOKU_INC')) {
+    define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
+}
+if (!defined('DOKU_PLUGIN')) {
+    define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+}
 require_once(DOKU_PLUGIN.'syntax.php');
 class syntax_plugin_yalist extends DokuWiki_Syntax_Plugin {
     var $stack = array();
@@ -62,8 +66,9 @@ 
                        "${frame['list']}_open",
                        "${frame['item']}_open",
                        "${frame['item']}_content_open");
-            if ($frame['paras'])
-                array_push($output, 'p_open');
+            if ($frame['paras']) {
+                            array_push($output, 'p_open');
+            }
             array_push($this->stack, $frame);
             break;
         case DOKU_LEXER_EXIT:
@@ -73,8 +78,9 @@ 
                 // close the content tag; for the rest it will have been
                 // closed already
                 if ($close_content) {
-                    if ($frame['paras'])
-                        array_push($output, 'p_close');
+                    if ($frame['paras']) {
+                                            array_push($output, 'p_close');
+                    }
                     array_push($output, "${frame['item']}_content_close");
                     $close_content = false;
                 }
@@ -92,8 +98,9 @@ 
                 $close_content = true;
                 while ($para_depth < $last_frame['depth'] && count($this->stack) > 1) {
                     if ($close_content) {
-                        if ($last_frame['paras'])
-                            array_push($output, 'p_close');
+                        if ($last_frame['paras']) {
+                                                    array_push($output, 'p_close');
+                        }
                         array_push($output, "${last_frame['item']}_content_close");
                         $close_content = false;
                     }
@@ -104,13 +111,14 @@ 
                     $last_frame = end($this->stack);
                 }
                 if ($last_frame['paras']) {
-                    if ($close_content)
-                        // depth did not change
+                    if ($close_content) {
+                                            // depth did not change
                         array_push($output, 'p_close', 'p_open');
-                    else
-                        array_push($output,
+                    } else {
+                                            array_push($output,
                                    "${last_frame['item']}_content_open",
                                    'p_open');
+                    }
                 } else {
                     // let's just pretend we didn't match...
                     $state = DOKU_LEXER_UNMATCHED;
@@ -122,8 +130,9 @@ 
             if ($curr_frame['depth'] > $last_frame['depth']) {
                 // going one level deeper
                 $level = $last_frame['level'] + 1;
-                if ($last_frame['paras'])
-                    array_push($output, 'p_close');
+                if ($last_frame['paras']) {
+                                    array_push($output, 'p_close');
+                }
                 array_push($output,
                            "${last_frame['item']}_content_close",
                            "${curr_frame['list']}_open");
@@ -139,8 +148,9 @@ 
                     // again, we need to close the content tag only for
                     // the first frame popped off the stack
                     if ($close_content) {
-                        if ($last_frame['paras'])
-                            array_push($output, 'p_close');
+                        if ($last_frame['paras']) {
+                                                    array_push($output, 'p_close');
+                        }
                         array_push($output, "${last_frame['item']}_content_close");
                         $close_content = false;
                     }
@@ -155,8 +165,9 @@ 
                 array_pop($this->stack);
                 $level = $last_frame['level'];
                 if ($close_content) {
-                    if ($last_frame['paras'])
-                        array_push($output, 'p_close');
+                    if ($last_frame['paras']) {
+                                            array_push($output, 'p_close');
+                    }
                     array_push($output, "${last_frame['item']}_content_close");
                     $close_content = false;
                 }
@@ -172,8 +183,9 @@ 
             array_push($output,
                        "${curr_frame['item']}_open",
                        "${curr_frame['item']}_content_open");
-            if ($curr_frame['paras'])
-                array_push($output, 'p_open');
+            if ($curr_frame['paras']) {
+                            array_push($output, 'p_open');
+            }
             $curr_frame['level'] = $level;
             array_push($this->stack, $curr_frame);
             break;
@@ -200,8 +212,9 @@ 
     }
 
     function render($mode, Doku_Renderer $renderer, $data) {
-        if ($mode != 'xhtml' && $mode != 'latex' && $mode != 'odt')
-            return false;
+        if ($mode != 'xhtml' && $mode != 'latex' && $mode != 'odt') {
+                    return false;
+        }
         if ($data['state'] == DOKU_LEXER_UNMATCHED) {
             if ($mode != 'odt') {
                 $renderer->doc .= $renderer->_xmlEntities($data['output']);