From: Paul Hänsch <paul@plutz.net>
Date: Mon, 11 Sep 2023 13:43:37 +0000 (+0200)
Subject: Merge commit 'a68722ad0e8de9bcac0bcb4af12025f3b903745c'
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;ds=sidebyside;h=7ee49ea6a4595386680b9a19ae75108068b93fb0;hp=-c;p=shellwiki

Merge commit 'a68722ad0e8de9bcac0bcb4af12025f3b903745c'
---

7ee49ea6a4595386680b9a19ae75108068b93fb0
diff --combined cgilite/markdown.awk
index 6d22e39,e478156..e478156
--- a/cgilite/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" \