Squashed 'cgilite/' changes from 4c361b1..8928c6e

8928c6e independent macro extension

git-subtree-dir: cgilite
git-subtree-split: 8928c6e74419a271da300bbede52ae2b88d02196

diff --git a/markdown.awk b/markdown.awk
index 6d22e3912e6f5e3580bffb61babf36b077117b39..e478156143dd79b59929874c5809b66b56be81f6 100755 (executable)
--- a/markdown.awk
+++ b/markdown.awk
@@ -291,9 +291,9 @@ function inline( line, LOCAL, len, text, code, href, guard ) {
     return "<em>" inline( substr( line, 2, len - 2 ) ) "</em>" 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 "<code class=\"macro\">" HTML( substr( line, 3, len - 4 ) ) "</code>" inline(substr(line, len + 1));
 
   # Verbatim inline HTML
   } else if ( AllowHTML && match( line, /^(<!--([^-]|-[^-]|--[^>])*-->|<\?([^\?]|\?[^>])*\?>|<![A-Z][^>]*>|<!\[CDATA\[([^\]]|\][^\]]|\]\][^>])*\]\]>|<\/[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 <<macro>> 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 "<code class=\"macro\">" HTML(text) "</code>" _block(substr(block, len + 1) );
 
   # Definition list
   } else if (match( block, "^(([ \t]*\n)*[^:\n \t][^\n]+\n" \