X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=markdown.awk;h=6d22e3912e6f5e3580bffb61babf36b077117b39;hb=4c361b1926eed5a426ff4271a027e54e57abe78a;hp=92b32fc2d2d462bc30f4069934f48f1e87c6ad70;hpb=8e5ffff1d6ed3d99361ffcfdccc1cd21f5d6d813;p=cgilite
diff --git a/markdown.awk b/markdown.awk
index 92b32fc..6d22e39 100755
--- a/markdown.awk
+++ b/markdown.awk
@@ -705,21 +705,23 @@ function _block( block, LOCAL, st, len, text, title, attrib, href, guard, code,
return "\n
\n" _dlist( list ) "
\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
@@ -751,6 +753,7 @@ function _startlist(block, type, mark, exclude, LOCAL, st, len, list, indent, te
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);