issue 92: capitalized element names break XML highlighting

mikesamuel@gmail.com · mikesamuel@gmail.com · commit 82be2f24444f · 2009-10-03T19:30:38.000Z
diff --git a/CHANGES.html b/CHANGES.html
@@ -5,6 +5,21 @@
   </head>
   <body bgcolor="white">
     <a style="float:right" href="README.html">README</a>
+
+    <h1>Known Issues</h1>
+    <ul>
+      <li>Perl formatting is really crappy.  Partly because the author is lazy and
+      partly because Perl is
+      <a href="http://www.perlmonks.org/?node_id=663393">hard</a> to parse.
+      <li>On some browsers, <code>&lt;code&gt;</code> elements with newlines in the text
+      which use CSS to specify <code>white-space:pre</code> will have the newlines
+      improperly stripped if the element is not attached to the document at the time
+      the stripping is done.  Also, on IE 6, all newlines will be stripped from
+      <code>&lt;code&gt;</code> elements because of the way IE6 produces
+      <code>innerHTML</code>.  Workaround: use <code>&lt;pre&gt;</code> for code with
+      newlines.
+    </ul>
+
     <h1>Change Log</h1>
     <h2>29 March 2007</h2>
     <ul>
@@ -62,7 +77,7 @@ <h2>6 Jan 2009</h2>
     <ul>
       <li>Language handlers for Visual Basic, Haskell, CSS, and WikiText</li>
       <li>Added <tt>.mxml</tt> extension to the markup style handler for
-	Flex <a href="http://en.wikipedia.org/wiki/MXML">MXML files</a>.  See
+        Flex <a href="http://en.wikipedia.org/wiki/MXML">MXML files</a>.  See
         <a
         href="http://code.google.com/p/google-code-prettify/issues/detail?id=37"
         >issue 37</a>.
@@ -83,5 +98,13 @@ <h2>21 May 2009</h2>
         number literals, Lua strings, C preprocessor directives,
         newlines in Wiki code on Windows, and newlines in IE6.</li>
     </ul>
+    <h2>14 August</h2>
+    <ul>
+      <li>Fixed prettifying of <code>&lt;code&gt;</code> blocks with embedded newlines.
+    </ul>
+    <h2>3 October</h2>
+    <ul>
+      <li>Fixed prettifying of XML/HTML tags that contain uppercase letters.
+    </ul>
   </body>
 </html>
