X-Git-Url: https://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=markdown.awk;h=361e6005c3fc42fa5e1f81859d69ec59d0c0a138;hp=506d22d08474b5f4a14dc5953c1dda121f4b9678;hb=HEAD;hpb=854547d423e0a1bc2d4437cb15e7c51d8be4904a

diff --git a/markdown.awk b/markdown.awk
index 506d22d..90dddbf 100755
--- a/markdown.awk
+++ b/markdown.awk
@@ -5,6 +5,20 @@
 # Meant to support all features of John Grubers basic Markdown
 # + a number of common extensions, mostly inspired by Pandoc Markdown
 
+# Copyright 2021 - 2024 Paul Hänsch
+# 
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+# 
+# THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+# IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 # Supported Features / TODO:
 # ==========================
 # [x] done    [ ] todo    [-] not planned    ? unsure
@@ -41,6 +55,7 @@
 # - [x] Automatic <section>-wrapping (custom)
 # -  ?  Heading identifiers (php md, pandoc)
 #   - [x] Heading attributes (custom)
+#   - [ ] <hr> terminates section
 # - [x] Automatic heading identifiers (custom)
 # - [x] Fenced code blocks (php md, pandoc)
 #   - [x] Fenced code attributes
@@ -54,7 +69,7 @@
 #   - [x] Pipe table (php md, pandoc)
 # - [x] Line blocks (pandoc)
 # - [x] Task lists (pandoc, custom)
-# - [ ] Definition lists (php md, pandoc)
+# - [x] Definition lists (php md, pandoc)
 # - [-] Numbered example lists (pandoc)
 # - [-] Metadata blocks (pandoc)
 # - [x] Metadata blocks (custom)
@@ -106,229 +121,288 @@ function URL ( text, sharp ) {
   return text;
 }
 
