mprins / dokuwiki-yalist-plugin

syntax.php

Indentation +21 added lines, -21 removed lines

@@ -40,10 +40,10 @@ 
         return array('substition', 'protected', 'disabled', 'formatting');
     }
     function connectTo($mode) {
-       $this->Lexer->addEntryPattern('\n {2,}(?:--?|\*\*?|\?|::?)', $mode, 'plugin_yalist');
-       $this->Lexer->addEntryPattern('\n\t{1,}(?:--?|\*\*?|\?|::?)', $mode, 'plugin_yalist');
-       $this->Lexer->addPattern('\n {2,}(?:--?|\*\*?|\?|::?|\.\.)', 'plugin_yalist');
-       $this->Lexer->addPattern('\n\t{1,}(?:--?|\*\*?|\?|::?|\.\.)', 'plugin_yalist');
+        $this->Lexer->addEntryPattern('\n {2,}(?:--?|\*\*?|\?|::?)', $mode, 'plugin_yalist');
+        $this->Lexer->addEntryPattern('\n\t{1,}(?:--?|\*\*?|\?|::?)', $mode, 'plugin_yalist');
+        $this->Lexer->addPattern('\n {2,}(?:--?|\*\*?|\?|::?|\.\.)', 'plugin_yalist');
+        $this->Lexer->addPattern('\n\t{1,}(?:--?|\*\*?|\?|::?|\.\.)', 'plugin_yalist');
     }
     function postConnect() {
         $this->Lexer->addExitPattern('\n', 'plugin_yalist');
@@ -56,9 +56,9 @@ 
             $frame = $this->_interpret_match($match);
             $level = $frame['level'] = 1;
             array_push($output,
-                       "${frame['list']}_open",
-                       "${frame['item']}_open",
-                       "${frame['item']}_content_open");
+                        "${frame['list']}_open",
+                        "${frame['item']}_open",
+                        "${frame['item']}_content_open");
             if ($frame['paras'])
                 array_push($output, 'p_open');
             array_push($this->stack, $frame);
@@ -76,8 +76,8 @@ 
                     $close_content = false;
                 }
                 array_push($output,
-                           "${frame['item']}_close",
-                           "${frame['list']}_close");
+                            "${frame['item']}_close",
+                            "${frame['list']}_close");
             }
             break;
         case DOKU_LEXER_MATCHED:
@@ -95,8 +95,8 @@ 
                         $close_content = false;
                     }
                     array_push($output,
-                               "${last_frame['item']}_close",
-                               "${last_frame['list']}_close");
+                                "${last_frame['item']}_close",
+                                "${last_frame['list']}_close");
                     array_pop($this->stack);
                     $last_frame = end($this->stack);
                 }
@@ -106,8 +106,8 @@ 
                         array_push($output, 'p_close', 'p_open');
                     else
                         array_push($output,
-                                   "${last_frame['item']}_content_open",
-                                   'p_open');
+                                    "${last_frame['item']}_content_open",
+                                    'p_open');
                 } else {
                     // let's just pretend we didn't match...
                     $state = DOKU_LEXER_UNMATCHED;
@@ -122,8 +122,8 @@ 
                 if ($last_frame['paras'])
                     array_push($output, 'p_close');
                 array_push($output,
-                           "${last_frame['item']}_content_close",
-                           "${curr_frame['list']}_open");
+                            "${last_frame['item']}_content_close",
+                            "${curr_frame['list']}_open");
             } else {
                 // same depth, or getting shallower
                 $close_content = true;
@@ -142,8 +142,8 @@ 
                         $close_content = false;
                     }
                     array_push($output,
-                               "${last_frame['item']}_close",
-                               "${last_frame['list']}_close");
+                                "${last_frame['item']}_close",
+                                "${last_frame['list']}_close");
                     array_pop($this->stack);
                     $last_frame = end($this->stack);
                 }
@@ -161,14 +161,14 @@ 
                 if ($curr_frame['list'] != $last_frame['list']) {
                     // change list types
                     array_push($output,
-                               "${last_frame['list']}_close",
-                               "${curr_frame['list']}_open");
+                                "${last_frame['list']}_close",
+                                "${curr_frame['list']}_open");
                 }
             }
             // and finally, open tags for the new list item
             array_push($output,
-                       "${curr_frame['item']}_open",
-                       "${curr_frame['item']}_content_open");
+                        "${curr_frame['item']}_open",
+                        "${curr_frame['item']}_content_open");
             if ($curr_frame['paras'])
                 array_push($output, 'p_open');
             $curr_frame['level'] = $level;

Switch Indentation +78 added lines, -78 removed lines

@@ -52,11 +52,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'])
@@ -206,26 +206,26 @@ 
             $markup = '';
             if ($mode == 'xhtml') {
                 switch ($i) {
-                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";
@@ -270,59 +270,59 @@ 
             } else {
                 // $mode == 'latex'
                 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;

Spacing +3 added lines, -3 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();
     function getType() {

Braces +38 added lines, -24 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();
@@ -59,8 +63,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:
@@ -70,8 +75,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;
                 }
@@ -89,8 +95,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;
                     }
@@ -101,13 +108,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;
@@ -119,8 +127,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");
@@ -136,8 +145,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;
                     }
@@ -152,8 +162,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;
                 }
@@ -169,8 +180,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;
@@ -196,8 +208,9 @@ 
         );
     }
     function render($mode, Doku_Renderer $renderer, $data) {
-        if ($mode != 'xhtml' && $mode != 'latex')
-            return false;
+        if ($mode != 'xhtml' && $mode != 'latex') {
+                    return false;
+        }
         if ($data['state'] == DOKU_LEXER_UNMATCHED) {
             $renderer->doc .= $renderer->_xmlEntities($data['output']);
             return true;
@@ -327,8 +340,9 @@ 
             }
             $renderer->doc .= $markup;
         }
-        if ($data['state'] == DOKU_LEXER_EXIT)
-            $renderer->doc .= "\n";
+        if ($data['state'] == DOKU_LEXER_EXIT) {
+                    $renderer->doc .= "\n";
+        }
         return true;
     }
 }
\ No newline at end of file