diff --git a/src/prettify.js b/src/prettify.js
@@ -1193,7 +1193,7 @@ window['_pr_isIE6'] = function () {
            [PR_ATTRIB_VALUE, /^(?:\"[^\"]*\"?|\'[^\']*\'?)/, null, '\"\'']
            ],
           [
-           [PR_TAG,          /^^<\/?[a-z](?:[\w:-]*\w)?|\/?>$/],
+           [PR_TAG,          /^^<\/?[a-z](?:[\w:-]*\w)?|\/?>$/i],
            [PR_ATTRIB_NAME,  /^(?!style\b|on)[a-z](?:[\w:-]*\w)?/],
            ['lang-uq.val',   /^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],
            [PR_PUNCTUATION,  /^[=<>\/]+/],
diff --git a/tests/prettify_test.html b/tests/prettify_test.html
@@ -1013,6 +1013,26 @@ <h1>CSS w/ language specified</h1>
 --&gt;
 </pre>
 
+<h1>Issue 79 CSS highlighting</h1>
+<pre class=prettyprint>
+&lt;style type='text/css'>
+/* desert scheme ported from vim to google prettify */
+code.prettyprint { display: block; padding: 2px; border: 1px solid #888;
+background-color: #333; }
+.str { color: #ffa0a0; } /* string  - pink */
+.kwd { color: #f0e68c; font-weight: bold; }
+.com { color: #87ceeb; } /* comment - skyblue */
+.typ { color: #98fb98; } /* type    - lightgreen */
+.lit { color: #cd5c5c; } /* literal - darkred */
+.pun { color: #fff; }    /* punctuation */
+.pln { color: #fff; }    /* plaintext */
+.tag { color: #f0e68c; font-weight: bold; } /* html/xml tag    - lightyellow*/
+.atn { color: #bdb76b; font-weight: bold; } /* attribute name  - khaki*/
+.atv { color: #ffa0a0; } /* attribute value - pink */
+.dec { color: #98fb98; } /* decimal         - lightgreen */
+&lt;/style>
+</pre>
+
 <h1>Issue 84 NBSPs</h1>
 <pre class="prettyprint lang-java" id="issue84">super("&amp;nbsp;");</pre>
 
@@ -1029,6 +1049,21 @@ <h1>Issue 86</h1>
 Two lines</xmp>
 <p><code class="prettyprint" id="issue86_5">#One<br>
 Two lines</code></p>
+
+<h1>Issue 92</h1>
+<pre class="prettyprint" id="issue92">
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;kml xmlns="http://www.opengis.net/kml/2.2"&gt;
+  &lt;Placemark&gt;
+    &lt;name&gt;Simple placemark&lt;/name&gt;
+    &lt;description&gt;Attached to the ground. Intelligently places itself 
+       at the height of the underlying terrain.&lt;/description&gt;
+    &lt;Point&gt;
+      &lt;coordinates&gt;-122.0822035425683,37.42228990140251,0&lt;/coordinates&gt;
+    &lt;/Point&gt;
+  &lt;/Placemark&gt;
+&lt;/kml&gt;
+</pre>
 </body>
 
 <script type="text/javascript">
@@ -2402,7 +2437,23 @@ <h1>Issue 86</h1>
   issue86_3: '`COM#One`END`PLN<br>' +
       '`END`TYPTwo`END`PLN lines`END',
   issue86_4: '`COM#One`END`PLN<br>' +
-      '`END`TYPTwo`END`PLN lines`END'
+      '`END`TYPTwo`END`PLN lines`END',
+  issue92: '`PUN&lt;?`END`PLNxml version`END`PUN=`END`STR"1.0"`END`PLN encoding`END`PUN=`END ' +
+          '`STR"UTF-8"`END`PUN?&gt;`END`PLN<br>' +
+      '`END`TAG&lt;kml`END`PLN `END`ATNxmlns`END`PUN=`END`ATV"http://www.opengis.net/kml/2.2"`END ' +
+          '`TAG&gt;`END`PLN<br>' +
+      '&nbsp; `END`TAG&lt;Placemark&gt;`END`PLN<br>' +
+      '&nbsp; &nbsp; `END`TAG&lt;name&gt;`END`PLNSimple placemark`END`TAG&lt;/name&gt;`END`PLN<br>' +
+      '&nbsp; &nbsp; `END`TAG&lt;description&gt;`END`PLNAttached to the ground. ' +
+          ' Intelligently places itself <br>' +
+      '&nbsp; &nbsp; &nbsp; &nbsp;at the height of the underlying terrain.`END ' +
+          '`TAG&lt;/description&gt;`END`PLN<br>' +
+      '&nbsp; &nbsp; `END`TAG&lt;Point&gt;`END`PLN<br>' +
+      '&nbsp; &nbsp; &nbsp; `END`TAG&lt;coordinates&gt;`END ' +
+          '`PLN-122.0822035425683,37.42228990140251,0`END`TAG&lt;/coordinates&gt;`END`PLN<br>' +
+      '&nbsp; &nbsp; `END`TAG&lt;/Point&gt;`END`PLN<br>' +
+      '&nbsp; `END`TAG&lt;/Placemark&gt;`END`PLN<br>' +
+      '`END`TAG&lt;/kml&gt;`END'
 };
 </script>
 

Original file line number	Diff line number	Diff line change
`@@ -1193,7 +1193,7 @@ window['_pr_isIE6'] = function () {`
`1193`	`1193`	`[PR_ATTRIB_VALUE, /^(?:\"[^\"]\"?\|\'[^\']\'?)/, null, '\"\'']`
`1194`	`1194`	`],`
`1195`	`1195`	`[`
`1196`		`- [PR_TAG, /^^<\/?[a-z](?:[\w:-]*\w)?\|\/?>$/],`
	`1196`	`+ [PR_TAG, /^^<\/?[a-z](?:[\w:-]*\w)?\|\/?>$/i],`
`1197`	`1197`	`[PR_ATTRIB_NAME, /^(?!style\b\|on)[a-z](?:[\w:-]*\w)?/],`
`1198`	`1198`	`['lang-uq.val', /^=\s([^>\'\"\s](?:[^>\'\"\s\/]\|\/(?=\s)))/],`
`1199`	`1199`	`[PR_PUNCTUATION, /^[=<>\/]+/],`