X-Git-Url: http://nsz.repo.hu/git/?p=c-standard;a=blobdiff_plain;f=ann2html.sh;h=a4c127c5fddf3f0baa128a81387c1fd225ec589e;hp=6fea593a3dbf08e7c9b6f8bff71d0ac2a0d91881;hb=6fa09ff7f9eb20582513c80f0fa883b056bde241;hpb=215a6de37394d96ac7d679bfdf36e79437dde89e

diff --git a/ann2html.sh b/ann2html.sh
index 6fea593..a4c127c 100755
--- a/ann2html.sh
+++ b/ann2html.sh
@@ -85,6 +85,10 @@ seencontents && !seenfore && /^[^@]/ {
 	next
 }
 
+/^@sect 3\./ {
+	markdef = 1
+}
+
 /^@sect/ {
 	sid++
 	slevel = split($2,a,/\./)+1
@@ -93,7 +97,7 @@ seencontents && !seenfore && /^[^@]/ {
 	sect = $2
 	getline
 	# todo hX, back to top
-	ss[sid] = sprintf("<a name=\"%s\" href=\"#%s\"><h%s>%s</h%s></a>\n", sect, sect, slevel, $0, slevel)
+	ss[sid] = sprintf("<h%s><a name=\"%s\" href=\"#%s\">%s</a></h%s>\n", slevel, sect, sect, $0, slevel)
 	if ($0 == "Index")
 		ss[sid] = ss[sid] "<pre>\n"
 	next
@@ -129,7 +133,7 @@ seencontents && !seenfore && /^[^@]/ {
 /^@end pre/ {
 	if (!pre)
 		next
-	pre = pre "</pre>\n"
+	pre = pre "\n</pre>\n"
 	if (nn)
 		note[nn] = note[nn] "\n" pre
 	else
@@ -148,18 +152,17 @@ seencontents && !seenfore && /^[^@]/ {
 	nn = 0
 	p = $2
 	getline
-	i = $2
-	ss[sid] = ss[sid] "<!--page " p " indent " i "-->\n"
+	ss[sid] = ss[sid] "<!--page " p " -->\n"
 	next
 }
 
 /^@para/ {
-	ss[sid] = ss[sid] "<p><!--para " $2 "-->\n"
+	ss[sid] = ss[sid] "<p><!--para " $2 " -->\n"
 	next
 }
 
-/^ *(Syntax|Semantics|Description|Constraints|Synopsis|Returns)$/ {
-	ss[sid] = ss[sid] "<h6>" $0 "</h6>\n"
+/^ ?(Syntax|Semantics|Description|Constraints|Synopsis|Returns|Recommended practice|Implementation limits|Environmental limits)$/ {
+	ss[sid] = ss[sid] "<p><b>" $0 "</b>\n"
 	next
 }
 
@@ -208,7 +211,19 @@ seencontents && !seenfore && /^[^@]/ {
 	}
 	s = p s
 	p = ""
-	while (match(s, noteid "\\)")) {
+	# TODO: false positives..
+	while (match(s, /[a-z]opt[ )"]/))
+		s = substr(s,1,RSTART) "<sub>opt</sub>" substr(s,RSTART+RLENGTH-1)
+	if (match(s, /[a-z]opt$/))
+		s = substr(s,1,RSTART) "<sub>opt</sub>"
+	for (;;) {
+		while (match(s, noteid-1 "\\)")) {
+			p = p substr(s,1,RSTART-1)
+			p = p "<sup><a href=\"#note" noteid-1 "\"><b>" noteid-1 ")</b></a></sup>"
+			s = substr(s,RSTART+RLENGTH)
+		}
+		if (!match(s, noteid "\\)"))
+			break
 		if (noteid==1 && s !~ /\.1\)/)
 			break
 		p = p substr(s,1,RSTART-1)
@@ -219,6 +234,10 @@ seencontents && !seenfore && /^[^@]/ {
 	}
 	s = p s
 	sub(/^ *Forward references/, "<p><b>&</b>", s)
+	if (markdef) {
+		s = "<b>" s "</b><br>"
+		markdef = 0
+	}
 	if (pre)
 		pre = pre "\n" s
 	else if (nn)
@@ -236,7 +255,7 @@ END {
 		print ss[i]
 		n = split(snote[i],a)
 		if (n > 0) {
-			s = "<h6>footnotes</h6>\n"
+			s = "<p><b>Footnotes</b>\n"
 			for (j = 1; j <= n; j++) {
 				s = s "<p><small><a name=\"note" a[j] "\" href=\"#note" a[j] "\">" a[j] ")</a>" note[a[j]+0] "</small>\n"
 			}