--- docbook-utils-0.6.10/bin/jw.in.autover	Mon Apr 15 20:36:15 2002
+++ docbook-utils-0.6.10/bin/jw.in	Tue Jun 11 13:25:22 2002
@@ -293,9 +293,19 @@
 then SGML_DECL=${SGML_BASE_DIR}/xml.dcl
 fi
 
+# Try to find the SGML normalizer
+if [ -z "$SGML_NORM" ]
+then
+  SGML_NORM=`which sgmlnorm 2>/dev/null`
+  if [ -z "SGML_NORM" ]
+  then
+    SGML_NORM=`which osgmlnorm 2>/dev/null`
+  fi
+fi
+
 # Set path to SGML catalogs (first try centralized catalog)
 case $SGML_STANDARD_CATALOGS in
-  yes)	export SGML_CATALOGS_DIR SGML_FILE SGML_XML
+  yes)	export SGML_CATALOGS_DIR SGML_FILE SGML_XML SGML_NORM
 	SGML_CENTRALIZED_CATALOG=`sh $SGML_FRONTEND centralized-catalog`
 	if [ -s $SGML_CENTRALIZED_CATALOG ]
 	then
--- docbook-utils-0.6.10/frontends/docbook.in.autover	Mon Apr 15 20:58:21 2002
+++ docbook-utils-0.6.10/frontends/docbook.in	Tue Jun 11 13:33:23 2002
@@ -6,13 +6,33 @@
 # 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)
-	SGML_VERSION=`grep -i '<!DOCTYPE' $SGML_FILE | head -n 1 | sed 's/\(V[0-9][\.0-9]*\).*$/\1/; s/^.* V\([0-9][\.0-9]*\)/\1/'`
-	if [ -f "${SGML_CATALOGS_DIR}/${SGML_XML}-docbook-${SGML_VERSION}"*".cat" ]
-	then echo "${SGML_CATALOGS_DIR}/${SGML_XML}-docbook-${SGML_VERSION}"*".cat"
-	elif [ "${SGML_XML}" != "sgml" ]
-	then echo "${SGML_CATALOGS_DIR}/${SGML_XML}-docbook.cat"
-	else echo "${SGML_CATALOGS_DIR}/catalog"
+	if [ -n "$SGML_NORM" ]; then
+	  SGML_NORM_OPTS='-d'
+	else
+	  SGML_NORM=cat
+	  SGML_NORM_OPTS=
 	fi
+	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"
 	;;
 # Find a stylesheet on the model "html/docbook.dsl" or "print/docbook.dsl"
   style-sheet)