kc3-lang/md4c

diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index 53ce7fd..471e87b 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -31,49 +31,53 @@ echo "CommonMark specification:"
 $PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/spec.txt" -p "$PROGRAM"
 
 echo
-echo "Code coverage & regressions:"
-$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/coverage.txt" -p "$PROGRAM"
-
-echo
 echo "Permissive e-mail autolinks extension:"
-$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/permissive-email-autolinks.txt" -p "$PROGRAM --fpermissive-email-autolinks"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/permissive-email-autolinks.txt" -p "$PROGRAM"
 
 echo
 echo "Permissive URL autolinks extension:"
-$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/permissive-url-autolinks.txt" -p "$PROGRAM --fpermissive-url-autolinks"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/permissive-url-autolinks.txt" -p "$PROGRAM"
 
 echo
 echo "WWW autolinks extension:"
-$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/permissive-www-autolinks.txt" -p "$PROGRAM --fpermissive-www-autolinks"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/permissive-www-autolinks.txt" -p "$PROGRAM"
 
 echo
 echo "Hard soft breaks extension:"
-$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/hard-soft-breaks.txt" -p "$PROGRAM --fhard-soft-breaks"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/hard-soft-breaks.txt" -p "$PROGRAM"
 
 echo
 echo "Tables extension:"
-$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/tables.txt" -p "$PROGRAM --ftables"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/tables.txt" -p "$PROGRAM"
 
 echo
 echo "Strikethrough extension:"
-$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/strikethrough.txt" -p "$PROGRAM --fstrikethrough"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/strikethrough.txt" -p "$PROGRAM"
 
 echo
 echo "Task lists extension:"
-$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/tasklists.txt" -p "$PROGRAM --ftasklists"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/tasklists.txt" -p "$PROGRAM"
 
 echo
 echo "LaTeX extension:"
-$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/latex-math.txt" -p "$PROGRAM --flatex-math"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/latex-math.txt" -p "$PROGRAM"
 
 echo
 echo "Wiki links extension:"
-$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/wiki-links.txt" -p "$PROGRAM --fwiki-links --ftables"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/wiki-links.txt" -p "$PROGRAM"
 
 echo
 echo "Underline extension:"
-$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/underline.txt" -p "$PROGRAM --funderline"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/underline.txt" -p "$PROGRAM"
+
+echo
+echo "Code coverage:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/coverage.txt" -p "$PROGRAM"
+
+echo
+echo "Regressions:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/regressions.txt" -p "$PROGRAM"
 
 echo
-echo "Pathological input:"
+echo "Pathological inputs:"
 $PYTHON "$TEST_DIR/pathological_tests.py" -p "$PROGRAM"
diff --git a/test/cmark.py b/test/cmark.py
deleted file mode 100755
index 1110860..0000000
--- a/test/cmark.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-from ctypes import CDLL, c_char_p, c_long
-from subprocess import *
-import platform
-import os
-
-def pipe_through_prog(prog, text):
-    p1 = Popen(prog.split(), stdout=PIPE, stdin=PIPE, stderr=PIPE)
-    [result, err] = p1.communicate(input=text.encode('utf-8'))
-    return [p1.returncode, result.decode('utf-8'), err]
-
-def use_library(lib, text):
-    textbytes = text.encode('utf-8')
-    textlen = len(textbytes)
-    return [0, lib(textbytes, textlen, 0).decode('utf-8'), '']
-
-class CMark:
-    def __init__(self, prog=None, library_dir=None):
-        self.prog = prog
-        if prog:
-            self.to_html = lambda x: pipe_through_prog(prog, x)
-        else:
-            sysname = platform.system()
-            if sysname == 'Darwin':
-                libname = "libcmark.dylib"
-            elif sysname == 'Windows':
-                libname = "cmark.dll"
-            else:
-                libname = "libcmark.so"
-            if library_dir:
-                libpath = os.path.join(library_dir, libname)
-            else:
-                libpath = os.path.join("build", "src", libname)
-            cmark = CDLL(libpath)
-            markdown = cmark.cmark_markdown_to_html
-            markdown.restype = c_char_p
-            markdown.argtypes = [c_char_p, c_long]
-            self.to_html = lambda x: use_library(markdown, x)
diff --git a/test/coverage.txt b/test/coverage.txt
index 5d79bdb..e8954c3 100644
--- a/test/coverage.txt
+++ b/test/coverage.txt
@@ -1,458 +1,11 @@
 
 # Coverage
 
-This file is just a collection of unit tests not covered elsewhere.
+This file is just a collection of tests designed to activate code in MD4C
+which may otherwise be hard to hit. It's to improve our test coverage.
 
-Most notably regression tests, tests improving code coverage and other useful
-things may drop here.
 
