From feaabb524532e3b4486d9e576cc20e36071b771c Mon Sep 17 00:00:00 2001 From: Diego Pettenò Date: Mon, 22 Sep 2008 14:10:17 +0000 Subject: Fix support for other XSL types by further delegating the catalogs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Diego Pettenò --- build-docbook-catalog | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/build-docbook-catalog b/build-docbook-catalog index b304430..d8117f8 100755 --- a/build-docbook-catalog +++ b/build-docbook-catalog @@ -1,5 +1,5 @@ #!/bin/bash -# $Header: /usr/local/src/gentoo/gentoo-src/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.3 2008/09/22 13:43:02 flameeyes Exp $ +# $Header: /usr/local/src/gentoo/gentoo-src/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.4 2008/09/22 14:10:17 flameeyes Exp $ # # build-docbook-catalog: populate /etc/xml/docbook based in # installed docbook-xml-dtd versions. @@ -109,8 +109,6 @@ create_catalogs() { xmlcatalog --noout --add "delegatePublic" "-//OASIS//DTD DocBook XML" "file://${CATALOG}" ${ROOTCATALOG} xmlcatalog --noout --add "delegateSystem" "http://www.oasis-open.org/docbook/" "file://${CATALOG}" ${ROOTCATALOG} xmlcatalog --noout --add "delegateURI" "http://www.oasis-open.org/docbook/" "file://${CATALOG}" ${ROOTCATALOG} - xmlcatalog --noout --add "delegateSystem" "http://docbook.sourceforge.net/release/xsl/" "file://${CATALOG}" ${ROOTCATALOG} - xmlcatalog --noout --add "delegateURI" "http://docbook.sourceforge.net/release/xsl/" "file://${CATALOG}" ${ROOTCATALOG} # entities pointer verb " Populating ${ROOTCATALOG} with ISO entities delegate to ${CATALOG}" @@ -274,16 +272,14 @@ populate_xsl() { # Populate catalog with XSL entries echo "Found DocBook XSL stylesheets (${type}) in ${xsldir}" - verb " Populating ${CATALOG} with XSL stylesheets" - # HACK: This is a totally arbitrary subset, either it should - # be reduced to just current or it should be expanded. - for version in current 1.39 1.40 1.41 1.42 1.43 1.44 1.45 1.46 1.47 \ - 1.48 1.49 1.50 - do - xmlcatalog --noout --add "rewriteSystem" "http://docbook.sourceforge.net/release/${type}/${version}" "file://${xsldir}" ${CATALOG} - xmlcatalog --noout --add "rewriteURI" "http://docbook.sourceforge.net/release/${type}/${version}" "file://${xsldir}" ${CATALOG} - done + verb " Populating ${ROOTCATALOG} with XSL delegations" + xmlcatalog --noout --add "delegateSystem" "http://docbook.sourceforge.net/release/${type}/" "file://${CATALOG}" ${ROOTCATALOG} + xmlcatalog --noout --add "delegateURI" "http://docbook.sourceforge.net/release/${type}/" "file://${CATALOG}" ${ROOTCATALOG} + + verb " Populating ${CATALOG} with XSL stylesheets" + xmlcatalog --noout --add "rewriteSystem" "http://docbook.sourceforge.net/release/${type}/current" "file://${xsldir}" ${CATALOG} + xmlcatalog --noout --add "rewriteURI" "http://docbook.sourceforge.net/release/${type}/current" "file://${xsldir}" ${CATALOG} } # Call the main routine -- cgit v1.2.3-65-gdbad