From: Paul Hänsch Date: Sun, 3 Sep 2023 13:10:01 +0000 (+0200) Subject: Squashed 'cgilite/' changes from 4ee910d5..4c361b19 X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=03403861ba29e3f7876d97171d317ee59c54fb64;p=shellwiki Squashed 'cgilite/' changes from 4ee910d5..4c361b19 4c361b19 allow bullet symbol as list marker (for copy/paste from office documents) git-subtree-dir: cgilite git-subtree-split: 4c361b1926eed5a426ff4271a027e54e57abe78a --- diff --git a/markdown.awk b/markdown.awk index 3b5a9bb..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