diff -Nru node-marked-man-0.3.0/debian/changelog node-marked-man-0.4.0/debian/changelog --- node-marked-man-0.3.0/debian/changelog 2019-01-22 19:21:58.000000000 +0000 +++ node-marked-man-0.4.0/debian/changelog 2019-02-02 01:12:42.000000000 +0000 @@ -1,8 +1,13 @@ -node-marked-man (0.3.0-2build1) disco; urgency=medium +node-marked-man (0.4.0-1) unstable; urgency=medium - * Rebuild against new nodejs. + * New upstream version 0.4.0 + This version fixes compatibility with node-marked@0.5.1 + Closes: #912168 + * Drop patch that fixes upstream tests expectations + * Standards-Version 4.3.0 + * (Build-)Depends marked 0.5.1 - -- Gianfranco Costamagna Tue, 22 Jan 2019 20:21:58 +0100 + -- Jérémy Lal Sat, 02 Feb 2019 02:12:42 +0100 node-marked-man (0.3.0-2) unstable; urgency=medium diff -Nru node-marked-man-0.3.0/debian/control node-marked-man-0.4.0/debian/control --- node-marked-man-0.3.0/debian/control 2018-04-07 15:37:15.000000000 +0000 +++ node-marked-man-0.4.0/debian/control 2019-02-02 01:12:31.000000000 +0000 @@ -6,9 +6,9 @@ Build-Depends: debhelper (>= 9) , dh-buildinfo - , node-marked (>= 0.3.9~) + , node-marked (>= 0.5.1~) , nodejs -Standards-Version: 4.1.3 +Standards-Version: 4.3.0 Homepage: https://github.com/kapouer/marked-man Vcs-Git: https://salsa.debian.org/js-team/node-marked-man.git Vcs-Browser: https://salsa.debian.org/js-team/node-marked-man @@ -18,7 +18,7 @@ Depends: ${misc:Depends} , nodejs - , node-marked + , node-marked (>= 0.5.1~) Description: Markdown to man page conversion - Node.js This module adds groff output support to node-marked. It provides an easy way to maintain man pages in a markdown diff -Nru node-marked-man-0.3.0/debian/patches/0001-Update-test-expectation-to-match-changes-in-marked.patch node-marked-man-0.4.0/debian/patches/0001-Update-test-expectation-to-match-changes-in-marked.patch --- node-marked-man-0.3.0/debian/patches/0001-Update-test-expectation-to-match-changes-in-marked.patch 2018-04-07 15:32:42.000000000 +0000 +++ node-marked-man-0.4.0/debian/patches/0001-Update-test-expectation-to-match-changes-in-marked.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -Description: update test expectations to match normal results for marked 0.3.9 -Author: Jérémy Lal -Forwarded: https://github.com/kapouer/marked-man/issues/15 -Last-Update: 2018-04-07 - ---- a/test/man/markdown_syntax -+++ b/test/man/markdown_syntax -@@ -1098,7 +1098,7 @@ escape it: - .RE - .SS Code - .P --To indicate a span of code, wrap it with backtick quotes (\fB` \fP)\. -+To indicate a span of code, wrap it with backtick quotes (\fB ` \fP)\. - .br - Unlike a pre\-formatted code block, a code span indicates code within a - .br -index ecfeaaa..b2ab769 100644 ---- a/test/out/markdown_syntax -+++ b/test/out/markdown_syntax -@@ -710,7 +710,7 @@ SSPPAANN EELLEEMMEENNTTSS - \*this text is surrounded by literal asterisks\* - - CCooddee -- To indicate a span of code, wrap it with backtick quotes (`` ). -+ To indicate a span of code, wrap it with backtick quotes ( `` ). - Unlike a pre-formatted code block, a code span indicates code within a - normal paragraph. For example: - - diff -Nru node-marked-man-0.3.0/debian/patches/series node-marked-man-0.4.0/debian/patches/series --- node-marked-man-0.3.0/debian/patches/series 2018-04-07 15:30:14.000000000 +0000 +++ node-marked-man-0.4.0/debian/patches/series 2019-02-02 01:08:13.000000000 +0000 @@ -1,2 +1 @@ remove-nodeico.patch -0001-Update-test-expectation-to-match-changes-in-marked.patch diff -Nru node-marked-man-0.3.0/debian/rules node-marked-man-0.4.0/debian/rules --- node-marked-man-0.3.0/debian/rules 2018-04-07 15:38:08.000000000 +0000 +++ node-marked-man-0.4.0/debian/rules 2019-02-02 01:08:13.000000000 +0000 @@ -3,16 +3,17 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export SOURCE_DATE_EPOCH=283996800 %: dh $@ override_dh_auto_clean: - rm -f test/out/*.err + rm -f test/*/*.err rm -f debian/marked-man.1 override_dh_auto_build: - ./bin/marked-man --date="$(SOURCE_DATE_EPOCH)000" README.md > debian/marked-man.1 + ./bin/marked-man --date="$(SOURCE_DATE_EPOCH)" README.md > debian/marked-man.1 diff -Nru node-marked-man-0.3.0/lib/marked-man.js node-marked-man-0.4.0/lib/marked-man.js --- node-marked-man-0.3.0/lib/marked-man.js 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/lib/marked-man.js 2019-02-02 00:42:15.000000000 +0000 @@ -9,12 +9,14 @@ InlineLexer.prototype.html_outputLink = InlineLexer.prototype.outputLink; InlineLexer.prototype.roff_outputLink = function(cap, link) { - var text = this.output(cap[1]); var href = resc(link.href); - var same = text == href; + var same = link.title == href; + var text = ''; if (same) text = ''; + else if (!link.title) text = this.output(cap[1]); + if (text) text += ' '; return text - + ' \\fI' + + '\\fI' + href + '\\fR'; }; @@ -24,13 +26,14 @@ , link , text , href - , cap; + , cap + , cur; while (src) { // escape if (cap = this.rules.escape.exec(src)) { src = src.substring(cap[0].length); - out += cap[1]; + out += lastMatch(cap); continue; } @@ -51,7 +54,7 @@ // url (gfm) if (cap = this.rules.url.exec(src)) { src = src.substring(cap[0].length); - out += resc(cap[1]); + out += resc(cap[0]); continue; } @@ -76,12 +79,15 @@ if ((cap = this.rules.reflink.exec(src)) || (cap = this.rules.nolink.exec(src))) { src = src.substring(cap[0].length); - link = (cap[2] || cap[1]).replace(/\s+/g, ' '); - link = this.links[link.toLowerCase()]; + cur = lastMatch(cap).replace(/\s+/g, ' '); + link = this.links[cur.toLowerCase()]; + if (!link || !link.href) { out += cap[0][0]; src = cap[0].substring(1) + src; continue; + } else if (link.title) { + out = out.slice(0, -cur.length); } out += this.outputLink(cap, link); continue; @@ -91,7 +97,7 @@ if (cap = this.rules.strong.exec(src)) { src = src.substring(cap[0].length); out += '\\fB' - + this.output(cap[2] || cap[1]) + + this.output(lastMatch(cap)) + '\\fR'; continue; } @@ -100,7 +106,7 @@ if (cap = this.rules.em.exec(src)) { src = src.substring(cap[0].length); out += '\\fI' - + this.output(cap[2] || cap[1]) + + this.output(lastMatch(cap)) + '\\fR'; continue; } @@ -109,7 +115,7 @@ if (cap = this.rules.code.exec(src)) { src = src.substring(cap[0].length); out += '\\fB' - + resc(cap[2], true) + + resc(lastMatch(cap), true) + '\\fP'; continue; } @@ -125,7 +131,7 @@ if (cap = this.rules.del.exec(src)) { src = src.substring(cap[0].length); out += "-" - + resc(cap[1]) + + resc(lastMatch(cap)) + "-"; continue; } @@ -163,6 +169,9 @@ this.inline.outputLink = this.inline.html_outputLink; } + // NOTE marked.js Parser.tok() relies on a this.inlineText reference. + this.inlineText = this.inline; + var out = ''; while (this.next()) { out += this.tok(); @@ -174,6 +183,7 @@ Parser.prototype.html_tok = Parser.prototype.tok; +Parser.prototype.isNestList = false; Parser.prototype.roff_tok = function() { switch (this.token.type) { case 'space': { @@ -234,12 +244,16 @@ case 'list_start': { var body = ''; var order = this.token.ordered ? 1 : null; + var originalLevel = this.isNestList; + this.isNestList = true; while (this.next().type !== 'list_end') { if (order) this.token.order = order++; body += this.tok(); } + this.isNestList = originalLevel; - return '.RS 0\n' + var indent = this.isNestList ? '.RS\n' : '.RS 0\n'; + return indent + body + '\n.RE\n'; } @@ -287,7 +301,7 @@ } /* deal with table format, add by gholk. - * use **tbl** macro format table in man page. + * use **tbl** macro format table in man page. */ case 'table': { var tblText = [], // troff tbl macro text. @@ -295,12 +309,12 @@ tblText.push('.TS'); // table start - tblText.push('tab(|) expand box;'); + tblText.push('tab(|) expand nowarn box;'); /* set `|` as seperator. * * set table border. * - * set expand to full screen. without expand, + * set expand to full screen. without expand, * tbl sometimes mistake terminal width. * but expand is ugly sometimes... * @@ -326,8 +340,8 @@ /* run each row */ for (var i=0; i= 0) { + cur = cap[len]; + if (cur === exclude) continue; + if (cur !== undefined) return cur; + } +} function quote(str) { return '"' + str + '"'; @@ -416,6 +439,9 @@ var stamp = parseInt(date); if (!isNaN(stamp) && stamp.toString().length == date.length) date = stamp; date = new Date(date); + if (process.env.SOURCE_DATE_EPOCH) { + date = new Date(process.env.SOURCE_DATE_EPOCH * 1000); + } var month = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][date.getMonth()]; return month + " " + date.getFullYear(); } diff -Nru node-marked-man-0.3.0/package.json node-marked-man-0.4.0/package.json --- node-marked-man-0.3.0/package.json 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/package.json 2019-02-02 00:42:15.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "marked-man", - "version": "0.3.0", + "version": "0.4.0", "description": "wrapper adding manpage output to 'marked', inspired by 'ronn'", "files": [ "lib", @@ -28,7 +28,7 @@ ], "author": "Jérémy Lal ", "license": "MIT", - "dependencies": { - "marked": "^0.3.2" + "peerDependencies": { + "marked": "^0.5.2" } } diff -Nru node-marked-man-0.3.0/test/compare.js node-marked-man-0.4.0/test/compare.js --- node-marked-man-0.3.0/test/compare.js 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/test/compare.js 2019-02-02 00:42:15.000000000 +0000 @@ -36,31 +36,30 @@ var fails = 0, works = 0, news = 0; - var launched = 0; - files.forEach(function(path) { - launched++; - check(path, function(err, status) { - if (err) console.error(err); - launched--; - switch (status) { - case -1: - fails++; - break; - case 0: - works++; - break; - case 1: - news++; - break; - } - if (!launched) { - if (fails > 0) console.error("Failed tests: ", fails); - if (works > 0) console.log("Succeeded tests: ", works); - if (news > 0) console.log("New tests: ", news); - if (fails == 0) console.log("All tests passed"); - else process.exit(1); - } + Promise.all(files.map(function(file) { + return new Promise(function(resolve, reject) { + check(file, function(err, status) { + if (err) return reject(err); + switch (status) { + case -1: + fails++; + break; + case 0: + works++; + break; + case 1: + news++; + break; + } + resolve(); + }); }); + })).then(function() { + if (fails > 0) console.error("Failed tests: ", fails); + if (works > 0) console.log("Succeeded tests: ", works); + if (news > 0) console.log("New tests: ", news); + if (fails == 0) console.log("All tests passed"); + else process.exit(1); }); }); @@ -68,12 +67,12 @@ var status = 0; try { var expect = fs.readFileSync(path).toString(); + var errpath = path + '.err'; if (expect != str) { - var errpath = path + '.err'; console.error("Test failure, result written in", errpath); - fs.writeFileSync(errpath, str); status = -1; } + fs.writeFileSync(errpath, str); } catch(e) { fs.writeFileSync(path, str); status = 1; diff -Nru node-marked-man-0.3.0/test/man/links node-marked-man-0.4.0/test/man/links --- node-marked-man-0.3.0/test/man/links 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/test/man/links 2019-02-02 00:42:15.000000000 +0000 @@ -2,6 +2,6 @@ .SH "NAME" \fBlinks\fR .P -I get 10 times more traffic from Google \fIhttp://google\.com/\fR than from +I get 10 times more traffic from [Google]\fIhttp://google\.com/\fR than from .br -Yahoo \fIhttp://search\.yahoo\.com/\fR or MSN \fIhttp://search\.msn\.com/\fR\|\. +[Yahoo]\fIhttp://search\.yahoo\.com/\fR or [MSN]\fIhttp://search\.msn\.com/\fR\|\. diff -Nru node-marked-man-0.3.0/test/man/markdown_syntax node-marked-man-0.4.0/test/man/markdown_syntax --- node-marked-man-0.3.0/test/man/markdown_syntax 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/test/man/markdown_syntax 2019-02-02 00:42:15.000000000 +0000 @@ -49,9 +49,9 @@ .br Markdown's syntax has been influenced by several existing text\-to\-HTML .br -filters \-\- including Setext \fIhttp://docutils\.sourceforge\.net/mirror/setext\.html\fR, atx \fIhttp://www\.aaronsw\.com/2002/atx/\fR, Textile \fIhttp://textism\.com/tools/textile/\fR, reStructuredText \fIhttp://docutils\.sourceforge\.net/rst\.html\fR, +filters \-\- including [Setext] 1 \fIhttp://docutils\.sourceforge\.net/mirror/setext\.html\fR, [atx] 2 \fIhttp://www\.aaronsw\.com/2002/atx/\fR, [Textile] 3 \fIhttp://textism\.com/tools/textile/\fR, [reStructuredText] 4 \fIhttp://docutils\.sourceforge\.net/rst\.html\fR, .br -Grutatext \fIhttp://www\.triptico\.com/software/grutatxt\.html\fR, and EtText \fIhttp://ettext\.taint\.org/doc/\fR \-\- the single biggest source of +[Grutatext] 5 \fIhttp://www\.triptico\.com/software/grutatxt\.html\fR, and [EtText] 6 \fIhttp://ettext\.taint\.org/doc/\fR \-\- the single biggest source of .br inspiration for Markdown's syntax is the format of plain text email\. .P @@ -274,7 +274,7 @@ work best \-\- and look better \-\- when you format them with hard breaks\. .SS Headers .P -Markdown supports two styles of headers, Setext \fIhttp://docutils\.sourceforge\.net/mirror/setext\.html\fR and atx \fIhttp://www\.aaronsw\.com/2002/atx/\fR\|\. +Markdown supports two styles of headers, [Setext] 1 \fIhttp://docutils\.sourceforge\.net/mirror/setext\.html\fR and [atx] 2 \fIhttp://www\.aaronsw\.com/2002/atx/\fR\|\. .P Setext\-style headers are "underlined" using equal signs (for first\-level .br @@ -1098,7 +1098,7 @@ .RE .SS Code .P -To indicate a span of code, wrap it with backtick quotes (\fB` \fP)\. +To indicate a span of code, wrap it with backtick quotes (\fB ` \fP)\. .br Unlike a pre\-formatted code block, a code span indicates code within a .br diff -Nru node-marked-man-0.3.0/test/man/nested_list_with_code node-marked-man-0.4.0/test/man/nested_list_with_code --- node-marked-man-0.3.0/test/man/nested_list_with_code 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/test/man/nested_list_with_code 2019-02-02 00:42:15.000000000 +0000 @@ -4,7 +4,7 @@ .RS 0 .IP \(bu 2 \fBtoggle_status\fP -.RS 0 +.RS .IP \(bu 2 Toggle the display of the status bar\. diff -Nru node-marked-man-0.3.0/test/man/table node-marked-man-0.4.0/test/man/table --- node-marked-man-0.3.0/test/man/table 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/test/man/table 2019-02-02 00:42:15.000000000 +0000 @@ -7,7 +7,7 @@ .P https://en\.wikipedia\.org/wiki/Comparison_of_file_systems .TS -tab(|) expand box; +tab(|) expand nowarn box; l l l l. T{ File system @@ -825,7 +825,7 @@ .P http://www\.troff\.org/faq\.html .TS -tab(|) expand box; +tab(|) expand nowarn box; l l l. T{ Person @@ -845,7 +845,7 @@ .TE .SH THING TABLE .TS -tab(|) expand box; +tab(|) expand nowarn box; l l. T{ 1 diff -Nru node-marked-man-0.3.0/test/out/definition_list_syntax node-marked-man-0.4.0/test/out/definition_list_syntax --- node-marked-man-0.3.0/test/out/definition_list_syntax 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/test/out/definition_list_syntax 2019-02-02 00:42:15.000000000 +0000 @@ -5,16 +5,16 @@ Definition lists look like unordered lists: - · term: + • term: definition - · another one: + • another one: The definition may span multiple lines and even start new paragraphs - · ----ssoommeeaarrgg=: + • ----ssoommeeaarrgg=: We can do that too. January 1979 DEFITION_LIST_SYNTAX(5) diff -Nru node-marked-man-0.3.0/test/out/entity_encoding_test node-marked-man-0.4.0/test/out/entity_encoding_test --- node-marked-man-0.3.0/test/out/entity_encoding_test 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/test/out/entity_encoding_test 2019-02-02 00:42:15.000000000 +0000 @@ -12,29 +12,29 @@ Here's some special entities: - · • ○ + • • ○ - ·   + •   - · © © + • © © - · ” \ + • ” \ - · — — + • — — - · ® ® + • ® ® - · § § + • § § - · ≥ ≥ + • ≥ ≥ - · ≤ ≤ + • ≤ ≤ - · ≠ ≠ + • ≠ ≠ - · ≡ ≡ + • ≡ ≡ - · ± ± + • ± ± Here's a line that uses non-breaking spaces to force the last few words to wrap together. diff -Nru node-marked-man-0.3.0/test/out/links node-marked-man-0.4.0/test/out/links --- node-marked-man-0.3.0/test/out/links 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/test/out/links 2019-02-02 00:42:15.000000000 +0000 @@ -3,7 +3,7 @@ NNAAMMEE lliinnkkss - I get 10 times more traffic from Google _h_t_t_p_:_/_/_g_o_o_g_l_e_._c_o_m_/ than from - Yahoo _h_t_t_p_:_/_/_s_e_a_r_c_h_._y_a_h_o_o_._c_o_m_/ or MSN _h_t_t_p_:_/_/_s_e_a_r_c_h_._m_s_n_._c_o_m_/. + I get 10 times more traffic from [Google]_h_t_t_p_:_/_/_g_o_o_g_l_e_._c_o_m_/ than from + [Yahoo]_h_t_t_p_:_/_/_s_e_a_r_c_h_._y_a_h_o_o_._c_o_m_/ or [MSN]_h_t_t_p_:_/_/_s_e_a_r_c_h_._m_s_n_._c_o_m_/. January 1979 LINKS() diff -Nru node-marked-man-0.3.0/test/out/markdown_syntax node-marked-man-0.4.0/test/out/markdown_syntax --- node-marked-man-0.3.0/test/out/markdown_syntax 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/test/out/markdown_syntax 2019-02-02 00:42:15.000000000 +0000 @@ -44,12 +44,12 @@ document should be publishable as-is, as plain text, without looking like it's been marked up with tags or formatting instructions. While Markdown's syntax has been influenced by several existing text-to-HTML - filters -- including Setext _h_t_t_p_:_/_/_d_o_c_u_t_i_l_s_._s_o_u_r_c_e_f_o_r_g_e_._n_e_t_/_m_i_r_‐ - _r_o_r_/_s_e_t_e_x_t_._h_t_m_l, atx _h_t_t_p_:_/_/_w_w_w_._a_a_r_o_n_s_w_._c_o_m_/_2_0_0_2_/_a_t_x_/, Textile - _h_t_t_p_:_/_/_t_e_x_t_i_s_m_._c_o_m_/_t_o_o_l_s_/_t_e_x_t_i_l_e_/, reStructuredText _h_t_t_p_:_/_/_d_o_c_u_‐ + filters -- including [Setext] 1 _h_t_t_p_:_/_/_d_o_c_u_t_i_l_s_._s_o_u_r_c_e_f_o_r_g_e_._n_e_t_/_m_i_r_‐ + _r_o_r_/_s_e_t_e_x_t_._h_t_m_l, [atx] 2 _h_t_t_p_:_/_/_w_w_w_._a_a_r_o_n_s_w_._c_o_m_/_2_0_0_2_/_a_t_x_/, [Textile] 3 + _h_t_t_p_:_/_/_t_e_x_t_i_s_m_._c_o_m_/_t_o_o_l_s_/_t_e_x_t_i_l_e_/, [reStructuredText] 4 _h_t_t_p_:_/_/_d_o_c_u_‐ _t_i_l_s_._s_o_u_r_c_e_f_o_r_g_e_._n_e_t_/_r_s_t_._h_t_m_l, - Grutatext _h_t_t_p_:_/_/_w_w_w_._t_r_i_p_t_i_c_o_._c_o_m_/_s_o_f_t_w_a_r_e_/_g_r_u_t_a_t_x_t_._h_t_m_l, and EtText - _h_t_t_p_:_/_/_e_t_t_e_x_t_._t_a_i_n_t_._o_r_g_/_d_o_c_/ -- the single biggest source of + [Grutatext] 5 _h_t_t_p_:_/_/_w_w_w_._t_r_i_p_t_i_c_o_._c_o_m_/_s_o_f_t_w_a_r_e_/_g_r_u_t_a_t_x_t_._h_t_m_l, and [Et‐ + Text] 6 _h_t_t_p_:_/_/_e_t_t_e_x_t_._t_a_i_n_t_._o_r_g_/_d_o_c_/ -- the single biggest source of inspiration for Markdown's syntax is the format of plain text email. To this end, Markdown's syntax is comprised entirely of punctuation @@ -191,10 +191,11 @@ work best -- and look better -- when you format them with hard breaks. HHeeaaddeerrss - Markdown supports two styles of headers, Setext _h_t_t_p_:_/_/_d_o_c_u_t_i_l_s_._s_o_u_r_c_e_‐ - _f_o_r_g_e_._n_e_t_/_m_i_r_r_o_r_/_s_e_t_e_x_t_._h_t_m_l and atx _h_t_t_p_:_/_/_w_w_w_._a_a_r_o_n_s_w_._c_o_m_/_2_0_0_2_/_a_t_x_/. + Markdown supports two styles of headers, [Setext] 1 _h_t_t_p_:_/_/_d_o_c_u_‐ + _t_i_l_s_._s_o_u_r_c_e_f_o_r_g_e_._n_e_t_/_m_i_r_r_o_r_/_s_e_t_e_x_t_._h_t_m_l and [atx] 2 + _h_t_t_p_:_/_/_w_w_w_._a_a_r_o_n_s_w_._c_o_m_/_2_0_0_2_/_a_t_x_/. - Setext-style headers are "underlined" using equal signs (for + Setext-style headers are "underlined" using equal signs (for first-level headers) and dashes (for second-level headers). For example: @@ -259,7 +260,7 @@ > > Back to the first level. - Blockquotes can contain other Markdown elements, including headers, + Blockquotes can contain other Markdown elements, including headers, lists, and code blocks: @@ -332,7 +333,7 @@ But if you want to be lazy, you don't have to. If you do use lazy list numbering, however, you should still start the - list with the number 1. At some point in the future, Markdown may sup‐ + list with the number 1. At some point in the future, Markdown may sup‐ port starting ordered lists at an arbitrary number. @@ -555,16 +556,16 @@ That is: - · Square brackets containing the link identifier (optionally + • Square brackets containing the link identifier (optionally indented from the left margin using up to three spaces); - · followed by a colon; + • followed by a colon; - · followed by one or more spaces (or tabs); + • followed by one or more spaces (or tabs); - · followed by the URL for the link; + • followed by the URL for the link; - · optionally followed by a title attribute for the link, enclosed + • optionally followed by a title attribute for the link, enclosed in double or single quotes, or enclosed in parentheses. The following three link definitions are equivalent: @@ -710,7 +711,7 @@ \*this text is surrounded by literal asterisks\* CCooddee - To indicate a span of code, wrap it with backtick quotes (`` ). + To indicate a span of code, wrap it with backtick quotes ( `` ). Unlike a pre-formatted code block, a code span indicates code within a normal paragraph. For example: @@ -777,12 +778,12 @@ That is: - · An exclamation mark: !!; + • An exclamation mark: !!; - · followed by a set of square brackets, containing the aalltt + • followed by a set of square brackets, containing the aalltt attribute text for the image; - · followed by a set of parentheses, containing the URL or path to + • followed by a set of parentheses, containing the URL or path to the image, and an optional ttiittllee attribute enclosed in double or single quotes. @@ -801,10 +802,10 @@ MMIISSCCEELLLLAANNEEOOUUSS AAuuttoommaattiicc LLiinnkkss - Markdown supports a shortcut style for creating "automatic" links for + Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with - angle brackets. What this means is that if you want to show the actual - text of a URL or email address, and also have it be a clickable link, + angle brackets. What this means is that if you want to show the actual + text of a URL or email address, and also have it be a clickable link, you can do this: @@ -827,7 +828,7 @@ m">address@exa mple.com - which will render in a browser as a clickable link to "address@exam‐ + which will render in a browser as a clickable link to "address@exam‐ ple.com". (This sort of entity-encoding trick will indeed fool many, if not @@ -863,7 +864,7 @@ Markdown was created by John Gruber. Manual page by Ryan Tomayko. It's pretty much a direct copy of the - Markdown Syntax Reference _h_t_t_p_:_/_/_d_a_r_i_n_g_f_i_r_e_b_a_l_l_._n_e_t_/_p_r_o_j_e_c_t_s_/_m_a_r_k_‐ + Markdown Syntax Reference _h_t_t_p_:_/_/_d_a_r_i_n_g_f_i_r_e_b_a_l_l_._n_e_t_/_p_r_o_j_e_c_t_s_/_m_a_r_k_‐ _d_o_w_n_/_s_y_n_t_a_x, also by John Gruber. diff -Nru node-marked-man-0.3.0/test/out/nested_list_with_code node-marked-man-0.4.0/test/out/nested_list_with_code --- node-marked-man-0.3.0/test/out/nested_list_with_code 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/test/out/nested_list_with_code 2019-02-02 00:42:15.000000000 +0000 @@ -3,11 +3,11 @@ NNAAMMEE aa - · ttooggggllee__ssttaattuuss + • ttooggggllee__ssttaattuuss - · Toggle the display of the status bar. + • Toggle the display of the status bar. - · ssppaawwnn <> <> TODO explain path-alike expan‐ + • ssppaawwnn <> <> TODO explain path-alike expan‐ sion January 1979 A(1) diff -Nru node-marked-man-0.3.0/test/out/table node-marked-man-0.4.0/test/out/table --- node-marked-man-0.3.0/test/out/table 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/test/out/table 2019-02-02 00:42:15.000000000 +0000 @@ -29,11 +29,11 @@ │GEC DOS filing GEC 1977 OS4000 │ │system extended │ │FAT (8-bit) Microsoft (Marc 1977 Microsoft Stand‐ │ - │ McDonald) for alone Disk │ - │ NCR BASIC-80 (later │ + │ McDonald) for alone Disk BA‐ │ + │ NCR SIC-80 (later │ │ Microsoft Stand‐ │ - │ alone Disk │ - │ BASIC-86) │ + │ alone Disk BA‐ │ + │ SIC-86) │ │DOS 3.x Apple Computer 1978 Apple DOS │ │Pascal Apple Computer 1978 Apple Pascal │ │CBM DOS Commodore 1978 Commodore BASIC │ @@ -100,8 +100,8 @@ │ OSR2[b] │ │QFS Sun Microsystems 1996 Solaris │ │GPFS IBM 1996 AIX, Linux │ - │Be File System Be Inc. (D. 1996 BeOS │ - │ Giampaolo, Cyril │ + │Be File System Be Inc. (D. Gi‐ 1996 BeOS │ + │ ampaolo, Cyril │ │ Meurillon) │ │Minix V2 FS Andrew S. Tanen‐ 1997 MINIX 2.0 │ │ baum │ @@ -177,12 +177,12 @@ │ recognize it, but │ │ beyond the obvious │ │ facts that you are │ - │ a bachelor, a │ - │ solicitor, a │ - │ freemason, and an │ - │ asthmatic, I know │ - │ nothing whatever │ - │ about you. │ + │ a bachelor, a so‐ │ + │ licitor, a freema‐ │ + │ son, and an asth‐ │ + │ matic, I know noth‐ │ + │ ing whatever about │ + │ you. │ └──────────────────────────────────────────────────────────────────────┘ TTHHIINNGG TTAABBLLEE ┌──────────────────────────────────────────────────────────────────────┐ diff -Nru node-marked-man-0.3.0/test/out/underline_spacing_test node-marked-man-0.4.0/test/out/underline_spacing_test --- node-marked-man-0.3.0/test/out/underline_spacing_test 2017-07-14 15:53:23.000000000 +0000 +++ node-marked-man-0.4.0/test/out/underline_spacing_test 2019-02-02 00:42:15.000000000 +0000 @@ -3,10 +3,10 @@ NNAAMMEE TThhiiss - · --SS _t_e_x_t, sseeaarrcchh _t_e_x_t: + • --SS _t_e_x_t, sseeaarrcchh _t_e_x_t: Performs a substring search of formula names for _t_e_x_t. - · --OO , ootthheerr : + • --OO , ootthheerr : Does something else. Should space text properly.