X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;ds=sidebyside;f=cgilite%2Fmarkdown.awk;h=6143b73dea4ccd07e4262867480152d4ad85b028;hb=c482ab648dce89fd42b6110728e8b05df4073732;hp=6d22e3912e6f5e3580bffb61babf36b077117b39;hpb=a08c8812fcd778738c0b7a983c4778e0503cddb1;p=shellwiki
diff --git a/cgilite/markdown.awk b/cgilite/markdown.awk
index 6d22e39..6143b73 100755
--- a/cgilite/markdown.awk
+++ b/cgilite/markdown.awk
@@ -291,9 +291,9 @@ function inline( line, LOCAL, len, text, code, href, guard ) {
return "" inline( substr( line, 2, len - 2 ) ) "" inline( substr( line, len + 1 ) );
# Macros
- } else if ( AllowMacros && match( line, /^<<([^>]|>[^>])+>>/) ) {
+ } else if ( match( line, /^<<([^>]|>[^>])+>>/ ) ) {
len = RLENGTH;
- return macro( substr( line, 3, len - 4 ) ) inline(substr(line, len + 1));
+ return "" HTML( substr( line, 3, len - 4 ) ) "
" inline(substr(line, len + 1));
# Verbatim inline HTML
} else if ( AllowHTML && match( line, /^(|<\?([^\?]|\?[^>])*\?>|]*>|])*\]\]>|<\/[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:]]*\/?>)/) ) {
@@ -402,7 +402,7 @@ function _block( block, LOCAL, st, len, text, title, attrib, href, guard, code,
# Pipe Tables (pandoc / php md / gfm )
} else if ( match(block, "^((\\|)?([^\n]+\\|)+[^\n]+(\\|)?)\n" \
- "((\\|)?:?(-+:?[\\|+])+:?-+:?(\\|)?)\n" \
+ "((\\|)?(:?-+:?[\\|+])+:?-+:?(\\|)?)\n" \
"((\\|)?([^\n]+\\|)+[^\n]+(\\|)?(\n|$))+" ) ) {
len = RLENGTH; st = RSTART;
#initialize empty arrays
@@ -688,10 +688,10 @@ function _block( block, LOCAL, st, len, text, title, attrib, href, guard, code,
}
# Macros (standalone <> calls handled as block, so they are not wrapped in paragraph)
- } else if ( AllowMacros && match( block, /^<<(([^>]|>[^>])+)>>(\n|$)/) ) {
+ } else if ( match( block, /^<<(([^>]|>[^>])+)>>(\n|$)/ ) ) {
len = RLENGTH;
text = gensub(/^<<(([^>]|>[^>])+)>>(\n.*)?$/, "\\1", 1, block);
- return macro(text) _block(substr(block, len + 1) );
+ return "" HTML(text) "
" _block(substr(block, len + 1) );
# Definition list
} else if (match( block, "^(([ \t]*\n)*[^:\n \t][^\n]+\n" \