X-Git-Url: https://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=markdown.awk;h=69a2fa8e70af9215c4b1ef5586a32620ff98b576;hp=e63541bebfa78ffc70053ca23a1d94ff6b586c66;hb=e619859fa2c940c4ab4c31550717d233c145bfea;hpb=b3075fd95ed1f474fbe0a4eff68228e72a7ec653

diff --git a/markdown.awk b/markdown.awk
index e63541b..69a2fa8 100755
--- a/markdown.awk
+++ b/markdown.awk
@@ -42,13 +42,13 @@
 # - [x] Automatic heading identifiers (custom)
 # - [x] Fenced code blocks (php md, pandoc)
 #   - [x] Fenced code attributes
-# - [ ] Tables
+# - [/] Tables
 #   -  ?  Simple table (pandoc)
 #   -  ?  Multiline table (pandoc)
-#   -  ?  Grid table (pandoc)
-#   -  ?  Pipe table (php md pandoc)
+#   - [x] Grid table (pandoc)
+#   - [x] Pipe table (php md pandoc)
 # - [x] Line blocks (pandoc)
-# - [x] Task lists (pandoc)
+# - [x] Task lists (pandoc, custom)
 # - [ ] Definition lists (php md, pandoc)
 # - [-] Numbered example lists (pandoc)
 # - [-] Metadata blocks (pandoc)
@@ -296,6 +296,115 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
     return "<blockquote>\n" _block( 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]="";
+    }
+
+    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"
+
+    while ( match(block, "^((\\|)?([^\n]+\\|)+[^\n]+(\\|)?(\n|$))+" ) ){
+      split( gensub( /(^\||\|$)/, "", "g", \
+             gensub( /(^|[^\\])\\\|/, "\\1\\&#x7C;", "g", \
+             substr(block, 1, match(block, /(\n|$)/)) \
+      )), tarray, /\|/);
+      block = substr(block, match(block, /(\n|$)/) + 1 );
+
+      ttext = ttext "<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)
+  } else if ( match(block, "^\\+(-+\\+)+\n" \
+                       "(\\|([^\n]+\\|)+\n)+" \
+                        "\\+(:?=+:?\\+)+\n" \
+                      "((\\|([^\n]+\\|)+\n)+" \
+                            "\\+(-+\\+)+(\n|$))+" \
+            ) ) {
+    len = RLENGTH; st = RSTART;
+    #initialize empty arrays
+    split("", talign); split("", tarray); split("", tread);
+    cols = 0; cnt=0; ttext = "";
+
+    # table header and alignment
+    block = substr(block, match(block, /(\n|$)/) + 1 );
+    while ( match(block, "^\\|([^\n]+\\|)+\n") ) {
+      cols = split( gensub( /(^\||\|$)/, "", "g", \
+             gensub( /(^|[^\\])\\\|/, "\\1\\&#x7C;", "g", \
+             substr(block, 1, match(block, /(\n|$)/)) \
+      )), tread, /\|/);
+      block = substr(block, match(block, /(\n|$)/) + 1 );
+      for (cnt = 1; cnt < cols; cnt++)
+        tarray[cnt] = tarray[cnt] "\n" tread[cnt];
+    }
+
+    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]="";
+    }
+
+    ttext = "<thead>\n<tr>"
+    for (cnt = 1; cnt < cols; cnt++)
+      ttext = ttext "<th align=\"" talign[cnt] "\">" _block(tarray[cnt]) "</th>"
+    ttext = ttext "</tr>\n</thead><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, /\|/);
+        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++)
+        ttext = ttext "<td align=\"" talign[cnt] "\">" _block(tarray[cnt]) "</td>"
+      ttext = ttext "</tr>\n"
+    }
+    return "<table>" ttext "</tbody></table>\n" _block(block);
+
   # Line Blocks (pandoc)
   } else if ( match(block, /^\| [^\n]*(\n|$)(\| [^\n]*(\n|$)|[ \t]+[^\n[:space:]][^\n]*(\n|$))*/) ) {
     len = RLENGTH; st = RSTART;
@@ -337,7 +446,7 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
   } 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);
