From c0052f39a81ac7f52a84cc006cda4cd143635de4 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 26 May 2006 20:20:51 +0000
Subject: [PATCH] Documentation now based on Docbook XML/XSLT using xsltproc +
 Norman Walsh's stylesheets. It means that the CVS version
 is no longer depending on jade/openjade or docbook-to-man
 scripts. PDF is no longer part of the distribution - but
 can optionally be made using DSSSL/jadetex or FOP.

---
 buildconf.sh    |    7 ++++---
 doc/Makefile.am |   10 +++++-----
 doc/main.xml.in |   14 +++++++-------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/buildconf.sh b/buildconf.sh
index 7275987..bf69bf7 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.9 2006-05-03 12:03:35 mike Exp $
+# $Id: buildconf.sh,v 1.10 2006-05-26 20:20:51 adam Exp $
 
 if automake --version|head -1 |grep '1\.[4-7]'; then
     echo "automake 1.4-1.7 is active. You should use automake 1.8 or later"
@@ -73,8 +73,9 @@ Or just build the Debian packages without configuring
   dpkg-buildpackage -rfakeroot
 
 When building from a CVS checkout, you need these Debian tools:
-  autoconf, automake, libtool, gcc, docbook-utils, docbook, docbook-xml,
-  docbook-dsssl, jade, jadetex, libxslt1-dev, libyazpp1-dev,
+  autoconf, automake, libtool, gcc, g++, make,
+  xsltproc, docbook, docbook-xml, docbook-xsl,
+  libxslt1-dev, libyazpp1-dev,
   libboost-thread-dev, libboost-date-time-dev,
   libboost-program-options-dev, libboost-test-dev
 and for the image-processing needed to build the documentation:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 94b56a9..3b8db2d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.15 2006-04-27 16:54:39 adam Exp $
+## $Id: Makefile.am,v 1.16 2006-05-26 20:20:51 adam Exp $
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUBDIRS = common
@@ -26,13 +26,13 @@ HTMLFILES = architecture.html \
 	filterref.html \
 	filters.html \
 	future.directions.html \
+	index.html
 	individual.classes.html \
 	installation.html \
 	installation.debian.html \
 	installation.windows.html \
 	introduction.html \
 	licence.html \
-	metaproxy.html \
 	multidb.html \
 	multidb.multi.html \
 	multidb.picture.html \
@@ -51,13 +51,13 @@ man_MANS = $(MANFILES)
 EXTRA_DIST = $(XMLFILES) $(XMLMAN) $(doc_DATA) $(man_MANS) multi.svg
 
 $(HTMLFILES): $(XMLFILES) multi.png
-	jade -E14 -D $(srcdir) -d common/html.dsl -t sgml $(srcdir)/common/xml.dcl $(MAINXML)
+	xsltproc common/html.xsl $(MAINXML)
 
 .xml.3mp:
-	docbook2man $<
+	xsltproc common/man.xsl $<
 
 .xml.1:
-	docbook2man $<
+	xsltproc common/man.xsl $<
 
 metaproxy.pdf: $(XMLFILES) multi.pdf
 	for i in $(PNGFILES) multi.pdf; do \
diff --git a/doc/main.xml.in b/doc/main.xml.in
index 681ca0e..90d0621 100644
--- a/doc/main.xml.in
+++ b/doc/main.xml.in
@@ -1,12 +1,13 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                    "@DTD_DIR@/docbookx.dtd" [
-     <!ENTITY oslash "&#x00F8;"> <!-- CIRCLED DIVISION SLASH -->
-     <!ENTITY book SYSTEM "book.xml">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+    "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" 
+[
+     <!ENTITY book SYSTEM "@srcdir@/book.xml">
      <!ENTITY manref SYSTEM "manref.xml">
      <!ENTITY progref SYSTEM "progref.xml">
      <!ENTITY version "@VERSION@">
-     <!ENTITY % entities SYSTEM "common/common.ent">
+     <!ENTITY % common SYSTEM "@srcdir@/common/common.ent">
+     %common;
      <!-- Next line allows imagedata/@format="PDF" and is taken from 
 http://lists.oasis-open.org/archives/docbook/200303/msg00163.html
      -->
@@ -16,9 +17,8 @@ http://lists.oasis-open.org/archives/docbook/200303/msg00163.html
 http://lists.oasis-open.org/archives/docbook/200303/msg00180.html
      -->
      <!NOTATION PDF SYSTEM "PDF">
-     %entities;
 ]>
-<!-- $Id: main.xml.in,v 1.6 2006-04-27 13:28:46 mike Exp $ -->
+<!-- $Id: main.xml.in,v 1.7 2006-05-26 20:20:51 adam Exp $ -->
 <book id="metaproxy">
  &book;
 </book>
-- 
1.7.10.4