- tabs in preamble

[packages/docbook-utils.git] / docbook-utils-catalog.patch

diff --git a/docbook-utils-catalog.patch b/docbook-utils-catalog.patch
index e242058464fbadb5161504fc98f3f83b56c7c64d..baccd602f20aace2204e3fa4cc4fddb2d3934997 100644 (file)
--- a/docbook-utils-catalog.patch
+++ b/docbook-utils-catalog.patch
@@ -1,19 +1,37 @@
-diff -Nur --exclude *~ docbook-utils-0.6.9/bin/jw.in docbook-utils-0.6.9.new/bin/jw.in
---- docbook-utils-0.6.9/bin/jw.in      Wed Mar 21 14:28:22 2001
-+++ docbook-utils-0.6.9.new/bin/jw.in  Sun Dec  9 16:27:14 2001
-@@ -264,14 +264,7 @@
- # Set path to SGML catalogs (first try centralized catalog)
- case $SGML_STANDARD_CATALOGS in
-   yes)        export SGML_CATALOGS_DIR SGML_FILE SGML_XML
--      SGML_CENTRALIZED_CATALOG=`sh $SGML_FRONTEND centralized-catalog`
--      if [ -s $SGML_CENTRALIZED_CATALOG ]
--      then
--        SGML_CATALOG_FILES=$SGML_CENTRALIZED_CATALOG
+--- docbook-utils-0.6.13/frontends/docbook.in.wiget    Sat Nov  2 18:45:10 2002
++++ docbook-utils-0.6.13/frontends/docbook.in  Mon Mar 17 20:16:20 2003
+@@ -6,33 +6,7 @@
+ # Give the location of the centralized catalog
+ # First try the one with a version matching the version that is indicated in the document
+   centralized-catalog)
+-      if [ -n "$SGML_NORM" ]; then
+-        SGML_NORM_OPTS='-d'
 -      else
--        SGML_CATALOG_FILES=`find $SGML_BASE_DIR -name catalog`
--        SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [:space:] :`
+-        SGML_NORM=cat
+-        SGML_NORM_OPTS=
 -      fi
-+        SGML_CATALOG_FILES="${SGML_CATALOGS_DIR}/catalog"
-       ;;
-   no) SGML_CATALOG_FILES=""
+-      SGML_VERSION=`"$SGML_NORM" $SGML_NORM_OPTS -- "$SGML_FILE" 2>/dev/null |
+-                      grep -i '<!DOCTYPE' |
+-                      head -n 1 |
+-                      sed 's/^.*DocBook\( XML\)\? V\([0-9][\.0-9]*\).*$/\2/'`
+-      SGML_CATALOG=
+-      for f in "${SGML_CATALOGS_DIR}/${SGML_XML}-docbook-${SGML_VERSION}"*".cat"
+-      do 
+-        if [ -f "$f" ]
+-        then
+-          SGML_CATALOG=$f
+-          break
+-        fi
+-      done
+-      if [ -z "$SGML_CATALOG" ]
+-      then
+-        if [ "${SGML_XML}" != "sgml" ]
+-        then SGML_CATALOG=${SGML_CATALOGS_DIR}/${SGML_XML}-docbook.cat
+-        else SGML_CATALOG=${SGML_CATALOGS_DIR}/catalog
+-        fi
+-      fi
+-      echo "$SGML_CATALOG"
++      echo "${SGML_CATALOGS_DIR}/catalog"
        ;;
+ # Find a stylesheet on the model "html/docbook.dsl" or "print/docbook.dsl"
+   style-sheet)