xorg-sgml-doctools: Changes to 'debian-unstable'
ChangeLog | 86 ++++++++++
Makefile.am | 8
README | 133 +++++++++++++++
configure.ac | 68 ++++----
debian/changelog | 15 +
debian/compat | 2
debian/control | 9 -
debian/patches/series | 1
debian/rules | 93 -----------
masterdb/.gitignore | 4
masterdb/Makefile.am | 26 +++
masterdb/masterdb.xml | 422 ++++++++++++++++++++++++++++++++++++++++++++++++++
xorg-fo.xsl | 87 ++++++++++
xorg-xhtml.xsl | 51 ++++++
xorg.xsl | 1
15 files changed, 879 insertions(+), 127 deletions(-)
New commits:
commit 79b567ce221ba6459b17a7465756635b63a4be55
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 30 19:01:56 2011 +0200
Get rid of (removed) --enable-man-pages configure flag.
diff --git a/debian/changelog b/debian/changelog
index 396a8cd..30b1bef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xorg-sgml-doctools (1:1.7-1) UNRELEASED; urgency=low
- Use dh-autoreconf.
- Use quilt (so that we're ready to patch if needed).
- Pass --fail-missing to dh_install for additional safety.
+ * Get rid of (removed) --enable-man-pages configure flag.
-- Cyril Brulebois <kibi@debian.org> Wed, 30 Mar 2011 18:40:46 +0200
diff --git a/debian/rules b/debian/rules
index 22070c0..48375b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
#!/usr/bin/make -f
-override_dh_auto_configure:
- dh_auto_configure -- --enable-man-pages=3
-
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
commit 50ad833cae40a5ba04d56d28e15c9abbd299a6c3
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 30 18:51:20 2011 +0200
Switch to dh.
diff --git a/debian/changelog b/debian/changelog
index 6f7508c..396a8cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ xorg-sgml-doctools (1:1.7-1) UNRELEASED; urgency=low
- Add support for docbook external references.
* Bump xutils-dev build-dep for new macros.
* Update Uploaders list. Thanks, David!
+ * Switch to dh:
+ - Bump compat to 8.
+ - Use dh-autoreconf.
+ - Use quilt (so that we're ready to patch if needed).
+ - Pass --fail-missing to dh_install for additional safety.
-- Cyril Brulebois <kibi@debian.org> Wed, 30 Mar 2011 18:40:46 +0200
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index ba523b4..5bf1ea9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,10 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8),
+ dh-autoreconf,
+ quilt,
pkg-config,
- automake,
xutils-dev (>= 1:7.5+4),
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/doc/xorg-sgml-doctools
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fdffa2a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# placeholder
diff --git a/debian/rules b/debian/rules
index a160624..22070c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,89 +1,15 @@
#!/usr/bin/make -f
-# debian/rules for the Debian xorg-sgml-doctools package.
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
-# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
-# Copyright © 2005 David Nusinow <dnusinow@debian.org>
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-man-pages=3
-# set this to the name of the main shlib's binary package
-PACKAGE = xorg-sgml-doctools
+# Install in debian/tmp to retain control through dh_install:
+override_dh_auto_install:
+ dh_auto_install --destdir=debian/tmp
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+# Forget no-one:
+override_dh_install:
+ dh_install --fail-missing
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
- confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-confflags += --enable-man-pages=3
-
-build: build-stamp
-build-stamp:
- dh_testdir
- autoreconf -vfi
- mkdir -p build
- cd build && \
- ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)"
- cd build && $(MAKE)
- >$@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- rm -f config.cache config.log config.status
- rm -f */config.cache */config.log */config.status
- rm -f conftest* */conftest*
- rm -rf autom4te.cache */autom4te.cache
- rm -rf build
- rm -f aclocal.m4 configure config.guess config.sub install-sh missing
- find -name Makefile.in -delete
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# Nothing to do
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
-
- dh_installdocs
- dh_install --sourcedir=debian/tmp
- dh_installchangelogs
- dh_link
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_shlibdeps
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+ dh $@ --with quilt,autoreconf --builddirectory=build
commit 645f72ee580f446ed8f391a9f347373a3715bf4f
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 30 18:44:24 2011 +0200
Update Uploaders list. Thanks, David!
diff --git a/debian/changelog b/debian/changelog
index f17fae1..6f7508c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-sgml-doctools (1:1.7-1) UNRELEASED; urgency=low
* New upstream release:
- Add support for docbook external references.
* Bump xutils-dev build-dep for new macros.
+ * Update Uploaders list. Thanks, David!
-- Cyril Brulebois <kibi@debian.org> Wed, 30 Mar 2011 18:40:46 +0200
diff --git a/debian/control b/debian/control
index 51b6f9f..ba523b4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xorg-sgml-doctools
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit 7c2ddab187a276997dcd1415cda90c69bff4d644
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 30 18:43:56 2011 +0200
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index fea75af..f17fae1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-sgml-doctools (1:1.7-1) UNRELEASED; urgency=low
* New upstream release:
- Add support for docbook external references.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <kibi@debian.org> Wed, 30 Mar 2011 18:40:46 +0200
diff --git a/debian/control b/debian/control
index d0ff713..51b6f9f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
automake,
- xutils-dev (>= 1:7.5~),
+ xutils-dev (>= 1:7.5+4),
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/doc/xorg-sgml-doctools
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/doc/xorg-sgml-doctools.git
commit f04dd6f8923f085b9d7c911b02f917376f72a29d
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 30 18:41:08 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 1e2386c..3f68b7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,89 @@
+commit db2672910d75780b0c3bd9d1b85707f61c74f6f1
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Mar 23 17:45:07 2011 -0400
+
+ Version bump: 1.7
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 93238ddbeabef3b131cae48d3f35e9f541ec545b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Mar 2 09:06:04 2011 -0500
+
+ DocBook/XML: add support for docbook external references
+
+ Documents external references
+ -----------------------------
+ A new feature with version 1.7 is references to documents in other
+ packages. For example a protocol specifications may refer to another
+ one or to a library implementing it.
+
+ This feature works with PDF, HTML, PS (and epub?) generated documents
+ and will generate links to the other versions of the same type, i.e. html
+ docs will link to other html docs, and pdf docs will link to other pdf
+ docs.
+
+ New: generating target databases
+ --------------------------------
+ All documents will generate a target db, analogous to a symbol table
+ which will be consulted by other documents to find linking information.
+ This is accomplished with xsltproc.
+
+ New: consulting target databases
+ --------------------------------
+ While documents are being converted from xml to html/pdf/ps,
+ they will consult the target dbs of each document they which to refer to.
+ This is accomplished with xmlto.
+
+ New: master database
+ --------------------
+ A hand written database has been created which provides an association
+ between the target dbs and the document themselves. It also reflects
+ the hierarchical structure of the documents relative to the installation dir.
+
+ New: xorg-xhtml.xsl and xorg-fo.xsl
+ -----------------------------------
+ A number of motivations are behind the new (and split) versions of xorg.xsl.
+ This module must remain backward compatible to build previous versions
+ of documentation. It was originally designed a while ago for sgml.
+ Given that all documents makefile had to change, it seemed a good opportunity
+ to break from the past. Among the differences:
+
+ The location of xorg.css is no longer set in the stylesheet.
+ The chunked html is no longer supported.
+ The html and fo parameters are kept separate.
+ Additional parameters for external references.
+ Now allows different values for html/fo xsl for the same parameter
+ should that be required.
+ The xorg-xhtml.xsl imports html/docbook.xsl
+ The xorg-fo.xsl imports fo/docbook.xsl
+
+ Co-authored-by: Matt Dew <marcoz@osource.org>
+
+ Acked-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 3d6307d418c694b103e8589c1911c053928ae033
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Feb 1 09:23:33 2011 -0500
+
+ config: comment, minor upgrade, quote and layout configure.ac
+
+ Group statements per section as per Autoconf standard layout
+ Quote statements where appropriate.
+ Autoconf recommends not using dnl instead of # for comments
+
+ Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
+ Add AC_CONFIG_SRCDIR([Makefile.am]) where missing
+ Update minimum version of util-macros to at least 1.8.
+
+ No functional configuration changes
+
+ This helps automated maintenance and release activities.
+ Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit 70a4707cd1114e6caa99f2b7787bc949f34cae3a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Dec 18 20:52:53 2010 -0800
diff --git a/debian/changelog b/debian/changelog
index 6a23ace..fea75af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-sgml-doctools (1:1.7-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - Add support for docbook external references.
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 30 Mar 2011 18:40:46 +0200
+
xorg-sgml-doctools (1:1.6-1) unstable; urgency=low
* New upstream release.
commit db2672910d75780b0c3bd9d1b85707f61c74f6f1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Mar 23 17:45:07 2011 -0400
Version bump: 1.7
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 9f28636..01643d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xorg-sgml-doctools], [1.6],
+AC_INIT([xorg-sgml-doctools], [1.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xorg-sgml-doctools])
AC_CONFIG_SRCDIR([Makefile.am])
commit 93238ddbeabef3b131cae48d3f35e9f541ec545b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Mar 2 09:06:04 2011 -0500
DocBook/XML: add support for docbook external references
Documents external references
-----------------------------
A new feature with version 1.7 is references to documents in other
packages. For example a protocol specifications may refer to another
one or to a library implementing it.
This feature works with PDF, HTML, PS (and epub?) generated documents
and will generate links to the other versions of the same type, i.e. html
docs will link to other html docs, and pdf docs will link to other pdf
docs.
New: generating target databases
--------------------------------
All documents will generate a target db, analogous to a symbol table
which will be consulted by other documents to find linking information.
This is accomplished with xsltproc.
New: consulting target databases
--------------------------------
While documents are being converted from xml to html/pdf/ps,
they will consult the target dbs of each document they which to refer to.
This is accomplished with xmlto.
New: master database
--------------------
A hand written database has been created which provides an association
between the target dbs and the document themselves. It also reflects
the hierarchical structure of the documents relative to the installation dir.
New: xorg-xhtml.xsl and xorg-fo.xsl
-----------------------------------
A number of motivations are behind the new (and split) versions of xorg.xsl.
This module must remain backward compatible to build previous versions
of documentation. It was originally designed a while ago for sgml.
Given that all documents makefile had to change, it seemed a good opportunity
to break from the past. Among the differences:
The location of xorg.css is no longer set in the stylesheet.
The chunked html is no longer supported.
The html and fo parameters are kept separate.
Additional parameters for external references.
Now allows different values for html/fo xsl for the same parameter
should that be required.
The xorg-xhtml.xsl imports html/docbook.xsl
The xorg-fo.xsl imports fo/docbook.xsl
Co-authored-by: Matt Dew <marcoz@osource.org>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index e3fcca5..74fe5cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,9 +19,13 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-sgmldir = $(sgmlrootdir)/X11
+SUBDIRS = masterdb
-dist_sgml_DATA = defs.ent xorg.css xorg.xsl
+dist_sgmlx11_DATA = \
+ defs.ent xorg.css \
+ xorg.xsl \
+ xorg-xhtml.xsl \
+ xorg-fo.xsl
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = xorg-sgml-doctools.pc
diff --git a/README b/README
index 5d60900..07e760b 100644
--- a/README
+++ b/README
@@ -5,6 +5,139 @@ source who want to produce formatted documentation from their builds,
or those who have installed the HTML version of the documentation,
which refers to the included common xorg.css stylesheet.
+Documents external references
+-----------------------------
+A new feature with version 1.7 is references to documents in other
+packages. For example a protocol specifications may refer to another
+one or to a library implementing it.
+
+This feature works with PDF, HTML, PS (and epub?) generated documents
+and will generate links to the other versions of the same type, i.e. html
+docs will link to other html docs, and pdf docs will link to other pdf
+docs.
+
+Due to the modular nature of the X window System and the flexibility
+it provides to O/S builders, one should not expect all links to
+be resolved all the time. A more recent version of a package may be
+installed or an older version may be retained for a long period of time.
+Not all packages are installed either.
+
+Build challenges
+----------------
+The X Window System is composed of over 200 packages. The documentation is
+included with the package it documents so the information matches the code.
+The build is organized to satisfy C code building requirements, but this
+paradigm does not fit very well for building documentation.
+
+For a document to build a reference to another document, it needs to have
+information about this document which may or may not be there, or may be
+at an unexpected version. The document it refers to may also wish to refer
+to the former document.
+
+Local X builds
+--------------
+When building X as a sandbox on a workstation, using a simple build script
+to configure and build all packages in the right order is all you need
+to get a working system, including documentation. You will not get all
+the links in the documentation resolved correctly due to build order
+and/or bi-directional references.
+
+Unless you are updating or testing the documentation, you do not need to
+worry about this glitch. A simple workaround is to build each affected
+package using "make clean install && make clean install" in any order.
+This will give a chance to each package to get information about the other one
+through the installed files.
+
+O/S X builds
+------------
+O/S builders often repackage X code and documentation, however they face the
+same challenges as described above. Users can update packages through
+the package management system or install additional packages. To use the
+earlier example, if a protocol is installed without its implementing
+library there will be a broken reference.
+
+Build assumptions
+-----------------
+Packages provide great flexibility, including the one to install each package
+documentation in a separate, totally unrelated directory using the --docdir
+configure option. For external references to work, it is assumed that
+the each package installs the documentation using the relative
+doc/${PACKAGE_TARNAME} location.
+
+The Docbook stylesheet technology will create references with paths relative
+to this location. It will navigate up to "doc" using ../ and then navigate
+down to the document it refers to.
+
+Diagnosing a broken reference
+-----------------------------
+A document reference is created at build time while the document is being
+transformed from Docbook/XML to HTML or another format. If this reference
+is missing, the document must be rebuilt.
+
+To build the reference, the docbook stylesheet consults a database stored
+in this package which is called masterdb.xml. This database supplies the
+relative directory structure of where the documents are located as well
+as including target document references in the various *.db files.
+These files are generated and installed while the documents are being build.
+
+This is what a Docbook/XML reference from docA to docB looks like (docA.xml):
+<olink targetdoc='docB' targetptr='docBfragment'>Title</olink>
+
+This is what an HTML reference from docA to docB looks like (docA.html):
+<a href="docB.html#docBfragment" class="olink">Title</a>
+
+This is what an HTML targetdoc for docB looks like (docB.html.db):
+<div element="article" href="#docBfragment" number="" targetptr="docBfragment">
+
+This is what an HTML reference from docA to docB looks like (docA.html)
+when the reference cannot be resolved:
+<span class="olink">Title</span>
+
+This can be caused by one or more of the following:
+
+ - docB may not longer contain the text (targetptr) docA is referring to.
+ - docB.html.db file may not have been installed by docB package
+ - masterdb.html.xml is missing a <document/> entry for docB
+ - masterdb.html.xml cannot be loaded so all refs are broken.
+ - an XSLT processor which does not support xinclude is being used
+ - docB.html.db was generated without --xinclude option for the processor
+ - xsltproc is not at version 1.1.26 or later
+ - for PDF/PS formats, the fragment is ignored, always points to top of docB
+
+Some pitfalls
+-------------------------
+<book id="docA"> in docA.xml: the id must match the file basename.
+In xorg-*.xsl, <xsl:param name="current.docid" select="/*/@id"/>
+supplies docid for *.db. The document id must be unique across
+all documents.
+
+The baseuri attribute in masterdb.xml is required for pdf/ps references
+to work. It cannot be replaced with olink.base.uri in the makefile.
+
+The pdf/ps "inside the document" references only started working with
+docbook-xsl v 1.76.1 which is not yet available to your favorite O/S.
+In xorg-fo.xsl, insert.olink.pdf.frag must be set to zero which allows
+the reference to at least point to the top of the document.
+
+XSL toolchain
+-------------
+The following minimum versions are needed for external references to work:
+XSLT processor: 1.1.26
+libxml2: 2.7.6
+libxslt1.1: 1.1.26
+The exact triplet may vary by distribution, sometimes a version is skipped.
+If you are close enough, try it.
+
+References
+----------
+http://docbook.org/tdg/en/html/docbook.html
+http://docbook.sourceforge.net/release/xsl/current/doc/html/
+http://docbook.sourceforge.net/release/xsl/current/doc/fo/
+http://www.sagehill.net/docbookxsl/OlinkPrintOutput.html
+
+
+-------------------------------------------------------------------------------
+
All questions regarding this software should be directed at the
Xorg mailing list:
diff --git a/configure.ac b/configure.ac
index c4b0940..9f28636 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,10 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AC_SUBST([sgmlrootdir],['${datarootdir}/sgml'])
+AC_SUBST([sgmlx11dir],['${sgmlrootdir}/X11'])
+AC_SUBST([sgmldbsdir],['${sgmlx11dir}/dbs'])
AC_CONFIG_FILES([Makefile
+ masterdb/Makefile
xorg-sgml-doctools.pc])
AC_OUTPUT
diff --git a/masterdb/.gitignore b/masterdb/.gitignore
new file mode 100644
index 0000000..f0a77b4
--- /dev/null
+++ b/masterdb/.gitignore
@@ -0,0 +1,4 @@
+masterdb.html.xml
+masterdb.pdf.xml
+masterdb.ps.xml
+masterdb.txt.xml
diff --git a/masterdb/Makefile.am b/masterdb/Makefile.am
new file mode 100644
index 0000000..b967d68
--- /dev/null
+++ b/masterdb/Makefile.am
@@ -0,0 +1,26 @@
+
+master_PRE = masterdb.xml
+sgmldbs_DATA = \
+ $(master_PRE:xml=html.xml) \
+ $(master_PRE:xml=pdf.xml) \
+ $(master_PRE:xml=ps.xml) \
+ $(master_PRE:xml=txt.xml)
+
+EXTRA_DIST = $(master_PRE)
+CLEANFILES = $(sgmldbs_DATA)
+
+%.html.xml: %.xml
+ $(AM_V_GEN)$(SED) -e 's|__ext__|html|g' \
+ -e 's|__db__|html|g' < $< > $@
+
+%.txt.xml: %.xml
+ $(AM_V_GEN)$(SED) -e 's|__ext__|txt|g' \
+ -e 's|__db__|html|g' < $< > $@
+
+%.pdf.xml: %.xml
+ $(AM_V_GEN)$(SED) -e 's|__ext__|pdf|g' \
+ -e 's|__db__|fo|g' < $< > $@
+
+%.ps.xml: %.xml
+ $(AM_V_GEN)$(SED) -e 's|__ext__|ps|g' \
+ -e 's|__db__|fo|g' < $< > $@
diff --git a/masterdb/masterdb.xml b/masterdb/masterdb.xml
new file mode 100644
index 0000000..7480f21
--- /dev/null
+++ b/masterdb/masterdb.xml
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE targetset SYSTEM
+"http://docbook.sourceforge.net/release/xsl/current/common/targetdatabase.dtd"; [
+<!--
+ target database files are text files that contain references to every
+ tag within a file that contains an 'id' attribute. This allows external
+ documents to link directly to those tags. xsltproc will generate a target
+ database for each document.
+
+ The master database files is a list of all
+ target databases within a collection. This allows the xslt processor
+ (xsltproc) to resolve references between documents in the collection.
+
+ Together this creates live/clickable links between documents. The
+ author doesn't have to worry about managing the links. The tool
+ will do it.
+-->
+]
+>
+<targetset>
+ <targetsetinfo>
+This is the X.org document collection. All documentation in X is (should be)
+listed here. This allows crosslinking between documents.
+ </targetsetinfo>
+ <!--
+ The sitemap represent the directory structure of the installed X docs
+ The toplevel directory name "doc" is irrelevant, just being the root node
+ Example of a computed href in an xorg-docs/specs/Xserver pointing to libX11:
+ href="../../../libX11/libX11.html#libX11"
+ The href first "climbs up" to the "doc" dir and then descends into libX11
+
+ The baseuri attribute cannot be replaced with stringparam olink.base.uri "$@"
+ on the command line. It is required by the pdf msterdb for propor linking. Details:
+ http://www.sagehill.net/docbookxsl/OlinkPrintOutput.html
+ -->
+ <sitemap>
+ <dir name="doc">
+ <!-- Libraries -->
+ <dir name="libICE">
+ <document targetdoc="ICElib" baseuri="ICElib.__ext__">
+ <xi:include href="ICElib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="ice" baseuri="ice.__ext__">
+ <xi:include href="ice.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="libSM">
+ <document targetdoc="SMlib" baseuri="SMlib.__ext__">
+ <xi:include href="SMlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="xsmp" baseuri="xsmp.__ext__">
+ <xi:include href="xsmp.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="libX11">
+ <document targetdoc="libX11" baseuri="libX11.__ext__">
+ <xi:include href="libX11.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <dir name="framework">
+ <document targetdoc="framework" baseuri="framework.__ext__">
+ <xi:include href="framework.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="localedb">
+ <document targetdoc="localedb" baseuri="localedb.__ext__">
+ <xi:include href="localedb.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="trans">
+ <document targetdoc="trans" baseuri="trans.__ext__">
+ <xi:include href="trans.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="XIM">
+ <document targetdoc="xim" baseuri="xim.__ext__">
+ <xi:include href="xim.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="XKB">
+ <document targetdoc="xkblib" baseuri="xkblib.__ext__">
+ <xi:include href="xkblib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ </dir>
+ <dir name="libXaw">
+ <document targetdoc="libXaw" baseuri="libXaw.__ext__">
+ <xi:include href="libXaw.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="libXdmcp">
+ <document targetdoc="xdmcp" baseuri="xdmcp.__ext__">
+ <xi:include href="xdmcp.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="libXext">
+ <document targetdoc="dbelib" baseuri="dbelib.__ext__">
+ <xi:include href="dbelib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="dpmslib" baseuri="dpmslib.__ext__">
+ <xi:include href="dpmslib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="shapelib" baseuri="shapelib.__ext__">
+ <xi:include href="shapelib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="synclib" baseuri="synclib.__ext__">
+ <xi:include href="synclib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="xtest1" baseuri="xtest1.__ext__">
+ <xi:include href="xtest1.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="libXi">
+ <document targetdoc="inputlib" baseuri="inputlib.__ext__">
+ <xi:include href="inputlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="porting" baseuri="porting.__ext__">
+ <xi:include href="porting.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="libXmu">
+ <document targetdoc="Xmu" baseuri="Xmu.__ext__">
+ <xi:include href="Xmu.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="libXtst">
+ <document targetdoc="recordlib" baseuri="recordlib.__ext__">
+ <xi:include href="recordlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="xtestlib" baseuri="xtestlib.__ext__">
+ <xi:include href="xtestlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="xtrans">
+ <document targetdoc="xtrans" baseuri="xtrans.__ext__">
+ <xi:include href="xtrans.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <!-- Protocols -->
+ <dir name="bigreqsproto">
+ <document targetdoc="bigreq" baseuri="bigreq.__ext__">
+ <xi:include href="bigreq.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="fontsproto">
+ <document targetdoc="fsproto" baseuri="fsproto.__ext__">
+ <xi:include href="fsproto.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="kbproto">
+ <document targetdoc="xkbproto" baseuri="xkbproto.__ext__">
+ <xi:include href="xkbproto.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="recordproto">
+ <document targetdoc="record" baseuri="record.__ext__">
+ <xi:include href="record.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="scrnsaverproto">
+ <document targetdoc="saver" baseuri="saver.__ext__">
+ <xi:include href="saver.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="xcmiscproto">
+ <document targetdoc="xc-misc" baseuri="xc-misc.__ext__">
+ <xi:include href="xc-misc.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="xextproto">
+ <document targetdoc="appgrp" baseuri="appgrp.__ext__">
+ <xi:include href="appgrp.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="dbe" baseuri="dbe.__ext__">
+ <xi:include href="dbe.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="dpms" baseuri="dpms.__ext__">
+ <xi:include href="dpms.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="evi" baseuri="evi.__ext__">
+ <xi:include href="evi.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="geproto" baseuri="geproto.__ext__">
+ <xi:include href="geproto.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="lbx" baseuri="lbx.__ext__">
+ <xi:include href="lbx.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="multibuf" baseuri="multibuf.__ext__">
+ <xi:include href="multibuf.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="security" baseuri="security.__ext__">
+ <xi:include href="security.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="shape" baseuri="shape.__ext__">
+ <xi:include href="shape.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="shm" baseuri="shm.__ext__">
+ <xi:include href="shm.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="sync" baseuri="sync.__ext__">
+ <xi:include href="sync.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="tog-cup" baseuri="tog-cup.__ext__">
+ <xi:include href="tog-cup.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ <document targetdoc="xtest" baseuri="xtest.__ext__">
+ <xi:include href="xtest.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <dir name="xproto">
+ <document targetdoc="x11protocol" baseuri="x11protocol.__ext__">
+ <xi:include href="x11protocol.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
+ <!-- X.Org System Documentation -->
+ <dir name="xorg-docs">
+ <document targetdoc="License" baseuri="License.__ext__">
+ <xi:include href="License.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
Reply to: