Index: html_syntax.php
===================================================================
RCS file: /repository/phpdoc/scripts/html_syntax.php,v
retrieving revision 1.11
diff -u -r1.11 html_syntax.php
--- html_syntax.php	3 Feb 2007 19:42:43 -0000	1.11
+++ html_syntax.php	3 Feb 2007 22:56:01 -0000
@@ -39,8 +39,11 @@
 	}
 }
 
+function callback_highlight_xml_indent($match) {
+    return strtr($match[0], array(' ' => ' ', "\t" => '    ')); 
+}
 function callback_highlight_xml($matches) {
-        $source = htmlentities($matches[1]);
+        $source = trim(htmlentities($matches[1]));
 
         $match = array(
             '/(\w+)=("|"|\')(.*?)("|"|\')/',
@@ -58,13 +61,15 @@
             '<span class="tags">!DOCTYPE</span> <span class="attributes">$1 $2 $3$4$3</span>',
             '&lt;<span class="tags">$1</span>',
             '&lt;/<span class="tags">$1</span>&gt;',
-            '<span class="comment"><!--',
+            '<span class="comment">&lt;!--',
             '--&gt;</span>',
             '&lt;<span class="tags">?xml</span> $1 <span class="tags">?</span>&gt;',
             '<span class="tags">&lt;![<span class="keyword">CDATA</span>[</span><span class="cdata">$1</span><span class="tags">]]&gt;</span>'
         );
-
-	 return '<div class="xmlcode">' . nl2br(preg_replace($match, $replace, $source)) . '</div>';
+        
+        $result = preg_replace($match, $replace, $source);
+        $result = preg_replace_callback('/^([ \t]+)/m', 'callback_highlight_xml_indent', $result);
+        return '<div class="xmlcode">' . nl2br($result) . '</div>';
 }
 
 $files = $_SERVER["argv"];