Merge commit '7c216c9e226458114e3d186605e54b51aae75ab7'

diff --combined cgilite/markdown.awk
index 6271996440dab3b37132f8eccdecbf6094a4db99,2dec7c8fec3830b4e07d9260436d43caf29ca456..2dec7c8fec3830b4e07d9260436d43caf29ca456
--- 1/cgilite/markdown.awk
--- 2/markdown.awk
+++ b/cgilite/markdown.awk
@@@ -42,10 -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 +303,7 @@@ function _block( block, LOCAL, st, len
      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", \
@@@ -341,7 -341,69 +341,69 @@@
          ttext = ttext "<td align=\"" talign[cnt] "\">" inline(tarray[cnt]) "</td>"
        ttext = ttext "</tr>\n"
      }
-     return "<table>" ttext "</tbody></table>\n" _block( substr(block, len + 1) );
+     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|$))*/) ) {
@@@ -354,7 -416,7 +416,7 @@@
             _block( substr( block, len + 1) );
  
    # Indented Code Block
-   } else if ( match(block, /^(    |\t)[^\n]+(\n|$)((    |\t)[^\n]+(\n|$)|[ \t]*(\n|$))*/) ) {
+   } else if ( match(block, /^(    |\t)( *\t*[^ \t\n])+(\n|$)((    |\t)[^\n]+(\n|$)|[ \t]*(\n|$))*/) ) {
      len = RLENGTH; st = RSTART;
      code = substr(block, 1, len);
      gsub(/(^|\n)(    |\t)/, "\n", code);
@@@ -426,14 -488,20 +488,20 @@@
    } 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
@@@ -443,7 -511,8 +511,8 @@@
      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