Merge commit '6bc502434737d7f08379e79b94fc6fda424ef779'

[shellwiki] / macros / toc

diff --git a/macros/toc b/macros/toc
index 801347a9546a142b53e32e0e7baca77615fdbcf4..ed046e7bb6f22e95516849920c0c1cb3d0fc6470 100755 (executable)
--- a/macros/toc
+++ b/macros/toc
@@ -16,22 +16,12 @@
 
 . "$_EXEC/cgilite/cgilite.sh"
 
-unset MD_MACROS
-
-if [ "$(which awk)" ]; then
-  md() { awk -f "$_EXEC/cgilite/markdown.awk"; }
-elif [ "$(which busybox)" ]; then
-  md() { busybox awk -f "$_EXEC/cgilite/markdown.awk"; }
-else
-  md() { cat; }
-fi
-
-min="$1" max="$2"
+min="${1:-1}" max="${2:-6}"
 [ "$min" -ge 1 -a "$min" -le 6 ] || min=1
 [ "$max" -ge "$min" ] || max="$min"
 [ "$max" -le 6 ] || max=6
 
-md |sed -nE '
+sed -nE '
   1i<ul class="macro toc">
   s;^.*<section class="(h[1-6])( [^"]+)?" id="([^"]*)"><h['${min}-${max}']>(([^<]|<[^aA]|<[aA][^ ])+)(<a class="anchor" href="[^>]*"></a>)?</h[1-6]>$;<li class="toc \1"><a href="#\3">\4</a></li>;p
   $i</ul>