LICENSE CHANGE: CGIlite is now under ISC License!

[cgilite] / markdown.awk

diff --git a/markdown.awk b/markdown.awk
index 4b180ebb3df2277ca2335a5370a75d21291fd44e..1e3c6e041ab500756fbfb9dd62f556441de6090a 100755 (executable)
--- a/markdown.awk
+++ b/markdown.awk
@@ -5,6 +5,20 @@
 # Meant to support all features of John Grubers basic Markdown
 # + a number of common extensions, mostly inspired by Pandoc Markdown
 
+# Copyright 2021 - 2023 Paul Hänsch
+# 
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+# 
+# THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+# IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 # Supported Features / TODO:
 # ==========================
 # [x] done    [ ] todo    [-] not planned    ? unsure
@@ -690,12 +704,22 @@ function _block( block, LOCAL, st, len, text, title, attrib, href, guard, code,
     list = substr( block, 1, RLENGTH); block = substr( block, RLENGTH + 1);
     return "\n<dl>\n" _dlist( list ) "</dl>\n" _block( block );
 
-  # Unordered list
-  } else if ( text = _startlist( block, "ul", "[-+*]", "([0-9]+\\.|#\\.)") ) {
+  # Unordered list types
+  } else if ( text = _startlist( block, "ul", "-",   "([+*]|[0-9]+\\.|#\\.|[0-9]+\\)|#\\))") ) {
+    return text;
+  } else if ( text = _startlist( block, "ul", "\\+", "([-*]|[0-9]+\\.|#\\.|[0-9]+\\)|#\\))") ) {
+    return text;
+  } else if ( text = _startlist( block, "ul", "\\*", "([-+]|[0-9]+\\.|#\\.|[0-9]+\\)|#\\))") ) {
     return text;
 
-  # Ordered list
-  } else if ( text = _startlist( block, "ol", "([0-9]+\\.|#\\.)", "[-+*]") ) {
+  # Ordered list types
+  } else if ( text = _startlist( block, "ol", "[0-9]+\\.", "([-+*]|#\\.|[0-9]+\\)|#\\))") ) {
+    return text;
+  } else if ( text = _startlist( block, "ol", "[0-9]+\\)", "([-+*]|[0-9]+\\.|#\\.|#\\))") ) {
+    return text;
+  } else if ( text = _startlist( block, "ol", "#\\.", "([-+*]|[0-9]+\\.|[0-9]+\\)|#\\))") ) {
+    return text;
+  } else if ( text = _startlist( block, "ol", "#\\)", "([-+*]|[0-9]+\\.|#\\.|[0-9]+\\))") ) {
     return text;
 
   # Split paragraphs
@@ -723,7 +747,7 @@ function _startlist(block, type, mark, exclude, LOCAL, st, len, list, indent, te
     st = RSTART; len = RLENGTH; list = substr( block, RSTART, RLENGTH);
 
     sub("^\n", "", list); match(list, "^ ? ? ?"); indent = RLENGTH;
-    gsub( "(^|\n) {0," indent - 1 "}", "\n", list); sub("^\n", "", list);
+    gsub( "(^|\n) {0," indent "}", "\n", list); sub("^\n", "", list);
 
     text = substr(block, 1, st - 1); block = substr(block, st + len);
     if (match( list, "\n" exclude "[ \t]" )) {