Support 6.4.3; set the parser explicitly to avoid AElfred bugs

diff --git a/cvstools/saxon b/cvstools/saxon
index 80e37f0ca5d50cbcce01e08d6640ca258a31e4cc..98728d7d5d9f22c114bae86c3d9a72db1f2e66d7 100755 (executable)
--- a/cvstools/saxon
+++ b/cvstools/saxon
@@ -7,7 +7,7 @@
 #
 
 DONE=0
-VERSION=642
+VERSION=643
 DEBUG=0
 JAR=0
 #XARG=""
@@ -28,6 +28,9 @@ while [ "$DONE" = "0" ]; do
                echo "Using jar file for extension classes"
                shift;
                ;;
+       -642)   VERSION=643;
+               shift;
+               ;;
        -642)   VERSION=642;
                shift;
                ;;
@@ -98,6 +101,13 @@ if [ "$OUTPUT" != "" ]; then
 fi
 
 case $VERSION in
+   643)        SAXON="/usr/local/java/saxon-6.4.3/saxon.jar"
+       SAXON_DEBUG="/usr/local/java/saxon-6.4.3/.classes"
+       NDWEXT="/sourceforge/docbook/xsl/extensions/saxon64/.classes";
+       if [ "$JAR" = "1" ]; then
+           NDWEXT="/sourceforge/docbook/xsl/extensions/saxon64.jar"
+       fi
+       ;;
    642)        SAXON="/usr/local/java/saxon-6.4.2/saxon.jar"
        SAXON_DEBUG="/usr/local/java/saxon-6.4.2/.classes"
        NDWEXT="/sourceforge/docbook/xsl/extensions/saxon64/.classes";
@@ -171,9 +181,12 @@ if [ "$DEBUG" = "1" ]; then
 fi
 
 SUN="/projects/sun/resolver/.classes";
-JAXP="/usr/local/jaxp-1.1/jaxp.jar:/usr/local/jaxp-1.1/crimson.jar"
+JAXP="/usr/local/jaxp-1.1/jaxp.jar";
 
-CLASSPATH=$SAXON:$JAXP:$SUN:$NDWEXT:~/java
+XERCESROOT="/projects/apache/xml-xerces/java"
+XERCES="$XERCESROOT/build/classes"
+
+CLASSPATH=$SAXON:$JAXP:$XERCES:$SUN:$NDWEXT:~/java
 
 #echo $CLASSPATH
 
@@ -185,10 +198,16 @@ if [ "$QUIET" = "0" ]; then
   fi
 fi
 
-FACTORY=com.icl.saxon.TransformerFactoryImpl
+TRANSFACTORY=com.icl.saxon.TransformerFactoryImpl
+
+# Force Saxon to use a decent parser (AElfred doesn't do PEs right)
+DBFACTORY=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
+SPFACTORY=org.apache.xerces.jaxp.SAXParserFactoryImpl
 
-java $MEMORY \
+java $MEMORY $FOO \
      -cp $CLASSPATH \
+     -Djavax.xml.parsers.DocumentBuilderFactory=$DBFACTORY \
+     -Djavax.xml.parsers.SAXParserFactory=$SPFACTORY \
      -Djavax.xml.transform.TransformerFactory=$FACTORY \
      com.icl.saxon.StyleSheet \
      $XARG $YARG $RARG $OUTPUT $XMLSRC $XMLSTY $@