For PDF documentation, use dblatex instead of pdfjadetex

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e0eadb3..10419dc 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.34 2007-01-05 10:56:17 marc Exp $
+## $Id: Makefile.am,v 1.35 2007-01-18 09:20:52 adam Exp $
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUBDIRS = common
@@ -74,12 +74,8 @@ metaproxy.pdf: $(XMLFILES) multi.pdf
        for i in $(PNGFILES) common/id.png multi.pdf; do \
                if test ! -f $$i; then cp $(srcdir)/$$i $$i; fi; \
        done
-       jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl $(MAINXML)
-       rm -f metaproxy.tex
-       mv book.tex metaproxy.tex
-       pdfjadetex metaproxy.tex >/dev/null
-       pdfjadetex metaproxy.tex >/dev/null
-       pdfjadetex metaproxy.tex >/dev/null
+       dblatex $(MAINXML)
+       mv book.pdf metaproxy.pdf
 
 manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl
        rm -f manref.xml

diff --git a/doc/book.xml b/doc/book.xml
index 32afa99..fa8af68 100644 (file)
--- a/doc/book.xml
+++ b/doc/book.xml
@@ -18,19 +18,22 @@
      -->
      <!NOTATION PDF SYSTEM "PDF">
 ]>
-<!-- $Id: book.xml,v 1.49 2007-01-12 15:43:00 adam Exp $ -->
+<!-- $Id: book.xml,v 1.50 2007-01-18 09:20:52 adam Exp $ -->
 <book id="metaproxy">
  <bookinfo>
   <title>Metaproxy - User's Guide and Reference</title>
-  <author>
-   <firstname>Adam</firstname><surname>Dickmeiss</surname>
-  </author>
-  <author>
-   <firstname>Marc</firstname><surname>Cromme</surname>
-  </author>
-  <author>
-   <firstname>Mike</firstname><surname>Taylor</surname>
-  </author>
+  <authorgroup>
+   <author>
+    <firstname>Adam</firstname><surname>Dickmeiss</surname>
+   </author>
+   <author>
+    <firstname>Marc</firstname><surname>Cromme</surname>
+   </author>
+   <author>
+    <firstname>Mike</firstname><surname>Taylor</surname>
+   </author>
+  </authorgroup>
+  <releaseinfo>&version;</releaseinfo>
   <copyright>
    <year>2005-2007</year>
    <holder>Index Data ApS</holder>