-(However any tests requiring any additional command line option, like enabling
-an extension, must be included in their respective files.)
-
-
-## GitHub Issues
-
-### [Issue 2](https://github.com/mity/md4c/issues/2)
-
-Raw HTML block:
-
-```````````````````````````````` example
-<gi att1=tok1 att2=tok2>
-.
-<gi att1=tok1 att2=tok2>
-````````````````````````````````
-
-Inline:
-
-```````````````````````````````` example
-foo <gi att1=tok1 att2=tok2> bar
-.
-<p>foo <gi att1=tok1 att2=tok2> bar</p>
-````````````````````````````````
-
-Inline with a line break:
-
-```````````````````````````````` example
-foo <gi att1=tok1
-att2=tok2> bar
-.
-<p>foo <gi att1=tok1
-att2=tok2> bar</p>
-````````````````````````````````
-
-
-### [Issue 4](https://github.com/mity/md4c/issues/4)
-
-```````````````````````````````` example
-![alt text with *entity* &copy;](img.png 'title')
-.
-<p><img src="img.png" alt="alt text with entity ©" title="title"></p>
-````````````````````````````````
-
-
-### [Issue 9](https://github.com/mity/md4c/issues/9)
-
-```````````````````````````````` example
-> [foo
-> bar]: /url
->
-> [foo bar]
-.
-<blockquote>
-<p><a href="/url">foo
-bar</a></p>
-</blockquote>
-````````````````````````````````
-
-
-### [Issue 10](https://github.com/mity/md4c/issues/10)
-
-```````````````````````````````` example
-[x]:
-x
-- <?
-
-  x
-.
-<ul>
-<li><?
-
-x
-</li>
-</ul>
-````````````````````````````````
-
-
-### [Issue 11](https://github.com/mity/md4c/issues/11)
-
-```````````````````````````````` example
-x [link](/url "foo &ndash; bar") x
-.
-<p>x <a href="/url" title="foo – bar">link</a> x</p>
-````````````````````````````````
-
-
-### [Issue 14](https://github.com/mity/md4c/issues/14)
-
-```````````````````````````````` example
-a***b* c*
-.
-<p>a*<em><em>b</em> c</em></p>
-````````````````````````````````
-
-
-### [Issue 15](https://github.com/mity/md4c/issues/15)
-
-```````````````````````````````` example
-***b* c*
-.
-<p>*<em><em>b</em> c</em></p>
-````````````````````````````````
-
-
-### [Issue 21](https://github.com/mity/md4c/issues/21)
-
-```````````````````````````````` example
-a*b**c*
-.
-<p>a<em>b**c</em></p>
-````````````````````````````````
-
-
-### [Issue 33](https://github.com/mity/md4c/issues/33)
-
-```````````````````````````````` example
-```&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;
-.
-<pre><code class="language-&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;"></code></pre>
-````````````````````````````````
-
-
-### [Issue 36](https://github.com/mity/md4c/issues/36)
-
-```````````````````````````````` example
-__x_ _x___
-.
-<p><em><em>x</em> <em>x</em></em>_</p>
-````````````````````````````````
-
-
-### [Issue 39](https://github.com/mity/md4c/issues/39)
-
-```````````````````````````````` example
-[\\]: x
-.
-````````````````````````````````
-
-
-### [Issue 40](https://github.com/mity/md4c/issues/40)
-
-```````````````````````````````` example
-[x](url
-'title'
-)x
-.
-<p><a href="url" title="title">x</a>x</p>
-````````````````````````````````
-
-
-### [Issue 65](https://github.com/mity/md4c/issues/65)
-
-```````````````````````````````` example
-`
-.
-<p>`</p>
-````````````````````````````````
-
-
-### [Issue 74](https://github.com/mity/md4c/issues/74)
-
-```````````````````````````````` example
-[f]:
--
-    xx
--
-.
-<pre><code>xx
-</code></pre>
-<ul>
-<li></li>
-</ul>
-````````````````````````````````
-
-
-### [Issue 78](https://github.com/mity/md4c/issues/78)
-
-```````````````````````````````` example
-[SS ẞ]: /url
-[ẞ SS]
-.
-<p><a href="/url">ẞ SS</a></p>
-````````````````````````````````
-
-
-### [Issue 83](https://github.com/mity/md4c/issues/83)
-
-```````````````````````````````` example
-foo
->
-.
-<p>foo</p>
-<blockquote>
-</blockquote>
-
-````````````````````````````````
-
-
-### [Issue 95](https://github.com/mity/md4c/issues/95)
-
-```````````````````````````````` example
-. foo
-.
-<p>. foo</p>
-````````````````````````````````
-
-
-### [Issue 96](https://github.com/mity/md4c/issues/96)
-
-```````````````````````````````` example
-[ab]: /foo
-[a] [ab] [abc]
-.
-<p>[a] <a href="/foo">ab</a> [abc]</p>
-````````````````````````````````
-
-```````````````````````````````` example
-[a b]: /foo
-[a   b]
-.
-<p><a href="/foo">a   b</a></p>
-````````````````````````````````
-
-
-### [Issue 97](https://github.com/mity/md4c/issues/97)
-
-```````````````````````````````` example
-*a **b c* d**
-.
-<p><em>a <em><em>b c</em> d</em></em></p>
-
-````````````````````````````````
-
-
-### [Issue 100](https://github.com/mity/md4c/issues/100)
-
-```````````````````````````````` example
-<foo@123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123>
-.
-<p><a href="mailto:foo@123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123">foo@123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123</a></p>
-````````````````````````````````
-
-```````````````````````````````` example
-<foo@123456789012345678901234567890123456789012345678901234567890123x.123456789012345678901234567890123456789012345678901234567890123>
-.
-<p>&lt;foo@123456789012345678901234567890123456789012345678901234567890123x.123456789012345678901234567890123456789012345678901234567890123&gt;</p>
-````````````````````````````````
-(Note the `x` here which turns it over the max. allowed length limit.)
-
-
-### [Issue 107](https://github.com/mity/md4c/issues/107)
-
-```````````````````````````````` example
-***foo *bar baz***
-.
-<p>*<strong>foo <em>bar baz</em></strong></p>
-
-````````````````````````````````
-
-
-### [Issue 124](https://github.com/mity/md4c/issues/124)
-
-```````````````````````````````` example
-~~~
-                x
-~~~
-
-~~~
-                 x
-~~~
-.
-<pre><code>                x
-</code></pre>
-<pre><code>                 x
-</code></pre>
-````````````````````````````````
-
-
-### [Issue 131](https://github.com/mity/md4c/issues/131)
-
-```````````````````````````````` example
-[![alt][img]][link]
-
-[img]: img_url
-[link]: link_url
-.
-<p><a href="link_url"><img src="img_url" alt="alt"></a></p>
-````````````````````````````````
-
-
-### [Issue 142](https://github.com/mity/md4c/issues/142)
-
-```````````````````````````````` example
-[fooﬗ]: /url
-[fooﬕ]
-.
-<p>[fooﬕ]</p>
-````````````````````````````````
-
-
-### [Issue 149](https://github.com/mity/md4c/issues/149)
-
-```````````````````````````````` example
-- <script>
-- foo
-bar
-</script>
-.
-<ul>
-<li><script>
-</li>
-<li>foo
-bar
-</script></li>
-</ul>
-````````````````````````````````
-
-
-### [Issue 190](https://github.com/mity/md4c/issues/190)
-
-```````````````````````````````` example
--
-
-    foo
-.
-<ul>
-<li></li>
-</ul>
-<pre><code>foo
-</code></pre>
-````````````````````````````````
-
-
-### [Issue 200](https://github.com/mity/md4c/issues/200)
-
-```````````````````````````````` example
-<!-- foo -->
-    ```
-    bar
-    ```
-.
-<!-- foo -->
-<pre><code>```
-bar
-```
-</code></pre>
-````````````````````````````````
-
-
-### [Issue 201](https://github.com/mity/md4c/issues/201)
-
-```````````````````````````````` example
-foo
-    ```
-    bar
-    ```
-.
-<p>foo
-<code>bar</code></p>
-````````````````````````````````
-
-
-### [Issue 207](https://github.com/mity/md4c/issues/207)
-
-```````````````````````````````` example
-<textarea>
-
-*foo*
-
-_bar_
-
-</textarea>
-
-baz
-.
-<textarea>
-
-*foo*
-
-_bar_
-
-</textarea>
-<p>baz</p>
-````````````````````````````````
-
-
-### [Issue 210](https://github.com/mity/md4c/issues/210)
-
-```````````````````````````````` example
-![outer ![inner](img_inner "inner title")](img_outer "outer title")
-.
-<p><img src="img_outer" alt="outer inner" title="outer title"></p>
-````````````````````````````````
-
-
-### [Issue 215](https://github.com/mity/md4c/issues/215)
-
-```````````````````````````````` example
-title
---→
-.
-<h2>title</h2>
-````````````````````````````````
-
-
-### [Issue 216](https://github.com/mity/md4c/issues/216)
-
-```````````````````````````````` example
-x <!A>
-.
-<p>x <!A></p>
-````````````````````````````````
-
-
-### [Issue 217](https://github.com/mity/md4c/issues/217)
-
-```````````````````````````````` example
-__!_!__
-
-__!x!__
-
-**!*!**
-
----
-
-_*__*_*
-
-_*xx*_*
-
-_*__-_-
-
-_*xx-_-
-.
-<p><strong>!_!</strong></p>
-<p><strong>!x!</strong></p>
-<p><strong>!*!</strong></p>
-<hr />
-<p><em><em>__</em></em>*</p>
-<p><em><em>xx</em></em>*</p>
-<p><em>*__-</em>-</p>
-<p><em>*xx-</em>-</p>
-````````````````````````````````
-
-
-## Code coverage
-
-### `md_is_unicode_whitespace__()`
+## `md_is_unicode_whitespace__()`
 
 Unicode whitespace (here U+2000) forms a word boundary so these cannot be
 resolved as emphasis span because there is no closer mark.
@@ -464,7 +17,7 @@ resolved as emphasis span because there is no closer mark.
 ````````````````````````````````
 
 
-### `md_is_unicode_punct__()`
+## `md_is_unicode_punct__()`
 
 Ditto for Unicode punctuation (here U+00A1).
 
@@ -475,7 +28,7 @@ Ditto for Unicode punctuation (here U+00A1).
 ````````````````````````````````
 
 
-### `md_get_unicode_fold_info()`
+## `md_get_unicode_fold_info()`
 
 ```````````````````````````````` example
 [Příliš žluťoučký kůň úpěl ďábelské ódy.]
@@ -486,7 +39,7 @@ Ditto for Unicode punctuation (here U+00A1).
 ````````````````````````````````
 
 
-### `md_decode_utf8__()` and `md_decode_utf8_before__()`
+## `md_decode_utf8__()` and `md_decode_utf8_before__()`
 
 ```````````````````````````````` example
 á*Á (U+00E1, i.e. two byte UTF-8 sequence)
@@ -497,7 +50,7 @@ Ditto for Unicode punctuation (here U+00A1).
 ````````````````````````````````
 
 
-### `md_is_link_destination_A()`
+## `md_is_link_destination_A()`
 
 ```````````````````````````````` example
 [link](</url\.with\.escape>)
@@ -506,7 +59,7 @@ Ditto for Unicode punctuation (here U+00A1).
 ````````````````````````````````
 
 
-### `md_link_label_eq()`
+## `md_link_label_eq()`
 
 ```````````````````````````````` example
 [foo bar]
@@ -517,7 +70,7 @@ Ditto for Unicode punctuation (here U+00A1).
 ````````````````````````````````
 
 
-### `md_is_inline_link_spec()`
+## `md_is_inline_link_spec()`
 
 ```````````````````````````````` example
 > [link](/url 'foo
@@ -530,7 +83,7 @@ bar">link</a></p>
 ````````````````````````````````
 
 
-### `md_build_ref_def_hashtable()`
+## `md_build_ref_def_hashtable()`
 
 All link labels in the following example all have the same FNV1a hash (after
 normalization of the label, which means after converting to a vector of Unicode
diff --git a/test/hard-soft-breaks.txt b/test/hard-soft-breaks.txt
index 45cb383..b33f6c7 100644
--- a/test/hard-soft-breaks.txt
+++ b/test/hard-soft-breaks.txt
@@ -10,6 +10,8 @@ baz
 .
 <p>foo<br>
 baz</p>
+.
+--fhard-soft-breaks
 ````````````````````````````````
 
 ```````````````````````````````` example
@@ -21,4 +23,6 @@ render soft line breaks as hard line breaks.
 <p>A quote from the CommonMark Spec below:</p>
 <p>A renderer may also provide an option to<br>
 render soft line breaks as hard line breaks.</p>
+.
+--fhard-soft-breaks
 ````````````````````````````````
diff --git a/test/latex-math.txt b/test/latex-math.txt
index 2a5774c..1f44fea 100644
--- a/test/latex-math.txt
+++ b/test/latex-math.txt
@@ -11,6 +11,8 @@ A math span is is any text wrapped in dollars or double dollars (`$...$` or
 $a+b=c$ Hello, world!
 .
 <p><x-equation>a+b=c</x-equation> Hello, world!</p>
+.
+--flatex-math
 ````````````````````````````````
 
 If the double dollar sign is used, the math span is a display math span.
@@ -19,6 +21,8 @@ If the double dollar sign is used, the math span is a display math span.
 This is a display equation: $$\int_a^b x dx$$.
 .
 <p>This is a display equation: <x-equation type="display">\int_a^b x dx</x-equation>.</p>
+.
+--flatex-math
 ````````````````````````````````
 
 Math spans may span multiple lines as they are normal spans:
@@ -30,6 +34,8 @@ f(x) dx
 $$
 .
 <p><x-equation type="display">\int_a^b f(x) dx </x-equation></p>
+.
+--flatex-math
 ````````````````````````````````
 
 Note though that many (simple) renderers may output the math spans just as a
diff --git a/test/pathological_tests.py b/test/pathological_tests.py
index 76cb9df..78d77b9 100755
--- a/test/pathological_tests.py
+++ b/test/pathological_tests.py
@@ -5,19 +5,15 @@ import re
 import argparse
 import sys
 import platform
-from cmark import CMark
+from prog import Prog
 from timeit import default_timer as timer
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Run cmark tests.')
+    parser = argparse.ArgumentParser(description='Run Markdown tests.')
     parser.add_argument('-p', '--program', dest='program', nargs='?', default=None,
             help='program to test')
-    parser.add_argument('--library-dir', dest='library_dir', nargs='?',
-            default=None, help='directory containing dynamic library')
     args = parser.parse_args(sys.argv[1:])
 
-cmark = CMark(prog=args.program, library_dir=args.library_dir)
-
 # list of pairs consisting of input and a regex that must match the output.
 pathological = {
     # note - some pythons have limit of 65535 for {num-matches} in re.
@@ -105,9 +101,15 @@ failed = 0
 
 #print("Testing pathological cases:")
 for description in pathological:
-    (inp, regex) = pathological[description]
+    if len(pathological[description]) == 2:
+        (inp, regex) = pathological[description]
+        prog = Prog(cmdline=args.program)
+    else:
+        (inp, regex, default_options) = pathological[description]
+        prog = Prog(cmdline=args.program, default_options=default_options)
+
     start = timer()
-    [rc, actual, err] = cmark.to_html(inp)
+    [rc, actual, err] = prog.to_html(inp)
     end = timer()
     if rc != 0:
         errored += 1
diff --git a/test/permissive-email-autolinks.txt b/test/permissive-email-autolinks.txt
index 12e8786..f2e8997 100644
--- a/test/permissive-email-autolinks.txt
+++ b/test/permissive-email-autolinks.txt
@@ -12,6 +12,8 @@ This is standard CommonMark e-mail autolink:
 E-mail: <mailto:john.doe@gmail.com>
 .
 <p>E-mail: <a href="mailto:john.doe@gmail.com">mailto:john.doe@gmail.com</a></p>
+.
+--fpermissive-email-autolinks
 ````````````````````````````````
 
 With the permissive autolinks enabled, this is sufficient:
@@ -20,6 +22,8 @@ With the permissive autolinks enabled, this is sufficient:
 E-mail: john.doe@gmail.com
 .
 <p>E-mail: <a href="mailto:john.doe@gmail.com">john.doe@gmail.com</a></p>
+.
+--fpermissive-email-autolinks
 ````````````````````````````````
 
 `+` can occur before the `@`, but not after.
@@ -28,6 +32,8 @@ E-mail: john.doe@gmail.com
 hello@mail+xyz.example isn't valid, but hello+xyz@mail.example is.
 .
 <p>hello@mail+xyz.example isn't valid, but <a href="mailto:hello+xyz@mail.example">hello+xyz@mail.example</a> is.</p>
+.
+--fpermissive-email-autolinks
 ````````````````````````````````
 
 `.`, `-`, and `_` can occur on both sides of the `@`, but only `.` may occur at
@@ -47,4 +53,6 @@ a.b-c_d@a.b_
 <p><a href="mailto:a.b-c_d@a.b">a.b-c_d@a.b</a>.</p>
 <p>a.b-c_d@a.b-</p>
 <p>a.b-c_d@a.b_</p>
+.
+--fpermissive-email-autolinks
 ````````````````````````````````
diff --git a/test/permissive-url-autolinks.txt b/test/permissive-url-autolinks.txt
index dfd6b5d..d068499 100644
--- a/test/permissive-url-autolinks.txt
+++ b/test/permissive-url-autolinks.txt
@@ -11,6 +11,8 @@ This is a standard CommonMark autolink:
 Homepage: <https://github.com/mity/md4c>
 .
 <p>Homepage: <a href="https://github.com/mity/md4c">https://github.com/mity/md4c</a></p>
+.
+--fpermissive-url-autolinks
 ````````````````````````````````
 
 With the permissive autolinks enabled, this is sufficient:
@@ -19,6 +21,8 @@ With the permissive autolinks enabled, this is sufficient:
 Homepage: https://github.com/mity/md4c
 .
 <p>Homepage: <a href="https://github.com/mity/md4c">https://github.com/mity/md4c</a></p>
+.
+--fpermissive-url-autolinks
 ````````````````````````````````
 
 But this permissive autolink feature can work only for very widely used URL
@@ -30,6 +34,8 @@ That's why this is not a permissive autolink:
 ssh://root@example.com
 .
 <p>ssh://root@example.com</p>
+.
+--fpermissive-url-autolinks
 ````````````````````````````````
 
 The same rules for path validation as for permissivve WWW autolinks apply.
@@ -39,6 +45,8 @@ Therefore the final question mark here is not part of the autolink:
 Have you ever visited http://www.zombo.com?
 .
 <p>Have you ever visited <a href="http://www.zombo.com">http://www.zombo.com</a>?</p>
+.
+--fpermissive-url-autolinks
 ````````````````````````````````
 
 But in contrast, in this example it is:
@@ -47,6 +55,8 @@ But in contrast, in this example it is:
 http://www.bing.com/search?q=md4c
 .
 <p><a href="http://www.bing.com/search?q=md4c">http://www.bing.com/search?q=md4c</a></p>
+.
+--fpermissive-url-autolinks
 ````````````````````````````````
 
 And finally one complex example:
@@ -61,39 +71,6 @@ Anonymous FTP is available at ftp://foo.bar.baz.
 <p><a href="http://commonmark.org">http://commonmark.org</a></p>
 <p>(Visit <a href="https://encrypted.google.com/search?q=Markup+(business)">https://encrypted.google.com/search?q=Markup+(business)</a>)</p>
 <p>Anonymous FTP is available at <a href="ftp://foo.bar.baz">ftp://foo.bar.baz</a>.</p>
-````````````````````````````````
-
-
-## GitHub Issues
-
-### [Issue 53](https://github.com/mity/md4c/issues/53)
-
-```````````````````````````````` example
-This is [link](http://github.com/).
-.
-<p>This is <a href="http://github.com/">link</a>.</p>
-````````````````````````````````
-
-```````````````````````````````` example
-This is [link](http://github.com/)X
-.
-<p>This is <a href="http://github.com/">link</a>X</p>
-````````````````````````````````
-
-
-## [Issue 76](https://github.com/mity/md4c/issues/76)
-
-```````````````````````````````` example
-*(http://example.com)*
-.
-<p><em>(<a href="http://example.com">http://example.com</a>)</em></p>
-````````````````````````````````
-
-
-## [Issue 152](https://github.com/mity/md4c/issues/152)
-
-```````````````````````````````` example
-[http://example.com](http://example.com)
 .
-<p><a href="http://example.com">http://example.com</a></p>
+--fpermissive-url-autolinks
 ````````````````````````````````
diff --git a/test/permissive-www-autolinks.txt b/test/permissive-www-autolinks.txt
index 046de9d..7a3a772 100644
--- a/test/permissive-www-autolinks.txt
+++ b/test/permissive-www-autolinks.txt
@@ -20,6 +20,8 @@ The scheme `http` will be inserted automatically:
 www.commonmark.org
 .
 <p><a href="http://www.commonmark.org">www.commonmark.org</a></p>
+.
+--fpermissive-www-autolinks
 ````````````````````````````````
 
 After a valid domain, zero or more non-space non-`<` characters may follow:
@@ -28,6 +30,8 @@ After a valid domain, zero or more non-space non-`<` characters may follow:
 Visit www.commonmark.org/help for more information.
 .
 <p>Visit <a href="http://www.commonmark.org/help">www.commonmark.org/help</a> for more information.</p>
+.
+--fpermissive-www-autolinks
 ````````````````````````````````
 
 We then apply extended autolink path validation as follows:
@@ -43,6 +47,8 @@ Visit www.commonmark.org/a.b.
 .
 <p>Visit <a href="http://www.commonmark.org">www.commonmark.org</a>.</p>
 <p>Visit <a href="http://www.commonmark.org/a.b">www.commonmark.org/a.b</a>.</p>
+.
+--fpermissive-www-autolinks
 ````````````````````````````````
 
 When an autolink ends in `)`, we scan the entire autolink for the total number
@@ -57,6 +63,8 @@ www.google.com/search?q=Markup+(business)
 .
 <p><a href="http://www.google.com/search?q=Markup+(business)">www.google.com/search?q=Markup+(business)</a></p>
 <p>(<a href="http://www.google.com/search?q=Markup+(business)">www.google.com/search?q=Markup+(business)</a>)</p>
+.
+--fpermissive-www-autolinks
 ````````````````````````````````
 
 This check is only done when the link ends in a closing parentheses `)`, so if
@@ -67,6 +75,8 @@ applied:
 www.google.com/search?q=(business))+ok
 .
 <p><a href="http://www.google.com/search?q=(business))+ok">www.google.com/search?q=(business))+ok</a></p>
+.
+--fpermissive-www-autolinks
 ````````````````````````````````
 
 If an autolink ends in a semicolon (`;`), we check to see if it appears to
@@ -81,6 +91,8 @@ www.google.com/search?q=commonmark&hl;
 .
 <p><a href="http://www.google.com/search?q=commonmark&amp;hl=en">www.google.com/search?q=commonmark&amp;hl=en</a></p>
 <p><a href="http://www.google.com/search?q=commonmark">www.google.com/search?q=commonmark</a>&amp;hl;</p>
+.
+--fpermissive-www-autolinks
 ````````````````````````````````
 
 `<` immediately ends an autolink.
@@ -89,19 +101,6 @@ www.google.com/search?q=commonmark&hl;
 www.commonmark.org/he<lp
 .
 <p><a href="http://www.commonmark.org/he">www.commonmark.org/he</a>&lt;lp</p>
-````````````````````````````````
-
-
-## GitHub Issues
-
-### [Issue 53](https://github.com/mity/md4c/issues/53)
-```````````````````````````````` example
-This is [link](www.github.com/).
-.
-<p>This is <a href="www.github.com/">link</a>.</p>
-````````````````````````````````
-```````````````````````````````` example
-This is [link](www.github.com/)X
 .
-<p>This is <a href="www.github.com/">link</a>X</p>
+--fpermissive-www-autolinks
 ````````````````````````````````
diff --git a/test/prog.py b/test/prog.py
new file mode 100644
index 0000000..fd28df9
--- /dev/null
+++ b/test/prog.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+from subprocess import *
+import platform
+import os
+
+def pipe_through_prog(argv, text):
+    p1 = Popen(argv, stdout=PIPE, stdin=PIPE, stderr=PIPE)
+    [result, err] = p1.communicate(input=text.encode('utf-8'))
+    return [p1.returncode, result.decode('utf-8'), err]
+
+class Prog:
+    def __init__(self, cmdline="md2html", default_options=[]):
+        self.cmdline = cmdline.split()
+        if len(self.cmdline) <= 1:
+            # cmdline provided no command line options. Use default ones.
+            if isinstance(default_options, str):
+                self.cmdline += default_options.split()
+            else:
+                self.cmdline += default_options
+        self.to_html = lambda x: pipe_through_prog(self.cmdline, x)
diff --git a/test/regressions.txt b/test/regressions.txt
new file mode 100644
index 0000000..9ac2259
--- /dev/null
+++ b/test/regressions.txt
@@ -0,0 +1,608 @@
+
+# Regressions
+
+These are (mostly) unit tests collected via bug resolving. Adding them here
+prevents us from reintroducing subtle bugs which we've already seen.
+
+
+## [Issue 2](https://github.com/mity/md4c/issues/2)
+
+Raw HTML block:
+
+```````````````````````````````` example
+<gi att1=tok1 att2=tok2>
+.
+<gi att1=tok1 att2=tok2>
+````````````````````````````````
+
+Inline:
+
+```````````````````````````````` example
+foo <gi att1=tok1 att2=tok2> bar
+.
+<p>foo <gi att1=tok1 att2=tok2> bar</p>
+````````````````````````````````
+
+Inline with a line break:
+
+```````````````````````````````` example
+foo <gi att1=tok1
+att2=tok2> bar
+.
+<p>foo <gi att1=tok1
+att2=tok2> bar</p>
+````````````````````````````````
+
+
+## [Issue 4](https://github.com/mity/md4c/issues/4)
+
+```````````````````````````````` example
+![alt text with *entity* &copy;](img.png 'title')
+.
+<p><img src="img.png" alt="alt text with entity ©" title="title"></p>
+````````````````````````````````
+
+
+## [Issue 9](https://github.com/mity/md4c/issues/9)
+
+```````````````````````````````` example
+> [foo
+> bar]: /url
+>
+> [foo bar]
+.
+<blockquote>
+<p><a href="/url">foo
+bar</a></p>
+</blockquote>
+````````````````````````````````
+
+
+## [Issue 10](https://github.com/mity/md4c/issues/10)
+
+```````````````````````````````` example
+[x]:
+x
+- <?
+
+  x
+.
+<ul>
+<li><?
+
+x
+</li>
+</ul>
+````````````````````````````````
+
+
+## [Issue 11](https://github.com/mity/md4c/issues/11)
+
+```````````````````````````````` example
+x [link](/url "foo &ndash; bar") x
+.
+<p>x <a href="/url" title="foo – bar">link</a> x</p>
+````````````````````````````````
+
+
+## [Issue 14](https://github.com/mity/md4c/issues/14)
+
+```````````````````````````````` example
+a***b* c*
+.
+<p>a*<em><em>b</em> c</em></p>
+````````````````````````````````
+
+
+## [Issue 15](https://github.com/mity/md4c/issues/15)
+
+```````````````````````````````` example
+***b* c*
+.
+<p>*<em><em>b</em> c</em></p>
+````````````````````````````````
+
+
+## [Issue 21](https://github.com/mity/md4c/issues/21)
+
+```````````````````````````````` example
+a*b**c*
+.
+<p>a<em>b**c</em></p>
+````````````````````````````````
+
+
+## [Issue 33](https://github.com/mity/md4c/issues/33)
+
+```````````````````````````````` example
+```&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;
+.
+<pre><code class="language-&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;"></code></pre>
+````````````````````````````````
+
+
+## [Issue 36](https://github.com/mity/md4c/issues/36)
+
+```````````````````````````````` example
+__x_ _x___
+.
+<p><em><em>x</em> <em>x</em></em>_</p>
+````````````````````````````````
+
+
+## [Issue 39](https://github.com/mity/md4c/issues/39)
+
+```````````````````````````````` example
+[\\]: x
+.
+````````````````````````````````
+
+
+## [Issue 40](https://github.com/mity/md4c/issues/40)
+
+```````````````````````````````` example
+[x](url
+'title'
+)x
+.
+<p><a href="url" title="title">x</a>x</p>
+````````````````````````````````
+
+
+## [Issue 42](https://github.com/mity/md4c/issues/42)
+
+```````````````````````````````` example
+] http://x.x *x*
+
+|x|x|
+|---|---|
+|x|
+.
+<p>] http://x.x <em>x</em></p>
+<table>
+<thead>
+<tr>
+<th>x</th>
+<th>x</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>x</td>
+<td></td>
+</tr>
+</tbody>
+</table>
+.
+--ftables
+````````````````````````````````
+
+
+## [Issue 53](https://github.com/mity/md4c/issues/53)
+
+```````````````````````````````` example
+This is [link](http://github.com/).
+.
+<p>This is <a href="http://github.com/">link</a>.</p>
+.
+--fpermissive-url-autolinks
+````````````````````````````````
+
+```````````````````````````````` example
+This is [link](http://github.com/)X
+.
+<p>This is <a href="http://github.com/">link</a>X</p>
+.
+--fpermissive-url-autolinks
+````````````````````````````````
+
+
+## [Issue 65](https://github.com/mity/md4c/issues/65)
+
+```````````````````````````````` example
+`
+.
+<p>`</p>
+````````````````````````````````
+
+
+## [Issue 69](https://github.com/mity/md4c/issues/69)
+```````````````````````````````` example
+~`foo`~
+.
+<p><del><code>foo</code></del></p>
+.
+--fstrikethrough
+````````````````````````````````
+
+```````````````````````````````` example
+~*foo*~
+.
+<p><del><em>foo</em></del></p>
+.
+--fstrikethrough
+````````````````````````````````
+
+```````````````````````````````` example
+*~foo~*
+.
+<p><em><del>foo</del></em></p>
+.
+--fstrikethrough
+````````````````````````````````
+
+
+## [Issue 74](https://github.com/mity/md4c/issues/74)
+
+```````````````````````````````` example
+[f]:
+-
+    xx
+-
+.
+<pre><code>xx
+</code></pre>
+<ul>
+<li></li>
+</ul>
+````````````````````````````````
+
+
+## [Issue 76](https://github.com/mity/md4c/issues/76)
+
+```````````````````````````````` example
+*(http://example.com)*
+.
+<p><em>(<a href="http://example.com">http://example.com</a>)</em></p>
+.
+--fpermissive-url-autolinks
+````````````````````````````````
+
+
+## [Issue 78](https://github.com/mity/md4c/issues/78)
+
+```````````````````````````````` example
+[SS ẞ]: /url
+[ẞ SS]
+.
+<p><a href="/url">ẞ SS</a></p>
+````````````````````````````````
+
+
+## [Issue 83](https://github.com/mity/md4c/issues/83)
+
+```````````````````````````````` example
+foo
+>
+.
+<p>foo</p>
+<blockquote>
+</blockquote>
+
+````````````````````````````````
+
+
+## [Issue 95](https://github.com/mity/md4c/issues/95)
+
+```````````````````````````````` example
+. foo
+.
+<p>. foo</p>
+````````````````````````````````
+
+
+## [Issue 96](https://github.com/mity/md4c/issues/96)
+
+```````````````````````````````` example
+[ab]: /foo
+[a] [ab] [abc]
+.
+<p>[a] <a href="/foo">ab</a> [abc]</p>
+````````````````````````````````
+
+```````````````````````````````` example
+[a b]: /foo
+[a   b]
+.
+<p><a href="/foo">a   b</a></p>
+````````````````````````````````
+
+
+## [Issue 97](https://github.com/mity/md4c/issues/97)
+
+```````````````````````````````` example
+*a **b c* d**
+.
+<p><em>a <em><em>b c</em> d</em></em></p>
+
+````````````````````````````````
+
+
+## [Issue 100](https://github.com/mity/md4c/issues/100)
+
+```````````````````````````````` example
+<foo@123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123>
+.
+<p><a href="mailto:foo@123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123">foo@123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123</a></p>
+````````````````````````````````
+
+```````````````````````````````` example
+<foo@123456789012345678901234567890123456789012345678901234567890123x.123456789012345678901234567890123456789012345678901234567890123>
+.
+<p>&lt;foo@123456789012345678901234567890123456789012345678901234567890123x.123456789012345678901234567890123456789012345678901234567890123&gt;</p>
+````````````````````````````````
+(Note the `x` here which turns it over the max. allowed length limit.)
+
+
+## [Issue 104](https://github.com/mity/md4c/issues/104)
+
+```````````````````````````````` example
+A | B
+--- | ---
+[x](url)
+.
+<table>
+<thead>
+<tr>
+<th>A</th>
+<th>B</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="url">x</a></td>
+<td></td>
+</tr>
+</tbody>
+</table>
+.
+--ftables
+````````````````````````````````
+
+
+## [Issue 107](https://github.com/mity/md4c/issues/107)
+
+```````````````````````````````` example
+***foo *bar baz***
+.
+<p>*<strong>foo <em>bar baz</em></strong></p>
+
+````````````````````````````````
+
+
+## [Issue 124](https://github.com/mity/md4c/issues/124)
+
+```````````````````````````````` example
+~~~
+                x
+~~~
+
+~~~
+                 x
+~~~
+.
+<pre><code>                x
+</code></pre>
+<pre><code>                 x
+</code></pre>
+````````````````````````````````
+
+
+## [Issue 131](https://github.com/mity/md4c/issues/131)
+
+```````````````````````````````` example
+[![alt][img]][link]
+
+[img]: img_url
+[link]: link_url
+.
+<p><a href="link_url"><img src="img_url" alt="alt"></a></p>
+````````````````````````````````
+
+
+## [Issue 138](https://github.com/mity/md4c/issues/138)
+
+```````````````````````````````` example
+| abc | def |
+| --- | --- |
+.
+<table>
+<thead>
+<tr>
+<th>abc</th>
+<th>def</th>
+</tr>
+</thead>
+</table>
+.
+--ftables
+````````````````````````````````
+
+
+## [Issue 142](https://github.com/mity/md4c/issues/142)
+
+```````````````````````````````` example
+[fooﬗ]: /url
+[fooﬕ]
+.
+<p>[fooﬕ]</p>
+````````````````````````````````
+
+
+## [Issue 149](https://github.com/mity/md4c/issues/149)
+
+```````````````````````````````` example
+- <script>
+- foo
+bar
+</script>
+.
+<ul>
+<li><script>
+</li>
+<li>foo
+bar
+</script></li>
+</ul>
+````````````````````````````````
+
+
+## [Issue 152](https://github.com/mity/md4c/issues/152)
+
+```````````````````````````````` example
+[http://example.com](http://example.com)
+.
+<p><a href="http://example.com">http://example.com</a></p>
+.
+--fpermissive-url-autolinks
+````````````````````````````````
+
+
+## [Issue 190](https://github.com/mity/md4c/issues/190)
+
+```````````````````````````````` example
+-
+
+    foo
+.
+<ul>
+<li></li>
+</ul>
+<pre><code>foo
+</code></pre>
+````````````````````````````````
+
+
+## [Issue 200](https://github.com/mity/md4c/issues/200)
+
+```````````````````````````````` example
+<!-- foo -->
+    ```
+    bar
+    ```
+.
+<!-- foo -->
+<pre><code>```
+bar
+```
+</code></pre>
+````````````````````````````````
+
+
+## [Issue 201](https://github.com/mity/md4c/issues/201)
+
+```````````````````````````````` example
+foo
+    ```
+    bar
+    ```
+.
+<p>foo
+<code>bar</code></p>
+````````````````````````````````
+
+
+## [Issue 207](https://github.com/mity/md4c/issues/207)
+
+```````````````````````````````` example
+<textarea>
+
+*foo*
+
+_bar_
+
+</textarea>
+
+baz
+.
+<textarea>
+
+*foo*
+
+_bar_
+
+</textarea>
+<p>baz</p>
+````````````````````````````````
+
+
+## [Issue 210](https://github.com/mity/md4c/issues/210)
+
+```````````````````````````````` example
+![outer ![inner](img_inner "inner title")](img_outer "outer title")
+.
+<p><img src="img_outer" alt="outer inner" title="outer title"></p>
+````````````````````````````````
+
+
+## [Issue 212](https://github.com/mity/md4c/issues/212)
+
+```````````````````````````````` example
+x
+|-
+|[*x*]()
+.
+<table>
+<thead>
+<tr>
+<th>x</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href=""><em>x</em></a></td>
+</tr>
+</tbody>
+</table>
+.
+--ftables
+````````````````````````````````
+
+
+## [Issue 215](https://github.com/mity/md4c/issues/215)
+
+```````````````````````````````` example
+title
+--→
+.
+<h2>title</h2>
+````````````````````````````````
+
+
+## [Issue 216](https://github.com/mity/md4c/issues/216)
+
+```````````````````````````````` example
+x <!A>
+.
+<p>x <!A></p>
+````````````````````````````````
+
+
+## [Issue 217](https://github.com/mity/md4c/issues/217)
+
+```````````````````````````````` example
+__!_!__
+
+__!x!__
+
+**!*!**
+
+---
+
+_*__*_*
+
+_*xx*_*
+
+_*__-_-
+
+_*xx-_-
+.
+<p><strong>!_!</strong></p>
+<p><strong>!x!</strong></p>
+<p><strong>!*!</strong></p>
+<hr />
+<p><em><em>__</em></em>*</p>
+<p><em><em>xx</em></em>*</p>
+<p><em>*__-</em>-</p>
+<p><em>*xx-</em>-</p>
+````````````````````````````````
diff --git a/test/spec_tests.py b/test/spec_tests.py
index c739e5f..50f1252 100755
--- a/test/spec_tests.py
+++ b/test/spec_tests.py
@@ -6,19 +6,17 @@ from difflib import unified_diff
 import argparse
 import re
 import json
-from cmark import CMark
+from prog import Prog
 from normalize import normalize_html
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Run cmark tests.')
+    parser = argparse.ArgumentParser(description='Run Markdown tests.')
     parser.add_argument('-p', '--program', dest='program', nargs='?', default=None,
             help='program to test')
     parser.add_argument('-s', '--spec', dest='spec', nargs='?', default='spec.txt',
             help='path to spec')
     parser.add_argument('-P', '--pattern', dest='pattern', nargs='?',
             default=None, help='limit to sections matching regex pattern')
-    parser.add_argument('--library-dir', dest='library_dir', nargs='?',
-            default=None, help='directory containing dynamic library')
     parser.add_argument('--no-normalize', dest='normalize',
             action='store_const', const=False, default=True,
             help='do not normalize HTML')
@@ -39,7 +37,8 @@ def print_test_header(headertext, example_number, start_line, end_line):
     out("Example %d (lines %d-%d) %s\n" % (example_number,start_line,end_line,headertext))
 
 def do_test(test, normalize, result_counts):
-    [retcode, actual_html, err] = cmark.to_html(test['markdown'])
+    prog = Prog(cmdline=args.program, default_options=test['cmdline_options'])
+    [retcode, actual_html, err] = prog.to_html(test['markdown'])
     if retcode == 0:
         expected_html = test['html']
         unicode_error = None
@@ -81,6 +80,7 @@ def get_tests(specfile):
     example_number = 0
     markdown_lines = []
     html_lines = []
+    cmdline_lines = []
     state = 0  # 0 regular text, 1 markdown example, 2 html output
     headertext = ''
     tests = []
@@ -91,16 +91,16 @@ def get_tests(specfile):
         for line in specf:
             line_number = line_number + 1
             l = line.strip()
-            #if l == "`" * 32 + " example":
             if re.match("`{32} example( [a-z]{1,})?", l):
                 state = 1
-            elif state == 2 and l == "`" * 32:
+            elif state >= 2 and l == "`" * 32:
                 state = 0
                 example_number = example_number + 1
                 end_line = line_number
                 tests.append({
                     "markdown":''.join(markdown_lines).replace('→',"\t"),
                     "html":''.join(html_lines).replace('→',"\t"),
+                    "cmdline_options":''.join(cmdline_lines),
                     "example": example_number,
                     "start_line": start_line,
                     "end_line": end_line,
@@ -108,14 +108,17 @@ def get_tests(specfile):
                 start_line = 0
                 markdown_lines = []
                 html_lines = []
+                cmdline_lines = []
             elif l == ".":
-                state = 2
+                state += 1
             elif state == 1:
                 if start_line == 0:
                     start_line = line_number - 1
                 markdown_lines.append(line)
             elif state == 2:
                 html_lines.append(line)
+            elif state == 3:
+                cmdline_lines.append(line)
             elif state == 0 and re.match(header_re, line):
                 headertext = header_re.sub('', line).strip()
     return tests
@@ -136,7 +139,6 @@ if __name__ == "__main__":
         exit(0)
     else:
         skipped = len(all_tests) - len(tests)
-        cmark = CMark(prog=args.program, library_dir=args.library_dir)
         result_counts = {'pass': 0, 'fail': 0, 'error': 0, 'skip': skipped}
         for test in tests:
             do_test(test, args.normalize, result_counts)
diff --git a/test/strikethrough.txt b/test/strikethrough.txt
index 884ce59..06610f5 100644
--- a/test/strikethrough.txt
+++ b/test/strikethrough.txt
@@ -10,6 +10,8 @@ Strike-through text is any text wrapped in one or two tildes (`~`).
 ~Hi~ Hello, world!
 .
 <p><del>Hi</del> Hello, world!</p>
+.
+--fstrikethrough
 ````````````````````````````````
 
 If the length of the opener and closer doesn't match, the strike-through is
@@ -19,6 +21,8 @@ not recognized.
 This ~text~~ is curious.
 .
 <p>This ~text~~ is curious.</p>
+.
+--fstrikethrough
 ````````````````````````````````
 
 Too long tilde sequence won't be recognized:
@@ -27,6 +31,8 @@ Too long tilde sequence won't be recognized:
 foo ~~~bar~~~
 .
 <p>foo ~~~bar~~~</p>
+.
+--fstrikethrough
 ````````````````````````````````
 
 Also note the markers cannot open a strike-through span if they are followed
@@ -37,6 +43,8 @@ preceded with a whitespace:
 ~foo ~bar
 .
 <p>~foo ~bar</p>
+.
+--fstrikethrough
 ````````````````````````````````
 
 
@@ -50,26 +58,6 @@ new paragraph~~.
 .
 <p>This ~~has a</p>
 <p>new paragraph~~.</p>
-````````````````````````````````
-
-
-## GitHub Issues
-
-### [Issue 69](https://github.com/mity/md4c/issues/69)
-```````````````````````````````` example
-~`foo`~
-.
-<p><del><code>foo</code></del></p>
-````````````````````````````````
-
-```````````````````````````````` example
-~*foo*~
-.
-<p><del><em>foo</em></del></p>
-````````````````````````````````
-
-```````````````````````````````` example
-*~foo~*
 .
-<p><em><del>foo</del></em></p>
+--fstrikethrough
 ````````````````````````````````
diff --git a/test/tables.txt b/test/tables.txt
index cd62100..8f2da38 100644
--- a/test/tables.txt
+++ b/test/tables.txt
@@ -24,6 +24,8 @@ counting the header) is as follows:
 <tr><td>quux</td><td>quuz</td></tr>
 </tbody>
 </table>
+.
+--ftables
 ````````````````````````````````
 
 The leading and succeeding pipe characters (`|`) on each line are optional:
@@ -45,6 +47,8 @@ quux     | quuz     |
 <tr><td>quux</td><td>quuz</td></tr>
 </tbody>
 </table>
+.
+--ftables
 ````````````````````````````````
 
 ```````````````````````````````` example
@@ -64,6 +68,8 @@ quux     | quuz     |
 <tr><td>quux</td><td>quuz</td></tr>
 </tbody>
 </table>
+.
+--ftables
 ````````````````````````````````
 
 ```````````````````````````````` example
@@ -83,6 +89,8 @@ quux     | quuz
 <tr><td>quux</td><td>quuz</td></tr>
 </tbody>
 </table>
+.
+--ftables
 ````````````````````````````````
 
 However for one-column table, at least one pipe has to be used in the table
@@ -100,6 +108,8 @@ quux
 <p>foo
 baz
 quux</p>
+.
+--ftables
 ````````````````````````````````
 
 Leading and trailing whitespace in a table cell is ignored and the columns do
@@ -122,6 +132,8 @@ quux|quuz
 <tr><td>quux</td><td>quuz</td></tr>
 </tbody>
 </table>
+.
+--ftables
 ````````````````````````````````
 
 The table cannot interrupt a paragraph.
@@ -163,6 +175,8 @@ Lorem ipsum dolor sit amet.
 <tr><td>Lorem ipsum dolor sit amet.</td><td></td></tr>
 </tbody>
 </table>
+.
+--ftables
 ````````````````````````````````
 
 The first, the last or both the first and the last dash in each column
@@ -182,6 +196,8 @@ alignment of the respective column:
 <tr><td>default</td><td align="left">left</td><td align="center">center</td><td align="right">right</td></tr>
 </tbody>
 </table>
+.
+--ftables
 ````````````````````````````````
 
 To include a literal pipe character in any cell, it has to be escaped.
@@ -203,6 +219,8 @@ quux     | quuz
 <tr><td>quux</td><td>quuz</td></tr>
 </tbody>
 </table>
+.
+--ftables
 ````````````````````````````````
 
 Contents of each cell is parsed as an inline text which may contents any
@@ -227,6 +245,8 @@ quux     | [quuz](/url2)
 <tr><td>quux</td><td><a href="/url2">quuz</a></td></tr>
 </tbody>
 </table>
+.
+--ftables
 ````````````````````````````````
 
 However pipes which are inside a code span are not recognized as cell
@@ -249,12 +269,14 @@ quux     | quuz
 <tr><td>quux</td><td>quuz</td></tr>
 </tbody>
 </table>
+.
+--ftables
 ````````````````````````````````
 
 
 ## GitHub Issues
 
-### [Issue 41](https://github.com/mity/md4c/issues/41)
+## [Issue 41](https://github.com/mity/md4c/issues/41)
 ```````````````````````````````` example
 * x|x
 ---|---
@@ -263,6 +285,8 @@ quux     | quuz
 <li>x|x
 ---|---</li>
 </ul>
+.
+--ftables
 ````````````````````````````````
 (Not a table, because the underline has wrong indentation and is not part of the
 list item.)
@@ -284,96 +308,9 @@ x|x
 </li>
 </ul>
 <p>x|x</p>
+.
+--ftables
 ````````````````````````````````
 (Here the underline has the right indentation so the table is detected.
 But the last line is not part of it due its indentation.)
 
-
-### [Issue 42](https://github.com/mity/md4c/issues/42)
-
-```````````````````````````````` example
-] http://x.x *x*
-
-|x|x|
-|---|---|
-|x|
-.
-<p>] http://x.x <em>x</em></p>
-<table>
-<thead>
-<tr>
-<th>x</th>
-<th>x</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>x</td>
-<td></td>
-</tr>
-</tbody>
-</table>
-````````````````````````````````
-
-
-### [Issue 104](https://github.com/mity/md4c/issues/104)
-
-```````````````````````````````` example
-A | B
---- | ---
-[x](url)
-.
-<table>
-<thead>
-<tr>
-<th>A</th>
-<th>B</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><a href="url">x</a></td>
-<td></td>
-</tr>
-</tbody>
-</table>
-````````````````````````````````
-
-
-### [Issue 138](https://github.com/mity/md4c/issues/138)
-
-```````````````````````````````` example
-| abc | def |
-| --- | --- |
-.
-<table>
-<thead>
-<tr>
-<th>abc</th>
-<th>def</th>
-</tr>
-</thead>
-</table>
-````````````````````````````````
-
-
-### [Issue 212](https://github.com/mity/md4c/issues/212)
-
-```````````````````````````````` example
-x
-|-
-|[*x*]()
-.
-<table>
-<thead>
-<tr>
-<th>x</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><a href=""><em>x</em></a></td>
-</tr>
-</tbody>
-</table>
-````````````````````````````````
diff --git a/test/tasklists.txt b/test/tasklists.txt
index aae1bf8..59de3f1 100644
--- a/test/tasklists.txt
+++ b/test/tasklists.txt
@@ -16,6 +16,8 @@ Basic task list may look as follows:
 <li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>bar</li>
 <li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>baz</li>
 </ul>
+.
+--ftasklists
 ````````````````````````````````
 
 Task lists can also be in ordered lists:
@@ -30,6 +32,8 @@ Task lists can also be in ordered lists:
 <li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>bar</li>
 <li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>baz</li>
 </ol>
+.
+--ftasklists
 ````````````````````````````````
 
 Task lists can also be nested in ordinary lists:
@@ -58,6 +62,8 @@ Task lists can also be nested in ordinary lists:
 <li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>quuz</li>
 </ul></li>
 </ul>
+.
+--ftasklists
 ````````````````````````````````
 
 Or in a parent task list:
@@ -86,6 +92,8 @@ Or in a parent task list:
 <li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>quuz</li>
 </ul></li>
 </ol>
+.
+--ftasklists
 ````````````````````````````````
 
 Also, ordinary lists can be nested in the task lists.
@@ -114,4 +122,6 @@ Also, ordinary lists can be nested in the task lists.
 <li>quuz</li>
 </ul></li>
 </ul>
+.
+--ftasklists
 ````````````````````````````````
diff --git a/test/underline.txt b/test/underline.txt
index 289e97f..d7e66ac 100644
--- a/test/underline.txt
+++ b/test/underline.txt
@@ -9,6 +9,8 @@ emphasis).
 _foo_
 .
 <p><u>foo</u></p>
+.
+--funderline
 ````````````````````````````````
 
 In sequences of multiple underscores, each single one translates into an
@@ -18,6 +20,8 @@ underline span mark.
 ___foo___
 .
 <p><u><u><u>foo</u></u></u></p>
+.
+--funderline
 ````````````````````````````````
 
 Intra-word underscores are not recognized as underline marks:
@@ -26,6 +30,8 @@ Intra-word underscores are not recognized as underline marks:
 foo_bar_baz
 .
 <p>foo_bar_baz</p>
+.
+--funderline
 ````````````````````````````````
 
 Also the parser follows the standard understanding when the underscore can
@@ -36,4 +42,6 @@ example because no underline can be seen as a closing mark.
 _foo _bar
 .
 <p>_foo _bar</p>
+.
+--funderline
 ````````````````````````````````
diff --git a/test/wiki-links.txt b/test/wiki-links.txt
index 00d394e..0793a32 100644
--- a/test/wiki-links.txt
+++ b/test/wiki-links.txt
@@ -10,6 +10,8 @@ The simple wiki-link is a wiki-link destination enclosed in `[[` followed with
 [[foo]]
 .
 <p><x-wikilink data-target="foo">foo</x-wikilink></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 However wiki-link may contain an explicit label, delimited from the destination
@@ -19,6 +21,8 @@ with `|`.
 [[foo|bar]]
 .
 <p><x-wikilink data-target="foo">bar</x-wikilink></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 A wiki-link destination cannot be empty.
@@ -27,12 +31,16 @@ A wiki-link destination cannot be empty.
 [[]]
 .
 <p>[[]]</p>
+.
+--fwiki-links
 ````````````````````````````````
 
 ```````````````````````````````` example
 [[|foo]]
 .
 <p>[[|foo]]</p>
+.
+--fwiki-links
 ````````````````````````````````
 
 
@@ -44,6 +52,8 @@ bar]]
 .
 <p>[[foo
 bar]]</p>
+.
+--fwiki-links
 ````````````````````````````````
 
 ```````````````````````````````` example
@@ -52,6 +62,8 @@ bar|baz]]
 .
 <p>[[foo
 bar|baz]]</p>
