" \
- "![\""](\"")
" \
+ return "" \
+ "" \
"\n\n" \
_block( substr( block, len + 1) );
} else {
@@ -641,7 +691,38 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
} else if ( AllowMacros && match( block, /^<<(([^>]|>[^>])+)>>(\n|$)/) ) {
len = RLENGTH;
text = gensub(/^<<(([^>]|>[^>])+)>>(\n.*)?$/, "\\1", 1, block);
- return macro(text) _block(substr(block, len + 1));
+ return macro(text) _block(substr(block, len + 1) );
+
+ # Definition list
+ } else if (match( block, "^(([ \t]*\n)*[^:\n \t][^\n]+\n" \
+ "([ \t]*\n)* ? ? ?:[ \t][^\n]+(\n|$)" \
+ "(([ \t]*\n)* ? ? ?:[ \t][^\n]+(\n|$)" \
+ "|[^:\n \t][^\n]+(\n|$)" \
+ "|( ? ? ?\t| +)[^\n]+(\n|$)" \
+ "|([ \t]*\n)+( ? ? ?\t| +)[^\n]+(\n|$))*)+" \
+ )) {
+ list = substr( block, 1, RLENGTH); block = substr( block, RLENGTH + 1);
+ return "\n\n" _dlist( list ) "
\n" _block( block );
+
+ # 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;
+ } 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]+\\)|#\\))") ) {
+ 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
} else if ( match( block, /(^|\n)[[:space:]]*(\n|$)/) ) {
@@ -660,52 +741,78 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
}
}
-function _list( block, last, LOCAL, p) {
- if ( ! length(block) ) return "";
- gsub(/^([-+*]|[0-9]+\.|#\.)( ? ? ?|\t)/, "", block)
+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, 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);
+ }
- # slice next list item from input
- if ( match( block, /\n([-+*]|[0-9]+\.|#\.)[ \t]+[^\n]+/) ) {
- p = substr( block, 1, RSTART);
- block = substr( block, RSTART + 1);
- } else {
- p = block; block = "";
- }
- sub( /\n +([-+*]|[0-9]+\.|#\.)/, "\n&", p );
+ return _block( text ) "<" type ">\n" _list( list, mark ) "\n" _block( block );
+ } else return 0;
+}
- # if this should be a paragraph item
- # either previous item (last) or current item (p) contains blank lines
- if (match(last, /\n[[:space:]]*\n/) || match(p, /\n[[:space:]]*\n/) ) {
- last = p; p = _block(p);
- } else {
- last = p; p = _block(p);
- sub( /^/, "", p );
- sub( /<\/p>\n/, "", p );
+function _list (block, mark, p, LOCAL, len, st, text, indent, task) {
+ if ( match(block, "^([ \t]*\n)*$")) return;
+
+ match(block, "^" mark "[ \t]"); indent = RLENGTH;
+ sub("^" mark "[ \t]", "", block);
+
+ if (match(block, /\n[ \t]*\n/)) p = 1;
+
+ match( block, "\n" mark "[ \t][^\n]+(\n|$)" );
+ st = (RLENGTH == -1) ? length(block) + 1 : RSTART;
+ text = substr(block, 1, st); block = substr(block, st + 1);
+
+ gsub("\n {0," indent "}", "\n", text);
+
+ task = match( text, /^\[ \]/ ) ? "
" : \
+ match( text, /^\[-\]/ ) ? "" : \
+ match( text, /^\[\/\]/ ) ? "" : \
+ match( text, /^\[\?\]/ ) ? "" : \
+ match( text, /^\[[xX]\]/) ? "" : "";
+ sub(/^\[[-? \/xX]\]/, "", text);
+
+ text = _nblock( text );
+ if ( ! p && match( text, "^(]|\n$" ))
+ gsub( "(^
|
\n$)", "", text);
+
+ return task text "\n" _list(block, mark, p);
+}
+
+function _dlist (block, LOCAL, len, st, text, indent, p) {
+ if (match( block, "^([ \t]*\n)*[^:\n \t][^\n]+\n" )) {
+ len = RLENGTH; text = substr(block, 1, len);
+ gsub( "(^\n*|\n*$)", "", text );
+ return "" inline( text ) "\n" _dlist( substr(block, len + 1) );
+ } else if (match( block, "^([ \t]*\n)* ? ? ?:[ \t][^\n]+(\n|$)" \
+ "([^:\n \t][^\n]+(\n|$)" \
+ "|( ? ? ?\t| +)[^\n]+(\n|$)" \
+ "|([ \t]*\n)+( ? ? ?\t| +)[^\n]+(\n|$))*" \
+ )) {
+ len = RLENGTH; text = substr(block, 1, len);
+ sub( "^([ \t]*\n)*", "", text);
+ match(text, "^ ? ? ?:(\t| +)"); indent = RLENGTH;
+ sub( "^ ? ? ?:(\t| +)", "", text);
+ gsub( "(^|\n) {0," indent "}", "\n", text );
+
+ text = _nblock(text);
+ if (match( text, "^(]|\n$" ))
+ gsub( "(^
|
\n$)", "", text);
+
+ return "" text "\n" _dlist( substr(block, len + 1) );
}
- sub( /\n$/, "", p );
-
- # Task List (pandoc, custom)
- if ( p ~ /^\[ \].*/ ) { return "" \
- substr(p, 4) "\n" _list( block, last );
- } else if ( p ~ /^\[-\].*/ ) { return "" \
- substr(p, 4) "\n" _list( block, last );
- } else if ( p ~ /^\[\?\].*/ ) { return "" \
- substr(p, 4) "\n" _list( block, last );
- } else if ( p ~ /^\[\/\].*/ ) { return "" \
- substr(p, 4) "\n" _list( block, last );
- } else if ( p ~ /^\[[xX]\].*/ ) { return "" \
- substr(p, 4) "\n" _list( block, last );
- } else if ( p ~ /^\[ \].*/ ) { return "
" \
- substr(p, 7) "
\n" _list( block, last );
- } else if ( p ~ /^\[-\].*/ ) { return "
" \
- substr(p, 7) "
\n" _list( block, last );
- } else if ( p ~ /^\[\?\].*/ ) { return "
" \
- substr(p, 7) "
\n" _list( block, last );
- } else if ( p ~ /^\[\/\].*/ ) { return "
" \
- substr(p, 7) "
\n" _list( block, last );
- } else if ( p ~ /^\[[xX]\].*/ ) { return "
" \
- substr(p, 7) "
\n" _list( block, last );
- } else { return "" p "\n" _list( block, last ); }
}
BEGIN {
@@ -713,6 +820,7 @@ BEGIN {
file = ""; rl_href[""] = ""; rl_title[""] = "";
if (ENVIRON["MD_HTML"] == "true") { AllowHTML = "true"; }
HL[1] = 0; HL[2] = 0; HL[3] = 0; HL[4] = 0; HL[5] = 0; HL[6] = 0;
+ # hls = "0 0 0 0 0 0";
# Buffering of full file ist necessary, e.g. to find reference links
while (getline) { file = file $0 "\n"; }
@@ -736,5 +844,5 @@ BEGIN {
# for (n in rl_href) { debug(n " | " rl_href[n] " | " rl_title[n] ); }
# Run Block Processing -> The Actual Markdown!
- printf "%s", _block( file );
+ printf "%s", _nblock( file );
}