Remove Asciidoc versions of the documentation and building apparatus;

replace with xfpt versions.

1 files changed, 55 insertions, 34 deletions

diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index 38e6ebff3..0495b582e 100644
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -1,6 +1,6 @@
-# $Cambridge: exim/doc/doc-docbook/Makefile,v 1.6 2005/12/20 15:45:02 ph10 Exp $
+# $Cambridge: exim/doc/doc-docbook/Makefile,v 1.7 2006/02/01 11:01:01 ph10 Exp $
 
-# Make file for Exim documentation from Asciidoc source.
+# Make file for Exim documentation from xfpt source.
 
 notarget:;    @echo "** You must specify a target, in the form x.y, where x is 'filter', 'spec',"
 	      @echo "** or 'test', and y is 'xml', 'fo', 'ps', 'pdf', 'html', 'txt', or 'info'."
@@ -10,7 +10,7 @@ notarget:;    @echo "** You must specify a target, in the form x.y, where x is '
 
 ############################## MAN PAGE ################################
 
-exim.8: spec.xml
+exim.8:       spec.xml x2man
 	      ./x2man
 
 ########################################################################
@@ -18,8 +18,8 @@ exim.8: spec.xml
 
 ############################### FILTER #################################
 
-filter.xml:   filter.ascd MyAsciidoc.conf
-	      asciidoc -d book -b docbook -f MyAsciidoc.conf filter.ascd
+filter.xml:   filter.xfpt
+	      xfpt filter.xfpt
 
 filter-fo.xml: filter.xml Pre-xml
 	      ./Pre-xml -bookinfo <filter.xml >filter-fo.xml
@@ -28,7 +28,10 @@ filter-html.xml: filter.xml Pre-xml
 	      ./Pre-xml -html <filter.xml >filter-html.xml
 
 filter-txt.xml: filter.xml Pre-xml
-	      ./Pre-xml -ascii -html <filter.xml >filter-txt.xml
+	      ./Pre-xml -ascii -html -quoteliteral <filter.xml >filter-txt.xml
+
+filter-info.xml: filter.xml Pre-xml
+	      ./Pre-xml -ascii -html <filter.xml >filter-info.xml
 
 filter.fo:    filter-fo.xml MyStyle-filter-fo.xsl MyStyle-fo.xsl MyStyle.xsl
 	      /bin/rm -rf filter.fo filter-fo.fo
@@ -48,23 +51,25 @@ filter.pdf:   filter.fo
 	      fop filter.fo -pdf filter-tmp.pdf
 	      mv filter-tmp.pdf filter.pdf
 
-filter.html:  filter-html.xml TidyHTML-filter MyStyle-nochunk-html.xsl MyStyle-html.xsl MyStyle.xsl
+filter.html:  filter-html.xml TidyHTML-filter MyStyle-nochunk-html.xsl \
+                MyStyle-html.xsl MyStyle.xsl
 	      /bin/rm -rf filter.html filter-html.html
 	      xmlto -x MyStyle-nochunk-html.xsl html-nochunks filter-html.xml
 	      /bin/mv -f filter-html.html filter.html
 	      ./TidyHTML-filter
 
-filter.txt:   filter-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl MyStyle.xsl
+filter.txt:   filter-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl \
+                MyStyle.xsl
 	      /bin/rm -rf filter-txt.html
 	      xmlto -x MyStyle-txt-html.xsl html-nochunks filter-txt.xml
-	      w3m -dump filter-txt.html >filter.txt
+	      w3m -dump filter-txt.html | ./Tidytxt >filter.txt
 
 # I have not found a way of making docbook2texi write its output anywhere
 # other than the file name that it makes up. The --to-stdout option does not
 # work.
 
-filter.info:  filter-txt.xml
-	      docbook2texi filter-txt.xml
+filter.info:  filter-info.xml
+	      docbook2texi filter-info.xml
 	      perl -ne 's/conceptindex/cindex/;s/optionindex/findex/;print;' \
 		<exim_filtering.texi | Tidytxt >filter.texinfo
 	      /bin/rm -rf exim_filtering.texi
@@ -75,19 +80,25 @@ filter.info:  filter-txt.xml
 
 ################################ SPEC ##################################
 
-spec.xml:     spec.ascd MyAsciidoc.conf
-	      asciidoc -d book -b docbook -f MyAsciidoc.conf spec.ascd
+spec.xml:     spec.xfpt
+	      xfpt spec.xfpt
 
 spec-fo.xml:  spec.xml Pre-xml
-	      ./Pre-xml <spec.xml >spec-fo.xml
+	      ./Pre-xml -optbreak <spec.xml >spec-fo.xml
 
 spec-html.xml: spec.xml Pre-xml
-	      ./Pre-xml -abstract -html -oneindex <spec.xml >spec-html.xml
+	      ./Pre-xml -html -oneindex \
+		<spec.xml >spec-html.xml
 
 spec-txt.xml: spec.xml Pre-xml
-	      ./Pre-xml -abstract -ascii -html -noindex <spec.xml >spec-txt.xml
+	      ./Pre-xml -ascii -html -noindex -quoteliteral \
+		<spec.xml >spec-txt.xml
+
+spec-info.xml: spec.xml Pre-xml
+	      ./Pre-xml -ascii -html -noindex <spec.xml >spec-info.xml
 
