X-Git-Url: https://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=markdown.awk;h=b86cd841c7b9b5511c6933154d85b5fc67442bc5;hp=6271996440dab3b37132f8eccdecbf6094a4db99;hb=aa80431f1f666e6a2180226b5dbd683f2c2021b9;hpb=9bb22561275a9ce0d5403a12fe7e8aeeeb2792e9
diff --git a/markdown.awk b/markdown.awk
index 6271996..b86cd84 100755
--- a/markdown.awk
+++ b/markdown.awk
@@ -42,10 +42,10 @@
# - [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)
+# - [x] Grid table (pandoc)
# - [x] Pipe table (php md pandoc)
# - [x] Line blocks (pandoc)
# - [x] Task lists (pandoc, custom)
@@ -303,7 +303,7 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
len = RLENGTH; st = RSTART;
#initialize empty arrays
split("", talign); split("", tarray);
- cols = 0; ttext = ""; cnt=0;
+ cols = 0; cnt=0; ttext = "";
# table header and alignment
split( gensub( /(^\||\|$)/, "", "g", \
@@ -343,6 +343,68 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
}
return "
\n" _block( substr(block, len + 1) );
+ # 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\\|", "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 = "\n"
+ for (cnt = 1; cnt < cols; cnt++)
+ ttext = ttext "" _block(tarray[cnt]) " | "
+ ttext = ttext "
\n\n"
+
+ while ( match(block, /^((\|([^\n]+\|)+\n)+\+(-+\+)+(\n|$))+/ ) ){
+ split("", tarray);
+ while ( match(block, /^\|([^\n]+\|)+\n/) ) {
+ split( gensub( /(^\||\|$)/, "", "g", \
+ gensub( /(^|[^\\])\\\|/, "\\1\\|", "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 ""
+ for (cnt = 1; cnt < cols; cnt++)
+ ttext = ttext "" _block(tarray[cnt]) " | "
+ ttext = ttext "
\n"
+ }
+ return "\n" _block( substr(block, len + 1) );
+
# Line Blocks (pandoc)
} else if ( match(block, /^\| [^\n]*(\n|$)(\| [^\n]*(\n|$)|[ \t]+[^\n[:space:]][^\n]*(\n|$))*/) ) {
len = RLENGTH; st = RSTART;