X-Git-Url: http://nsz.repo.hu/git/?p=c-standard;a=blobdiff_plain;f=ann2html.sh;h=9acba6243b6c2a378eb6033963fdcb51f65826ba;hp=8999198a11a788d8324dbb5364a398b8e3eb4713;hb=fb5050e94537cf9c61d58584264f1b3b0476e472;hpb=c8552f228e75429c8c11edb869899f05b70ea1e5

diff --git a/ann2html.sh b/ann2html.sh
index 8999198..9acba62 100755
--- a/ann2html.sh
+++ b/ann2html.sh
@@ -8,12 +8,16 @@ BEGIN {
 	ss[sid] = "<pre>"
 }
 
-{
+function esc() {
 	gsub(/\&/, "\\&amp;")
 	gsub(/</, "\\&lt;")
 	gsub(/>/, "\\&gt;")
 }
 
+{
+	esc()
+}
+
 !title && /^[^@]/ {
 	title = $0
 	gsub(/  +/, "  ", title)
@@ -35,6 +39,7 @@ seencontents && !seenfore && /^[^@]/ {
 	s = $0
 	if (!sub(/ +\. .*/, "", s)) {
 		getline
+		esc()
 		sub(/^ */, " ")
 		s = s $0
 		sub(/ +\. .*/, "", s)
@@ -78,6 +83,7 @@ seencontents && !seenfore && /^[^@]/ {
 	}
 	sid++
 	getline
+	esc()
 	ss[sid] = ss[sid] "<h1>" $0 "</h1>\n"
 	if (!seencontents) {
 		ss[sid] = ss[sid] "<pre>\n"
@@ -96,6 +102,7 @@ seencontents && !seenfore && /^[^@]/ {
 		slevel = 5
 	sect = $2
 	getline
+	esc()
 	# todo hX, back to top
 	ss[sid] = sprintf("<h%s><a name=\"%s\" href=\"#%s\">%s</a></h%s>\n", slevel, sect, sect, $0, slevel)
 	if ($0 == "Index")
@@ -133,7 +140,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
@@ -162,7 +169,7 @@ seencontents && !seenfore && /^[^@]/ {
 }
 
 /^ ?(Syntax|Semantics|Description|Constraints|Synopsis|Returns|Recommended practice|Implementation limits|Environmental limits)$/ {
-	ss[sid] = ss[sid] "<h6>" $0 "</h6>\n"
+	ss[sid] = ss[sid] "<p><b>" $0 "</b>\n"
 	next
 }
 
@@ -212,7 +219,7 @@ seencontents && !seenfore && /^[^@]/ {
 	s = p s
 	p = ""
 	# TODO: false positives..
-	while (match(s, /[a-z]opt[ )]/))
+	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>"
@@ -255,7 +262,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"
 			}