Changeset 3599 for trunk/vendor/Sensei

Timestamp:

01/23/08 16:37:39 (12 months ago)

Author:

jepso

Message:

fixes #527

Files:

• trunk/vendor/Sensei/Sensei/Doc/Renderer/Xhtml.php (modified) (12 diffs)

trunk/vendor/Sensei/Sensei/Doc/Renderer/Xhtml.php

@@ -35 +35 @@
     /**
      * Available options
-     * 
+     *
      * (Sensei_Doc_Section|null) section :
      *     Section to be rendered. If null all sections will be rendered.
      *
      * (string) url_prefix :
-     *     All URLs pointing to sections will be prefixed with this. 
+     *     All URLs pointing to sections will be prefixed with this.
      */
     protected $_options = array(
@@ -46 +46 @@
         'url_prefix' => ''
     );
-    
+
+    private $_chapter;
+    private $_codeListingsIndex;
+
     public function __construct(Sensei_Doc_Toc $toc, array $options = array())
     {
         parent::__construct($toc, $options);
-        
+
         $this->_wiki->setRenderConf('xhtml', 'Doclink', 'url_callback', array(&$this, 'makeUrl'));
+        $this->_wiki->setRenderConf('xhtml', 'Code', 'code_begin_callback', array(&$this, 'codeListingsNumberingCallback'));
     }
 
     /**
      * Renders table of contents as nested unordered lists.
-     * 
+     *
      * @return string  rendered table of contents
      */
@@ -73 +77 @@
     {
         $output = '';
-    
+
         if ($section instanceof Sensei_Doc_Toc) {
             $class = ' class="tree"';
@@ -81 +85 @@
             $class = '';
         }
-        
-        $output .= '<ul' . $class . '>' . "\n";       
-       
+
+        $output .= '<ul' . $class . '>' . "\n";
+
         for ($i = 0; $i < $section->count(); $i++) {
             $child = $section->getChild($i);
-            
+
             $text = $child->getIndex() . ' ' . $child->getName();
             $href = $this->makeUrl($child);
-            
+
             $output .= '<li><a href="' . $href . '">' . $text . '</a>';
-            
+
             if ($child->count() > 0) {
                 $output .= "\n";
                 $output .= $this->_renderToc($child);
             }
-    
+
             $output .= '</li>' . "\n";
         }
-    
+
         $output .= '</ul>' . "\n";
-        
+
         return $output;
     }
@@ -114 +118 @@
     {
         $section = $this->_options['section'];
-        
+
         if ($section instanceof Sensei_Doc_Section) {
-        
+
             $content = $this->_renderSection($section);
-        
-        } else {
-
-            // No section was set, so let's render all sections            
+
+        } else {
+
+            // No section was set, so let's render all sections
             $content = '';
             for ($i = 0; $i < count($this->_toc); $i++) {
@@ -127 +131 @@
             }
         }
-        
+
         $output = $this->_options['template'];
-        
+
         $output = str_replace('%TITLE%', $this->_options['title'], $output);
         $output = str_replace('%AUTHOR%', $this->_options['author'], $output);
@@ -136 +140 @@
         $output = str_replace('%TOC%', $this->renderToc(), $output);
         $output = str_replace('%CONTENT%', $content, $output);
-        
+
         return $output;
     }
@@ -149 +153 @@
     {
         $output = '';
-        
+
         $title = $section->getIndex() . ' ' . $section->getName();
         $level = $section->getLevel();
-        
+
         if ($level === 1) {
             $class = ' class="chapter"';
             $title = 'Chapter ' . $title;
+            $this->_chapter = $section->getIndex();
+            $this->_codeListingsIndex = 0;
         } else {
             $class = ' class="section"';
         }
-        
+
         $output .= '<div' . $class .'>' . "\n";
-        
+
         $output .= "<h$level>";
-        
+
         if ( ! ($this->_options['section'] instanceof Sensei_Doc_Section)
         || ($level > $this->_options['section']->getLevel())) {
@@ -172 +178 @@
             $output .= $title;
         }
-        
+
         $output .= "</h$level>";
-        
+
         // Transform section contents from wiki syntax to XHTML
         $output .= $this->_wiki->transform($section->getText());
-        
+
         // Render children of this section recursively
         for ($i = 0; $i < count($section); $i++) {
             $output .= $this->_renderSection($section->getChild($i));
         }
-        
+
         $output .= '</div>' . "\n";
-        
-        return $output;       
-    }
-    
+
+        return $output;
+    }
+
     public function makeUrl($section)
     {
@@ -195 +201 @@
             $path = $section;
         }
-        
+
         $url = $this->_options['url_prefix'];
-        
+
         if ($this->_options['section'] instanceof Sensei_Doc_Section) {
             $level = $this->_options['section']->getLevel();
             $url .= implode(':', array_slice(explode(':', $path), 0, $level));
         }
-        
+
         $anchor = $this->makeAnchor($section);
         if ($anchor !== '') {
             $url .= '#' . $anchor;
         }
-        
+
         return $url;
     }
-    
+
     public function makeAnchor($section)
     {
@@ -218 +224 @@
             $path = $section;
         }
-        
+
         if ($this->_options['section'] instanceof Sensei_Doc_Section) {
             $level = $this->_options['section']->getLevel();
@@ -226 +232 @@
         }
     }
+
+    public function codeListingsNumberingCallback()
+    {
+        $this->_codeListingsIndex++;
+        $html = '<p class="caption">Listing ' . $this->_chapter . '.'
+              . $this->_codeListingsIndex . "</p>\n";
+        return $html;
+    }
 }