Changeset 3599 for trunk/manual/lib

Timestamp:

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

Author:

jepso

Message:

fixes #527

Location:

trunk/manual/lib/Text/Wiki/Render

Files:

• Latex/Code.php (modified) (3 diffs)
• Xhtml/Code.php (modified) (3 diffs)

trunk/manual/lib/Text/Wiki/Render/Latex/Code.php

@@ -2 +2 @@
 
 class Text_Wiki_Render_Latex_Code extends Text_Wiki_Render {
-    
-    
+
+
     /**
-    * 
+    *
     * Renders a token into text matching the requested format.
-    * 
+    *
     * @access public
-    * 
+    *
     * @param array $options The "options" portion of the token (second
     * element).
-    * 
+    *
     * @return string The text rendered from the token options.
-    * 
+    *
     */
-    
+
     function token($options)
     {
@@ -22 +22 @@
         $attr = $options['attr'];
         $type = strtolower($attr['type']);
-        
+
         if ($type == 'php') {
             if (substr($options['text'], 0, 5) != '<?php') {
@@ -30 +30 @@
             }
         }
-            
-        $text = "\\begin{lstlisting}\n$text\n\\end{lstlisting}\n\n"; 
-        
+
+        $text = "\\begin{lstlisting}[caption={} {}]\n$text\n\\end{lstlisting}\n\n";
+
         if ($type != '') {
             $text = "\\lstset{language=$type}\n" . $text;

trunk/manual/lib/Text/Wiki/Render/Xhtml/Code.php

@@ -31 +31 @@
         'css_php'  => null, // class for PHP <code>
         'css_html' => null, // class for HTML <code>
-        'css_filename' => null // class for optional filename <div>
+        'css_filename' => null, // class for optional filename <div>
+        'code_begin_callback' => null
     );
 
@@ -48 +49 @@
 
     function token($options)
-    {   
+    {
         $text = $options['text'];
         $attr = $options['attr'];
@@ -105 +106 @@
         }
 
+        $callback = $this->getConf('code_begin_callback');
+        if ($callback) {
+            $text = call_user_func($callback) . $text;
+        }
+
         return "\n$text\n\n";
     }