X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=markdown.awk;h=be7d723b6b96d0efa7ccdc9ecc5be38c881f1026;hb=ae55f6f3fd50539c90fbc8237ae025edc9b17ba4;hp=16acc25d4b8548d2fa01c0bdfc74cde6a7d00f29;hpb=33570b0d2e2697cc7196a7a0ddc34cc2b4edd71b;p=cgilite
diff --git a/markdown.awk b/markdown.awk
index 16acc25..be7d723 100755
--- a/markdown.awk
+++ b/markdown.awk
@@ -40,6 +40,7 @@
# ----------------------------
# - [x] Automatic -wrapping (custom)
# - ? Heading identifiers (php md, pandoc)
+# - [x] Heading attributes (custom)
# - [x] Automatic heading identifiers (custom)
# - [x] Fenced code blocks (php md, pandoc)
# - [x] Fenced code attributes
@@ -53,7 +54,7 @@
# - [x] Pipe table (php md, pandoc)
# - [x] Line blocks (pandoc)
# - [x] Task lists (pandoc, custom)
-# - [ ] Definition lists (php md, pandoc)
+# - [x] Definition lists (php md, pandoc)
# - [-] Numbered example lists (pandoc)
# - [-] Metadata blocks (pandoc)
# - [x] Metadata blocks (custom)
@@ -307,20 +308,20 @@ function inline( line, LOCAL, len, code, href, guard ) {
}
}
-function headline( hlvl, htxt, LOCAL, sec, n, HL) {
+function headline( hlvl, htxt, attrib, LOCAL, sec, n, HL) {
split( gensub( /^(.* )?([0-9]+( [0-9]+){5})$/, "\\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 = ""; for ( n = 2; n <= blvl; n++) { hid = hid BL[n] "/"; }
hid = hid HL[1]; for ( n = 2; n <= hlvl; n++) { hid = hid "." HL[n] ; }
- # hid = hid ":" URL(htxt, 1);
+ hid = hid ":" URL(htxt, 1);
hstack = gensub( /^(.* )?([0-9]+( [0-9]+){5})$/, "\\1" ,"1", hstack) \
HL[1] " " HL[2] " " HL[3] " " HL[4] " " HL[5] " " HL[6];
- return sec "" \
- "" inline( htxt ) \
+ return sec "" \
+ "" inline( htxt ) \
"" \
"\n\n";
}
@@ -379,7 +380,7 @@ function _block( block, LOCAL, st, len, hlvl, htxt, sec, guard, code, indent, at
} else if ( match( block, /^> /) ) {
match( block, /(^|\n)[[:space:]]*(\n|$)/ ) || match(block, /$/);
len = RLENGTH; st = RSTART;
- return "\n" _nblock( gensub( /(^|\n)> /, "\n", "g", substr(block, 1, st - 1) ) ) "
\n\n" \
+ return "" gensub( /^\n|\n$/, "", "g", _nblock( gensub( /(^|\n)> /, "\n", "g", substr(block, 1, st - 1) ) ) ) "
\n\n" \
_block( substr(block, st + len) );
# Pipe Tables (pandoc / php md / gfm )
@@ -589,28 +590,71 @@ function _block( block, LOCAL, st, len, hlvl, htxt, sec, guard, code, indent, at
gsub("(^|\n) {0," indent "}", "\n", list);
return "\n\n" _list( substr(list, 2) ) "
\n" _block( block );
+ # 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 );
+
+ # First Order Heading H1 + Attrib
+ } else if ( match( block, /^([^\n]+)([ \t]*\{([^\}\n]+)\})\n===+(\n|$)/ ) ) {
+ len = RLENGTH;
+ text = gensub(/^([^\n]+)([ \t]*\{([^\}\n]+)\})\n===+(\n.*)?$/, "\\1", 1, block)
+ attrib = gensub(/^([^\n]+)([ \t]*\{([^\}\n]+)\})\n===+(\n.*)?$/, "\\3", 1, block)
+ gsub(/[^a-zA-Z0-9_-]+/, " ", attrib); gsub(/(^ | $)/, "", attrib);
+
+ return headline(1, text, attrib) \
+ _block( substr( block, len + 1 ) );
+
# First Order Heading H1
- } else if ( match( block, /^[^\n]+\n===+(\n|$)/ ) ) {
+ } else if ( match( block, /^([^\n]+)\n===+(\n|$)/ ) ) {
len = RLENGTH;
+ text = gensub(/^([^\n]+)\n===+(\n.*)?$/, "\\1", 1, block)
- return headline(1, gensub( /\n.*$/, "", "g", block )) \
+ return headline(1, text, 0) \
_block( substr( block, len + 1 ) );
+ # Second Order Heading H2 + Attrib
+ } else if ( match( block, /^([^\n]+)([ \t]*\{([^\}\n]+)\})\n---+(\n|$)/ ) ) {
+ len = RLENGTH;
+ text = gensub(/^([^\n]+)([ \t]*\{([^\}\n]+)\})\n---+(\n.*)?$/, "\\1", 1, block)
+ attrib = gensub(/^([^\n]+)([ \t]*\{([^\}\n]+)\})\n---+(\n.*)?$/, "\\3", 1, block)
+ gsub(/[^a-zA-Z0-9_-]+/, " ", attrib); gsub(/(^ | $)/, "", attrib);
+
+ return headline(2, text, attrib) \
+ _block( substr( block, len + 1) );
+
# Second Order Heading H2
- } else if ( match( block, /^[^\n]+\n---+(\n|$)/ ) ) {
+ } else if ( match( block, /^([^\n]+)\n---+(\n|$)/ ) ) {
len = RLENGTH;
+ text = gensub(/^([^\n]+)\n---+(\n.*)?$/, "\\1", 1, block)
- return headline(2, gensub( /\n.*$/, "", "g", block )) \
+ return headline(2, text, 0) \
+ _block( substr( block, len + 1) );
+
+ # Nth Order Heading H1 H2 H3 H4 H5 H6 + Attrib
+ } else if ( match( block, /^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*([ \t]*\{([a-zA-Z \t-]*)\})(\n|$)/ ) ) {
+ len = RLENGTH;
+ n = gensub(/^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*([ \t]*\{([a-zA-Z \t-]*)\})(\n.*)?$/, "\\1", 1, block);
+ text = gensub(/^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*([ \t]*\{([a-zA-Z \t-]*)\})(\n.*)?$/, "\\2", 1, block);
+ attrib = gensub(/^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*([ \t]*\{([a-zA-Z \t-]*)\})(\n.*)?$/, "\\5", 1, block);
+ gsub(/[^a-zA-Z0-9_-]+/, " ", attrib); gsub(/(^ | $)/, "", attrib);
+
+ return headline( length(n), text, attrib ) \
_block( substr( block, len + 1) );
# Nth Order Heading H1 H2 H3 H4 H5 H6
- } else if ( match( block, /^#{1,6}[ \t]*[^\n]+([ \t]*#*)(\n|$)/ ) ) {
+ } else if ( match( block, /^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*(\n|$)/ ) ) {
len = RLENGTH;
+ n = gensub(/^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*(\n.*)?$/, "\\1", 1, block);
+ text = gensub(/^(#{1,6})[ \t]*(([^ \t\n]+|[ \t]+[^ \t\n#]|[ \t]+#+[ \t]*[^ \t\n#])+)[ \t]*#*(\n.*)?$/, "\\2", 1, block);
- 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) \
- ) \
+ return headline( length(n), text, 0 ) \
_block( substr( block, len + 1) );
# block images (wrapped in