diff --git a/ansi_up.js b/ansi_up.js index 4482605..fe186ee 100644 --- a/ansi_up.js +++ b/ansi_up.js @@ -34,7 +34,7 @@ var PacketKind; })(PacketKind || (PacketKind = {})); var AnsiUp = (function () { function AnsiUp() { - this.VERSION = "5.0.0"; + this.VERSION = "5.0.1"; this.setup_palettes(); this._use_classes = false; this.bold = false; @@ -227,7 +227,7 @@ var AnsiUp = (function () { } } if (!this._osc_regex) { - this._osc_regex = rgx(__makeTemplateObject(["\n ^ # beginning of line\n #\n \u001B]8; # OSC Hyperlink\n [ -:<-~]* # params (excluding ;)\n ; # end of params\n ([!-~]{0,512}) # URL capture\n (?: # ST\n (?:\u001B\\) # ESC | # alternate\n (?:\u0007) # BEL (what xterm did)\n )\n ([!-~]+) # TEXT capture\n \u001B]8;; # OSC Hyperlink End\n (?: # ST\n (?:\u001B\\) # ESC | # alternate\n (?:\u0007) # BEL (what xterm did)\n )\n "], ["\n ^ # beginning of line\n #\n \\x1b\\]8; # OSC Hyperlink\n [\\x20-\\x3a\\x3c-\\x7e]* # params (excluding ;)\n ; # end of params\n ([\\x21-\\x7e]{0,512}) # URL capture\n (?: # ST\n (?:\\x1b\\\\) # ESC \\\n | # alternate\n (?:\\x07) # BEL (what xterm did)\n )\n ([\\x21-\\x7e]+) # TEXT capture\n \\x1b\\]8;; # OSC Hyperlink End\n (?: # ST\n (?:\\x1b\\\\) # ESC \\\n | # alternate\n (?:\\x07) # BEL (what xterm did)\n )\n "])); + this._osc_regex = rgx(__makeTemplateObject(["\n ^ # beginning of line\n #\n \u001B]8; # OSC Hyperlink\n [ -:<-~]* # params (excluding ;)\n ; # end of params\n ([!-~]{0,512}) # URL capture\n (?: # ST\n (?:\u001B\\) # ESC | # alternate\n (?:\u0007) # BEL (what xterm did)\n )\n ([ -~]+) # TEXT capture\n \u001B]8;; # OSC Hyperlink End\n (?: # ST\n (?:\u001B\\) # ESC | # alternate\n (?:\u0007) # BEL (what xterm did)\n )\n "], ["\n ^ # beginning of line\n #\n \\x1b\\]8; # OSC Hyperlink\n [\\x20-\\x3a\\x3c-\\x7e]* # params (excluding ;)\n ; # end of params\n ([\\x21-\\x7e]{0,512}) # URL capture\n (?: # ST\n (?:\\x1b\\\\) # ESC \\\n | # alternate\n (?:\\x07) # BEL (what xterm did)\n )\n ([\\x20-\\x7e]+) # TEXT capture\n \\x1b\\]8;; # OSC Hyperlink End\n (?: # ST\n (?:\\x1b\\\\) # ESC \\\n | # alternate\n (?:\\x07) # BEL (what xterm did)\n )\n "])); } var match = this._buffer.match(this._osc_regex); if (match === null) { diff --git a/ansi_up.ts b/ansi_up.ts index 016518f..324b066 100644 --- a/ansi_up.ts +++ b/ansi_up.ts @@ -50,7 +50,7 @@ interface TextPacket { class AnsiUp { - VERSION = "5.0.0"; + VERSION = "5.0.1"; // // *** SEE README ON GITHUB FOR PUBLIC API *** @@ -467,7 +467,7 @@ class AnsiUp | # alternate (?:\x07) # BEL (what xterm did) ) - ([\x21-\x7e]+) # TEXT capture + ([\x20-\x7e]+) # TEXT capture \x1b\]8;; # OSC Hyperlink End (?: # ST (?:\x1b\\) # ESC \ diff --git a/dist/ansi_up.js.include b/dist/ansi_up.js.include index 54f78e8..1d26c10 100644 --- a/dist/ansi_up.js.include +++ b/dist/ansi_up.js.include @@ -15,7 +15,7 @@ var PacketKind; })(PacketKind || (PacketKind = {})); var AnsiUp = (function () { function AnsiUp() { - this.VERSION = "5.0.0"; + this.VERSION = "5.0.1"; this.setup_palettes(); this._use_classes = false; this.bold = false; @@ -208,7 +208,7 @@ var AnsiUp = (function () { } } if (!this._osc_regex) { - this._osc_regex = rgx(__makeTemplateObject(["\n ^ # beginning of line\n #\n \u001B]8; # OSC Hyperlink\n [ -:<-~]* # params (excluding ;)\n ; # end of params\n ([!-~]{0,512}) # URL capture\n (?: # ST\n (?:\u001B\\) # ESC | # alternate\n (?:\u0007) # BEL (what xterm did)\n )\n ([!-~]+) # TEXT capture\n \u001B]8;; # OSC Hyperlink End\n (?: # ST\n (?:\u001B\\) # ESC | # alternate\n (?:\u0007) # BEL (what xterm did)\n )\n "], ["\n ^ # beginning of line\n #\n \\x1b\\]8; # OSC Hyperlink\n [\\x20-\\x3a\\x3c-\\x7e]* # params (excluding ;)\n ; # end of params\n ([\\x21-\\x7e]{0,512}) # URL capture\n (?: # ST\n (?:\\x1b\\\\) # ESC \\\n | # alternate\n (?:\\x07) # BEL (what xterm did)\n )\n ([\\x21-\\x7e]+) # TEXT capture\n \\x1b\\]8;; # OSC Hyperlink End\n (?: # ST\n (?:\\x1b\\\\) # ESC \\\n | # alternate\n (?:\\x07) # BEL (what xterm did)\n )\n "])); + this._osc_regex = rgx(__makeTemplateObject(["\n ^ # beginning of line\n #\n \u001B]8; # OSC Hyperlink\n [ -:<-~]* # params (excluding ;)\n ; # end of params\n ([!-~]{0,512}) # URL capture\n (?: # ST\n (?:\u001B\\) # ESC | # alternate\n (?:\u0007) # BEL (what xterm did)\n )\n ([ -~]+) # TEXT capture\n \u001B]8;; # OSC Hyperlink End\n (?: # ST\n (?:\u001B\\) # ESC | # alternate\n (?:\u0007) # BEL (what xterm did)\n )\n "], ["\n ^ # beginning of line\n #\n \\x1b\\]8; # OSC Hyperlink\n [\\x20-\\x3a\\x3c-\\x7e]* # params (excluding ;)\n ; # end of params\n ([\\x21-\\x7e]{0,512}) # URL capture\n (?: # ST\n (?:\\x1b\\\\) # ESC \\\n | # alternate\n (?:\\x07) # BEL (what xterm did)\n )\n ([\\x20-\\x7e]+) # TEXT capture\n \\x1b\\]8;; # OSC Hyperlink End\n (?: # ST\n (?:\\x1b\\\\) # ESC \\\n | # alternate\n (?:\\x07) # BEL (what xterm did)\n )\n "])); } var match = this._buffer.match(this._osc_regex); if (match === null) { diff --git a/package.json b/package.json index 351389d..ac68bab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ansi_up", - "version": "5.0.0", + "version": "5.0.1", "description": "Convert ansi sequences in strings to colorful HTML", "keywords": [ "ansi", diff --git a/test/ansi_up-test.js b/test/ansi_up-test.js index 2225029..2f5eb01 100644 --- a/test/ansi_up-test.js +++ b/test/ansi_up-test.js @@ -154,6 +154,14 @@ describe('ansi_up', function () { l.should.eql(expected); }); + it('should allow spaces in anchor text', function () { + var start = "ABC \x1b]8;;http://example.com\x1b\\A Link\x1b]8;;\x1b\\ DEF" + var expected = "ABC A Link DEF"; + + var au = new AnsiUp(); + var l = au.ansi_to_html(start); + l.should.eql(expected); + }); });