+.
+--fwiki-links
 ````````````````````````````````
 
 The wiki-link destination is rendered verbatim; inline markup in it is not
@@ -61,12 +73,16 @@ recognized.
 [[*foo*]]
 .
 <p><x-wikilink data-target="*foo*">*foo*</x-wikilink></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 ```````````````````````````````` example
 [[foo|![bar](bar.jpg)]]
 .
 <p><x-wikilink data-target="foo"><img src="bar.jpg" alt="bar"></x-wikilink></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 With multiple `|` delimiters, only the first one is recognized and the other
@@ -76,6 +92,8 @@ ones are part of the label.
 [[foo|bar|baz]]
 .
 <p><x-wikilink data-target="foo">bar|baz</x-wikilink></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 However the delimiter `|` can be escaped with `/`.
@@ -84,6 +102,8 @@ However the delimiter `|` can be escaped with `/`.
 [[foo\|bar|baz]]
 .
 <p><x-wikilink data-target="foo|bar">baz</x-wikilink></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 The label can contain inline elements.
@@ -92,6 +112,8 @@ The label can contain inline elements.
 [[foo|*bar*]]
 .
 <p><x-wikilink data-target="foo"><em>bar</em></x-wikilink></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 Empty explicit label is the same as using the implicit label; i.e. the verbatim
