X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;ds=inline;f=markdown.awk;h=6143b73dea4ccd07e4262867480152d4ad85b028;hb=4462399434b8a11f02c5a843d46bade660796fc5;hp=1e3c6e041ab500756fbfb9dd62f556441de6090a;hpb=06ff8fb4d3bf490b71257cf9e5eefa7017c16bed;p=shellwiki
diff --git a/markdown.awk b/markdown.awk
index 1e3c6e0..6143b73 100755
--- a/markdown.awk
+++ b/markdown.awk
@@ -291,9 +291,9 @@ function inline( line, LOCAL, len, text, code, href, guard ) {
return "" inline( substr( line, 2, len - 2 ) ) "" inline( substr( line, len + 1 ) );
# Macros
- } else if ( AllowMacros && match( line, /^<<([^>]|>[^>])+>>/) ) {
+ } else if ( match( line, /^<<([^>]|>[^>])+>>/ ) ) {
len = RLENGTH;
- return macro( substr( line, 3, len - 4 ) ) inline(substr(line, len + 1));
+ return "" HTML( substr( line, 3, len - 4 ) ) "
" inline(substr(line, len + 1));
# Verbatim inline HTML
} else if ( AllowHTML && match( line, /^(|<\?([^\?]|\?[^>])*\?>|]*>|])*\]\]>|<\/[A-Za-z][A-Za-z0-9-]*[[:space:]]*>|<[A-Za-z][A-Za-z0-9-]*([[:space:]]+[A-Za-z_:][A-Za-z0-9_\.:-]*([[:space:]]*=[[:space:]]*([[:space:]"'=<>`]+|"[^"]*"|'[^']*'))?)*[[:space:]]*\/?>)/) ) {
@@ -402,7 +402,7 @@ function _block( block, LOCAL, st, len, text, title, attrib, href, guard, code,
# Pipe Tables (pandoc / php md / gfm )
} else if ( match(block, "^((\\|)?([^\n]+\\|)+[^\n]+(\\|)?)\n" \
- "((\\|)?:?(-+:?[\\|+])+:?-+:?(\\|)?)\n" \
+ "((\\|)?(:?-+:?[\\|+])+:?-+:?(\\|)?)\n" \
"((\\|)?([^\n]+\\|)+[^\n]+(\\|)?(\n|$))+" ) ) {
len = RLENGTH; st = RSTART;
#initialize empty arrays
@@ -688,10 +688,10 @@ function _block( block, LOCAL, st, len, text, title, attrib, href, guard, code,
}
# Macros (standalone <> calls handled as block, so they are not wrapped in paragraph)
- } else if ( AllowMacros && match( block, /^<<(([^>]|>[^>])+)>>(\n|$)/) ) {
+ } else if ( match( block, /^<<(([^>]|>[^>])+)>>(\n|$)/ ) ) {
len = RLENGTH;
text = gensub(/^<<(([^>]|>[^>])+)>>(\n.*)?$/, "\\1", 1, block);
- return macro(text) _block(substr(block, len + 1) );
+ return "" HTML(text) "
" _block(substr(block, len + 1) );
# Definition list
} else if (match( block, "^(([ \t]*\n)*[^:\n \t][^\n]+\n" \
@@ -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
@@ -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);