+    attrib = gensub(/^(~~~+|```+)[ \t]*\{?[ \t]*([^\}\n]*)\}?[ \t]*\n.*$/, "\\2", 1, block);
     gsub(/[^a-zA-Z0-9_-]+/, " ", attrib);
     gsub(/(^ | $)/, "", attrib);
     if ( match(code, "(^|\n)" guard "+(\n|$)" ) ) {
@@ -379,14 +488,20 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
   } else if ( match( block, /^[^\n]+\n===+(\n|$)/ ) ) {
     len = RLENGTH;
     HL[1]++; HL[2] = 0; HL[3] = 0; HL[4] = 0; HL[5] = 0; HL[6] = 0;
-    return "<h1 id=\"" HL[1] " - " HTML(gensub( /\n.*$/, "", "g", block )) "\">" inline( gensub( /\n.*$/, "", "g", block ) ) "</h1>\n\n" \
+    return "<h1 id=\"" HL[1] " - " HTML(gensub( /\n.*$/, "", "g", block )) "\">" \
+           inline( gensub( /\n.*$/, "", "g", block ) ) \
+           "<a class=\"anchor\" href=\"" HL[1] " - " \
+           HTML(gensub( /\n.*$/, "", "g", block )) "\"></a></h1>\n\n" \
            _block( substr( block, len + 1 ) );
 
   # Second Order Heading
   } else if ( match( block, /^[^\n]+\n---+(\n|$)/ ) ) {
     len = RLENGTH;
     HL[2]++; HL[3] = 0; HL[4] = 0; HL[5] = 0; HL[6] = 0;
-    return "<h2 id=\"" HL[1] "." HL[2] " - " HTML(gensub( /\n.*$/, "", "g", block )) "\">" inline( gensub( /\n.*$/, "", "g", block ) ) "</h2>\n\n" \
+    return "<h2 id=\"" HL[1] "." HL[2] " - " HTML(gensub( /\n.*$/, "", "g", block )) "\">" \
+           inline( gensub( /\n.*$/, "", "g", block ) ) \
+           "<a class=\"anchor\" href=\"" HL[1] "." HL[2] " - " \
+           HTML(gensub( /\n.*$/, "", "g", block )) "\"></a></h2>\n\n" \
            _block( substr( block, len + 1) );
 
   # Nth Order Heading
@@ -396,7 +511,8 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
     htxt = gensub(/^#{1,6}[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[^\n#])+)([ \t]*#*)(\n.*)?$/, "\\1", 1, block);
     HL[hlvl]++; for ( n = hlvl + 1; n < 7; n++) { HL[n] = 0;}
     hid = HL[1]; for ( n = 2; n <= hlvl; n++) { hid = hid "." HL[n] ; }
-    return "<h" hlvl " id=\"" hid " - " HTML(htxt) "\">" inline( htxt ) "</h" hlvl ">\n\n" \
+    return "<h" hlvl " id=\"" hid " - " HTML(htxt) "\">" inline( htxt ) \
+           "<a class=\"anchor\" href=\"" hid "\"></a></h" hlvl ">\n\n" \
            _block( substr( block, len + 1) );
 
   # Split paragraphs
@@ -440,12 +556,28 @@ function _list( block, last, LOCAL, p) {
   }
   sub( /\n$/, "", p );
 
-  # Task List (pandoc)
-       if ( p ~ /^\[ \].*/ )       { p = "<input type=checkbox disabled />" substr(p, 4); }
-  else if ( p ~ /^\[[xX]\].*/ )    { p = "<input type=checkbox disabled checked />" substr(p, 4); }
-  else if ( p ~ /^<p>\[ \].*/ )    { p = "<p><input type=checkbox disabled />" substr(p, 7); }
-  else if ( p ~ /^<p>\[[xX]\].*/ ) { p = "<p><input type=checkbox disabled checked />" substr(p, 7); }
-  return "<li>" p "</li>\n" _list( block, last );
+  # 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 {