Changeset 1128 for trunk/vendor/Text

Timestamp:

02/23/07 19:45:22 (23 months ago)

Author:

zYne

Message:

 

Location:

trunk/vendor/Text

Files:

• Wiki.php (modified) (7 diffs)
• Wiki/Parse/Default/Code.php (modified) (1 diff)
• Wiki/Render/Xhtml/Code.php (modified) (3 diffs)

trunk/vendor/Text/Wiki.php

@@ -409 +409 @@
     * @return &object a reference to the Text_Wiki unique instantiation.
     */
-    function &singleton($parser = 'Default', $rules = null)
+    function singleton($parser = 'Default', $rules = null)
     {
         static $only = array();
         if (!isset($only[$parser])) {
-            $ret = & Text_Wiki::factory($parser, $rules);
+            $ret = Text_Wiki::factory($parser, $rules);
             if (Text_Wiki::isError($ret)) {
                 return $ret;
             }
-            $only[$parser] =& $ret;
+            $only[$parser] = $ret;
         }
         return $only[$parser];
@@ -433 +433 @@
      * @return Text_Wiki a Parser object extended from Text_Wiki
      */
-    function &factory($parser = 'Default', $rules = null)
+    function factory($parser = 'Default', $rules = null)
     {
         $class = 'Text_Wiki_' . $parser;
@@ -446 +446 @@
         }
 
-        $obj =& new $class($rules);
+        $obj = new $class($rules);
         return $obj;
     }
@@ -921 +921 @@
                 // load may have failed; only parse if
                 // an object is in the array now
-                if (is_object($this->parseObj[$name])) {
+                if (isset($this->parseObj[$name]) && is_object($this->parseObj[$name])) {
                     $this->parseObj[$name]->parse();
                 }
@@ -1223 +1223 @@
         }
 
-        $this->parseObj[$rule] =& new $class($this);
+        $this->parseObj[$rule] = new $class($this);
 
     }
@@ -1259 +1259 @@
         }
 
-        $this->renderObj[$rule] =& new $class($this);
+        $this->renderObj[$rule] = new $class($this);
     }
 
@@ -1292 +1292 @@
         }
 
-        $this->formatObj[$format] =& new $class($this);
+        $this->formatObj[$format] = new $class($this);
     }
 

trunk/vendor/Text/Wiki/Parse/Default/Code.php

@@ -72 +72 @@
         // are there additional attribute arguments?
         $args = trim($matches[1]);
-        
+
         if ($args == '') {
             $options = array(

trunk/vendor/Text/Wiki/Render/Xhtml/Code.php

@@ -59 +59 @@
         $css_filename = $this->formatConf(' class="%s"', 'css_filename');
 
-        if ($type == 'php') {
+        if ($type == 'php' || true) {
             if (substr($options['text'], 0, 5) != '<?php') {
                 // PHP code example:
                 // add the PHP tags
-                $text = "<?php\n" . $options['text'] . "\n?>"; // <?php
+                $text = "<?php 
+                " .  $options['text'] . "\n?>"; // <?php
             }
 
             // convert tabs to four spaces
-            $text = str_replace("\t", "    ", $text);
+            $text = str_replace("\t", "&nbsp;&nbsp;%nbsp;&nbsp;", $text);
 
             // colorize the code block (also converts HTML entities and adds
             // <code>...</code> tags)
-            ob_start();
-            highlight_string($text);
-            $text = ob_get_contents();
-            ob_end_clean();
+            $h = new PHP_Highlight;
+            $h->loadString($text);
+            $text = $h->toHtml(true);
 
             // replace <br /> tags with simple newlines.
@@ -80 +80 @@
             // translate HTML <font> and color to XHTML <span> and style.
             // courtesy of research by A. Kalin :-).
+            /**
             $map = array(
                 '<br />'  => "\n",
                 '&nbsp;'  => ' ',
+                "\n"      => "<br \>",
                 '<font'   => '<span',
                 '</font>' => '</span>',
                 'color="' => 'style="color:'
             );
+
             $text = strtr($text, $map);
+            */
 
             // get rid of the last newline inside the code block
@@ -101 +105 @@
 
             // done
-            $text = "<pre$css>$text</pre>";
+            $text = "<table border=1 class='dashed' cellpadding=0 cellspacing=0>
+                     <tr><td><b>$text
+                     </b></td></tr>
+                     </table>";
 
         } elseif ($type == 'html' || $type == 'xhtml') {