Fixed issue 19: XML tag names can contain 19

Author: mikesamuel

src/prettify.js

@@ -391,7 +391,7 @@ function PR_extractTags(s) {
         } else if (pr_brPrefix.test(match)) {
           // <br> tags are lexically significant so convert them to text.
           // This is undone later.
-          // <br> tags are lexically significant 
+          // <br> tags are lexically significant
           sourceBuf.push('\n');
           sourceBufLen += 1;
         } else {
@@ -534,7 +534,7 @@ var PR_C_STYLE_LITERAL_IDENTIFIER_PUNC_RECOGNIZER = PR_createSimpleLexer([], [
     [PR_PUNCTUATION, /^[^\s\w\.$@]+/, null]
     // Fallback will handle decimal points not adjacent to a digit
     ]);
-    
+
 /** splits plain text tokens into more specific tokens, and then tries to
   * recognize keywords, and types.
   * @private
@@ -618,10 +618,10 @@ var PR_TAG_LEXER = PR_createSimpleLexer([
     [PR_ATTRIB_VALUE, /^\"[^\"]*(?:\"|$)/, null, '"'],
     [PR_PUNCTUATION,  /^[<>\/=]+/, null, '<>/=']
     ], [
-    [PR_TAG,          /^[\w-]+/, /^</],
-    [PR_ATTRIB_VALUE, /^[\w-]+/, /^=/], 
-    [PR_ATTRIB_NAME,  /^[\w-]+/, null], 
-    [PR_PLAIN,        /^\s+/, null, ' \r\n']
+    [PR_TAG,          /^[\w:-]+/, /^</],
+    [PR_ATTRIB_VALUE, /^[\w-]+/, /^=/],
+    [PR_ATTRIB_NAME,  /^[\w:-]+/, null],
+    [PR_PLAIN,        /^\s+/, null, ' \t\r\n']
     ]);
 /** split tags attributes and their values out from the tag name, and
   * recursively lex source chunks.
@@ -737,10 +737,10 @@ function PR_decorateSource(sourceCode) {
   // contain stuff that looks like other tokens, so we want to mark those early
   // so we don't recurse into them.
   var decorations = PR_splitStringAndCommentTokens(sourceCode);
-  
+
   // Split non comment|string tokens on whitespace and word boundaries
   decorations = PR_splitNonStringNonCommentTokens(sourceCode, decorations);
-  
+
   return decorations;
 }
 
@@ -856,7 +856,7 @@ function PR_recombineTagsAndDecorations(
         // Close the current decoration
         html.push('</span>');
         openDecoration = null;
-      } 
+      }
       html.push(extractedTags[tagPos + 1]);
       tagPos += 2;
     } else if (decPos < decorations.length) {

tests/prettify_test.html

@@ -366,7 +366,7 @@ <h1>XHTML</h1>
 </pre>
 
 <h1>PHP</h1>
-<pre class="prettyprint" id ="PHP">
+<pre class="prettyprint" id="PHP">
 &lt;html>
   &lt;head>
     &lt;title>&lt;?= 'Fibonacci numbers' ?>&lt;/title>
@@ -394,6 +394,17 @@ <h1>PHP</h1>
 &lt;/html>
 </pre>
 
+<h1>XSL (Issue 19)</h1>
+<pre class="prettyprint" id="xsl">
+&lt;!-- Test elements and attributes with namespaces --&gt;
+
+&lt;xsl:stylesheet xml:lang="en"&gt;
+  &lt;xsl:template match="."&gt;
+    &lt;xsl:text&gt;Hello World&lt;/xsl:text&gt;
+  &lt;/xsl:template&gt;
+&lt;/xsl:stylesheet&gt;
+</pre>
+
 <h1>Whitespace</h1>
 <pre class=prettyprint id="whitespace"></pre>
 
@@ -902,11 +913,27 @@ <h1>Bug 14b - comments not ignored</h1>
           '`PUN(`END`LIT10`END`PUN)`END`PLN `END`PUN?&gt;`END`PLN<br>' +
       '&nbsp; `END`PUN&lt;/`END`TAGbody`END`PUN&gt;`END`PLN<br>' +
       '`END`PUN&lt;/`END`TAGhtml`END`PUN&gt;`END'),
+  xsl: (
+      '`COM&lt;!-- Test elements and attributes with namespaces --&gt;' +
+          '`END`PLN<br>' +
+      '<br>' +
+      '`END`PUN&lt;`END`TAGxsl:stylesheet`END`PLN `END`ATNxml:lang`END' +
+          '`PUN=`END`ATV"en"`END`PUN&gt;`END`PLN<br>' +
+      '&nbsp; `END`PUN&lt;`END`TAGxsl:template`END' +
+          '`PLN `END`ATNmatch`END`PUN=`END`ATV"."`END' +
+          '`PUN&gt;`END`PLN<br>' +
+      '&nbsp; &nbsp; `END`PUN&lt;`END`TAGxsl:text`END`PUN&gt;`END' +
+          '`PLNHello World`END' +
+          '`PUN&lt;/`END`TAGxsl:text`END`PUN&gt;`END`PLN<br>' +
+      '&nbsp; `END`PUN&lt;/`END`TAGxsl:template`END`PUN&gt;`END`PLN<br>' +
+      '`END`PUN&lt;/`END`TAGxsl:stylesheet`END`PUN&gt;`END'
+      ),
   whitespace: '',
   misc1: '`COM// ends with line comment token`END`PLN<br>' +
       '`END`COM//`END',
   issue4: (
-      '`PUN&lt;`END`TAGscript`END`PLN `END`ATNtype`END`PUN=`END`ATV"text/javascript"`END' +
+      '`PUN&lt;`END`TAGscript`END`PLN `END' +
+          '`ATNtype`END`PUN=`END`ATV"text/javascript"`END' +
           '`PUN&gt;`END`PLN<br>' +
       '&nbsp; &nbsp;var savedTarget=null' +
           '; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; ' +