aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rpkid/Makefile6
-rw-r--r--rpkid/doc/tweak-doc.awk40
2 files changed, 44 insertions, 2 deletions
diff --git a/rpkid/Makefile b/rpkid/Makefile
index 3c14d0c5..5fe29f98 100644
--- a/rpkid/Makefile
+++ b/rpkid/Makefile
@@ -80,7 +80,9 @@ docs:: doc/irdbd.pdf doc/pubd.pdf doc/rpkid.pdf doc/rpkid-bpki.pdf doc/pubd-bpki
docs::
TZ='' doxygen
for i in Installation Configuration Operation Left-right Publication; do \
- xsltproc --html doc/tweak-doc.xsl doc/html/$$i.html | lynx -dump -nolist -force_html -stdin >doc/$$i; \
- done
+ xsltproc --html doc/tweak-doc.xsl doc/html/$$i.html | \
+ lynx -dump -nolist -force_html -stdin >doc/$$i; \
+ done 2>&1 | \
+ awk -f doc/tweak-doc.awk 1>&2
cd doc/latex && TZ='' ${MAKE} && ln -f refman.pdf ../manual.pdf
cd doc && tar -cf - html | gzip -9 >manual.tar.gz
diff --git a/rpkid/doc/tweak-doc.awk b/rpkid/doc/tweak-doc.awk
new file mode 100644
index 00000000..80dab21a
--- /dev/null
+++ b/rpkid/doc/tweak-doc.awk
@@ -0,0 +1,40 @@
+# $Id$
+#
+# Copyright (C) 2010 Internet Systems Consortium ("ISC")
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+# Doxygen's (X)HTML output is a bit buggy, and libxml2 is picky.
+# This script suppresses xsltproc error messages that arise when
+# xlstproc's HTML parser gags on known Doxygen problems that turn out
+# not to make any difference to us in this particular context.
+#
+# The intent is to suppress known harmless messages while letting
+# everything else through. This is intended as a stderr filter.
+
+/HTML parser error : Unexpected end tag : p/ {
+ nr = NR;
+ next;
+}
+
+/^<\/pre><\/div><\/p>/ && nr && NR == nr + 1 {
+ next;
+}
+
+/^ +\^/ && nr && NR == nr + 2 {
+ next;
+}
+
+{
+ print;
+}