-function inline( line, LOCAL, len, code, href, guard ) {
-  nu = "(\\\\\\\\|\\\\[^\\\\]|[^\\\\_]|_[[:alnum:]])*"    # not underline (except when escaped)
-  na = "(\\\\\\\\|\\\\[^\\\\]|[^\\\\\\*])*"  # not asterisk (except when escaped)
-  ieu =  "_([^_[:space:]]|[^_[:space:]]" nu "[^_[:space:]])_"                 # inner <em> (underline)
-  isu = "__([^_[:space:]]|[^_[:space:]]" nu "[^_[:space:]])__"                # inner <strong> (underline)
-  iea =    "\\*([^\\*[:space:]]|[^\\*[:space:]]" na "[^\\*[:space:]])\\*"     # inner <em> (asterisk)
-  isa = "\\*\\*([^\\*[:space:]]|[^\\*[:space:]]" na "[^\\*[:space:]])\\*\\*"  # inner <strong> (asterisk)
-
-  if ( line ~ /^$/ ) {  # Recursion End
-    return "";
-
-  # omit processing of escaped characters
-  } else if ( line ~ /^\\./) {
-    return HTML(substr(line, 2, 1)) inline( substr(line, 3) );
-
-  # hard brakes
-  } else if ( match(line, /^  \n/) ) {
-    return "<br>\n" inline( substr(line, RLENGTH + 1) );
-
-  #  ``code spans``
-  } else if ( match( line, /^`+/) ) {
-    len = RLENGTH
-    guard = substr( line, 1, len )
-    if ( match(line, guard ".*" guard) ) {
-      code = substr( line, len + 1, match( substr(line, len + 1), guard ) - 1)
-      len = 2 * length(guard) + length(code)
-      #  strip single surrounding white spaces
-      code = gensub( /^ | $/, "", "g" , code)
-      #  escape HTML within code span
-      gsub( /&/, "\\&amp;", code ); gsub( /</, "\\&lt;", code ); gsub( />/, "\\&gt;", code );
-      return "<code>" code "</code>" inline( substr( line, len + 1 ) )
-    }
-
-  # Wiki style links
-  } else if ( match( line, /^\[\[([^]|]+)(\|[^]]+)?\]\]/) ) {
-    len = RLENGTH;
-    href = gensub(/^\[\[([^]|]+)(\|([^]]+))?\]\]/, "\\1", 1, substr(line, 1, len) );
-    text = gensub(/^\[\[([^]|]+)(\|([^]]+))?\]\]/, "\\3", 1, substr(line, 1, len) );
-    if ( ! text ) text = href;
-    return "<a href=\"" URL(href) "\">" HTML(text) "</a>" inline( substr( line, len + 1) );
-
-  #  quick links ("automatic links" in md doc)
-  } else if ( match( line, /^<[a-zA-Z]+:\/\/([-\.[:alnum:]]+)(:[0-9]*)?(\/[^>]*)?>/ ) ) {
-    len = RLENGTH;
-    href = URL( substr( line, 2, len - 2) );
-    return "<a href=\"" href "\">" href "</a>" inline( substr( line, len + 1) );
-
-  # quick link email
-  } else if ( match( line, /^<[a-zA-Z0-9.!#$%&'\''*+\/=?^_`{|}~-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*>/ ) ) {
-    len = RLENGTH;
-    href = URL( substr( line, 2, len - 2) );
-    return "<a href=\"mailto:" href "\">" href "</a>" inline( substr( line, len + 1) );
-
-  # inline links
-  #                                 ,_______________________Image____________________________,
-  } else if ( match(line, /^\[([^]]+|!\[[^]]*\]\([^"\)]+([ \t]+"[^"]+")?\)(\{[a-zA-Z \t-]*\})?)\]\(([^"\)]+)([[:space:]]+"([^"]+)")?\)/) ) {
-    len = RLENGTH;
-    text  = gensub(/^\[([^]]+|!\[[^]]*\]\([^"\)]+([ \t]+"[^"]+")?\)(\{[a-zA-Z \t-]*\})?)\]\(([^"\)]+)([[:space:]]+"([^"]+)")?\)/, \
-                   "\\1", 1, substr(line, 1, len) );
-    href  = gensub(/^\[([^]]+|!\[[^]]*\]\([^"\)]+([ \t]+"[^"]+")?\)(\{[a-zA-Z \t-]*\})?)\]\(([^"\)]+)([[:space:]]+"([^"]+)")?\)/, \
-                   "\\4", 1, substr(line, 1, len) );
-    title = gensub(/^\[([^]]+|!\[[^]]*\]\([^"\)]+([ \t]+"[^"]+")?\)(\{[a-zA-Z \t-]*\})?)\]\(([^"\)]+)([[:space:]]+"([^"]+)")?\)/, \
-                   "\\6", 1, substr(line, 1, len) );
-    if ( title ) {
-      return "<a href=\"" URL(href) "\" title=\"" HTML(title) "\">" inline( text ) "</a>" inline( substr( line, len + 1) );
-    } else {
-      return "<a href=\"" URL(href) "\">" inline( text ) "</a>" inline( substr( line, len + 1) );
-    }
-
-  # reference style links
-  } else if ( match(line, /^\[([^]]+)\] ?\[([^]]*)\]/ ) ) {
-    len = RLENGTH;
-    text = gensub(/^\[([^\n]+)\] ?\[([^\n]*)\].*/, "\\1", 1, substr(line, 1, len) );
-      id = gensub(/^\[([^\n]+)\] ?\[([^\n]*)\].*/, "\\2", 1, substr(line, 1, len) );
-    if ( ! id ) id = text;
-    if ( rl_href[id] && rl_title[id] ) {
-      return "<a href=\"" URL(rl_href[id]) "\" title=\"" HTML(rl_title[id]) "\">" inline(text) "</a>" inline( substr( line, len + 1) );
-    } else if ( rl_href[id] ) {
-      return "<a href=\"" URL(rl_href[id]) "\">" inline(text) "</a>" inline( substr( line, len + 1) );
-    } else {
-      return "" HTML(substr(line, 1, len)) inline( substr(line, len + 1) );
-    }
+function inline( line, LOCAL, len, text, code, href, guard, ret ) {
+  ret = "";
+  while (line !~ /^$/) {
+    # omit processing of escaped characters
+    if ( line ~ /^\\./) {
+      ret = ret HTML(substr(line, 2, 1)); line = substr(line, 3);
+      continue;
+
+    # hard brakes
+    } else if ( match(line, /^  \n/) ) {
+      ret = ret "<br>\n"; line = substr(line, RLENGTH + 1);
+      continue;
+
+    #  ``code spans``
+    } else if ( match( line, /^`+/) ) {
+      len = RLENGTH
+      guard = substr( line, 1, len )
+      if ( match(line, guard ".*" guard) ) {
+        code = substr( line, len + 1, match( substr(line, len + 1), guard ) - 1)
+        len = 2 * length(guard) + length(code)
+        #  strip single surrounding white spaces
+        gsub( /^ | $/, "", code)
+        #  escape HTML within code span
+        gsub( /&/, "\\&amp;", code ); gsub( /</, "\\&lt;", code ); gsub( />/, "\\&gt;", code );
+        ret = ret "<code>" code "</code>"; line = substr( line, len + 1 );
+        continue;
+      }
 
-  # inline images
-  } else if ( match(line, /^!\[([^]]*)\]\(([^"\)]+)([ \t]+"([^"]+)")?\)(\{([a-zA-Z \t-]*)\})?/) ) {
-    len = RLENGTH;
-    text   = gensub(/^!\[([^]]*)\]\(([^"\)]+)([ \t]+"([^"]+)")?\)(\{([a-zA-Z \t-]*)\})?/, "\\1", "g", substr(line, 1, len) );
-    href   = gensub(/^!\[([^]]*)\]\(([^"\)]+)([ \t]+"([^"]+)")?\)(\{([a-zA-Z \t-]*)\})?/, "\\2", "g", substr(line, 1, len) );
-    title  = gensub(/^!\[([^]]*)\]\(([^"\)]+)([ \t]+"([^"]+)")?\)(\{([a-zA-Z \t-]*)\})?/, "\\4", "g", substr(line, 1, len) );
-    attrib = gensub(/^!\[([^]]*)\]\(([^"\)]+)([ \t]+"([^"]+)")?\)(\{([a-zA-Z \t-]*)\})?/, "\\6", "g", substr(line, 1, len) );
-    if ( title && attrib ) {
-      return "<img src=\"" URL(href, 1) "\" alt=\"" HTML(text) "\" title=\"" HTML(title) "\" class=\"" HTML(attrib) "\">" \
-             inline( substr( line, len + 1) );
-    } else if ( title ) {
-      return "<img src=\"" URL(href, 1) "\" alt=\"" HTML(text) "\" title=\"" HTML(title) "\">" \
-             inline( substr( line, len + 1) );
-    } else if ( attrib ) {
-      return "<img src=\"" URL(href, 1) "\" alt=\"" HTML(text) "\" class=\"" HTML(attrib) "\">" \
-             inline( substr( line, len + 1) );
-    } else {
-      return "<img src=\"" URL(href, 1) "\" alt=\"" HTML(text) "\">" \
-             inline( substr( line, len + 1) );
-    }
+    # Macros
+    } else if ( match( line, /^<<([^>]|>[^>])+>>/ ) ) {
+      len = RLENGTH;
+      ret = ret "<code class=\"macro\">" HTML( substr( line, 3, len - 4 ) ) "</code>"; line = substr(line, len + 1);
+      continue;
+
+    # Wiki style links
+    } else if ( match( line, /^\[\[([^]|]+)(\|[^]]+)?\]\]/) ) {
+      len = RLENGTH; href = text = substr(line, 1, len);
+      sub(/^\[\[/, "", href); sub(/(\|([^]]+))?\]\].*$/, "", href);
+      sub(/^\[\[([^]|]+)/, "", text); sub(/\]\].*$/, "", text); sub(/^\|/, "", text);
+      # sub(/^\[\[([^]|]+)(\|([^]]+))?\]\]/, "\\1", href );
+      # sub(/^\[\[([^]|]+)(\|([^]]+))?\]\]/, "\\3", text );
+      if ( ! text ) text = href;
+      ret = ret "<a href=\"" HTML(href) "\">" HTML(text) "</a>"; line = substr( line, len + 1);
+      continue;
+
+    #  quick links ("automatic links" in md doc)
+    } else if ( match( line, /^<[a-zA-Z]+:\/\/([-\.[:alnum:]]+)(:[0-9]*)?(\/[^>]*)?>/ ) ) {
+      len = RLENGTH;
+      href = HTML( substr( line, 2, len - 2) );
+      ret = ret "<a href=\"" href "\">" href "</a>"; line = substr( line, len + 1);
+      continue;
+
+    # quick link email
+    # } else if ( match( line, /^<[a-zA-Z0-9.!#$%&'\''*+\/=?^_`{|}~-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*>/ ) ) {
+    } else if ( match( line, /^<[a-zA-Z0-9.!#$%&'\''*+\/=?^_`{|}~-]+@([a-zA-Z0-9]\.[a-zA-Z0-9]|[a-zA-Z0-9-])+>/ ) ) {
+      len = RLENGTH;
+      href = HTML( substr( line, 2, len - 2) );
+      ret = ret "<a href=\"mailto:" href "\">" href "</a>"; line = substr( line, len + 1);
+      continue;
+
+    # Verbatim inline HTML
+    } else if ( AllowHTML && match( line, /^(<!--([^-]|-[^-]|--[^>])*-->|<\?([^\?]|\?[^>])*\?>|<![A-Z][^>]*>|<!\[CDATA\[([^\]]|\][^\]]|\]\][^>])*\]\]>|<\/[A-Za-z][A-Za-z0-9-]*[[:space:]]*>|<[A-Za-z][A-Za-z0-9-]*([[:space:]]+[A-Za-z_:][A-Za-z0-9_\.:-]*([[:space:]]*=[[:space:]]*([[:space:]"'=<>`]+|"[^"]*"|'[^']*'))?)*[[:space:]]*\/?>)/) ) {
+      len = RLENGTH;
+      ret = ret substr( line, 1, len); line =substr(line, len + 1);
+      continue;
+
+    # inline links
+    } else if ( match(line, "^" lii "\\([\n\t ]*" lid "([\n\t ]+" lit ")?[\n\t ]*\\)") ) {
+      len = RLENGTH;
+      text = href = title = substr( line, 1, len);
+      sub("^\\[", "", text); sub("\\]\\([\n\t ]*" lid "([\n\t ]+" lit ")?[\n\t ]*\\)$", "", text);
+      sub("^" lii "\\([\n\t ]*", "", href); sub("([\n\t ]+" lit ")?[\n\t ]*\\)$", "", href);
+      sub("^" lii "\\([\n\t ]*" lid, "", title); sub("[\n\t ]*\\)$", "", title); sub("^[\n\t ]+", "", title);
+
+      if ( match(href, /^<.*>$/) ) { sub(/^</, "", href); sub(/>$/, "", href); }
+           if ( match(title, /^".*"$/) ) { sub(/^"/, "", title); sub(/"$/, "", title); }
+      else if ( match(title, /^'.*'$/) ) { sub(/^'/, "", title); sub(/'$/, "", title); }
+      else if ( match(title, /^\(.*\)$/) ) { sub(/^\(/, "", title); sub(/\)$/, "", title); }
+
+      gsub(/\\/, "", href); gsub(/\\/, "", title); gsub(/[\n\t]+/, " ", title);
+
+      ret = ret "<a href=\"" HTML(href) "\"" (title?" title=\"" HTML(title) "\"":"") ">" \
+             inline( text ) "</a>";
+      line = substr( line, len + 1);
+      continue;
+
+    # reference style links
+    } else if ( match(line, /^\[([^]]+)\] ?\[([^]]*)\]/ ) ) {
+      len = RLENGTH; text = id = substr(line, 1, len);
+      sub(/\n.*$/, "", text); sub(/^\[/, "", text); sub(/\] ?\[([^\n]*)\].*$/, "", text);
+      sub(/\n.*$/, "",   id); sub(/^\[([^]]+)\] ?\[/, "",   id); sub(/\].*$/, "",   id);
+      # text = gensub(/^\[([^\n]+)\] ?\[([^\n]*)\].*/, "\\1", 1, text );
+      # id = gensub(/^\[([^\n]+)\] ?\[([^\n]*)\].*/, "\\2", 1,   id );
+      if ( ! id ) id = text;
+
+      if ( rl_href[id] && rl_title[id] ) {
+        ret = ret "<a href=\"" HTML(rl_href[id]) "\" title=\"" HTML(rl_title[id]) "\">" inline(text) "</a>";
+        line = substr( line, len + 1);
+        continue;
+
+      } else if ( rl_href[id] ) {
+        ret = ret "<a href=\"" HTML(rl_href[id]) "\">" inline(text) "</a>"; line = substr( line, len + 1);
+        continue;
+
+      } else {
+        ret = ret "" HTML(substr(line, 1, len)); line = substr(line, len + 1);
+        continue;
+      }
 
-  # reference style images
-  } else if ( match(line, /^!\[([^]]*)\] ?\[([^]]*)\]/ ) ) {
-    len = RLENGTH;
-    text = gensub(/^!\[([^\n]*)\] ?\[([^\n]*)\].*/, "\\1", 1, substr(line, 1, len) );
-      id = gensub(/^!\[([^\n]*)\] ?\[([^\n]*)\].*/, "\\2", 1, substr(line, 1, len) );
-    if ( ! id ) id = text;
-    if ( rl_href[id] && rl_title[id] ) {
-      return "<img src=\"" URL(rl_href[id], 1) "\" alt=\"" HTML(text) "\" title=\"" HTML(rl_title[id]) "\">" \
-             inline( substr( line, len + 1) );
-    } else if ( rl_href[id] ) {
-      return "<img src=\"" URL(rl_href[id], 1) "\" alt=\"" HTML(text) "\">" \
-             inline( substr( line, len + 1) );
-    } else {
-      return "" HTML(substr(line, 1, len)) inline( substr(line, len + 1) );
-    }
+    # inline images
+    } else if ( match(line, "^!" lix "\\([\n\t ]*" lid "([\n\t ]+" lit ")?[\n\t ]*\\)(\\{[a-zA-Z \t-]*\\})?") ) {
+      len = RLENGTH; text = href = title = attrib = substr( line, 1, len);
+
+      sub("^!\\[", "", text);
+      sub("\\]\\([\n\t ]*" lid "([\n\t ]+" lit ")?[\n\t ]*\\)(\\{[a-zA-Z \t-]*\\})?$", "", text);
+
+      sub("^!" lix "\\([\n\t ]*", "", href);
+      sub("([\n\t ]+" lit ")?[\n\t ]*\\)(\\{[a-zA-Z \t-]*\\})?$", "", href);
+
+      sub("^!" lix "\\([\n\t ]*" lid, "", title);
+      sub("[\n\t ]*\\)(\\{[a-zA-Z \t-]*\\})?$", "", title);
+      sub("^[\n\t ]+", "", title);
+
+      sub("^!" lix "\\([\n\t ]*" lid "([\n\t ]+" lit ")?[\n\t ]*\\)", "", attrib);
+      sub(/^\{[ \t]*/, "", attrib); sub(/[ \t]*\}$/, "", attrib); gsub(/[ \t]+/, " ", attrib);
+
+      if ( match(href, /^<.*>$/) ) { sub(/^</, "", href); sub(/>$/, "", href); }
+           if ( match(title, /^".*"$/) ) { sub(/^"/, "", title); sub(/"$/, "", title); }
+      else if ( match(title, /^'.*'$/) ) { sub(/^'/, "", title); sub(/'$/, "", title); }
+      else if ( match(title, /^\(.*\)$/) ) { sub(/^\(/, "", title); sub(/\)$/, "", title); }
+
+      gsub(/^[\t ]+$/, "", text); gsub(/\\/, "", href);
+      gsub(/\\/, "", title); gsub(/[\n\t]+/, " ", title);
+
+      ret = ret "<img src=\"" HTML(href) "\" alt=\"" HTML(text?text:title?title:href) "\"" \
+             (title?" title=\"" HTML(title) "\"":"") (attrib?" class=\"" HTML(attrib) "\"":"") \
+             ">";
+      line = substr( line, len + 1);
+      continue;
+
+    # reference style images
+    } else if ( match(line, /^!\[([^]]*)\] ?\[([^]]*)\]/ ) ) {
+      len = RLENGTH; text = id = substr(line, 1, len);
+      sub(/\n.*$/, "", text); sub(/^!\[/, "", text); sub(/\] ?\[([^\n]*)\].*$/, "", text);
+      sub(/\n.*$/, "",   id); sub(/^!\[([^]]+)\] ?\[/, "",   id); sub(/\].*$/, "",   id);
+      # text = gensub(/^!\[([^\n]*)\] ?\[([^\n]*)\].*/, "\\1", 1, substr(line, 1, len) );
+      #   id = gensub(/^!\[([^\n]*)\] ?\[([^\n]*)\].*/, "\\2", 1, substr(line, 1, len) );
+      if ( ! id ) id = text;
+      if ( rl_href[id] && rl_title[id] ) {
+        ret = ret "<img src=\"" HTML(rl_href[id]) "\" alt=\"" HTML(text) "\" title=\"" HTML(rl_title[id]) "\">";
+        line = substr( line, len + 1);
+        continue;
+
+      } else if ( rl_href[id] ) {
+        ret = ret "<img src=\"" HTML(rl_href[id]) "\" alt=\"" HTML(text) "\">";
+        line = substr( line, len + 1);
+        continue;
+
+      } else {
+        ret = ret "" HTML(substr(line, 1, len)); line = substr(line, len + 1);
+        continue;
+      }
 
-  #  ~~strikeout~~ (pandoc)
-  } else if ( match(line, /^~~([[:graph:]]|[[:graph:]]([^~]|~[^~])*[[:graph:]])~~/) ) {
-    len = RLENGTH;
-    return "<del>" inline( substr( line, 3, len - 4 ) ) "</del>" inline( substr( line, len + 1 ) );
-
-  #  ^superscript^ (pandoc)
-  } else if ( match(line, /^\^([^[:space:]^]|\\[ ^])+\^/) ) {
-    len = RLENGTH;
-    return "<sup>" inline( substr( line, 2, len - 2 ) ) "</sup>" inline( substr( line, len + 1 ) );
-
-  #  ~subscript~ (pandoc)
-  } else if ( match(line, /^~([^[:space:]~]|\\[ ~])+~/) ) {
-    len = RLENGTH;
-    return "<sub>" inline( substr( line, 2, len - 2 ) ) "</sub>" inline( substr( line, len + 1 ) );
-
-  # ignore embedded underscores (pandoc, php md)
-  } else if ( match(line, "^[[:alnum:]](__|_)") ) {
-    return HTML(substr( line, 1, RLENGTH)) inline( substr(line, RLENGTH + 1) );
-
-  #  __strong__$
-  } else if ( match(line, "^__(([^_[:space:]]|" ieu ")|([^_[:space:]]|" ieu ")(" nu "|" ieu ")*([^_[:space:]]|" ieu "))__$") ) {
-    len = RLENGTH;
-    return "<strong>" inline( substr( line, 3, len - 4 ) ) "</strong>" inline( substr( line, len + 1 ) );
-
-  #  __strong__
-  } else if ( match(line, "^__(([^_[:space:]]|" ieu ")|([^_[:space:]]|" ieu ")(" nu "|" ieu ")*([^_[:space:]]|" ieu "))__[[:space:][:punct:]]") ) {
-    len = RLENGTH;
-    return "<strong>" inline( substr( line, 3, len - 5 ) ) "</strong>" inline( substr( line, len) );
-
-  #  **strong**
-  } else if ( match(line, "^\\*\\*(([^\\*[:space:]]|" iea ")|([^\\*[:space:]]|" iea ")(" na "|" iea ")*([^\\*[:space:]]|" iea "))\\*\\*") ) {
-    len = RLENGTH;
-    return "<strong>" inline( substr( line, 3, len - 4 ) ) "</strong>" inline( substr( line, len + 1 ) );
-
-  #  _em_$
-  } else if ( match(line, "^_(([^_[:space:]]|" isu ")|([^_[:space:]]|" isu ")(" nu "|" isu ")*([^_[:space:]]|" isu "))_$") ) {
-    len = RLENGTH;
-    return "<em>" inline( substr( line, 2, len - 2 ) ) "</em>" inline( substr( line, len + 1 ) );
-
-  #  _em_
-  } else if ( match(line, "^_(([^_[:space:]]|" isu ")|([^_[:space:]]|" isu ")(" nu "|" isu ")*([^_[:space:]]|" isu "))_[[:space:][:punct:]]") ) {
-    len = RLENGTH;
-    return "<em>" inline( substr( line, 2, len - 3 ) ) "</em>" inline( substr( line, len ) );
-
-  #  *em*
-  } else if ( match(line, "^\\*(([^\\*[:space:]]|" isa ")|([^\\*[:space:]]|" isa ")(" na "|" isa ")*([^\\*[:space:]]|" isa "))\\*") ) {
-    len = RLENGTH;
-    return "<em>" inline( substr( line, 2, len - 2 ) ) "</em>" inline( substr( line, len + 1 ) );
-
-  # Macros
-  } else if ( AllowMacros && match( line, /^<<([^>]|>[^>])+>>/) ) {
-    len = RLENGTH;
-    return macro( substr( line, 3, len - 4 ) ) inline(substr(line, len + 1));
-
-  # Verbatim inline HTML
-  } else if ( AllowHTML && match( line, /^(<!--([^-]|-[^-]|--[^>])*-->|<\?([^\?]|\?[^>])*\?>|<![A-Z][^>]*>|<!\[CDATA\[([^\]]|\][^\]]|\]\][^>])*\]\]>|<\/[A-Za-z][A-Za-z0-9-]*[[:space:]]*>|<[A-Za-z][A-Za-z0-9-]*([[:space:]]+[A-Za-z_:][A-Za-z0-9_\.:-]*([[:space:]]*=[[:space:]]*([[:space:]"'=<>`]+|"[^"]*"|'[^']*'))?)*[[:space:]]*\/?>)/) ) {
-    len = RLENGTH;
-    return substr( line, 1, len) inline(substr(line, len + 1));
-
-  # Literal HTML entities
-  } else if ( match( line, /^&([a-zA-Z]{2,32}|#[0-9]{1,7}|#[xX][0-9a-fA-F]{1,6});/) ) {
-    len = RLENGTH;
-    return substr( line, 1, len ) inline(substr(line, len + 1));
-
-  # Arrows
-  } else if ( line ~ /^-->( |$)/) {  # ignore multidash-arrow
-    return "--&gt;" inline( substr(line, 4) );
-  } else if ( line ~ /^<-( |$)/) {
-    return "&larr;" inline( substr(line, 3) );
-  } else if ( line ~ /^->( |$)/) {
-    return "&rarr;" inline( substr(line, 3) );
-
-  # Escape lone HTML character
-  } else if ( match( line, /^[&<>"']/) ) {
-    return HTML(substr(line, 1, 1)) inline(substr(line, 2));
-
-  #  continue walk over string
-  } else {
-    return substr(line, 1, 1) inline( substr(line, 2) );
+    #  ~~strikeout~~ (pandoc)
+    } else if ( match(line, /^~~([[:graph:]]|[[:graph:]]([^~]|~[^~])*[[:graph:]])~~/) ) {
+      len = RLENGTH;
+      ret = ret "<del>" inline( substr( line, 3, len - 4 ) ) "</del>"; line = substr( line, len + 1 );
+      continue;
+
+    #  ^superscript^ (pandoc)
+    } else if ( match(line, /^\^([^[:space:]^]|\\[ ^])+\^/) ) {
+      len = RLENGTH;
+      ret = ret "<sup>" inline( substr( line, 2, len - 2 ) ) "</sup>"; line = substr( line, len + 1 );
+      continue;
+
+    #  ~subscript~ (pandoc)
+    } else if ( match(line, /^~([^[:space:]~]|\\[ ~])+~/) ) {
+      len = RLENGTH;
+      ret = ret "<sub>" inline( substr( line, 2, len - 2 ) ) "</sub>"; line = substr( line, len + 1 );
+      continue;
+
+    # ignore embedded underscores (pandoc, php md)
+    } else if ( match(line, "^[[:alnum:]](__|_)") ) {
+      ret = ret HTML(substr( line, 1, RLENGTH)); line = substr(line, RLENGTH + 1);
+      continue;
+
+    # strong / em matchers use pre match pattern to make processing cheaper
+    #  __strong__$
+    } else if ( match(line, "^__(([^_[:space:]]|" ieu ")|([^_[:space:]]|" ieu ")(" nu "|" ieu ")*([^_[:space:]]|" ieu "))__$") ) {
+      len = RLENGTH;
+      ret = ret "<strong>" inline( substr( line, 3, len - 4 ) ) "</strong>"; line = substr( line, len + 1 );
+      continue;
+
+    #  __strong__
+    } else if ( match(line, "^__(([^_[:space:]]|" ieu ")|([^_[:space:]]|" ieu ")(" nu "|" ieu ")*([^_[:space:]]|" ieu "))__[[:space:][:punct:]]") ) {
+      len = RLENGTH;
+      ret = ret "<strong>" inline( substr( line, 3, len - 5 ) ) "</strong>"; line = substr( line, len);
+      continue;
+
+    #  **strong**
+    } else if ( match(line, "^\\*\\*(([^*[:space:]]|" iea ")|([^*[:space:]]|" iea ")(" na "|" iea ")*([^*[:space:]]|" iea "))\\*\\*") ) {
+      len = RLENGTH;
+      ret = ret "<strong>" inline( substr( line, 3, len - 4 ) ) "</strong>"; line = substr( line, len + 1 );
+      continue;
+
+    #  _em_$
+    } else if ( match(line, "^_(([^_[:space:]]|" isu ")|([^_[:space:]]|" isu ")(" nu "|" isu ")*([^_[:space:]]|" isu "))_$") ) {
+      len = RLENGTH;
+      ret = ret "<em>" inline( substr( line, 2, len - 2 ) ) "</em>"; line = substr( line, len + 1 );
+      continue;
+
+    #  _em_
+    } else if ( match(line, "^_(([^_[:space:]]|" isu ")|([^_[:space:]]|" isu ")(" nu "|" isu ")*([^_[:space:]]|" isu "))_[[:space:][:punct:]]") ) {
+      len = RLENGTH;
+      ret = ret "<em>" inline( substr( line, 2, len - 3 ) ) "</em>"; line = substr( line, len );
+      continue;
+
+    #  *em*
+    } else if ( match(line, "^\\*(([^*[:space:]]|" isa ")|([^*[:space:]]|" isa ")(" na "|" isa ")*([^*[:space:]]|" isa "))\\*") ) {
+      len = RLENGTH;
+      ret = ret "<em>" inline( substr( line, 2, len - 2 ) ) "</em>"; line = substr( line, len + 1 );
+      continue;
+
+    # Literal HTML entities
+    # } else if ( match( line, /^&([a-zA-Z]{2,32}|#[0-9]{1,7}|#[xX][0-9a-fA-F]{1,6});/) ) {
+    # mawk does not support repitition ranges
+    } else if ( match( line, /^&[a-zA-Z][a-zA-Z][a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?[a-zA-Z]?;/) ) {
+      len = RLENGTH;
+      ret = ret substr( line, 1, len ); line = substr(line, len + 1);
+      continue;
+    } else if ( match( line, /^&(#[0-9][0-9]?[0-9]?[0-9]?[0-9]?[0-9]?[0-9]?|#[xX][0-9a-fA-F][0-9a-fA-F]?[0-9a-fA-F]?[0-9a-fA-F]?[0-9a-fA-F]?[0-9a-fA-F]?);/) ) {
+      len = RLENGTH;
+      ret = ret substr( line, 1, len ); line = substr(line, len + 1);
+      continue;
+
+    # Arrows
+    } else if ( line ~ /^-->( |$)/) {  # ignore multidash-arrow
+      ret = ret "--&gt;"; line = substr(line, 4);
+      continue;
+    } else if ( line ~ /^<-( |$)/) {
+      ret = ret "&larr;"; line = substr(line, 3);
+      continue;
+    } else if ( line ~ /^->( |$)/) {
+      ret = ret "&rarr;"; line = substr(line, 3);
+      continue;
+
+    # Escape lone HTML character
+    } else if ( match( line, /^[&<>"']/) ) {
+      ret = ret HTML(substr(line, 1, 1)); line = substr(line, 2);
+      continue;
+
+    }  # inline patterns end
+
+    # continue walk over string
+    ret = ret substr(line, 1, 1); line = substr(line, 2);
   }
+  return ret;
 }
 
 function headline( hlvl, htxt, attrib, LOCAL, sec, n, HL) {
-  split( gensub( /^(.* )?([0-9]+( [0-9]+){5})$/, "\\2" ,"1", hstack),  HL);
+  # match(hstack, /([0-9]+( [0-9]+){5})$/); split( substr(hstack, RSTART),  HL);
+  match(hstack, /([0-9]+( [0-9]+)( [0-9]+)( [0-9]+)( [0-9]+)( [0-9]+))$/); split( substr(hstack, RSTART),  HL);
 
   for ( n = hlvl; n <= 6; n++ ) { sec = sec (HL[n]?"</section>":""); }
   HL[hlvl]++; for ( n = hlvl + 1; n <= 6; n++) { HL[n] = 0;}
+
   hid = ""; for ( n = 2; n <= blvl; n++) { hid = hid BL[n] "/"; }
   hid = hid HL[1]; for ( n = 2; n <= hlvl; n++) { hid = hid "." HL[n] ; }
   hid = hid ":" URL(htxt, 1);
 
-  hstack = gensub( /^(.* )?([0-9]+( [0-9]+){5})$/, "\\1" ,"1", hstack) \
-           HL[1] " " HL[2] " " HL[3] " " HL[4] " " HL[5] " " HL[6];
+  # sub(/([0-9]+( [0-9]+){5})$/, "", hstack);
+  sub(/([0-9]+( [0-9]+)( [0-9]+)( [0-9]+)( [0-9]+)( [0-9]+))$/, "", hstack);
+  hstack = hstack HL[1] " " HL[2] " " HL[3] " " HL[4] " " HL[5] " " HL[6];
 
   return sec "<section class=\"" (attrib ? "h" hlvl " " attrib : "h" hlvl)  "\" id=\"" hid "\">" \
          "<h" hlvl (attrib ? " class=\"" attrib "\"" : "") ">" inline( htxt ) \
          "<a class=\"anchor\" href=\"#" hid "\"></a>" \
-         "</h" hlvl ">\n\n";
+         "</h" hlvl ">\n";
 }
 
 # Nested Block, resets heading counters
-function _nblock( block, LOCAL, hlsav, sec, n ) {
-  hlsav = hstack;
+function _nblock( block, LOCAL, sec, n ) {
   hstack = hstack " 0 0 0 0 0 0";
 
   # Block Level
@@ -336,437 +410,539 @@ function _nblock( block, LOCAL, hlsav, sec, n ) {
   for ( n = blvl + 1; n in BL; n++) { delete BL[n]; }
 
   block = _block( block );
-  split( gensub( /^(.* )?([0-9]+( [0-9]+){5})$/, "\\2" ,"1", hstack),  HL);
+  match(hstack, /([0-9]+( [0-9]+)( [0-9]+)?( [0-9]+)?( [0-9]+)?( [0-9]+)?)$/); split( substr(hstack, RSTART),  HL);
   sec = ""; for ( n = 1; n <= 6; n++ ) { sec = sec (HL[n]?"</section>":""); }
-  hstack = hlsav; blvl--;
+
+  sub("( +[0-9]+)( +[0-9]+)?( +[0-9]+)?( +[0-9]+)?( +[0-9]+)?( +[0-9]+)? *$", "", hstack); blvl--;
   return block sec;
 }
 
-function _block( block, LOCAL, st, len, hlvl, htxt, sec, guard, code, indent, attrib ) {
-  gsub( /^\n+|\n+$/, "", block );
-
-  if ( block == "" ) {
-    return "";
-
-  # HTML #2 #3 #4 $5
-  } else if ( AllowHTML && match( block, /(^|\n) ? ? ?(<!--([^-]|-[^-]|--[^>])*(-->|$)|<\?([^\?]|\?[^>])*(\?>|$)|<![A-Z][^>]*(>|$)|<!\[CDATA\[([^\]]|\][^\]]|\]\][^>])*(\]\]>|$))/) ) {
-    len = RLENGTH; st = RSTART;
-    return _block(substr(block, 1, st - 1)) substr(block, st, len) _block(substr(block, st + len));
-
-  # HTML #6
-  } else if ( AllowHTML && match( tolower(block), /(^|\n) ? ? ?<\/?(address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[123456]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)([[:space:]\n>]|\/>)([^\n]|\n[ \t]*[^\n])*(\n[[:space:]]*\n|$)/) ) {
-    len = RLENGTH; st = RSTART;
-    return _block(substr(block, 1, st - 1)) substr(block, st, len) _block(substr(block, st + len));
-
-  # HTML #1
-  } else if ( AllowHTML && match( tolower(block), /(^|\n) ? ? ?<(script|pre|style)([[:space:]\n>]).*(<\/script>|<\/pre>|<\/style>|$)/) ) {
-    len = RLENGTH; st = RSTART;
-    match( tolower(substr(block, st, len)), /(<\/script>|<\/pre>|<\/style>)/);
-    len = RSTART + RLENGTH;
-    return _block(substr(block, 1, st - 1)) substr(block, st, len) _block(substr(block, st + len));
-
-  # HTML #7
-  } else if ( AllowHTML && match( block, /^ ? ? ?(<\/[A-Za-z][A-Za-z0-9-]*[[:space:]]*>|<[A-Za-z][A-Za-z0-9-]*([[:space:]]+[A-Za-z_:][A-Za-z0-9_\.:-]*([[:space:]]*=[[:space:]]*([[:space:]"'=<>`]+|"[^"]*"|'[^']*'))?)*[[:space:]]*\/?>)([[:space:]]*\n)([^\n]|\n[ \t]*[^\n])*(\n[[:space:]]*\n|$)/) ) {
-    len = RLENGTH; st = RSTART;
-    return substr(block, st, len) _block(substr(block, st + len));
-
-  # Metadata (custom, block starting with %something)
-  # Metadata is ignored but can be interpreted externally
-  } else if ( match(block, /^%[a-zA-Z]+([[:space:]][^\n]*)?(\n|$)(%[a-zA-Z]+([[:space:]][^\n]*)?(\n|$)|%([[:space:]][^\n]*)?(\n|$)|[ \t]+[^\n[:space:]][^\n]*(\n|$))*/) ) {
-    len = RLENGTH; st = RSTART;
-    return  _block( substr( block, len + 1) );
- 
-  # Blockquote (leading >)
-  } else if ( match( block, /^> /) ) {
-    match( block, /(^|\n)[[:space:]]*(\n|$)/ ) || match(block, /$/);
-    len = RLENGTH; st = RSTART;
-    return "<blockquote>\n" _nblock( gensub( /(^|\n)> /, "\n", "g", substr(block, 1, st - 1) ) ) "</blockquote>\n\n" \
-           _block( substr(block, st + len) );
-
-  # Pipe Tables (pandoc / php md / gfm )
-  } else if ( match(block, "^((\\|)?([^\n]+\\|)+[^\n]+(\\|)?)\n" \
-                           "((\\|)?:?(-+:?[\\|+])+:?-+:?(\\|)?)\n" \
-                           "((\\|)?([^\n]+\\|)+[^\n]+(\\|)?(\n|$))+" ) ) {
-    len = RLENGTH; st = RSTART;
-    #initialize empty arrays
-    split("", talign); split("", tarray);
-    cols = 0; cnt=0; ttext = "";
-
-    # table header and alignment
-    split( gensub( /(^\||\|$)/, "", "g", \
-           gensub( /(^|[^\\])\\\|/, "\\1\\&#x7C;", "g", \
-           substr(block, 1, match(block, /(\n|$)/)) \
-    )), tarray, /\|/);
-    block = substr(block, match(block, /(\n|$)/) + 1 );
-    cols = split( \
-           gensub( /(^\||\|$)/, "", "g", \
-           substr(block, 1, match(block, /(\n|$)/)) \
-    ), talign, /[+\|]/);
-    block = substr(block, match(block, /(\n|$)/) + 1 );
-
-    for( cnt = 1; cnt < cols; cnt++ ) {
-           if (match(talign[cnt], /:-+:/)) talign[cnt]="center";
-      else if (match(talign[cnt],  /-+:/)) talign[cnt]="right";
-      else if (match(talign[cnt],  /:-+/)) talign[cnt]="left";
-      else talign[cnt]="";
-    }
+function _block( block, LOCAL, st, len, text, title, attrib, href, guard, code, indent, list, tmp, ret) {
+  ret = "";
+  while ( block != "" ) {
+    gsub( "(^\n+|\n+$)", "", block );
+
+    # HTML #2 #3 #4 $5
+    if ( AllowHTML && match( block, /(^|\n) ? ? ?(<!--([^-]|-[^-]|--[^>])*(-->|$)|<\?([^\?]|\?[^>])*(\?>|$)|<![A-Z][^>]*(>|$)|<!\[CDATA\[([^\]]|\][^\]]|\]\][^>])*(\]\]>|$))/) ) {
+      len = RLENGTH; st = RSTART;
+      ret = ret _block(substr(block, 1, st - 1)) substr(block, st, len); block = substr(block, st + len);
+      continue;
+
+    # HTML #6 (part1)
+    } else if ( AllowHTML && match( tolower(block), /(^|\n) ? ? ?<\/?(address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset)([[:space:]\n>]|\/>)([^\n]|\n[ \t]*[^\n])*(\n[[:space:]]*\n|$)/) ) {
+      len = RLENGTH; st = RSTART;
+      ret = ret _block(substr(block, 1, st - 1)) substr(block, st, len); block = substr(block, st + len);
+      continue;
 
-    ttext = "<thead>\n<tr>"
-    for (cnt = 1; cnt < cols; cnt++)
-      ttext = ttext "<th align=\"" talign[cnt] "\">" inline(tarray[cnt]) "</th>"
-    ttext = ttext "</tr>\n</thead><tbody>\n"
+    # HTML #6 (part2)
+    } else if ( AllowHTML && match( tolower(block), /(^|\n) ? ? ?<\/?(h[123456]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)([[:space:]\n>]|\/>)([^\n]|\n[ \t]*[^\n])*(\n[[:space:]]*\n|$)/) ) {
+      len = RLENGTH; st = RSTART;
+      ret = ret _block(substr(block, 1, st - 1)) substr(block, st, len); block = substr(block, st + len);
+      continue;
+
+    # HTML #1
+    } else if ( AllowHTML && match( tolower(block), /(^|\n) ? ? ?<(script|pre|style)([[:space:]\n>]).*(<\/script>|<\/pre>|<\/style>|$)/) ) {
+      len = RLENGTH; st = RSTART;
+      match( tolower(substr(block, st, len)), /(<\/script>|<\/pre>|<\/style>)/);
+      len = RSTART + RLENGTH;
+      ret = ret _block(substr(block, 1, st - 1)) substr(block, st, len); block = substr(block, st + len);
+      continue;
+
+    # HTML #7
+    } else if ( AllowHTML && match( block, /^ ? ? ?(<\/[A-Za-z][A-Za-z0-9-]*[[:space:]]*>|<[A-Za-z][A-Za-z0-9-]*([[:space:]]+[A-Za-z_:][A-Za-z0-9_\.:-]*([[:space:]]*=[[:space:]]*([[:space:]"'=<>`]+|"[^"]*"|'[^']*'))?)*[[:space:]]*\/?>)([[:space:]]*\n)([^\n]|\n[ \t]*[^\n])*(\n[[:space:]]*\n|$)/) ) {
+      len = RLENGTH; st = RSTART;
+      ret = ret substr(block, st, len); block = substr(block, st + len);
+      continue;
 
-    while ( match(block, "^((\\|)?([^\n]+\\|)+[^\n]+(\\|)?(\n|$))+" ) ){
-      split( gensub( /(^\||\|$)/, "", "g", \
-             gensub( /(^|[^\\])\\\|/, "\\1\\&#x7C;", "g", \
-             substr(block, 1, match(block, /(\n|$)/)) \
-      )), tarray, /\|/);
+    # Metadata (custom, block starting with %something)
+    # Metadata is ignored but can be interpreted externally
+    } else if ( match(block, /^%[a-zA-Z-]+([[:space:]][^\n]*)?(\n|$)(%[a-zA-Z-]+([[:space:]][^\n]*)?(\n|$)|%([[:space:]][^\n]*)?(\n|$)|[ \t]+[^\n[:space:]][^\n]*(\n|$))*/) ) {
+      len = RLENGTH; st = RSTART;
+      block = substr( block, len + 1);
+      continue;
+ 
+    # Blockquote (leading >)
+    } else if ( match( block, /^> /) ) {
+      match( block, /(^|\n)[[:space:]]*(\n|$)/ ) || match(block, /$/);
+      len = RLENGTH; st = RSTART;
+      text = substr(block, 1, st - 1); gsub( /(^|\n)> /, "\n", text );
+      text = _nblock( text ); gsub( /^\n|\n$/, "", text )
+      ret = ret "<blockquote>" text "</blockquote>\n\n"; block = substr(block, st + len);
+      continue;
+
+    # Pipe Tables (pandoc / php md / gfm )
+    } else if ( match(block, "^((\\|)?([^\n]+\\|)+[^\n]+(\\|)?)\n" \
+                             "((\\|)?(:?-+:?[\\|+])+:?-+:?(\\|)?)\n" \
+                             "((\\|)?([^\n]+\\|)+[^\n]+(\\|)?(\n|$))+" ) ) {
+      len = RLENGTH; st = RSTART;
+      #initialize empty arrays
+      split("", talign); split("", tarray);
+      cols = 0; cnt=0; ttext = "";
+
+      # table header and alignment
+      tmp = substr(block, 1, match(block, /(\n|$)/));
+      gsub( /(^|[^\\])\\\|/, "\\1\\&#x7C;", tmp );
+      gsub( /(^\||\|$)/, "", tmp)
+      split( tmp, tarray, /\|/);
+      block = substr(block, match(block, /(\n|$)/) + 1 );
+      tmp = substr(block, 1, match(block, /(\n|$)/));
+      gsub( /(^\||\|$)/, "", tmp );
+      cols = split( tmp , talign, /[+\|]/);
       block = substr(block, match(block, /(\n|$)/) + 1 );
 
-      ttext = ttext "<tr>"
+      for( cnt = 1; cnt < cols; cnt++ ) {
+             if (match(talign[cnt], /:-+:/)) talign[cnt]="center";
+        else if (match(talign[cnt],  /-+:/)) talign[cnt]="right";
+        else if (match(talign[cnt],  /:-+/)) talign[cnt]="left";
+        else talign[cnt]="";
+      }
+
+      ttext = "<thead>\n<tr>"
       for (cnt = 1; cnt < cols; cnt++)
-        ttext = ttext "<td align=\"" talign[cnt] "\">" inline(tarray[cnt]) "</td>"
-      ttext = ttext "</tr>\n"
-    }
-    return "<table>" ttext "</tbody></table>\n" _block(block);
-
-  # Grid Tables (pandoc)
-  # (with, and without header)
-  } else if ( match( block, "^\\+(-+\\+)+\n" \
-                            "(\\|([^\n]+\\|)+\n)+" \
-                            "(\\+(:?=+:?\\+)+)\n" \
-                           "((\\|([^\n]+\\|)+\n)+" \
-                             "\\+(-+\\+)+(\n|$))+" \
-                   ) || \
-              match( block, "^()()()" \
-                            "(\\+(:?-+:?\\+)+)\n" \
-                           "((\\|([^\n]+\\|)+\n)+" \
-                             "\\+(-+\\+)+(\n|$))+" \
-  ) ) {
-    len = RLENGTH; st = RSTART;
-    #initialize empty arrays
-    split("", talign); split("", tarray); split("", tread);
-    cols = 0; cnt=0; ttext = "";
-
-    # Column Count
-    cols = split(   gensub( "^(\\+(:?-+:?\\+)+)(\n.*)*$", "\\1", 1, block), tread, /\+/) - 2;
-    # debug(" Cols: " gensub( "^(\\+(:?-+:?\\+)+)(\n.*)*$", "\\1", 1, block ));
-
-    # table alignment
-    split( gensub( "^(.*\n)?\\+((:?=+:?\\+|(:-+|-+:|:-+:)\\+)+)(\n.*)$", "\\2", "g", block ), talign, /\+/ );
-    # debug("Align: " gensub( "^(.*\n)?\\+((:?=+:?\\+|(:-+|-+:|:-+:)\\+)+)(\n.*)$", "\\2", "g", block ));
-
-    for (cnt = 1; cnt <= cols; cnt++) {
-           if (match(talign[cnt], /:(-+|=+):/)) talign[cnt]="center";
-      else if (match(talign[cnt],  /(-+|=+):/)) talign[cnt]="right";
-      else if (match(talign[cnt], /:(-+|=+)/ )) talign[cnt]="left";
-      else talign[cnt]="";
-    }
+        ttext = ttext "<th align=\"" talign[cnt] "\">" inline(tarray[cnt]) "</th>"
+      ttext = ttext "</tr>\n</thead><tbody>\n"
+
+      while ( match(block, "^((\\|)?([^\n]+\\|)+[^\n]+(\\|)?(\n|$))+" ) ){
+        tmp = substr(block, 1, match(block, /(\n|$)/));
+        gsub( /(^|[^\\])\\\|/, "\\1\\&#x7C;", tmp );
+        gsub( /(^\||\|$)/, "", tmp );
+        split( tmp, tarray, /\|/);
+        block = substr(block, match(block, /(\n|$)/) + 1 );
 
-    if ( match(block, "^\\+(-+\\+)+\n" \
-                      "(\\|([^\n]+\\|)+\n)+" \
-                       "\\+(:?=+:?\\+)+\n" \
-                     "((\\|([^\n]+\\|)+\n)+" \
-                       "\\+(-+\\+)+(\n|$))+" \
+        ttext = ttext "<tr>"
+        for (cnt = 1; cnt < cols; cnt++)
+          ttext = ttext "<td align=\"" talign[cnt] "\">" inline(tarray[cnt]) "</td>"
+        ttext = ttext "</tr>\n"
+      }
+      ret = ret "<table>" ttext "</tbody></table>\n";
+      continue;
+
+    # Grid Tables (pandoc)
+    # (with, and without header)
+    } else if ( match( block, "^\\+(-+\\+)+\n" \
+                              "(\\|([^\n]+\\|)+\n)+" \
+                              "(\\+(:?=+:?\\+)+)\n" \
+                             "((\\|([^\n]+\\|)+\n)+" \
+                               "\\+(-+\\+)+(\n|$))+" \
+                     ) || \
+                match( block, "^(\\+(:?-+:?\\+)+)\n" \
+                             "((\\|([^\n]+\\|)+\n)+" \
+                               "\\+(-+\\+)+(\n|$))+" \
     ) ) {
-      # table header
-      block = substr(block, match(block, /(\n|$)/) + 1 );
-      while ( match(block, "^\\|([^\n]+\\|)+\n") ) {
-        split( gensub( /(^\||\|$)/, "", "g", \
-                 gensub( /(^|[^\\])\\\|/, "\\1\\&#x7C;", "g", \
-                   substr(block, 1, match(block, /(\n|$)/)) \
-        )), tread, /\|/);
+      len = RLENGTH; st = RSTART;
+      #initialize empty arrays
+      split("", talign); split("", tarray); split("", tread);
+      cols = 0; cnt=0; ttext = "";
+
+      # Column Count
+      tmp = block; sub( "(\n.*)*$", "", tmp);
+      cols = split( tmp, tread, /\+/) - 2;
+      # debug(" Cols: " gensub( "^(\\+(:?-+:?\\+)+)(\n.*)*$", "\\1", 1, block ));
+
+      # table alignment
+      match(block, "((:?=+:?\\+|(:-+|-+:|:-+:)\\+)+)");
+      split( substr(block, RSTART, RLENGTH) , talign, /\+/ );
+      # split( gensub( "^(.*\n)?\\+((:?=+:?\\+|(:-+|-+:|:-+:)\\+)+)(\n.*)$", "\\2", "g", block ), talign, /\+/ );
+      # debug("Align: " gensub( "^(.*\n)?\\+((:?=+:?\\+|(:-+|-+:|:-+:)\\+)+)(\n.*)$", "\\2", "g", block ));
+
+      for (cnt = 1; cnt <= cols; cnt++) {
+             if (match(talign[cnt], /:(-+|=+):/)) talign[cnt]="center";
+        else if (match(talign[cnt],  /(-+|=+):/)) talign[cnt]="right";
+        else if (match(talign[cnt], /:(-+|=+)/ )) talign[cnt]="left";
+        else talign[cnt]="";
+      }
+
+      if ( match(block, "^\\+(-+\\+)+\n" \
+                        "(\\|([^\n]+\\|)+\n)+" \
+                         "\\+(:?=+:?\\+)+\n" \
+                       "((\\|([^\n]+\\|)+\n)+" \
+                         "\\+(-+\\+)+(\n|$))+" \
+      ) ) {
+        # table header
         block = substr(block, match(block, /(\n|$)/) + 1 );
+        while ( match(block, "^\\|([^\n]+\\|)+\n") ) {
+          tmp = substr(block, 1, match(block, /(\n|$)/));
+          gsub( /\\\\/, "\\&#x5C;", tmp); gsub(/\\\|/, "\\&#x7C;", tmp);
+          gsub( /(^\||\|$)/, "", tmp );
+          split(tmp, tread, /\|/);
+          block = substr(block, match(block, /(\n|$)/) + 1 );
+          for (cnt = 1; cnt <= cols; cnt++)
+            tarray[cnt] = tarray[cnt] "\n" tread[cnt];
+        }
+
+        ttext = "<thead>\n<tr>"
         for (cnt = 1; cnt <= cols; cnt++)
-          tarray[cnt] = tarray[cnt] "\n" tread[cnt];
+          ttext = ttext "<th align=\"" talign[cnt] "\">" _nblock(tarray[cnt]) "</th>"
+        ttext = ttext "</tr>\n</thead>"
       }
 
-      ttext = "<thead>\n<tr>"
-      for (cnt = 1; cnt <= cols; cnt++)
-        ttext = ttext "<th align=\"" talign[cnt] "\">" _nblock(tarray[cnt]) "</th>"
-      ttext = ttext "</tr>\n</thead>"
-    }
-
-    # table body
-    block = substr(block, match(block, /(\n|$)/) + 1 );
-    ttext = ttext "<tbody>\n"
-
-    while ( match(block, /^((\|([^\n]+\|)+\n)+\+(-+\+)+(\n|$))+/ ) ){
-      split("", tarray);
-      while ( match(block, /^\|([^\n]+\|)+\n/) ) {
-        split( gensub( /(^\||\|$)/, "", "g", \
-               gensub( /(^|[^\\])\\\|/, "\\1\\&#x7C;", "g", \
-               substr(block, 1, match(block, /(\n|$)/)) \
-        )), tread, /\|/);
+      # table body
+      block = substr(block, match(block, /(\n|$)/) + 1 );
+      ttext = ttext "<tbody>\n"
+
+      while ( match(block, /^((\|([^\n]+\|)+\n)+\+(-+\+)+(\n|$))+/ ) ){
+        split("", tarray);
+        while ( match(block, /^\|([^\n]+\|)+\n/) ) {
+          tmp = substr(block, 1, match(block, /(\n|$)/));
+          gsub( /\\\\/, "\\&#x5C;", tmp); gsub(/\\\|/, "\\&#x7C;", tmp);
+          gsub( /(^\||\|$)/, "", tmp);
+          split( tmp, tread, /\|/);
+          block = substr(block, match(block, /(\n|$)/) + 1 );
+          for (cnt = 1; cnt <= cols; cnt++)
+            tarray[cnt] = tarray[cnt] "\n" tread[cnt];
+        }
         block = substr(block, match(block, /(\n|$)/) + 1 );
+
+        ttext = ttext "<tr>"
         for (cnt = 1; cnt <= cols; cnt++)
-          tarray[cnt] = tarray[cnt] "\n" tread[cnt];
+          ttext = ttext "<td align=\"" talign[cnt] "\">" _nblock(tarray[cnt]) "</td>"
+        ttext = ttext "</tr>\n"
       }
-      block = substr(block, match(block, /(\n|$)/) + 1 );
+      return ret "<table>" ttext "</tbody></table>\n" _nblock(block);
 
-      ttext = ttext "<tr>"
-      for (cnt = 1; cnt <= cols; cnt++)
-        ttext = ttext "<td align=\"" talign[cnt] "\">" _nblock(tarray[cnt]) "</td>"
-      ttext = ttext "</tr>\n"
-    }
-    return "<table>" ttext "</tbody></table>\n" _nblock(block);
-
-  # Line Blocks (pandoc)
-  } else if ( match(block, /^\| [^\n]*(\n|$)(\| [^\n]*(\n|$)|[ \t]+[^\n[:space:]][^\n]*(\n|$))*/) ) {
-    len = RLENGTH; st = RSTART;
-    code = substr(block, 1, len);
-    gsub(/\n[[:space:]]+/, " ", code);
-    gsub(/\n\| /, "\n", code);
-    gsub(/^\| |\n$/, "", code);
-    return "<div class=\"line-block\">" gensub(/\n/, "<br>\n", "g", inline( code )) "</div>\n" \
-           _block( substr( block, len + 1) );
-
-  # Indented Code Block
-  } else if ( match(block, /^(    |\t)( *\t*[^ \t\n]+ *\t*)+(\n|$)((    |\t)[^\n]+(\n|$)|[ \t]*(\n|$))*/) ) {
-    len = RLENGTH; st = RSTART;
-    code = substr(block, 1, len);
-    gsub(/(^|\n)(    |\t)/, "\n", code);
-    gsub(/^\n|\n+$/, "", code);
-    return "<pre><code>" HTML( code ) "</code></pre>\n" \
-           _block( substr( block, len + 1 ) );
-
-  # Fenced Divs (pandoc, custom)
-  } else if ( match( block, /^(:::+)/ ) ) {
-    guard = substr( block, 1, RLENGTH );
-    code = gensub(/^[^\n]+\n/, "", 1, block);
-    attrib = gensub(/^:::+[ \t]*\{?[ \t]*([^\}\n]*)\}?[ \t]*\n.*$/, "\\1", 1, block);
-    gsub(/[^a-zA-Z0-9_-]+/, " ", attrib);
-    gsub(/(^ | $)/, "", attrib);
-    if ( match(code, "(^|\n)" guard "+(\n|$)" ) ) {
+    # Line Blocks (pandoc)
+    } else if ( match(block, /^\| [^\n]*(\n|$)(\| [^\n]*(\n|$)|[ \t]+[^\n[:space:]][^\n]*(\n|$))*/) ) {
       len = RLENGTH; st = RSTART;
-      return "<div class=\"" attrib "\">" _nblock( substr(code, 1, st - 1) ) "</div>\n" \
-             _block( substr( code, st + len ) );
-    } else {
-      match( block, /(^|\n)[[:space:]]*(\n|$)/ ) || match( block, /$/ );
+
+      text = substr(block, 1, len); gsub(/\n[[:space:]]+/, " ", text);
+      gsub(/\n\| /, "\n", text); gsub(/^\| |\n$/, "", text);
+      text = inline(text); gsub(/\n/, "<br>\n", text);
+
+      ret = ret "<div class=\"line-block\">" text "</div>\n"; block =  substr( block, len + 1);
+      continue;
+
+    # Indented Code Block
+    } else if ( match(block, /^((    |\t)[^\n]*[^\n\t ][^\n]*(\n|$))((    |\t)[^\n]*(\n|$)|[\t ]*(\n|$))*/) ) {
       len = RLENGTH; st = RSTART;
-      return "<p>" inline( substr(block, 1, st - 1) ) "</p>\n" \
-             _block( substr(block, st + len) );
-    }
 
-  # Fenced Code Block (pandoc)
-  } else if ( match( block, /^(~~~+|```+)/ ) ) {
-    guard = substr( block, 1, RLENGTH );
-    code = gensub(/^[^\n]+\n/, "", 1, block);
-    attrib = gensub(/^(~~~+|```+)[ \t]*\{?[ \t]*([^\}\n]*)\}?[ \t]*\n.*$/, "\\2", 1, block);
-    gsub(/[^a-zA-Z0-9_-]+/, " ", attrib);
-    gsub(/(^ | $)/, "", attrib);
-    if ( match(code, "(^|\n)" guard "+(\n|$)" ) ) {
+      code = substr(block, 1, len);
+      gsub(/(^|\n)(    |\t)/, "\n", code);
+      gsub(/^\n|\n+$/, "", code);
+      ret = ret "<pre><code>" HTML( code ) "</code></pre>\n"; block = substr( block, len + 1 );
+      continue;
+
+    # Fenced Divs (pandoc, custom)
+    } else if ( match( block, /^(:::+)/ ) ) {
+      guard = substr( block, 1, RLENGTH ); attrib = code = block;
+      sub(/^[^\n]+\n/, "", code);
+      sub(/^:::+[ \t]*\{?[ \t]*/, "", attrib); sub(/\}?[ \t]*\n.*$/, "", attrib);
+      # attrib = gensub(/^:::+[ \t]*\{?[ \t]*([^\}\n]*)\}?[ \t]*\n.*$/, "\\1", 1, attrib);
+      gsub(/[^a-zA-Z0-9_-]+/, " ", attrib);
+      gsub(/(^ | $)/, "", attrib);
+      if ( match(code, "(^|\n)" guard "+(\n|$)" ) && attrib ) {
+        len = RLENGTH; st = RSTART;
+        ret = ret "<div class=\"" attrib "\">" _nblock( substr(code, 1, st - 1) ) "</div>\n";
+        block = substr( code, st + len );
+        continue;
+
+      } else if ( match(code, "(^|\n)" guard "+(\n|$)" ) ) {
+        len = RLENGTH; st = RSTART;
+        ret = ret "<div>" _nblock( substr(code, 1, st - 1) ) "</div>\n"; block = substr( code, st + len );
+        continue;
+
+      } else {
+        match( block, /(^|\n)[[:space:]]*(\n|$)/ ) || match( block, /$/ );
+        len = RLENGTH; st = RSTART;
+        ret = ret "<p>" inline( substr(block, 1, st - 1) ) "</p>\n"; block = substr(block, st + len);
+        continue;
+      }
+
+    # Fenced Code Block (pandoc)
+    } else if ( match( block, /^(~~~+|```+)/ ) ) {
+      guard = substr( block, 1, RLENGTH ); attrib = code = block;
+      sub(/^[^\n]+\n/, "", code);
+      sub(/^(~~~+|```+)[ \t]*\{?[ \t]*/, "", attrib); sub(/\}?[ \t]*\n.*$/, "", attrib);
+      # attrib = gensub(/^(~~~+|```+)[ \t]*\{?[ \t]*([^\}\n]*)\}?[ \t]*\n.*$/, "\\2", 1, attrib);
+      gsub(/[^a-zA-Z0-9_-]+/, " ", attrib);
+      gsub(/(^ | $)/, "", attrib);
+      if ( match(code, "(^|\n)" guard "+(\n|$)" ) && attrib ) {
+        len = RLENGTH; st = RSTART;
+        ret = ret "<pre><code class=\"" attrib "\">" HTML( substr(code, 1, st - 1) ) "</code></pre>\n";
+        block = substr( code, st + len );
+        continue;
+
+      } else if ( match(code, "(^|\n)" guard "+(\n|$)" ) ) {
+        len = RLENGTH; st = RSTART;
+        ret = ret "<pre><code>" HTML( substr(code, 1, st - 1) ) "</code></pre>\n";
+        block = substr( code, st + len );
+        continue;
+
+      } else {
+        match( block, /(^|\n)[[:space:]]*(\n|$)/ ) || match( block, /$/ );
+        len = RLENGTH; st = RSTART;
+        ret = ret "<p>" inline( substr(block, 1, st - 1) ) "</p>\n"; block = substr(block, st + len);
+        continue;
+      }
+
+    # First Order Heading H1 + Attrib
+    } else if ( match( block, /^([^\n]+)([ \t]*\{([^\}\n]+)\})\n===+(\n|$)/ ) ) {
+      len = RLENGTH; text = attrib = block;
+      sub(/([ \t]*\{([^\}\n]+)\})\n===+(\n.*)?$/, "", text);
+      sub(/\}\n===+(\n.*)?$/, "", attrib); sub(/^([^\n]+)[ \t]*\{/, "", attrib);
+      gsub(/[^a-zA-Z0-9_-]+/, " ", attrib); gsub(/(^ | $)/, "", attrib);
+
+      ret = ret headline(1, text, attrib) ; block = substr( block, len + 1 );
+      continue;
+
+    # First Order Heading H1
+    } else if ( match( block, /^([^\n]+)\n===+(\n|$)/ ) ) {
+      len = RLENGTH; text = substr(block, 1, len);
+      sub(/\n===+(\n.*)?$/, "", text);
+
+      ret = ret headline(1, text, 0) ; block = substr( block, len + 1 );
+      continue;
+
+    # Second Order Heading H2 + Attrib
+    } else if ( match( block, /^([^\n]+)([ \t]*\{([^\}\n]+)\})\n---+(\n|$)/ ) ) {
+      len = RLENGTH; text = attrib = block;
+      sub(/([ \t]*\{([^\}\n]+)\})\n---+(\n.*)?$/, "", text);
+      sub(/\}\n---+(\n.*)?$/, "", attrib); sub(/^([^\n]+)[ \t]*\{/, "", attrib);
+      gsub(/[^a-zA-Z0-9_-]+/, " ", attrib); gsub(/(^ | $)/, "", attrib);
+
+      ret = ret headline(2, text, attrib) ; block = substr( block, len + 1);
+      continue;
+
+    # Second Order Heading H2
+    } else if ( match( block, /^([^\n]+)\n---+(\n|$)/ ) ) {
+      len = RLENGTH; text = substr(block, 1, len);
+      sub(/\n---+(\n.*)?$/, "", text);
+
+      ret = ret headline(2, text, 0) ; block = substr( block, len + 1);
+      continue;
+
+    # # Nth Order Heading H1 H2 H3 H4 H5 H6 + Attrib
+    # } else if ( match( block, /^(##?#?#?#?#?)[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*[ \t]*\{[a-zA-Z \t-]*\}(\n|$)/ ) ) {
+    } else if ( match( block, /^##?#?#?#?#?[^#\n]([^\n#]|#[^\t\n# ]|#[\t ]+[^\t\n ])+#*[\t ]*\{[\ta-zA-Z -]*\}(\n|$)/ ) ) {
+      len = RLENGTH; text = attrib = substr(block, 1, len);
+      match(block, /^##?#?#?#?#?[^#]/); n = RLENGTH - 1;
+      # sub(/^(##?#?#?#?#?)[ \t]*/, "", text);  # not working in mawk
+      text = substr(text, n + 1); sub(/^[ \t]*/, "", text);
+      sub(/[ \t]*#*([ \t]*\{([a-zA-Z \t-]*)\})(\n.*)?$/, "", text);
+
+      sub(/^##?#?#?#?#?[^#\n]([^\n#]|#[^\t\n# ]|#[\t ]+[^\t\n ])+#*[\t ]*\{/, "", attrib);
+      sub(/\}(\n.*)?$/, "", attrib);
+      gsub(/[^a-zA-Z0-9_-]+/, " ", attrib); gsub(/(^ | $)/, "", attrib);
+
+      ret = ret headline( n, text, attrib ); block = substr( block, len + 1);
+      continue;
+
+    # Nth Order Heading H1 H2 H3 H4 H5 H6
+    # } else if ( match( block, /^(##?#?#?#?#?)[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*(\n|$)/ ) ) {
+    } else if ( match( block, /^##?#?#?#?#?[^#\n]([^\n#]|#[^\t\n# ]|#[\t ]+[^\t\n ])+#*(\n|$)/ ) ) {
+      len = RLENGTH; text = substr(block, 1, len);
+      match(block, /^##?#?#?#?#?[^#]/); n = RLENGTH - 1;
+      # sub(/^(##?#?#?#?#?)[ \t]+/, "", text);  # not working in mawk
+      text = substr(text, n + 1); sub(/^[ \t]*/, "", text);
+      sub(/[ \t]*#*(\n.*)?$/, "", text);
+
+      ret = ret headline( n, text, 0 ) ; block = substr( block, len + 1);
+      continue;
+
+    # block images (wrapped in <figure>)
+    } else if ( match(block, "^!" lix "\\([\n\t ]*" lid "([\n\t ]+" lit ")?[\n\t ]*\\)(\\{[a-zA-Z \t-]*\\})?(\n|$)") ) {
+      len = RLENGTH; text = href = title = attrib = substr( block, 1, len);
+
+      sub("^!\\[", "", text);
+      sub("\\]\\([\n\t ]*" lid "([\n\t ]+" lit ")?[\n\t ]*\\)(\\{[a-zA-Z \t-]*\\})?(\n.*)?$", "", text);
+
+      sub("^!" lix "\\([\n\t ]*", "", href);
+      sub("([\n\t ]+" lit ")?[\n\t ]*\\)(\\{[a-zA-Z \t-]*\\})?(\n.*)?$", "", href);
+
+      sub("^!" lix "\\([\n\t ]*" lid, "", title);
+      sub("[\n\t ]*\\)(\\{[a-zA-Z \t-]*\\})?(\n.*)?$", "", title);
+      sub("^[\n\t ]+", "", title);
+
+      sub("^!" lix "\\([\n\t ]*" lid "([\n\t ]+" lit ")?[\n\t ]*\\)", "", attrib);
+      sub("(\n.*)?$", "", attrib);
+      sub(/^\{[ \t]*/, "", attrib); sub(/[ \t]*\}$/, "", attrib); gsub(/[ \t]+/, " ", attrib);
+
+      if ( match(href, /^<.*>$/) ) { sub(/^</, "", href); sub(/>$/, "", href); }
+           if ( match(title, /^".*"$/) ) { sub(/^"/, "", title); sub(/"$/, "", title); }
+      else if ( match(title, /^'.*'$/) ) { sub(/^'/, "", title); sub(/'$/, "", title); }
+      else if ( match(title, /^\(.*\)$/) ) { sub(/^\(/, "", title); sub(/\)$/, "", title); }
+
+      gsub(/^[\t ]+$/, "", text); gsub(/\\/, "", href);
+
+      ret = ret "<figure data-src=\"" HTML(href) "\"" (attrib?" class=\"" HTML(attrib) "\"":"") ">" \
+             "<img src=\"" HTML(href) "\" alt=\"" HTML(text?text:title?title:href) "\"" \
+             (attrib?" class=\"" HTML(attrib) "\"":"") ">" \
+             (title?"<figcaption>" inline(title) "</figcaption>":"") \
+             "</figure>\n\n";
+      block = substr( block, len + 1);
+      continue;
+
+    } else if ( match(block, /^!\[([^]]*)\] ?\[([^]]*)\](\n|$)/ ) ) {
+      len = RLENGTH; text = id = block;
+      sub(/(\n.*)?$/, "", text); sub( /^!\[/, "", text); sub(/\] ?\[([^\n]*)\]$/, "", text);
+      sub(/(\n.*)?$/, "",   id); sub( /^!\[([^\n]*)\] ?\[/, "",   id); sub(/\]$/, "",   id);
+      # text = gensub(/^!\[([^\n]*)\] ?\[([^\n]*)\](\n.*)?$/, "\\1", 1, block);
+      #   id = gensub(/^!\[([^\n]*)\] ?\[([^\n]*)\](\n.*)?$/, "\\2", 1, block);
+      if ( ! id ) id = text;
+      if ( rl_href[id] && rl_title[id] ) {
+        ret = ret "<figure data-src=\"" HTML(rl_href[id]) "\">" \
+                 "<img src=\"" HTML(rl_href[id]) "\" alt=\"" HTML(text) "\">" \
+                 "<figcaption>" inline(rl_title[id]) "</figcaption>" \
+               "</figure>\n\n";
+        block = substr( block, len + 1);
+        continue;
+
+      } else if ( rl_href[id] ) {
+        ret = ret "<figure data-src=\"" HTML(rl_href[id]) "\">" \
+                 "<img src=\"" HTML(rl_href[id]) "\" alt=\"" HTML(text) "\">" \
+               "</figure>\n\n";
+        block = substr( block, len + 1);
+        continue;
+      } else {
+        ret = ret "<p>" HTML(substr(block, 1, len)) "</p>\n" ; block = substr(block, len + 1);
+        continue;
+      }
+
+    # Macros (standalone <<macro>> calls handled as block, so they are not wrapped in paragraph)
+    } else if ( match( block, /^<<(([^>]|>[^>])+)>>(\n|$)/ ) ) {
+      len = RLENGTH; text = block;
+      sub(/^<</, "", text); sub(/>>(\n.*)?$/, "", text);
+      # text = gensub(/^<<(([^>]|>[^>])+)>>(\n.*)?$/, "\\1", 1, block);
+      ret = ret "<code class=\"macro\">" HTML(text) "</code>" ; block = substr(block, len + 1);
+      continue;
+
+    # Definition list
+    } else if (match( block, "^(([ \t]*\n)*[^:\n \t][^\n]+\n" \
+                             "([ \t]*\n)* ? ? ?:[ \t][^\n]+(\n|$)" \
+                            "(([ \t]*\n)* ? ? ?:[ \t][^\n]+(\n|$)" \
+                             "|[^:\n \t][^\n]+(\n|$)" \
+                             "|( ? ? ?\t|  +)[^\n]+(\n|$)" \
+                             "|([ \t]*\n)+( ? ? ?\t|  +)[^\n]+(\n|$))*)+" \
+    )) {
+      list = substr( block, 1, RLENGTH); block = substr( block, RLENGTH + 1);
+      ret = ret "<dl>\n" _dlist( list ) "</dl>\n";
+      continue;
+
+    # Unordered list types
+    } else if ( text = _startlist( block, "ul", "-",   "([+*•]|[0-9]+\\.|#\\.|[0-9]+\\)|#\\))") ) {
+      return ret text;
+    } else if ( text = _startlist( block, "ul", "\\+", "([-*•]|[0-9]+\\.|#\\.|[0-9]+\\)|#\\))") ) {
+      return ret text;
+    } else if ( text = _startlist( block, "ul", "\\*", "([-+•]|[0-9]+\\.|#\\.|[0-9]+\\)|#\\))") ) {
+      return ret text;
+    } else if ( text = _startlist( block, "ul", "•", "([-+*]|[0-9]+\\.|#\\.|[0-9]+\\)|#\\))") ) {
+      return ret text;
+
+    # Ordered list types
+    } else if ( text = _startlist( block, "ol", "[0-9]+\\.", "([-+*•]|#\\.|[0-9]+\\)|#\\))") ) {
+      return ret text;
+    } else if ( text = _startlist( block, "ol", "[0-9]+\\)", "([-+*•]|[0-9]+\\.|#\\.|#\\))") ) {
+      return ret text;
+    } else if ( text = _startlist( block, "ol", "#\\.", "([-+*•]|[0-9]+\\.|[0-9]+\\)|#\\))") ) {
+      return ret text;
+    } else if ( text = _startlist( block, "ol", "#\\)", "([-+*•]|[0-9]+\\.|#\\.|[0-9]+\\))") ) {
+      return ret text;
+
+    # Split paragraphs
+    } else if ( match( block, /(^|\n)[[:space:]]*(\n|$)/) ) {
       len = RLENGTH; st = RSTART;
-      return "<pre><code class=\"" attrib "\">" HTML( substr(code, 1, st - 1) ) "</code></pre>\n" \
-             _block( substr( code, st + len ) );
-    } else {
-      match( block, /(^|\n)[[:space:]]*(\n|$)/ ) || match( block, /$/ );
+      ret = ret _block( substr(block, 1, st - 1) ) "\n"; block = substr(block, st + len);
+      continue;
+
+    # Horizontal rule
+    # } else if ( match( block, /(^|\n) ? ? ?((\* *){3,}|(- *){3,}|(_ *){3,})($|\n)/) ) {
+    } else if ( match( block, /(^|\n) ? ? ?((\* *)(\* *)(\* *)(\* *)*|(- *)(- *)(- *)(- *)*|(_ *)(_ *)(_ *)(_ *)*)($|\n)/) ) {
       len = RLENGTH; st = RSTART;
-      return "<p>" inline( substr(block, 1, st - 1) ) "</p>\n" \
-             _block( substr(block, st + len) );
-    }
+      ret = ret _block(substr(block, 1, st - 1)) "<hr>\n"; block = substr(block, st + len);
+      continue;
 
-  # Unordered list
-  } else if ( match( block, "^ ? ? ?[-+*][ \t]+[^\n]+(\n|$)" \
-                            "(([ \t]*\n)* ? ? ?[-+*][ \t]+[^\n]+(\n|$)" \
-                            "|([ \t]*\n)*( ? ? ?\t|  +)[^\n]+(\n|$)" \
-                            "|[^\n]+(\n|$))*" ) ) {
-  list = substr( block, 1, RLENGTH);
-  block = substr( block, RLENGTH + 1);
-  indent = length( gensub(/[-+*][ \t]+[^\n]+.*$/, "", 1, list) );
-
-  gsub("(^|\n) {0," indent "}", "\n", list);
-  return "\n<ul>\n" _list( substr(list, 2) ) "</ul>\n" _block( block );
-
-  # Ordered list
-  } else if ( match( block, "^ ? ? ?([0-9]+|#)\\.[ \t]+[^\n]+(\n|$)" \
-                            "(([ \t]*\n)* ? ? ?([0-9]+|#)\\.[ \t]+[^\n]+(\n|$)" \
-                            "|([ \t]*\n)*( ? ? ?\t|  +)[^\n]+(\n|$)" \
-                            "|[^\n]+(\n|$))*" ) ) {
-  list = substr( block, 1, RLENGTH);
-  block = substr( block, RLENGTH + 1);
-  indent = length( gensub(/([0-9]+|#)\.[ \t]+[^\n]+.*$/, "", 1, list) );
-
-  gsub("(^|\n) {0," indent "}", "\n", list);
-  return "\n<ol>\n" _list( substr(list, 2) ) "</ol>\n" _block( block );
-
-  # First Order Heading H1 + Attrib
-  } else if ( match( block, /^([^\n]+)([ \t]*\{([^\}\n]+)\})\n===+(\n|$)/ ) ) {
-    len = RLENGTH;
-    text   = gensub(/^([^\n]+)([ \t]*\{([^\}\n]+)\})\n===+(\n.*)?$/, "\\1", 1, block)
-    attrib = gensub(/^([^\n]+)([ \t]*\{([^\}\n]+)\})\n===+(\n.*)?$/, "\\3", 1, block)
-    gsub(/[^a-zA-Z0-9_-]+/, " ", attrib); gsub(/(^ | $)/, "", attrib);
-
-    return headline(1, text, attrib) \
-           _block( substr( block, len + 1 ) );
-
-  # First Order Heading H1
-  } else if ( match( block, /^([^\n]+)\n===+(\n|$)/ ) ) {
-    len = RLENGTH;
-    text   = gensub(/^([^\n]+)\n===+(\n.*)?$/, "\\1", 1, block)
-
-    return headline(1, text, 0) \
-           _block( substr( block, len + 1 ) );
-
-  # Second Order Heading H2 + Attrib
-  } else if ( match( block, /^([^\n]+)([ \t]*\{([^\}\n]+)\})\n---+(\n|$)/ ) ) {
-    len = RLENGTH;
-    text   = gensub(/^([^\n]+)([ \t]*\{([^\}\n]+)\})\n---+(\n.*)?$/, "\\1", 1, block)
-    attrib = gensub(/^([^\n]+)([ \t]*\{([^\}\n]+)\})\n---+(\n.*)?$/, "\\3", 1, block)
-    gsub(/[^a-zA-Z0-9_-]+/, " ", attrib); gsub(/(^ | $)/, "", attrib);
-
-    return headline(2, text, attrib) \
-           _block( substr( block, len + 1) );
-
-  # Second Order Heading H2
-  } else if ( match( block, /^([^\n]+)\n---+(\n|$)/ ) ) {
-    len = RLENGTH;
-    text   = gensub(/^([^\n]+)\n---+(\n.*)?$/, "\\1", 1, block)
-
-    return headline(2, text, 0) \
-           _block( substr( block, len + 1) );
-
-  # Nth Order Heading H1 H2 H3 H4 H5 H6 + Attrib
-  } else if ( match( block, /^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*([ \t]*\{([a-zA-Z \t-]*)\})(\n|$)/ ) ) {
-    len = RLENGTH;
-    n      = gensub(/^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*([ \t]*\{([a-zA-Z \t-]*)\})(\n.*)?$/, "\\1", 1, block);
-    text   = gensub(/^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*([ \t]*\{([a-zA-Z \t-]*)\})(\n.*)?$/, "\\2", 1, block);
-    attrib = gensub(/^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*([ \t]*\{([a-zA-Z \t-]*)\})(\n.*)?$/, "\\5", 1, block);
-    gsub(/[^a-zA-Z0-9_-]+/, " ", attrib); gsub(/(^ | $)/, "", attrib);
-
-    return headline( length(n), text, attrib ) \
-           _block( substr( block, len + 1) );
-
-  # Nth Order Heading H1 H2 H3 H4 H5 H6
-  } else if ( match( block, /^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*(\n|$)/ ) ) {
-    len = RLENGTH;
-    n      = gensub(/^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*(\n.*)?$/, "\\1", 1, block);
-    text   = gensub(/^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*(\n.*)?$/, "\\2", 1, block);
-
-    return headline( length(n), text, 0 ) \
-           _block( substr( block, len + 1) );
-
-  # block images (wrapped in <figure>)
-  } else if ( match(block, /^!\[([^]]*)\]\(([^"\)]+)([ \t]+"([^"]+)")?\)(\{([a-zA-Z \t-]*)\})?(\n|$)/) ) {
-    len = RLENGTH;
-    text   = gensub(/^!\[([^]]*)\]\(([^"\)]+)([ \t]+"([^"]+)")?\)(\{([a-zA-Z \t-]*)\})?(\n.*)?$/, "\\1", "g", block);
-    href   = gensub(/^!\[([^]]*)\]\(([^"\)]+)([ \t]+"([^"]+)")?\)(\{([a-zA-Z \t-]*)\})?(\n.*)?$/, "\\2", "g", block);
-    title  = gensub(/^!\[([^]]*)\]\(([^"\)]+)([ \t]+"([^"]+)")?\)(\{([a-zA-Z \t-]*)\})?(\n.*)?$/, "\\4", "g", block);
-    attrib = gensub(/^!\[([^]]*)\]\(([^"\)]+)([ \t]+"([^"]+)")?\)(\{([a-zA-Z \t-]*)\})?(\n.*)?$/, "\\6", "g", block);
-    if ( title && attrib ) {
-      return "<figure data-src=\"" URL(href, 1) "\" class=\"" HTML(attrib) "\">" \
-               "<img src=\"" URL(href, 1) "\" alt=\"" HTML(text) "\" class=\"" HTML(attrib) "\">" \
-               "<figcaption>" inline(title) "</figcaption>" \
-             "</figure>\n\n" \
-             _block( substr( block, len + 1) );
-    } else if ( title ) {
-      return "<figure data-src=\"" URL(href, 1) "\">" \
-               "<img src=\"" URL(href, 1) "\" alt=\"" HTML(text) "\">" \
-               "<figcaption>" inline(title) "</figcaption>" \
-             "</figure>\n\n" \
-             _block( substr( block, len + 1) );
-    } else if ( attrib ) {
-      return "<figure data-src=\"" URL(href, 1) "\" class=\"" HTML(attrib) "\">" \
-               "<img src=\"" URL(href, 1) "\" alt=\"" HTML(text) "\" class=\"" HTML(attrib) "\">" \
-             "</figure>\n\n" \
-             _block( substr( block, len + 1) );
-    } else {
-      return "<figure data-src=\"" URL(href, 1) "\">" \
-               "<img src=\"" URL(href, 1) "\" alt=\"" HTML(text) "\">" \
-             "</figure>\n\n" \
-             _block( substr( block, len + 1) );
-    }
+    }  # block patterns end
+
+    # Plain paragraph
+    return ret "<p>" inline(block) "</p>\n";
+  }
+  return ret;
+}
 
-  # reference style images (block)
-  } else if ( match(line, /^!\[([^]]*)\] ?\[([^]]*)\](\n|$)/ ) ) {
-    len = RLENGTH;
-    text = gensub(/^!\[([^\n]*)\] ?\[([^\n]*)\](\n.*)?$/, "\\1", 1, block);
-      id = gensub(/^!\[([^\n]*)\] ?\[([^\n]*)\](\n.*)?$/, "\\2", 1, block);
-    if ( ! id ) id = text;
-    if ( rl_href[id] && rl_title[id] ) {
-      return "<figure data-src=\"" URL(rl_href[id], 1) "\">" \
-               "<img src=\"" URL(rl_href[id], 1) "\" alt=\"" HTML(text) "\">" \
-               "<figcaption>" inline(rl_title[id]) "</figcaption>" \
-             "</figure>\n\n" \
-             _block( substr( block, len + 1) );
-    } else if ( rl_href[id] ) {
-      return "<figure data-src=\"" URL(rl_href[id], 1) "\">" \
-               "<img src=\"" URL(rl_href[id], 1) "\" alt=\"" HTML(text) "\">" \
-             "</figure>\n\n" \
-             _block( substr( block, len + 1) );
-    } else {
-      return "<p>" HTML(substr(block, 1, len)) "</p>\n" _block( substr(block, len + 1) );
+function _startlist(block, type, mark, exclude, LOCAL, st, len, list, indent, it, text) {
+  if (match( block, "(^|\n) ? ? ?" mark "[ \t][^\n]+(\n|$)" \
+                                   "(([ \t]*\n)* ? ? ?" mark "[ \t][^\n]+(\n|$)" \
+                                   "|([ \t]*\n)*( ? ? ?\t|  +)[^\n]+(\n|$)" \
+                                   "|[^\n \t][^\n]+(\n|$))*" ) ) {
+    st = RSTART; len = RLENGTH; list = substr( block, st, len);
+
+    sub("^\n", "", list); match(list, "^(   |  | )?"); indent = RLENGTH;
+    # gsub( "(^|\n) {0," indent "}", "\n", list); sub("^\n", "", list);
+    # emulate greedy range matcher for mawk
+    it = "("; while ( indent > 0 ) { for (k = indent; k > 0; k--) { it = it " "; } it = it "|"; indent--; }
+    sub(/\|$/, ")?", it); sub(/^\($/, "", it);
+    gsub( "(^|\n)" it, "\n", list ); sub("^\n", "", list);
+
+    text = substr(block, 1, st - 1); block = substr(block, st + len);
+    if (match(text, /\n[[:space:]]*\n/)) return 0;
+    if (match(text, "(^|\n) ? ? ?" exclude "[ \t][^\n]+")) return 0;
+    if (match( list, "\n" exclude "[ \t]" )) {
+      block = substr(list, RSTART + 1) block;
+      list = substr(list, 1, RSTART);
     }
 
-  # Macros (standalone <<macro>> calls handled as block, so they are not wrapped in paragraph)
-  } else if ( AllowMacros && match( block, /^<<(([^>]|>[^>])+)>>(\n|$)/) ) {
-    len = RLENGTH;
-    text = gensub(/^<<(([^>]|>[^>])+)>>(\n.*)?$/, "\\1", 1, block);
-    return macro(text) _block(substr(block, len + 1) );
-
-  # Split paragraphs
-  } else if ( match( block, /(^|\n)[[:space:]]*(\n|$)/) ) {
-    len = RLENGTH; st = RSTART;
-    return _block( substr(block, 1, st - 1) ) "\n" \
-           _block( substr(block, st + len) );
-
-  # Horizontal rule
-  } else if ( match( block, /(^|\n) ? ? ?((\* *){3,}|(- *){3,}|(_ *){3,})($|\n)/) ) {
-    len = RLENGTH; st = RSTART;
-    return _block(substr(block, 1, st - 1)) "<hr>\n" _block(substr(block, st + len));
-
-  # Plain paragraph
-  } else {
-    return "<p>" inline(block) "</p>\n";
-  }
+    return _block( text ) "<" type ">\n" _list( list, mark ) "</" type ">\n" _block( block );
+  } else return 0;
 }
 
-function _list( block, last, LOCAL, p) {
-  if ( ! length(block) ) return "";
-  gsub(/^([-+*]|[0-9]+\.|#\.)(  ? ? ?|\t)/, "", block)
+function _list (block, mark, p, LOCAL, len, st, text, indent, it, task) {
+  if ( match(block, "^([ \t]*\n)*$")) return;
 
-  # slice next list item from input
-  if ( match( block, /\n([-+*]|[0-9]+\.|#\.)[ \t]+[^\n]+/) ) {
-    p = substr( block, 1, RSTART);
-    block = substr( block, RSTART + 1);
-  } else {
-    p = block; block = "";
-  }
-  sub( /\n +([-+*]|[0-9]+\.|#\.)/, "\n&", p );
-
-  # if this should be a paragraph item
-  # either previous item (last) or current item (p) contains blank lines
-  if (match(last, /\n[[:space:]]*\n/) || match(p, /\n[[:space:]]*\n/) ) {
-    last = p; p = _nblock(p);
-  } else {
-    last = p; p = _nblock(p);
-    sub( /^<p>/, "", p );
-    sub( /<\/p>\n/, "", p );
+  match(block, "^" mark "[ \t]"); indent = RLENGTH;
+
+  sub("^" mark "[ \t]", "", block);
+
+  if (match(block, /\n[ \t]*\n/)) p = 1;
+
+  match( block, "\n" mark "[ \t][^\n]+(\n|$)" );
+  st = (RLENGTH == -1) ? length(block) + 1 : RSTART;
+  text = substr(block, 1, st); block = substr(block, st + 1);
+
+  # gsub("\n {0," indent "}", "\n", text);
+  # emulate greedy range matcher for mawk
+  it = "("; while ( indent > 0 ) { for (k = indent; k > 0; k--) { it = it " "; } it = it "|"; indent--; }
+  sub(/\|$/, ")?", it); sub(/^\($/, "", it);
+  gsub("\n" it, "\n", text);
+
+  task = match( text, /^\[ \]/   ) ? "<li class=\"task pending\"><input type=checkbox disabled>"      : \
+         match( text, /^\[-\]/   ) ? "<li class=\"task negative\"><input type=checkbox disabled>"     : \
+         match( text, /^\[\/\]/  ) ? "<li class=\"task partial\"><input type=checkbox disabled>"      : \
+         match( text, /^\[\?\]/  ) ? "<li class=\"task unsure\"><input type=checkbox disabled>"       : \
+         match( text, /^\[[xX]\]/) ? "<li class=\"task done\"><input type=checkbox disabled checked>" : "<li>";
+  sub(/^\[[-? \/xX]\]/, "", text);
+
+  text = _nblock( text );
+  if ( ! p && match( text, "^<p>(</p[^>]|</[^p]|<[^/]|[^<])*</p>\n$" ))
+     gsub( "(^<p>|</p>\n$)", "", text);
+
+  return task text "</li>\n" _list(block, mark, p);
+}
+
+function _dlist (block, LOCAL, len, st, text, indent, it, p) {
+  if (match( block, "^([ \t]*\n)*[^:\n \t][^\n]+\n" )) {
+    len = RLENGTH; text = substr(block, 1, len);
+    gsub( "(^\n*|\n*$)", "", text );
+    return "<dt>" inline( text ) "</dt>\n" _dlist( substr(block, len + 1) );
+  } else if (match( block, "^([ \t]*\n)* ? ? ?:[ \t][^\n]+(\n|$)" \
+                         "([^:\n \t][^\n]+(\n|$)" \
+                         "|( ? ? ?\t|  +)[^\n]+(\n|$)" \
+                         "|([ \t]*\n)+( ? ? ?\t|  +)[^\n]+(\n|$))*" \
+  )) {
+    len = RLENGTH; text = substr(block, 1, len);
+    sub( "^([ \t]*\n)*", "", text);
+    match(text, "^ ? ? ?:(\t| +)"); indent = RLENGTH;
+    sub( "^ ? ? ?:(\t| +)", "", text);
+    # gsub( "(^|\n) {0," indent "}", "\n", text );
+    # emulate greedy range matcher for mawk
+    it = "("; while ( indent > 0 ) { for (k = indent; k > 0; k--) { it = it " "; } it = it "|"; indent--; }
+    sub(/\|$/, ")?", it); sub(/^\($/, "", it);
+    gsub( "(^|\n)" it, "\n", text );
+
+    text = _nblock(text);
+    if (match( text, "^<p>(</p[^>]|</[^p]|<[^/]|[^<])*</p>\n$" ))
+       gsub( "(^<p>|</p>\n$)", "", text);
+
+    return "<dd>" text "</dd>\n" _dlist( substr(block, len + 1) );
   }
-  sub( /\n$/, "", p );
-
-  # Task List (pandoc, custom)
-         if ( p ~ /^\[ \].*/ )       { return "<li class=\"task pending\"><input type=checkbox disabled>" \
-                                              substr(p, 4) "</li>\n" _list( block, last );
-  } else if ( p ~ /^\[-\].*/ )       { return "<li class=\"task negative\"><input type=checkbox disabled>" \
-                                              substr(p, 4) "</li>\n" _list( block, last );
-  } else if ( p ~ /^\[\?\].*/ )      { return "<li class=\"task unsure\"><input type=checkbox disabled>" \
-                                              substr(p, 4) "</li>\n" _list( block, last );
-  } else if ( p ~ /^\[\/\].*/ )      { return "<li class=\"task partial\"><input type=checkbox disabled>" \
-                                              substr(p, 4) "</li>\n" _list( block, last );
-  } else if ( p ~ /^\[[xX]\].*/ )    { return "<li class=\"task done\"><input type=checkbox disabled checked>" \
-                                            substr(p, 4) "</li>\n" _list( block, last );
-  } else if ( p ~ /^<p>\[ \].*/ )    { return "<li class=\"task pending\"><p><input type=checkbox disabled>" \
-                                              substr(p, 7) "</li>\n" _list( block, last );
-  } else if ( p ~ /^<p>\[-\].*/ )    { return "<li class=\"task negative\"><p><input type=checkbox disabled>" \
-                                              substr(p, 7) "</li>\n" _list( block, last );
-  } else if ( p ~ /^<p>\[\?\].*/ )   { return "<li class=\"task unsure\"><p><input type=checkbox disabled>" \
-                                              substr(p, 7) "</li>\n" _list( block, last );
-  } else if ( p ~ /^<p>\[\/\].*/ )   { return "<li class=\"task partial\"><p><input type=checkbox disabled>" \
-                                              substr(p, 7) "</li>\n" _list( block, last );
-  } else if ( p ~ /^<p>\[[xX]\].*/ ) { return "<li class=\"task done\"><p><input type=checkbox disabled checked>" \
-                                              substr(p, 7) "</li>\n" _list( block, last );
-  } else { return "<li>" p "</li>\n" _list( block, last ); }
 }
 
 BEGIN {
@@ -776,6 +952,20 @@ BEGIN {
   HL[1] = 0; HL[2] = 0; HL[3] = 0; HL[4] = 0; HL[5] = 0; HL[6] = 0;
   # hls = "0 0 0 0 0 0";
 
+  # Universal Patterns
+  nu = "([^_\\\\]|\\\\.|_[[:alnum:]])"  # not underline (except when escaped, or inside a word)
+  na = "([^*\\\\]|\\\\.)"               # not asterisk (except when escaped)
+  ieu =  "_([^_[:space:]]|[^_[:space:]]" nu "*[^_[:space:]])_"                 # inner <em> (underline)
+  isu = "__([^_[:space:]]|[^_[:space:]]" nu "*[^_[:space:]])__"                # inner <strong> (underline)
+  iea =    "\\*([^*[:space:]]|[^*[:space:]]" na "*[^*[:space:]])\\*"     # inner <em> (asterisk)
+  isa = "\\*\\*([^*[:space:]]|[^*[:space:]]" na "*[^*[:space:]])\\*\\*"  # inner <strong> (asterisk)
+
+  lix="\\[(\\\\[^\n]|[^]\n\\\\[])*\\]"  # link text
+  lid="(<(\\\\[^\n]|[^\n<>\\\\])*>|(\\\\.|[^()\"'\\\\])+|([^<\n\t ()\\\\]|\\\\[^\n])(\\\\[\n]|[^\n\t \\(\\)\\\\])*)"  # link dest
+  lit="(\"(\\\\.|[^\"\\\\])*\"|'(\\\\.|[^'\\\\])*'|\\((\\\\.|[^\\(\\)\\\\])*\\))"  # link text
+  # link text with image def
+  lii="\\[(\\\\[^\n]|[^]\n\\\\[])*(!" lix "\\([\n\t ]*" lid "([\n\t ]+" lit ")?[\n\t ]*\\))?(\\\\[^\n]|[^]\n\\\\[])*\\]"
+
   # Buffering of full file ist necessary, e.g. to find reference links
   while (getline) { file = file $0 "\n"; }
   # Clean up MS-DOS line breaks
@@ -786,10 +976,17 @@ BEGIN {
   re_reflink = "(^|\n) ? ? ?\\[([^]\n]+)\\]: ([^ \t\n]+)(\n?[ \t]+(\"([^\"]+)\"|'([^']+)'|\\(([^)]+)\\)))?(\n|$)";
   # /(^|\n) ? ? ?\[([^]\n]+)\]: ([^ \t\n]+)(\n?[ \t]+("([^"]+)"|'([^']+)'|\(([^)]+)\)))?(\n|$)/
   while ( match(f, re_reflink ) ) {
-    rl_id           = gensub( re_reflink, "\\2", 1, substr(f, RSTART, RLENGTH) );
-    rl_href[rl_id]  = gensub( re_reflink, "\\3", 1, substr(f, RSTART, RLENGTH) );
-    rl_title[rl_id] = gensub( re_reflink, "\\5", 1, substr(f, RSTART, RLENGTH) );
-    f = substr(f, RSTART + RLENGTH);
+    tt = th = ti = substr(f, RSTART, RLENGTH); f = substr(f, RSTART + RLENGTH);
+    sub("(^|\n) ? ? ?\\[", "", ti); sub("\\]: ([^ \t\n]+)(\n?[ \t]+(\"([^\"]+)\"|'([^']+)'|\\(([^)]+)\\)))?(\n.*)?$", "", ti);
+    sub("(^|\n) ? ? ?\\[([^]\n]+)\\]: ", "", th); sub("(\n?[ \t]+(\"([^\"]+)\"|'([^']+)'|\\(([^)]+)\\)))?(\n.*)?$", "", th);
+    if (match(tt, "(^|\n) ? ? ?\\[([^]\n]+)\\]: ([^ \t\n]+)(\n?[ \t]+(\"([^\"]+)\"|'([^']+)'|\\(([^)]+)\\)))(\n|$)")) {
+      sub("(^|\n) ? ? ?\\[([^]\n]+)\\]: ([^ \t\n]+)", "", tt); sub("^\n?[ \t]+", "", tt); sub("(\n.*)?$", "", tt);
+    } else { tt = ""; }
+    rl_id = ti; rl_href[rl_id] = th; rl_title[rl_id] = tt;
+    # rl_id           = gensub( re_reflink, "\\2", 1, substr(f, RSTART, RLENGTH) );
+    # rl_href[rl_id]  = gensub( re_reflink, "\\3", 1, substr(f, RSTART, RLENGTH) );
+    # rl_title[rl_id] = gensub( re_reflink, "\\5", 1, substr(f, RSTART, RLENGTH) );
+    # f = substr(f, RSTART + RLENGTH);
     rl_title[rl_id] = substr( rl_title[rl_id], 2, length(rl_title[rl_id]) - 2 );
     if ( rl_href[rl_id] ~ /<.*>/ ) rl_href[rl_id] = substr( rl_href[rl_id], 2, length(rl_href[rl_id]) - 2 );
   }