3 more rules (84%)

git-svn-id: https://svn.php.net/repository/pear/packages/Text_Wiki/trunk@206400 c90b9560-bf6c-de11-be94-00142212c4b1
horde · Feb 4, 2006 · 0026d47 · 0026d47
1 parent 3818bb5
commit 0026d47
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 101 deletions.
diff --git a/Text/Wiki/Render/Docbook/List.php b/Text/Wiki/Render/Docbook/List.php
@@ -26,18 +26,23 @@
 class Text_Wiki_Render_Docbook_List extends Text_Wiki_Render {
 
     var $conf = array(
-        'css_ol' => null,
-        'css_ol_li' => null,
-        'css_ul' => null,
-        'css_ul_li' => null
+        'mark' => null
+    );
+
+    var $numeration = array(
+        '1' => 'arabic',
+        'i' => 'lowerroman',
+        'I' => 'upperroman',
+        'a' => 'loweralpha',
+        'A' => 'upperalpha',
     );
 
     /**
     *
     * Renders a token into text matching the requested format.
     *
     * This rendering method is syntactically and semantically compliant
-    * with DocBook 1.1 in that sub-lists are part of the previous list item.
+    * with DocBook in that sub-lists are part of the previous list item.
     *
     * @access public
     *
@@ -53,117 +58,35 @@ function token($options)
         // make nice variables (type, level, count)
         extract($options);
 
-        // set up indenting so that the results look nice; we do this
-        // in two steps to avoid str_pad mathematics.  ;-)
-        $pad = str_pad('', $level, "\t");
-        $pad = str_replace("\t", '    ', $pad);
-
-        switch ($type) {
+        switch ($options['type']) {
 
         case 'bullet_list_start':
-
-            // build the base HTML
-            $css = $this->formatConf(' class="%s"', 'css_ul');
-            $html = "<ul$css>";
-
-            /*
-            // if this is the opening block for the list,
-            // put an extra newline in front of it so the
-            // output looks nice.
-            if ($level == 0) {
-                $html = "\n$html";
-            }
-            */
-
-            // done!
-            return $html;
-            break;
+            return '<itemizedlist' . (($mark = $this->getConf('mark', null)) ?
+                ' mark="' . $mark . '"' : '') . ">\n";
 
         case 'bullet_list_end':
-
-            // build the base HTML
-            $html = "</li>\n$pad</ul>";
-
-            // if this is the closing block for the list,
-            // put extra newlines after it so the output
-            // looks nice.
-            if ($level == 0) {
-                $html .= "\n\n";
-            }
-
-            // done!
-            return $html;
-            break;
+            return "</itemizedlist>\n";
 
         case 'number_list_start':
-            if (isset($format)) {
-                $format = ' type="' . $format . '"';
-            } else  {
+            if (empty($format) || !isset($this->numeration[$format])) {
                 $format = '';
+            } else  {
+                $format = ' numeration="' . $this->numeration[$format] . '"';
             }
-            // build the base HTML
-            $css = $this->formatConf(' class="%s"', 'css_ol');
-            $html = "<ol{$format}{$css}>";
-
-            /*
-            // if this is the opening block for the list,
-            // put an extra newline in front of it so the
-            // output looks nice.
-            if ($level == 0) {
-                $html = "\n$html";
-            }
-            */
-
-            // done!
-            return $html;
-            break;
+            return '<orderedlist' . $format . ">\n";
 
         case 'number_list_end':
-
-            // build the base HTML
-            $html = "</li>\n$pad</ol>";
-
-            // if this is the closing block for the list,
-            // put extra newlines after it so the output
-            // looks nice.
-            if ($level == 0) {
-                $html .= "\n\n";
-            }
-
-            // done!
-            return $html;
-            break;
+            return "</orderedlist>\n";
 
         case 'bullet_item_start':
         case 'number_item_start':
-
-            // pick the proper CSS class
-            if ($type == 'bullet_item_start') {
-                $css = $this->formatConf(' class="%s"', 'css_ul_li');
-            } else {
-                $css = $this->formatConf(' class="%s"', 'css_ol_li');
-            }
-
-            // build the base HTML
-            $html = "\n$pad<li$css>";
-
-            // for the very first item in the list, do nothing.
-            // but for additional items, be sure to close the
-            // previous item.
-            if ($count > 0) {
-                $html = "</li>$html";
-            }
-
-            // done!
-            return $html;
-            break;
+            return "<listitem>\n";
 
         case 'bullet_item_end':
         case 'number_item_end':
+            return "</listitem>\n";
+
         default:
-            // ignore item endings and all other types.
-            // item endings are taken care of by the other types
-            // depending on their place in the list.
             return '';
             break;
         }

diff --git a/Text/Wiki/Render/Docbook/Revise.php b/Text/Wiki/Render/Docbook/Revise.php
@@ -46,11 +46,11 @@ class Text_Wiki_Render_Docbook_Revise extends Text_Wiki_Render {
     function token($options)
     {
         switch ($options['type']) {
-            'del_start':
+            case 'del_start':
                 return '<emphasis' . 
                     (($role = $this->getConf('role_del', 'deleted')) ?
                     ' role="' . $role . '"' : '') . '>';
-            'ins_start':
+            case 'ins_start':
                 return '<emphasis' . 
                     (($role = $this->getConf('role_ins', 'inserted')) ?
                     ' role="' . $role . '"' : '') . '>';