replace original toc.awk

docs/Makefile

@@ -1,5 +1,5 @@
 toc.html: template.html toc.awk
-	./toc2.awk $< > $@
+	./toc.awk $< > $@
 
 index.html: template.html toc.html
 	m4 $< > $@

docs/toc.awk

@@ -1,55 +1,30 @@
 #!/usr/bin/awk -f
 
-BEGIN { print "<ul>" }
-END { print "</ul>" }
-
-/head[2345]\(/ {
-	printf "\t"
+function make_id(s,   ret) {
+	ret = tolower(s)
+	gsub(/ +/, "-", ret)
+	return ret
 }
 
-/head2\(/ {
-	last_level = 2
-	if (sublist) {
-		print "</ul>" # close previous sublist
-		sublist = 0
-	}
-	match($0, /head2\(([^)]+)\)/, arr)
-	printf "<li><a href=\"#%s\">%s</a></li>\n", make_id(arr[1]), arr[1]
+BEGIN {
+	HEAD = "head([2345])\\(([^)]+)\\)"
 }
+END { print "</ul>" }
 
-/head3\(/ {
-	last_level = 3
-	if (!sublist) {
-		print "<ul>"
+$0 ~ HEAD {
+	match($0, HEAD, arr)
+	cur = arr[1] # current heading level
+	while (p > 0 && cur < buf[p-1]) {
+		#printf("closing list with cur = %d, last = %d\n", cur, buf[p-1])
+		print "</ul>"
+		p--
 	}
-	sublist = 1
-	printf "\t"
-	match($0, /head3\(([^)]+)\)/, arr)
-	printf "<li><a href=\"#%s\">%s</a></li>\n", make_id(arr[1]), arr[1]
-}
-
-/head4\(/ {
-	last_level = 4
-	print "<ul>" # always add a list level for this, assume it's alone
-	printf "\t\t"
-	match($0, /head4\(([^)]+)\)/, arr)
-	printf "<li><a href=\"#%s\">%s</a></li>\n", make_id(arr[1]), arr[1]
-	print "</ul>"
-}
-
-/head5\(/ {
-	last_level = 5
-	if (last_level != 4) {
-		print "<ul>" # always add a list level for this, assume it's alone
+	if (buf[p-1] < cur) {
+		#printf "opening new list with cur = %d, last = %d\n", cur, buf[p-1]
+		print "<ul>"
 	}
-	printf "\t\t"
-	match($0, /head5\(([^)]+)\)/, arr)
-	printf "<li><a href=\"#%s\">%s</a></li>\n", make_id(arr[1]), arr[1]
-	print "</ul>"
-}
+	if (buf[p-1] != arr[1])
+		buf[p++] = arr[1] # heading level stack
 
-function make_id(s,   ret) {
-	ret = tolower(s)
-	gsub(/ +/, "-", ret)
-	return ret
+	printf "<li><a href=\"#%s\">%s</a></li>\n", make_id(arr[2]), arr[2]
 }