-spec.fo:      spec-fo.xml MyStyle-spec-fo.xsl MyStyle-fo.xsl MyStyle.xsl MyTitleStyle.xsl
+spec.fo:      spec-fo.xml MyStyle-spec-fo.xsl MyStyle-fo.xsl MyStyle.xsl \
+              MyTitleStyle.xsl
 	      /bin/rm -rf spec.fo spec-fo.fo
 	      xmlto -x MyStyle-spec-fo.xsl fo spec-fo.xml
 	      /bin/mv -f spec-fo.fo spec.fo
@@ -99,28 +110,31 @@ spec.ps:      spec.fo
 	      mv spec-tmp.ps spec.ps
 
 # Do not use ps2pdf from the PS version; better PDF is generated directly. It
-# contains cross links etc.
+# contains cross links etc. We post-process it to add page label information
+# so that the page identifiers shown by acroread are the correct page numbers.
 
-spec.pdf:     spec.fo
+spec.pdf:     spec.fo PageLabelPDF
 	      FOP_OPTS=-Xmx512m fop spec.fo -pdf spec-tmp.pdf
-	      mv spec-tmp.pdf spec.pdf
+	      ./PageLabelPDF <spec-tmp.pdf >spec.pdf
 
-spec.html:    spec-html.xml TidyHTML-spec MyStyle-chunk-html.xsl MyStyle-html.xsl MyStyle.xsl
+spec.html:    spec-html.xml TidyHTML-spec MyStyle-chunk-html.xsl \
+                MyStyle-html.xsl MyStyle.xsl
 	      /bin/rm -rf spec.html
 	      xmlto -x MyStyle-chunk-html.xsl -o spec.html html spec-html.xml
 	      ./TidyHTML-spec
 
-spec.txt:     spec-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl MyStyle.xsl
+spec.txt:     spec-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl \
+                MyStyle.xsl
 	      /bin/rm -rf spec-txt.html
 	      xmlto -x MyStyle-txt-html.xsl html-nochunks spec-txt.xml
-	      w3m -dump spec-txt.html | Tidytxt >spec.txt
+	      w3m -dump spec-txt.html | ./Tidytxt >spec.txt
 
 # I have not found a way of making docbook2texi write its output anywhere
 # other than the file name that it makes up. The --to-stdout option does not
 # work.
 
-spec.info:    spec-txt.xml
-	      docbook2texi spec-txt.xml
+spec.info:    spec-info.xml
+	      docbook2texi spec-info.xml
 	      perl -ne 's/conceptindex/cindex/;s/optionindex/findex/;print;' \
 		<the_exim_mta.texi >spec.texinfo
 	      /bin/rm -rf the_exim_mta.texi
@@ -133,19 +147,24 @@ spec.info:    spec-txt.xml
 
 # These targets (similar to the above)  are for running little tests.
 
-test.xml:     test.ascd MyAsciidoc.conf
-	      asciidoc -d book -b docbook -f MyAsciidoc.conf test.ascd
+test.xml:     test.xfpt
+	      xfpt test.xfpt
 
 test-fo.xml:  test.xml Pre-xml
 	      ./Pre-xml <test.xml >test-fo.xml
 
 test-html.xml: test.xml Pre-xml
-	      ./Pre-xml -abstract -html -oneindex <test.xml >test-html.xml
+	      ./Pre-xml -html -oneindex <test.xml >test-html.xml
 
 test-txt.xml: test.xml Pre-xml
-	      ./Pre-xml -abstract -ascii -html -noindex <test.xml >test-txt.xml
+	      ./Pre-xml -ascii -html -noindex -quoteinfo \
+		<test.xml >test-txt.xml
+
+test-info.xml: test.xml Pre-xml
+	      ./Pre-xml -ascii -html -noindex <test.xml >test-info.xml
 
-test.fo:      test-fo.xml MyStyle-spec-fo.xsl MyStyle-fo.xsl MyStyle.xsl MyTitleStyle.xsl
+test.fo:      test-fo.xml MyStyle-spec-fo.xsl MyStyle-fo.xsl MyStyle.xsl \
+                MyTitleStyle.xsl
 	      /bin/rm -rf test.fo test-fo.fo
 	      xmlto -x MyStyle-spec-fo.xsl fo test-fo.xml
 	      /bin/mv -f test-fo.fo test.fo
@@ -163,12 +182,14 @@ test.pdf:     test.fo
 	      fop test.fo -pdf test-tmp.pdf
 	      mv test-tmp.pdf test.pdf
 
-test.html:    test-html.xml MyStyle-nochunk-html.xsl MyStyle-html.xsl MyStyle.xsl
+test.html:    test-html.xml MyStyle-nochunk-html.xsl MyStyle-html.xsl \
+                MyStyle.xsl
 	      /bin/rm -rf test.html test-html.html
 	      xmlto -x MyStyle-nochunk-html.xsl html-nochunks test-html.xml
 	      /bin/mv -f test-html.html test.html
 
-test.txt:     test-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl MyStyle.xsl
+test.txt:     test-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl \
+                MyStyle.xsl
 	      /bin/rm -rf test-txt.html
 	      xmlto -x MyStyle-txt-html.xsl html-nochunks test-txt.xml
 	      w3m -dump test-txt.html | Tidytxt >test.txt
@@ -177,8 +198,8 @@ test.txt:     test-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl MyStyle
 # other than the file name that it makes up. The --to-stdout option does not
 # work.
 
-test.info:    test-txt.xml
-	      docbook2texi test-txt.xml
+test.info:    test-info.xml
+	      docbook2texi test-info.xml
 	      perl -ne 's/conceptindex/cindex/;s/optionindex/findex/;print;' \
 		<short_title.texi >test.texinfo
 	      /bin/rm -rf short_title.texi