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.

diff --git a/buildconf.sh b/buildconf.sh
index 2bb46b3..f2ea8da 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: buildconf.sh,v 1.15 2006-05-25 15:49:27 mike Exp $
+# $Id: buildconf.sh,v 1.16 2006-05-26 19:46:37 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"
 
 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"

@@ -71,8 +71,8 @@ Or just build the Debian packages without configuring
   dpkg-buildpackage -rfakeroot
 
 When building from a CVS checkout, you need these Debian tools:
   dpkg-buildpackage -rfakeroot
 
 When building from a CVS checkout, you need these Debian tools:

-  autoconf, automake, libtool, gcc, libyaz-dev, docbook-utils, docbook,
-  docbook-xml, docbook-dsssl, jade, jadetex, libxml2-dev,
+  autoconf, automake, libtool, gcc, g++, libyaz-dev,
+  xsltproc, docbook, docbook-xml, docbook-xsl, make,

   libssl-dev, libreadline5-dev, g++
 EOF
 fi
   libssl-dev, libreadline5-dev, g++
 EOF
 fi

diff --git a/configure.ac b/configure.ac
index d5335c6..0cef813 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl YAZ++ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.
 dnl YAZ++ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.

-dnl $Id: configure.ac,v 1.4 2006-04-30 12:22:03 adam Exp $
+dnl $Id: configure.ac,v 1.5 2006-05-26 19:46:37 adam Exp $

 AC_PREREQ(2.59)
 AC_INIT([yazpp],[1.0.0],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_PREREQ(2.59)
 AC_INIT([yazpp],[1.0.0],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)

@@ -40,5 +40,6 @@ AC_OUTPUT([
        doc/Makefile
        doc/yazpp.xml
        doc/common/Makefile
        doc/Makefile
        doc/yazpp.xml
        doc/common/Makefile

-       doc/common/html.dsl doc/common/html.xsl doc/common/print.dsl doc/common/tkl.xsl
+       doc/common/tkl.xsl doc/common/html.xsl doc/common/man.xsl 
+       doc/common/print.dsl doc/common/html.dsl

 ],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yazpp-config >src/yazpp-config && chmod +x yazpp-config src/yazpp-config])
 ],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yazpp-config >src/yazpp-config && chmod +x yazpp-config src/yazpp-config])

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1ff6e7b..8a67151 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.19 2006-04-24 08:55:28 marc Exp $
+## $Id: Makefile.am,v 1.20 2006-05-26 19:46:37 adam Exp $

 docdir=$(datadir)/doc/@PACKAGE@
 
 SUBDIRS = common
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUBDIRS = common

@@ -11,7 +11,7 @@ XMLFILES = \
  license.xml \
  yazpp.xml.in
 
  license.xml \
  yazpp.xml.in
 

-TOP=yazpp.xml
+TOP = yazpp.xml

 
 MANFILES = yazpp-config.8
 
 
 MANFILES = yazpp-config.8
 

@@ -20,11 +20,11 @@ REFFILES = yazpp-config-man.xml
 HTMLFILES = \
  api.html \
  implementations.html \
 HTMLFILES = \
  api.html \
  implementations.html \

+ index.html \

  installation.html \
  introduction.html \
  license.html \
  windows.html \
  installation.html \
  introduction.html \
  license.html \
  windows.html \

- yazpp.html \

  zoom-connection.html \
  zoom-exception.html \
  zoom-query.html \
  zoom-connection.html \
  zoom-exception.html \
  zoom-query.html \

@@ -32,14 +32,14 @@ HTMLFILES = \
  zoom-resultset.html \
  zoom.html
 
  zoom-resultset.html \
  zoom.html
 

-doc_DATA = $(HTMLFILES) yazpp.pdf 
+doc_DATA = $(HTMLFILES) 

 
 man_MANS = $(MANFILES)
 
 
 man_MANS = $(MANFILES)
 

-EXTRA_DIST = $(XMLFILES) $(doc_DATA) $(man_MANS)  $(REFFILES) 
+EXTRA_DIST = $(XMLFILES) $(doc_DATA) $(man_MANS) $(REFFILES) entities.ent

 
 $(HTMLFILES): $(XMLFILES)
 
 $(HTMLFILES): $(XMLFILES)

-       jade -E14 -D $(srcdir) -d common/html.dsl -t sgml $(srcdir)/common/xml.dcl $(TOP)
+       xsltproc common/html.xsl $(TOP)

 
 yazpp.pdf: $(XMLFILES)
        if test ! -f common/id.png ; then cp $(srcdir)/common/id.png common/; fi
 
 yazpp.pdf: $(XMLFILES)
        if test ! -f common/id.png ; then cp $(srcdir)/common/id.png common/; fi

