Put static YAZ entities in separate file entities.ent.

Put bookinfo section in separate file bookinfo.xml.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 97cc3d4..92cfe7c 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,8 +1,9 @@
-## $Id: Makefile.am,v 1.60 2005-08-25 12:44:24 adam Exp $
+## $Id: Makefile.am,v 1.61 2005-10-15 10:40:37 adam Exp $
 
 docdir=$(datadir)/doc/@PACKAGE@
 
-XMLFILES=yaz.xml.in introduction.xml installation.xml indexdata.xml \
+XMLFILES=yaz.xml.in bookinfo.xml introduction.xml installation.xml \
+ indexdata.xml \
  asn.xml tools.xml odr.xml comstack.xml frontend.xml license.xml \
  future.xml client.xml zoom.xml credits.xml gfs-options.xml \
  yaz-client-commands.xml soap.xml gfs-virtual.xml gfs-synopsis.xml
@@ -32,7 +33,7 @@ REFFILES=yaz-client-man.xml yaz-ztest-man.xml yaz-config-man.xml \
        yaz-man.xml zoomsh-man.xml yaz-asncomp-man.xml \
        yaz-marcdump-man.xml yaz-iconv-man.xml yaz-log-man.xml
 
-SUPPORTFILES=yazhtml.dsl yazprint.dsl tkl.xsl xml.dcl id.eps \
+SUPPORTFILES=entities.ent yazhtml.dsl yazprint.dsl tkl.xsl xml.dcl id.eps \
        apilayer.obj yaz.css
 
 doc_DATA = $(HTMLFILES) yaz.pdf id.png apilayer.png yaz.css

diff --git a/doc/bookinfo.xml b/doc/bookinfo.xml
new file mode 100644 (file)
index 0000000..2a8f0d7
--- /dev/null
+++ b/doc/bookinfo.xml
@@ -0,0 +1,45 @@
+<!-- $Id: bookinfo.xml,v 1.1 2005-10-15 10:40:37 adam Exp $ -->
+ <bookinfo>
+  <title>YAZ User&apos;s Guide and Reference</title>
+  <author><firstname>Sebastian</firstname><surname>Hammer</surname></author>
+  <author><firstname>Adam</firstname><surname>Dickmeiss</surname></author>
+  <author><firstname>Mike</firstname><surname>Taylor</surname></author>
+  <author><firstname>Heikki</firstname><surname>Levanto</surname></author>
+  <copyright>
+   <year>&copyright-year;</year>
+   <holder>Index Data</holder>
+  </copyright>
+  <abstract><simpara>
+    This document is the programmer's guide and reference to the &yaz;
+    package version &version;. &yaz; is a compact toolkit that provides
+    access to the Z39.50 and SRW/SRU protocols, as well as a set of
+    higher-level tools for implementing the server and client
+    roles, respectively.
+    The documentation can be used on its own, or as a reference when
+    looking at the example applications provided with the package.
+   </simpara>
+   <simpara>
+    <inlinemediaobject>
+     <imageobject>
+      <imagedata fileref="id.png" format="PNG"/>
+     </imageobject>
+     <imageobject>
+      <imagedata fileref="id.eps" format="EPS"/>
+     </imageobject>
+    </inlinemediaobject>
+   </simpara></abstract>
+ </bookinfo>
+ <!-- Keep this comment at the end of the file
+ Local variables:
+ mode: sgml
+ sgml-omittag:t
+ sgml-shorttag:t
+ sgml-minimize-attributes:nil
+ sgml-always-quote-attributes:t
+ sgml-indent-step:1
+ sgml-indent-data:t
+ sgml-parent-document: "yaz.xml"
+ sgml-local-catalogs: nil
+ sgml-namecase-general:t
+ End:
+ -->

diff --git a/doc/entities.ent b/doc/entities.ent
new file mode 100644 (file)
index 0000000..c13c0e6
--- /dev/null
+++ b/doc/entities.ent
@@ -0,0 +1,28 @@
+<!-- $Id: entities.ent,v 1.1 2005-10-15 10:40:37 adam Exp $ -->
+<!ENTITY yaz "YAZ">
+<!ENTITY bookinfo SYSTEM "bookinfo.xml">
+<!ENTITY chap-introduction SYSTEM "introduction.xml">
+<!ENTITY chap-installation SYSTEM "installation.xml">
+<!ENTITY chap-zoom SYSTEM "zoom.xml">
+<!ENTITY chap-client SYSTEM "client.xml">
+<!ENTITY chap-asn SYSTEM "asn.xml">
+<!ENTITY chap-soap SYSTEM "soap.xml">
+<!ENTITY chap-tools SYSTEM "tools.xml">
+<!ENTITY chap-odr SYSTEM "odr.xml">
+<!ENTITY chap-comstack SYSTEM "comstack.xml">
+<!ENTITY chap-frontend SYSTEM "frontend.xml">
+<!ENTITY chap-future SYSTEM "future.xml">
+<!ENTITY app-license SYSTEM "license.xml">
+<!ENTITY app-indexdata SYSTEM "indexdata.xml">
+<!ENTITY app-credits SYSTEM "credits.xml">
+<!ENTITY gfs-options SYSTEM "gfs-options.xml">
+<!ENTITY gfs-synopsis SYSTEM "gfs-synopsis.xml">
+<!ENTITY gfs-virtual SYSTEM "gfs-virtual.xml">
+<!ENTITY yaz-client-commands SYSTEM "yaz-client-commands.xml">
+<!ENTITY asn "Z39.50 ASN.1">
+<!ENTITY odr "<acronym>ODR</acronym>">
+<!ENTITY comstack "<acronym>COMSTACK</acronym>">
+<!ENTITY zoom "<acronym>ZOOM</acronym>">
+<!ENTITY gfs-synopsis-app "application">
+<!ENTITY reference-tools-cql-map "<xref linkend='tools.cql.map'/>">
+<!ENTITY copyright-year "1995-2005">

