[project @ 2002-02-13 19:43:46 by sof]

Use SGML_CATALOG_FILES, if defined

diff --git a/glafp-utils/docbook/db2dvi.dir/db2dvi.sh b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
index dc847cc..e0c8288 100644 (file)
--- a/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
+++ b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
@@ -1,8 +1,12 @@
-if [ ! -f "$DOCBOOK_CATALOG" ] ; then
+if [ ! -f "$DOCBOOK_CATALOG" ] && [ ! -f "$SGML_CATALOG_FILES" ] ; then
   echo "CATALOG file not set up; see installation guide for details."
   exit 1
 fi
 
+if [ -f "$DOCBOOK_CATALOG" ] ; then
+  CATALOG_OPTION=-c $DOCBOOK_CATALOG
+fi
+
 # Dave Mason's option to specify a different stylesheet
 case $1 in
     -d) DB_STYLESHEET=$2
@@ -35,7 +39,7 @@ echo OUTPUT FILE NAME IS $output
 
 TMPFN=`echo $1 | sed 's/\.sgml//'`
 
-$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex -c $DOCBOOK_CATALOG $1
+$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex $CATALOG_OPTION $1
 
 jadetex ${TMPFN}.tex
 

diff --git a/glafp-utils/docbook/db2html.dir/db2html.sh b/glafp-utils/docbook/db2html.dir/db2html.sh
index 1dc46b6..e5be4d6 100644 (file)
--- a/glafp-utils/docbook/db2html.dir/db2html.sh
+++ b/glafp-utils/docbook/db2html.dir/db2html.sh
@@ -1,8 +1,12 @@
-if [ ! -f "$DOCBOOK_CATALOG" ] ; then
+if [ ! -f "$DOCBOOK_CATALOG" ] && [ ! -f "$SGML_CATALOG_FILES" ] ; then
   echo "CATALOG file not set up; see installation guide for details."
   exit 1
 fi
 
+if [ -f "$DOCBOOK_CATALOG" ] ; then
+  CATALOG_OPTION=-c $DOCBOOK_CATALOG
+fi
+
 HTML_STYLESHEET=$HTML_DIR/html/docbook.css
 ADMON_GRAPHICS=$HTML_DIR/html/images/*.gif
 
@@ -53,10 +57,10 @@ mkdir $TMPDIR
 SAVE_PWD=`pwd`
 if [ $1 = `basename $1` ]; then
   echo "working on ../$1"
-  (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html -c $DOCBOOK_CATALOG ../$1; cd $SAVE_PWD)
+  (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html $CATALOG_OPTION ../$1; cd $SAVE_PWD)
 else
   echo "working on $1"
-  (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html -c $DOCBOOK_CATALOG $1; cd $SAVE_PWD)
+  (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html $CATALOG_OPTION $1; cd $SAVE_PWD)
 fi
 
 if [ $# -eq 1 ]

diff --git a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
index 82d6798..a5478aa 100644 (file)
--- a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
+++ b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
@@ -1,8 +1,12 @@
-if [ ! -f "$DOCBOOK_CATALOG" ] ; then
+if [ ! -f "$DOCBOOK_CATALOG" ] && [ ! -f "$SGML_CATALOG_FILES" ] ; then
   echo "CATALOG file not set up; see installation guide for details."
   exit 1
 fi
 
+if [ -f "$DOCBOOK_CATALOG" ] ; then
+  CATALOG_OPTION=-c $DOCBOOK_CATALOG
+fi
+
 # Dave Mason's option to specify a different stylesheet
 case $1 in
     -d) DB_STYLESHEET=$2
@@ -31,7 +35,7 @@ then
   fi
 fi
 
-$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${output}.tex -c $DOCBOOK_CATALOG $1
+$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${output}.tex $CATALOG_OPTION $1
 
 jadetex ${output}
 

diff --git a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
index 9ed7e8f..3b32894 100644 (file)
--- a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
+++ b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
@@ -1,8 +1,12 @@
-if [ ! -f "$DOCBOOK_CATALOG" ] ; then
+if [ ! -f "$DOCBOOK_CATALOG" ] && [ ! -f "$SGML_CATALOG_FILES" ] ; then
   echo "CATALOG file not set up; see installation guide for details."
   exit 1
 fi
 
+if [ -f "$DOCBOOK_CATALOG" ] ; then
+  CATALOG_OPTION=-c $DOCBOOK_CATALOG
+fi
+
 output=db2rtf.rtf
 
 # Dave Mason's option to specify a different stylesheet
@@ -33,7 +37,7 @@ then
   fi
 fi
 
-cat $* | $JADE -t rtf -d ${DB_STYLESHEET}\#print -c $DOCBOOK_CATALOG
+cat $* | $JADE -t rtf -d ${DB_STYLESHEET}\#print $CATALOG_OPTION
 
 if [ $# -eq 1 ]
 then