Merge commit 'a68722ad0e8de9bcac0bcb4af12025f3b903745c'

diff --combined cgilite/markdown.awk
index 6d22e3912e6f5e3580bffb61babf36b077117b39,e478156143dd79b59929874c5809b66b56be81f6..e478156143dd79b59929874c5809b66b56be81f6
--- 1/cgilite/markdown.awk
--- 2/markdown.awk
+++ b/cgilite/markdown.awk
@@@ -291,9 -291,9 +291,9 @@@ function inline( line, LOCAL, len, text
      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 +688,10 @@@ function _block( block, LOCAL, st, len
      }
  
    # 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" \