bugfix: endless loop in _startlist because of lacking indention removal

[cgilite] / markdown.awk

diff --git a/markdown.awk b/markdown.awk
index 4b180ebb3df2277ca2335a5370a75d21291fd44e..b5aa538055fe017b8c2b2827f23631f5d91d23b3 100755 (executable)
--- a/markdown.awk
+++ b/markdown.awk
@@ -690,12 +690,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 +733,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]" )) {