X-Git-Url: https://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=markdown.awk;fp=markdown.awk;h=e478156143dd79b59929874c5809b66b56be81f6;hp=6d22e3912e6f5e3580bffb61babf36b077117b39;hb=8928c6e74419a271da300bbede52ae2b88d02196;hpb=4c361b1926eed5a426ff4271a027e54e57abe78a
diff --git a/markdown.awk b/markdown.awk
index 6d22e39..e478156 100755
--- a/markdown.awk
+++ b/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:]]*\/?>)/) ) {
@@ -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" \