diff --git a/doc/yaz.xml.in b/doc/yaz.xml.in
index 80cf698..70752d9 100644 (file)
--- a/doc/yaz.xml.in
+++ b/doc/yaz.xml.in
@@ -1,66 +1,14 @@
 <?xml version="1.0" standalone="no"?>
-<!-- $Id: yaz.xml.in,v 1.18 2005-06-29 22:52:54 adam Exp $ -->
+<!-- $Id: yaz.xml.in,v 1.19 2005-10-15 10:40:37 adam Exp $ -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4//EN"
           "@DTD_DIR@/docbookx.dtd" [
-     <!ENTITY yaz "YAZ">
-     <!ENTITY chap-introduction SYSTEM "introduction.xml">
-     <!ENTITY chap-installation SYSTEM "installation.xml">
-     <!ENTITY chap-zoom SYSTEM "zoom.xml">
-     <!ENTITY chap-client SYSTEM "client.xml">
-     <!ENTITY chap-asn SYSTEM "asn.xml">
-     <!ENTITY chap-soap SYSTEM "soap.xml">
-     <!ENTITY chap-tools SYSTEM "tools.xml">
-     <!ENTITY chap-odr SYSTEM "odr.xml">
-     <!ENTITY chap-comstack SYSTEM "comstack.xml">
-     <!ENTITY chap-frontend SYSTEM "frontend.xml">
-     <!ENTITY chap-future SYSTEM "future.xml">
-     <!ENTITY app-license SYSTEM "license.xml">
-     <!ENTITY app-indexdata SYSTEM "indexdata.xml">
-     <!ENTITY app-credits SYSTEM "credits.xml">
-     <!ENTITY gfs-options SYSTEM "gfs-options.xml">
-     <!ENTITY gfs-synopsis SYSTEM "gfs-synopsis.xml">
-     <!ENTITY gfs-virtual SYSTEM "gfs-virtual.xml">
-     <!ENTITY yaz-client-commands SYSTEM "yaz-client-commands.xml">
-     <!ENTITY asn "Z39.50 ASN.1">
-     <!ENTITY odr "<acronym>ODR</acronym>">
-     <!ENTITY comstack "<acronym>COMSTACK</acronym>">
-     <!ENTITY zoom "<acronym>ZOOM</acronym>">
-     <!ENTITY gfs-synopsis-app "application">
-     <!ENTITY reference-tools-cql-map "<xref linkend='tools.cql.map'/>">
-     <!ENTITY copyright-year "1995-2005">
+     <!ENTITY version "@VERSION@">
+
+     <!ENTITY % entities  SYSTEM "entities.ent">
+     %entities;
 ]>
 <book id="yaz">
- <bookinfo>
-  <title>YAZ User&apos;s Guide and Reference</title>
-  <author><firstname>Sebastian</firstname><surname>Hammer</surname></author>
-  <author><firstname>Adam</firstname><surname>Dickmeiss</surname></author>
-  <author><firstname>Mike</firstname><surname>Taylor</surname></author>
-  <author><firstname>Heikki</firstname><surname>Levanto</surname></author>
-  <copyright>
-   <year>&copyright-year;</year>
-   <holder>Index Data</holder>
-  </copyright>
-  <abstract><simpara>
-    This document is the programmer's guide and reference to the &yaz;
-    package version @VERSION@. &yaz; is a compact toolkit that provides
-    access to the Z39.50 and SRW/SRU protocols, as well as a set of
-    higher-level tools for implementing the server and client
-    roles, respectively.
-    The documentation can be used on its own, or as a reference when
-    looking at the example applications provided with the package.
-   </simpara>
-   <simpara>
-    <inlinemediaobject>
-     <imageobject>
-      <imagedata fileref="id.png" format="PNG"/>
-     </imageobject>
-     <imageobject>
-      <imagedata fileref="id.eps" format="EPS"/>
-     </imageobject>
-    </inlinemediaobject>
-   </simpara></abstract>
- </bookinfo>
- 
+ &bookinfo; 
  &chap-introduction;
  &chap-installation;
  &chap-zoom;