@@ -101,6 +123,8 @@ destination string is used as the label.
 [[foo|]]
 .
 <p><x-wikilink data-target="foo">foo</x-wikilink></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 The label can span multiple lines.
@@ -113,6 +137,8 @@ baz]]
 <p><x-wikilink data-target="foo">foo
 bar
 baz</x-wikilink></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 Wiki-links have higher priority than links.
@@ -121,6 +147,8 @@ Wiki-links have higher priority than links.
 [[foo]](foo.jpg)
 .
 <p><x-wikilink data-target="foo">foo</x-wikilink>(foo.jpg)</p>
+.
+--fwiki-links
 ````````````````````````````````
 
 ```````````````````````````````` example
@@ -129,6 +157,8 @@ Wiki-links have higher priority than links.
 [[foo]]
 .
 <p><x-wikilink data-target="foo">foo</x-wikilink></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 Wiki links can be inlined in tables.
@@ -152,6 +182,8 @@ Wiki links can be inlined in tables.
 </tr>
 </tbody>
 </table>
+.
+--fwiki-links --ftables
 ````````````````````````````````
 
 Wiki-links are not prioritized over images.
@@ -160,6 +192,8 @@ Wiki-links are not prioritized over images.
 ![[foo]](foo.jpg)
 .
 <p><img src="foo.jpg" alt="[foo]"></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 Something that may look like a wiki-link at first, but turns out not to be,
