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

diff --git a/markdown.awk b/markdown.awk
index 69a2fa8..ccd4cde 100755
--- a/markdown.awk
+++ b/markdown.awk
@@ -416,7 +416,7 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
            _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]+ *\t*)+(\n|$)((    |\t)[^\n]+(\n|$)|[ \t]*(\n|$))*/) ) {
     len = RLENGTH; st = RSTART;
     code = substr(block, 1, len);
     gsub(/(^|\n)(    |\t)/, "\n", code);
@@ -490,7 +490,7 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
     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 ) ) \
-           "<a class=\"anchor\" href=\"" HL[1] " - " \
+           "<a class=\"anchor\" href=\"#" HL[1] " - " \
            HTML(gensub( /\n.*$/, "", "g", block )) "\"></a></h1>\n\n" \
            _block( substr( block, len + 1 ) );
 
@@ -500,7 +500,7 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
     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 ) ) \
-           "<a class=\"anchor\" href=\"" HL[1] "." HL[2] " - " \
+           "<a class=\"anchor\" href=\"#" HL[1] "." HL[2] " - " \
            HTML(gensub( /\n.*$/, "", "g", block )) "\"></a></h2>\n\n" \
            _block( substr( block, len + 1) );
 
@@ -512,7 +512,7 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
     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 ) \
-           "<a class=\"anchor\" href=\"" hid "\"></a></h" hlvl ">\n\n" \
+           "<a class=\"anchor\" href=\"#" hid "\"></a></h" hlvl ">\n\n" \
            _block( substr( block, len + 1) );
 
   # Split paragraphs