X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=cgilite%2Fmarkdown.awk;h=6d22e3912e6f5e3580bffb61babf36b077117b39;hb=ebac34c61bddb0792733cd5101cf0c74db085513;hp=1e3c6e041ab500756fbfb9dd62f556441de6090a;hpb=c95b5507dbbc11cce8dea2360fb0dee95bfdd2f0;p=shellwiki

diff --git a/cgilite/markdown.awk b/cgilite/markdown.awk
index 1e3c6e0..6d22e39 100755
--- a/cgilite/markdown.awk
+++ b/cgilite/markdown.awk
@@ -705,21 +705,23 @@ function _block( block, LOCAL, st, len, text, title, attrib, href, guard, code,
     return "\n<dl>\n" _dlist( list ) "</dl>\n" _block( block );
 
   # Unordered list types
-  } else if ( text = _startlist( block, "ul", "-",   "([+*]|[0-9]+\\.|#\\.|[0-9]+\\)|#\\))") ) {
+  } else if ( text = _startlist( block, "ul", "-",   "([+*•]|[0-9]+\\.|#\\.|[0-9]+\\)|#\\))") ) {
     return text;
-  } else if ( text = _startlist( block, "ul", "\\+", "([-*]|[0-9]+\\.|#\\.|[0-9]+\\)|#\\))") ) {
+  } else if ( text = _startlist( block, "ul", "\\+", "([-*•]|[0-9]+\\.|#\\.|[0-9]+\\)|#\\))") ) {
     return text;
-  } else if ( text = _startlist( block, "ul", "\\*", "([-+]|[0-9]+\\.|#\\.|[0-9]+\\)|#\\))") ) {
+  } 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 types
-  } else if ( text = _startlist( block, "ol", "[0-9]+\\.", "([-+*]|#\\.|[0-9]+\\)|#\\))") ) {
+  } else if ( text = _startlist( block, "ol", "[0-9]+\\.", "([-+*•]|#\\.|[0-9]+\\)|#\\))") ) {
     return text;
-  } else if ( text = _startlist( block, "ol", "[0-9]+\\)", "([-+*]|[0-9]+\\.|#\\.|#\\))") ) {
+  } else if ( text = _startlist( block, "ol", "[0-9]+\\)", "([-+*•]|[0-9]+\\.|#\\.|#\\))") ) {
     return text;
-  } else if ( text = _startlist( block, "ol", "#\\.", "([-+*]|[0-9]+\\.|[0-9]+\\)|#\\))") ) {
+  } else if ( text = _startlist( block, "ol", "#\\.", "([-+*•]|[0-9]+\\.|[0-9]+\\)|#\\))") ) {
     return text;
-  } else if ( text = _startlist( block, "ol", "#\\)", "([-+*]|[0-9]+\\.|#\\.|[0-9]+\\))") ) {
+  } else if ( text = _startlist( block, "ol", "#\\)", "([-+*•]|[0-9]+\\.|#\\.|[0-9]+\\))") ) {
     return text;
 
   # Split paragraphs
@@ -741,15 +743,17 @@ function _block( block, LOCAL, st, len, text, title, attrib, href, guard, code,
 
 function _startlist(block, type, mark, exclude, LOCAL, st, len, list, indent, text) {
   if (match( block, "(^|\n) ? ? ?" mark "[ \t][^\n]+(\n|$)" \
-         "(([ \t]*\n)* ? ? ?" mark "[ \t][^\n]+(\n|$)" \
-         "|([ \t]*\n)*( ? ? ?\t|  +)[^\n]+(\n|$)" \
-         "|[^\n \t][^\n]+(\n|$))*" ) ) {
-    st = RSTART; len = RLENGTH; list = substr( block, RSTART, RLENGTH);
+                                   "(([ \t]*\n)* ? ? ?" mark "[ \t][^\n]+(\n|$)" \
+                                   "|([ \t]*\n)*( ? ? ?\t|  +)[^\n]+(\n|$)" \
+                                   "|[^\n \t][^\n]+(\n|$))*" ) ) {
+    st = RSTART; len = RLENGTH; list = substr( block, st, len);
 
     sub("^\n", "", list); match(list, "^ ? ? ?"); indent = RLENGTH;
     gsub( "(^|\n) {0," indent "}", "\n", list); sub("^\n", "", list);
 
     text = substr(block, 1, st - 1); block = substr(block, st + len);
+    if (match(text, /\n[[:space:]]*\n/)) return 0;
+    if (match(text, "(^|\n) ? ? ?" exclude "[ \t][^\n]+")) return 0;
     if (match( list, "\n" exclude "[ \t]" )) {
       block = substr(list, RSTART + 1) block;
       list = substr(list, 1, RSTART);