@@ -171,6 +205,8 @@ is recognized as a normal link.
 [foo]: /url
 .
 <p>[<a href="/url">foo</a></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 Escaping the opening `[` escapes only that one character, not the whole `[[`
@@ -182,6 +218,8 @@ opener:
 [foo]: /url
 .
 <p>[<a href="/url">foo</a>]</p>
+.
+--fwiki-links
 ````````````````````````````````
 
 Like with other inline links, the innermost wiki-link is preferred.
@@ -190,6 +228,8 @@ Like with other inline links, the innermost wiki-link is preferred.
 [[foo[[bar]]]]
 .
 <p>[[foo<x-wikilink data-target="bar">bar</x-wikilink>]]</p>
+.
+--fwiki-links
 ````````````````````````````````
 
 There is limit of 100 characters for the wiki-link destination.
@@ -200,6 +240,8 @@ There is limit of 100 characters for the wiki-link destination.
 .
 <p>[[12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901]]
 [[12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901|foo]]</p>
+.
+--fwiki-links
 ````````````````````````````````
 
 100 characters inside a wiki link target works.
@@ -210,6 +252,8 @@ There is limit of 100 characters for the wiki-link destination.
 .
 <p><x-wikilink data-target="1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890">1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890</x-wikilink>
 <x-wikilink data-target="1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890">foo</x-wikilink></p>
+.
+--fwiki-links
 ````````````````````````````````
 
 The limit on link content does not include any characters belonging to a block
@@ -229,4 +273,6 @@ quote, if the label spans multiple lines contained in a block quote.
 1234567890
 123456789</x-wikilink></p>
 </blockquote>
+.
+--fwiki-links
 ````````````````````````````````