Tweaked newlines

Author: mikesamuel@gmail.com

js-modules/extractSourceSpans.js

@@ -78,7 +78,7 @@ function extractSourceSpans(node) {
           if (!isPreformatted) {
             text = text.replace(/[ \t\r\n]+/g, ' ');
           } else {
-            text = text.replace(/\r\n?/g, '\n');  // Normalize newlines.
+            text = text.replace(/\r\n?/g, '\r\n');  // Normalize newlines.
           }
           // TODO: handle tabs here?
           chunks[k] = text;
@@ -93,7 +93,7 @@ function extractSourceSpans(node) {
   walk(node);
 
   return {
-    source: chunks.join('').replace(/\n$/, ''),
+    source: chunks.join('').replace(/\r\n$/, ''),
     spans: spans
   };
-}
+}

js-modules/numberLines.js

@@ -1,7 +1,7 @@
 /**
  * Given a DOM subtree, wraps it in a list, and puts each line into its own
  * list item.
- * 
+ *
  * @param {Node} node modified in place.  Its content is pulled into an
  *     HTMLOListElement, and each line is moved into a separate list item.
  *     This requires cloning elements, so the input might not have unique
@@ -88,7 +88,9 @@ function numberLines(node, opt_startLineNum) {
       var parent = limit.parentNode;
       if (parent) {
         // We clone the parent chain.
-        // This helps us resurrect important 
+        // This helps us resurrect important styling elements that cross lines.
+        // E.g. in <i>Foo<br>Bar</i>
+        // should be rewritten to <li><i>Foo</i></li><li><i>Bar</i></li>.
         var parentClone = breakLeftOf(parent, 1);
         // Move the clone and everything to the right of the original
         // onto the cloned parent.

tests/prettify_test.html

@@ -1295,7 +1295,7 @@ <h1>Go mode</h1>
     fmt.Printf("Hello, world; or &#x039a;&#x03b1;&#x03bb;&#x03b7;&#x03bc;&#x03ad;&#x03c1;&#x03b1; &#x03ba;&#x03cc;&#x03c3;&#x03bc;&#x03b5;; or &#x3053;&#x3093;&#x306b;&#x3061;&#x306f; &#x4e16;&#x754c;\n")  // Semicolon inserted here
 }
 
-/* " */  "foo /* "  /*/  */
+/* " */  &quot;foo /* "  /*/  */
 </pre>
 
 Test IE by copy/pasting content here.
@@ -1305,8 +1305,8 @@ <h1>Go mode</h1>
 <script type="text/javascript">
 /**
  * maps ids of rewritten code to the expected output.
- * For brevity, <span class="foo"> has been changed to `FOO and close span tags
- * have been changed to `END.
+ * For brevity, <span class="foo"> has been changed to `FOO and </span>
+ * has been changed to `END.
  */
 var goldens = {
   bash: (