@@ -51,16 +51,14 @@ yazpp.pdf: $(XMLFILES)
 index.tkl: $(XMLFILES) common/tkl.xsl
        xsltproc common/tkl.xsl $(TOP)
 
 index.tkl: $(XMLFILES) common/tkl.xsl
        xsltproc common/tkl.xsl $(TOP)
 

-

 yazpp-config.8: yazpp-config-man.xml
 yazpp-config.8: yazpp-config-man.xml

-       docbook2man $(srcdir)/yazpp-config-man.xml
-
+       xsltproc common/man.xsl $(srcdir)/yazpp-config-man.xml

 
 clean-data-hook:
        rm -f [0-9]* *.bak
 
 dist-hook:
 
 clean-data-hook:
        rm -f [0-9]* *.bak
 
 dist-hook:

-       for f in $(srcdir)/*.html; do \
+       for f in *.html; do \

                found=0; \
                b=`basename $$f`; \
                for h in $(HTMLFILES); do \
                found=0; \
                b=`basename $$f`; \
                for h in $(HTMLFILES); do \

diff --git a/doc/entities.ent b/doc/entities.ent
new file mode 100644 (file)
index 0000000..866c65d
--- /dev/null
+++ b/doc/entities.ent
@@ -0,0 +1,6 @@
+<!-- $Id: entities.ent,v 1.1 2006-05-26 19:46:37 adam Exp $ -->
+<!ENTITY chap-introduction SYSTEM "introduction.xml">
+<!ENTITY chap-installation SYSTEM "installation.xml">
+<!ENTITY chap-zoom SYSTEM "zoom.xml">
+<!ENTITY chap-api SYSTEM "api.xml">
+<!ENTITY app-license SYSTEM "license.xml">

diff --git a/doc/yazpp-config-man.xml b/doc/yazpp-config-man.xml
index ce74e76..6d6d35d 100644 (file)
--- a/doc/yazpp-config-man.xml
+++ b/doc/yazpp-config-man.xml
@@ -1,5 +1,7 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "">
-<!-- $Id: yazpp-config-man.xml,v 1.4 2006-04-25 12:37:05 marc Exp $ -->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" 
+ "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" 
+[ ]>
+<!-- $Id: yazpp-config-man.xml,v 1.5 2006-05-26 19:46:37 adam Exp $ -->

 <refentry id="yazpp-config">
  <refmeta>
   <refentrytitle>yazpp-config</refentrytitle>
 <refentry id="yazpp-config">
  <refmeta>
   <refentrytitle>yazpp-config</refentrytitle>

diff --git a/doc/yazpp.xml.in b/doc/yazpp.xml.in
index 414fc29..8b10307 100644 (file)
--- a/doc/yazpp.xml.in
+++ b/doc/yazpp.xml.in
@@ -1,15 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <?xml version="1.0" standalone="no"?>

-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4//EN"
-                    "@DTD_DIR@/docbookx.dtd" [
-     <!ENTITY chap-introduction SYSTEM "introduction.xml">
-     <!ENTITY chap-installation SYSTEM "installation.xml">
-     <!ENTITY chap-zoom SYSTEM "zoom.xml">
-     <!ENTITY chap-api SYSTEM "api.xml">
-     <!ENTITY app-license SYSTEM "license.xml">
-     <!ENTITY % common  SYSTEM "common/common.ent">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+    "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" 
+[
+     <!ENTITY % entities  SYSTEM "@srcdir@/entities.ent">
+     %entities;
+     <!ENTITY % common  SYSTEM "@srcdir@/common/common.ent">

      %common;
 ]>
      %common;
 ]>

-<!-- $Id: yazpp.xml.in,v 1.5 2006-04-30 12:51:45 adam Exp $ -->
+<!-- $Id: yazpp.xml.in,v 1.6 2006-05-26 19:46:37 adam Exp $ -->

 <book id="yazpp">
  <bookinfo>
   <title>YAZ++ User's Guide and Reference</title>
 <book id="yazpp">
  <bookinfo>
   <title>YAZ++ User's Guide and Reference</title>

@@ -42,7 +40,7 @@
     This manual covers version @VERSION@.
     </simpara>
    <simpara>
     This manual covers version @VERSION@.
     </simpara>
    <simpara>

-    CVS ID: $Id: yazpp.xml.in,v 1.5 2006-04-30 12:51:45 adam Exp $
+    CVS ID: $Id: yazpp.xml.in,v 1.6 2006-05-26 19:46:37 adam Exp $

    </simpara>
    <simpara>
     <inlinemediaobject>
    </simpara>
    <simpara>
     <inlinemediaobject>