Update/add discount library tests

Author: mingodad

discount/Plan9/markdown.2

@@ -122,7 +122,7 @@ tags from the output.
 Suppress Smartypants-style replacement of quotes, dashes, or ellipses.
 .TP
 .B MKD_STRICT
-Disable superscript and relaxed emphasis processing if configured; otherwise a no-op.
+Disable superscript and relaxed emphasis processing.
 .TP
 .B MKD_TAGTEXT
 Process as inside an

discount/Plan9/markdown.6

@@ -520,9 +520,7 @@ cell in the column.
 A colon at both ends of a column's header dashes indicates center alignment.
 .TP
 Relaxed Emphasis
-If configured with
-.BR --relaxed-emphasis ,
-the rules for emphasis are changed so that a single
+The rules for emphasis are changed so that a single
 .B _
 will not count as an emphasis character in the middle of a word.
 This is useful for documenting some code where

discount/Plan9/mkfile

@@ -2,7 +2,7 @@ BIN=/$objtype/bin
 CC='cc -D_BSD_EXTENSION -D_C99_SNPRINTF_EXTENSION'
 
 markdown:
-	ape/psh -c 'cd .. && make'
+	ape/psh -c 'cd .. && $CC mktags.c -o mktags && ./mktags > blocktags && make'
 
 none:V: markdown
 

discount/tests/backslash.t

@@ -12,5 +12,10 @@ try -fautolink 'autolink url with trailing \' \
     'http://a.com/\' \
     '<p><a href="http://a.com/\">http://a.com/\</a></p>'
 
+
+try 'backslashes before <text' '\<code>' '<p>\<code></p>'
+try 'backslashes before <{EOF}' '\<' '<p>&lt;</p>'
+try 'backslashes before <[space]' '\< j' '<p>&lt; j</p>'
+
 summary $0
 exit $rc

discount/tests/code.t

@@ -31,16 +31,54 @@ try 'backslashes in code(1)' '    printf "%s: \n", $1;' \
 try 'backslashes in code(2)' '`printf "%s: \n", $1;`' \
 '<p><code>printf "%s: \n", $1;</code></p>'
 
-if ./markdown -V | grep FENCED-CODE >/dev/null; then
+try 'fenced code disabled backtick' \
+'```
 
