X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=markdown.awk;h=a2bb989bd3d6e0af3752578695656d37941ef67d;hb=925f0423dcc9040fa530e9090db2b7c914243451;hp=3fa248d25f2877fdc0e6f7eab9a5642635407d75;hpb=8ce6dce8725f84096aebcf1a4063eaeee754b92a;p=cgilite
diff --git a/markdown.awk b/markdown.awk
index 3fa248d..a2bb989 100755
--- a/markdown.awk
+++ b/markdown.awk
@@ -38,6 +38,7 @@
#
# Extensions - Block elements:
# ----------------------------
+# - [x] Automatic -wrapping (custom)
# - ? Heading identifiers (php md, pandoc)
# - [x] Automatic heading identifiers (custom)
# - [x] Fenced code blocks (php md, pandoc)
@@ -89,13 +90,13 @@ function HTML ( text ) {
return text;
}
-function URL ( text ) {
+function URL ( text, sharp ) {
gsub( /&/, "%26", text );
gsub( /"/, "%22", text );
gsub( /'/, "%27", text );
gsub( /`/, "%60", text );
gsub( /\?/, "%3F", text );
- gsub( /#/, "%23", text );
+ if (sharp) gsub( /#/, "%23", text );
gsub( /\[/, "%5B", text );
gsub( /\]/, "%5D", text );
gsub( / /, "%20", text );
@@ -195,16 +196,16 @@ function inline( line, LOCAL, len, code, href, guard ) {
title = gensub(/^!\[([^]]*)\]\(([^"\)]+)([ \t]+"([^"]+)")?\)(\{([a-zA-Z \t-]*)\})?/, "\\4", "g", substr(line, 1, len) );
attrib = gensub(/^!\[([^]]*)\]\(([^"\)]+)([ \t]+"([^"]+)")?\)(\{([a-zA-Z \t-]*)\})?/, "\\6", "g", substr(line, 1, len) );
if ( title && attrib ) {
- return "" \
+ return "" \
inline( substr( line, len + 1) );
} else if ( title ) {
- return "" \
+ return "" \
inline( substr( line, len + 1) );
} else if ( attrib ) {
- return "" \
+ return "" \
inline( substr( line, len + 1) );
} else {
- return "" \
+ return "" \
inline( substr( line, len + 1) );
}
@@ -215,10 +216,10 @@ function inline( line, LOCAL, len, code, href, guard ) {
id = gensub(/^!\[([^\n]*)\] ?\[([^\n]*)\].*/, "\\2", 1, substr(line, 1, len) );
if ( ! id ) id = text;
if ( rl_href[id] && rl_title[id] ) {
- return "" \
+ return "" \
inline( substr( line, len + 1) );
} else if ( rl_href[id] ) {
- return "" \
+ return "" \
inline( substr( line, len + 1) );
} else {
return "" HTML(substr(line, 1, len)) inline( substr(line, len + 1) );
@@ -306,7 +307,38 @@ function inline( line, LOCAL, len, code, href, guard ) {
}
}
-function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib ) {
+function headline( hlvl, htxt, LOCAL, sec, n, HL) {
+ split( gensub( /^(.* )?(([0-9]+ ){5}[0-9]+)$/, "\\2" ,"1", hstack), HL);
+
+ for ( n = hlvl; n <= 6; n++ ) { sec = sec (HL[n]?"":""); }
+ HL[hlvl]++; for ( n = hlvl + 1; n <= 6; n++) { HL[n] = 0;}
+ hid = HL[1]; for ( n = 2; n <= hlvl; n++) { hid = hid "." HL[n] ; }
+ # hid = hid ":" URL(htxt, 1);
+
+ hstack = HL[1] " " HL[2] " " HL[3] " " HL[4] " " HL[5] " " HL[6];
+
+ return sec " 10)?"":" id=\"" hid "\"") ">" \
+ "" inline( htxt ) \
+ ((blvl > 0)?"":"") \
+ "
\n\n";
+}
+
+# Nested Block, resets heading counters
+function _nblock( block, LOCAL, hlsav, sec ) {
+ hlsav = hstack;
+ hstack = "0 0 0 0 0 0";
+
+ # Block Level
+ blvl++;
+
+ block = _block( block );
+ split( gensub( /^(.* )?(([0-9]+ ){5}[0-9]+)$/, "\2" ,"1", hstack), HL);
+ sec = ""; for ( n = 1; n <= 6; n++ ) { sec = sec (HL[n]?"":""); }
+ hstack = hlsav; blvl--;
+ return block sec;
+}
+
+function _block( block, LOCAL, st, len, hlvl, htxt, sec, guard, code, indent, attrib ) {
gsub( /^\n+|\n+$/, "", block );
if ( block == "" ) {
@@ -344,7 +376,7 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
} else if ( match( block, /^> /) ) {
match( block, /(^|\n)[[:space:]]*(\n|$)/ ) || match(block, /$/);
len = RLENGTH; st = RSTART;
- return "
\n" _block( gensub( /(^|\n)> /, "\n", "g", substr(block, 1, st - 1) ) ) "
\n\n" \
+ return "\n" _nblock( gensub( /(^|\n)> /, "\n", "g", substr(block, 1, st - 1) ) ) "
\n\n" \
_block( substr(block, st + len) );
# Pipe Tables (pandoc / php md / gfm )
@@ -447,7 +479,7 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
ttext = "\n"
for (cnt = 1; cnt <= cols; cnt++)
- ttext = ttext "" _block(tarray[cnt]) " | "
+ ttext = ttext "" _nblock(tarray[cnt]) " | "
ttext = ttext "
\n"
}
@@ -470,10 +502,10 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
ttext = ttext ""
for (cnt = 1; cnt <= cols; cnt++)
- ttext = ttext "" _block(tarray[cnt]) " | "
+ ttext = ttext "" _nblock(tarray[cnt]) " | "
ttext = ttext "
\n"
}
- return "\n" _block(block);
+ return "\n" _nblock(block);
# Line Blocks (pandoc)
} else if ( match(block, /^\| [^\n]*(\n|$)(\| [^\n]*(\n|$)|[ \t]+[^\n[:space:]][^\n]*(\n|$))*/) ) {
@@ -503,7 +535,7 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
gsub(/(^ | $)/, "", attrib);
if ( match(code, "(^|\n)" guard "+(\n|$)" ) ) {
len = RLENGTH; st = RSTART;
- return "" _block( substr(code, 1, st - 1) ) "
\n" \
+ return "" _nblock( substr(code, 1, st - 1) ) "
\n" \
_block( substr( code, st + len ) );
} else {
match( block, /(^|\n)[[:space:]]*(\n|$)/ ) || match( block, /$/ );
@@ -554,35 +586,28 @@ function _block( block, LOCAL, st, len, hlvl, htxt, guard, code, indent, attrib
gsub("(^|\n) {0," indent "}", "\n", list);
return "\n\n" _list( substr(list, 2) ) "
\n" _block( block );
- # First Order Heading
+ # First Order Heading H1
} else if ( match( block, /^[^\n]+\n===+(\n|$)/ ) ) {
len = RLENGTH;
- HL[1]++; HL[2] = 0; HL[3] = 0; HL[4] = 0; HL[5] = 0; HL[6] = 0;
- return "" \
- inline( gensub( /\n.*$/, "", "g", block ) ) \
- "
\n\n" \
+
+ return headline(1, gensub( /\n.*$/, "", "g", block )) \
_block( substr( block, len + 1 ) );
- # Second Order Heading
+ # Second Order Heading H2
} else if ( match( block, /^[^\n]+\n---+(\n|$)/ ) ) {
len = RLENGTH;
- HL[2]++; HL[3] = 0; HL[4] = 0; HL[5] = 0; HL[6] = 0;
- return "" \
- inline( gensub( /\n.*$/, "", "g", block ) ) \
- "
\n\n" \
+
+ return headline(2, gensub( /\n.*$/, "", "g", block )) \
_block( substr( block, len + 1) );
- # Nth Order Heading
+ # Nth Order Heading H1 H2 H3 H4 H5 H6
} else if ( match( block, /^#{1,6}[ \t]*[^\n]+([ \t]*#*)(\n|$)/ ) ) {
len = RLENGTH;
- hlvl = length( gensub( /^(#{1,6}).*$/, "\\1", "g", block ) );
- htxt = gensub(/^#{1,6}[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[^\n#])+)([ \t]*#*)(\n.*)?$/, "\\1", 1, block);
- HL[hlvl]++; for ( n = hlvl + 1; n < 7; n++) { HL[n] = 0;}
- hid = HL[1]; for ( n = 2; n <= hlvl; n++) { hid = hid "." HL[n] ; }
- return "" inline( htxt ) \
- "\n\n" \
+
+ return headline( \
+ length( gensub( /^(#{1,6}).*$/, "\\1", "g", block ) ), \
+ gensub(/^#{1,6}[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[^\n#])+)([ \t]*#*)(\n.*)?$/, "\\1", 1, block) \
+ ) \
_block( substr( block, len + 1) );
# block images (wrapped in