Merge pull request #1659 from mdboom/notebook-carriage-return

Handle carriage return characters ("\r") in HTML notebook output.

IPython/frontend/html/notebook/static/js/codecell.js

@@ -623,11 +623,8 b' var IPython = (function (IPython) {'
         if (json.stream == undefined){
             json.stream = 'stdout';
         }
-        if (!utils.fixConsole(json.text)){
-            // fixConsole gives nothing (empty string, \r, etc.)
-            // so don't append any elements, which might add undesirable space
-            return;
-        }
+
+        var text = utils.fixConsole(json.text);
         var subclass = "output_"+json.stream;
         if (this.outputs.length > 0){
             // have at least one output to consider
@@ -636,15 +633,22 b' var IPython = (function (IPython) {'
                 // latest output was in the same stream,
                 // so append directly into its pre tag
                 // escape ANSI & HTML specials:
-                var text = utils.fixConsole(json.text);
-                this.element.find('div.'+subclass).last().find('pre').append(text);
+                pre = this.element.find('div.'+subclass).last().find('pre');
+                text = utils.fixCarriageReturn(pre.text() + text);
+                pre.text(text);
                 return;
             }
         }
-        
+
+        if (!text.replace("\r", "")) {
+            // text is nothing (empty string, \r, etc.)
+            // so don't append any elements, which might add undesirable space
+            return;
+        }
+
         // If we got here, attach a new div
         var toinsert = this.create_output_area();
-        this.append_text(json.text, toinsert, "output_stream "+subclass);
+        this.append_text(text, toinsert, "output_stream "+subclass);
         this.element.find('div.output').append(toinsert);
     };
 
@@ -702,6 +706,7 b' var IPython = (function (IPython) {'
         var toinsert = $("<div/>").addClass("box_flex1 output_subarea output_text");
         // escape ANSI & HTML specials in plaintext:
         data = utils.fixConsole(data);
+        data = utils.fixCarriageReturn(data);
         if (extra_class){
             toinsert.addClass(extra_class);
         }

IPython/frontend/html/notebook/static/js/pager.js

@@ -89,9 +89,9 b' var IPython = (function (IPython) {'
 
     Pager.prototype.append_text = function (text) {
         var toinsert = $("<div/>").addClass("output_area output_stream");
-        toinsert.append($('<pre/>').html(utils.fixConsole(text)));
+        toinsert.append($('<pre/>').html(utils.fixCarriageReturn(utils.fixConsole(text))));
         this.pager_element.append(toinsert);
-    };   
+    };
 
 
     IPython.Pager = Pager;

IPython/frontend/html/notebook/static/js/utils.js

@@ -47,7 +47,7 b' IPython.utils = (function (IPython) {'
         "37":"ansigrey", "01":"ansibold"
     };
 
-    // Transform ANI color escape codes into HTML <span> tags with css
+    // Transform ANSI color escape codes into HTML <span> tags with css
     // classes listed in the above ansi_colormap object. The actual color used
     // are set in the css file.
     function fixConsole(txt) {
@@ -57,8 +57,6 b' IPython.utils = (function (IPython) {'
         var cmds = [];
         var opener = "";
         var closer = "";
-        // \r does nothing, so shouldn't be included
-        txt = txt.replace('\r', '');
         while (re.test(txt)) {
             var cmds = txt.match(re)[1].split(";");
             closer = opened?"</span>":"";
@@ -74,6 +72,16 b' IPython.utils = (function (IPython) {'
         return txt;
     }
 
+    // Remove chunks that should be overridden by the effect of
+    // carriage return characters
+    function fixCarriageReturn(txt) {
+        tmp = txt;
+        do {
+            txt = tmp;
+            tmp = txt.replace(/^.*\r/gm, '');
+        } while (tmp.length < txt.length);
+        return txt;
+    }
 
     grow = function(element) {
         // Grow the cell by hand. This is used upon reloading from JSON, when the
@@ -95,7 +103,8 b' IPython.utils = (function (IPython) {'
     return {
         uuid : uuid,
         fixConsole : fixConsole,
-        grow : grow
+        grow : grow,
+        fixCarriageReturn : fixCarriageReturn
     };
 
 }(IPython));