-try 'fenced code block' \
+unrecognized code!
+```' \
+'<p>```</p>
+
+<p>unrecognized code!
+```</p>'
+
+# no <pre/> proves it’s the inline variant of `code` delimitation
+try 'fenced code disabled backtick as inline code' \
+'```
+inline code?
+```' \
+'<p><code>
+inline code?
+</code></p>'
+
+try 'fenced code disabled tilde' \
+'~~~
+
+unrecognized code!
+~~~' \
+'<p>~~~</p>
+
+<p>unrecognized code!
+~~~</p>'
+
+try -ffencedcode 'fenced code block with blank lines' \
 '~~~
 code!
+
+still code!
 ~~~' \
     '<pre><code>code!
+
+still code!
 </code></pre>'
 
-try 'fenced code block in list' \
+try  -ffencedcode 'fenced code block' \
+'~~~
+code!
+~~~' \
+    '<pre><code>code!
+</code></pre>'
+
+try  -ffencedcode 'fenced code block in list' \
 '1. ~~~
 code block
 ~~~' \
@@ -49,20 +87,20 @@ code block
 </code></pre></li>
 </ol>'
 
-try 'fenced code block in blockquote' \
+try  -ffencedcode 'fenced code block in blockquote' \
 '>~~~
 code
 ~~~' \
 '<blockquote><pre><code>code
 </code></pre></blockquote>'
 
-try 'unterminated fenced code block' \
+try  -ffencedcode 'unterminated fenced code block' \
 '~~~
 code' \
 '<p>~~~
 code</p>'
 
-try 'fenced code block with tildes' \
+try  -ffencedcode 'fenced code block with tildes' \
 '~~~~~
 ~~~
 code with tildes
@@ -73,7 +111,7 @@ code with tildes
 ~~~
 </code></pre>'
 
-try 'paragraph with trailing fenced block' \
+try  -ffencedcode 'paragraph with trailing fenced block' \
 'text text text
 text text text
 ~~~
@@ -85,7 +123,69 @@ text text text
 code code code?
 ~~~</p>'
 
-fi
+try  -ffencedcode 'fenced code blocks with backtick delimiters' \
+'```
+code
+```' \
+'<pre><code>code
+</code></pre>'
+
+try  -ffencedcode 'fenced code block with mismatched delimters' \
+'```
+code
+~~~' \
+'<p>```
+code
+~~~</p>'
+
+try  -ffencedcode 'fenced code block with lang attribute' \
+'```lang
+code
+```' \
+'<pre><code class="lang">code
+</code></pre>'
+
+try  -ffencedcode 'fenced code block with lang-name attribute' \
+'```lang-name
+code
+```' \
+'<pre><code class="lang-name">code
+</code></pre>'
+
+try  -ffencedcode 'fenced code block with lang_name attribute' \
+'```lang_name
+code
+```' \
+'<pre><code class="lang_name">code
+</code></pre>'
+
+try  -ffencedcode 'fenced code block with lang attribute and space' \
+'``` lang
+code
+```' \
+'<pre><code class="lang">code
+</code></pre>'
+
+try  -ffencedcode 'fenced code block with lang attribute and multiple spaces' \
+'```       lang
+code
+```' \
+'<pre><code class="lang">code
+</code></pre>'
+
+try  -ffencedcode 'fenced code block with lang-name attribute and space' \
+'``` lang-name
+code
+```' \
+'<pre><code class="lang-name">code
+</code></pre>'
+
+try  -ffencedcode 'fenced code block with lang_name attribute and space' \
+'``` lang_name
+code
+```' \
+'<pre><code class="lang_name">code
+</code></pre>'
 
 summary $0
 exit $rc

discount/tests/defects.t

@@ -0,0 +1,25 @@
+. tests/functions.sh
+
+title "reported defects"
+
+rc=0
+MARKDOWN_FLAGS=
+
+try 'masses of non-block html' \
+'<span>foo</span><br>
+<br>
+<span>bar</span><br>' \
+'<p><span>foo</span><br>
+<br>
+<span>bar</span><br></p>'
+
+try -fautolink -G 'autolink + github-flavoured markdown' \
+'http://foo
+bar' \
+'<p><a href="http://foo">http://foo</a><br/>
+bar</p>'
+
+try 'unterminated <p> block' '<p></>*' '<p><p></>*</p>'
+
+summary $0
+exit $rc

discount/tests/dl.t

@@ -2,10 +2,6 @@
 
 title "definition lists"
 
-eval `./markdown -V | tr ' ' '\n' | grep '^DL='`
-
-DL=${DL:-BOTH}
-
 rc=0
 MARKDOWN_FLAGS=
 
@@ -22,11 +18,11 @@ RSLT='<dl>
 <dd>eh?</dd>
 </dl>'
 
-if [ "$DL" = "DISCOUNT" -o "$DL" = "BOTH" ]; then
-    try -fdefinitionlist '=tag= generates definition lists' "$SRC" "$RSLT"
+# discount style
+try -fdefinitionlist '=tag= generates definition lists' "$SRC" "$RSLT"
 
-	try 'one item with two =tags=' \
-	    '=this=
+try 'one item with two =tags=' \
+    '=this=
 =is=
     A test, eh?' \
 	    '<dl>
@@ -35,24 +31,22 @@ if [ "$DL" = "DISCOUNT" -o "$DL" = "BOTH" ]; then
 <dd>A test, eh?</dd>
 </dl>'
 
-
-	try -fnodefinitionlist '=tag= does nothing' "$SRC" \
-	    '<p>=this=
+# extra style
+try -fnodefinitionlist,dlextra '=tag= does nothing' "$SRC" \
+    '<p>=this=
     is an ugly
 =test=
     eh?</p>'
-fi
 
-if [ "$DL" = "EXTRA" -o "$DL" = "BOTH" ]; then
-    try 'markdown extra-style definition lists' \
+try -fdlextra 'markdown extra-style definition lists' \
 'foo
 : bar' \
 '<dl>
 <dt>foo</dt>
 <dd>bar</dd>
 </dl>'
 
-    try '... with two <dt>s in a row' \
+try -fdlextra '... with two <dt>s in a row' \
 'foo
 bar
 : baz' \
@@ -62,7 +56,7 @@ bar
 <dd>baz</dd>
 </dl>'
 
-    try '... with two <dd>s in a row' \
+try -fdlextra '... with two <dd>s in a row' \
 'foo
 : bar
 : baz' \
@@ -72,7 +66,7 @@ bar
 <dd>baz</dd>
 </dl>'
 
-    try '... with blanks between list items' \
+try -fdlextra '... with blanks between list items' \
 'foo
 : bar
 
@@ -85,7 +79,23 @@ zip
 <dd>zap</dd>
 </dl>'
 
-fi
+# Hmm, redundancy...
+SRC='foo
+: bar
+
+=this=
+    is ugly'
+RSLT='<p>foo
+: bar</p>
+
+<p>=this=
+    is ugly</p>'
+try -fnodldiscount '... with definitionlists enabled but all styles disabled' \
+"$SRC" \
+"$RSLT"
+try -fnodefinitionlist,dldiscount,dlextra '... with definitionlists disabled but all styles enabled' \
+    "$SRC" \
+    "$RSLT"
 
 summary $0
 exit $rc