From fff5e8fe24000a12efe046e2bab4057a5512ec74 Mon Sep 17 00:00:00 2001
From: fotis <fotis@unknown>
Date: Tue, 29 Feb 2000 09:41:19 +0000
Subject: [PATCH] to utilize the Xalan parser rather than XT for autogeneration
 of the various Java files (submitted by Sean Timm)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193279 13f79535-47bb-0310-9956-ffa450edef68
---
 Makefile                           |   7 +-
 Makefile.rules                     |   4 +-
 src/codegen/code-point-mapping.xsl |  33 ++++----
 src/codegen/font-file.xsl          |  49 ++++++-----
 src/codegen/properties.xsl         | 127 +++++++++++++++--------------
 5 files changed, 119 insertions(+), 101 deletions(-)

diff --git a/Makefile b/Makefile
index 8a22c526b..6c9a54505 100644
--- a/Makefile
+++ b/Makefile
@@ -88,13 +88,13 @@ $(GENDIR):
 	mkdir -p $(GENDIR)/org/apache/fop/render/pdf/fonts;
 
 properties: $(PROPERTIESXML) $(PROPERTIESXSL)
-	cd $(GENDIR) && $(XT) ../$(PROPERTIESXML) ../$(PROPERTIESXSL)
+	cd $(GENDIR) && $(XALAN) -IN ../$(PROPERTIESXML) -XSL ../$(PROPERTIESXSL)
 
 charlist: $(CHARLISTXML) $(CHARLISTXSL)
-	cd $(GENDIR) && $(XT) ../$(CHARLISTXML) ../$(CHARLISTXSL)
+	cd $(GENDIR) && $(XALAN) -IN ../$(CHARLISTXML) -XSL ../$(CHARLISTXSL)
 
 fonts: $(FONTXML) $(FONTXSL)
-	cd $(GENDIR) && for font in $(FONTXML) ; do $(XT) ../$$font ../$(FONTXSL) ; done
+	cd $(GENDIR) && for font in $(FONTXML) ; do $(XALAN) -IN ../$$font -XSL ../$(FONTXSL) ; done
 
 docs: all $(APIDOCDIR) 
 	$(JAVADOC) $(JAVADOC_ARGS) $(PACKAGES)
@@ -130,3 +130,4 @@ $(TARGETS:%=%subs): %subs :
 		(cd $$dir && pwd && $(MAKE) $(MFLAGS) $*) || exit 1 ; \
 	done
 
+
diff --git a/Makefile.rules b/Makefile.rules
index 2826a757b..6fc79344c 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -15,7 +15,8 @@ FIND=find
 TAR=tar
 JAR=jar
 
-XT=${JAVA} com.jclark.xsl.sax.Driver
+#XT=${JAVA} com.jclark.xsl.sax.Driver
+XALAN=${JAVA} org.apache.xalan.xslt.Process
 
 JAVADOC = javadoc
 JAVADOC_ARGS = -overview $(BASEDIR)/src/overview.html -sourcepath "$(BASEDIR)/src;$(BASEDIR)/generated" -classpath "$(BASEDIR)/src;$(BASEDIR)/generated;$(CLASSPATH)" -d $(APIDOCDIR)
@@ -26,3 +27,4 @@ TARGETS = all clean clobber
 
 .java.class:
 	$(JAVAC) $(JAVAC_ARGS) $<
+
diff --git a/src/codegen/code-point-mapping.xsl b/src/codegen/code-point-mapping.xsl
index 7c45b0fea..c972aed2e 100644
--- a/src/codegen/code-point-mapping.xsl
+++ b/src/codegen/code-point-mapping.xsl
@@ -1,19 +1,24 @@
-<transform xmlns="http://www.w3.org/1999/XSL/Transform"
- xmlns:xt="http://www.jclark.com/xt" extension-element-prefixes="xt"
- version="1.0">
-<template match="font-mappings">
-<xt:document href="org/apache/fop/render/pdf/CodePointMapping.java" method="text">
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:lxslt="http://xml.apache.org/xslt"
+                xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
+                extension-element-prefixes="redirect">
+<xsl:output method="text" />
+
+<xsl:template match="font-mappings">
+<redirect:write file="org/apache/fop/render/pdf/CodePointMapping.java">
 package org.apache.fop.render.pdf;
 
 public class CodePointMapping {
-	public static char[] map;
+        public static char[] map;
 
-	static {
-		map = new char[65536];
-<for-each select="map[@unicode!='-1' and @win-ansi!='-1']">		map[<value-of select="@unicode"/>] = <value-of select="@win-ansi"/>;
-</for-each>
-	}
+        static {
+                map = new char[65536];
+<xsl:for-each select="map[@unicode!='-1' and @win-ansi!='-1']">             map[<xsl:value-of select="@unicode"/>] = <xsl:value-of select="@win-ansi"/>;
+</xsl:for-each>
+        }
 }
-</xt:document>
-</template>
-</transform>
+</redirect:write>
+</xsl:template>
+</xsl:stylesheet>
+
diff --git a/src/codegen/font-file.xsl b/src/codegen/font-file.xsl
index b72fa5fc9..4bba5933f 100644
--- a/src/codegen/font-file.xsl
+++ b/src/codegen/font-file.xsl
@@ -1,26 +1,30 @@
-<transform xmlns="http://www.w3.org/1999/XSL/Transform"
- xmlns:xt="http://www.jclark.com/xt" extension-element-prefixes="xt"
- version="1.0">
-<template match="font-metrics">
-<variable name="class-name" select="class-name"/>
-<xt:document method="text" href="org/apache/fop/render/pdf/fonts/{$class-name}.java">
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:lxslt="http://xml.apache.org/xslt"
+                xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
+                extension-element-prefixes="redirect">
+<xsl:output method="text" />
+
+<xsl:template match="font-metrics">
+<xsl:variable name="class-name" select="class-name"/>
+<redirect:write select="concat('org/apache/fop/render/pdf/fonts/', $class-name, '.java')">
 package org.apache.fop.render.pdf.fonts;
 
 import org.apache.fop.render.pdf.Font;
 
-public class <value-of select="class-name"/> extends Font {
-    private final static String fontName = "<value-of select="font-name"/>";
-    private final static String encoding = "<value-of select="encoding"/>";
-    private final static int capHeight = <value-of select="cap-height"/>;
-    private final static int xHeight = <value-of select="x-height"/>;
-    private final static int ascender = <value-of select="ascender"/>;
-    private final static int descender = <value-of select="descender"/>;
+public class <xsl:value-of select="class-name"/> extends Font {
+    private final static String fontName = "<xsl:value-of select="font-name"/>";
+    private final static String encoding = "<xsl:value-of select="encoding"/>";
+    private final static int capHeight = <xsl:value-of select="cap-height"/>;
+    private final static int xHeight = <xsl:value-of select="x-height"/>;
+    private final static int ascender = <xsl:value-of select="ascender"/>;
+    private final static int descender = <xsl:value-of select="descender"/>;
     private final static int[] width;
 
     static {
         width = new int[256];
-<for-each select="widths/char"><variable name="char-name" select="@name"/><variable name="char-num" select="document('charlist.xml')/font-mappings/map[@adobe-name=$char-name]/@win-ansi"/><if test="$char-num!='-1'">        width[<value-of select="$char-num"/>] = <value-of select="@width"/>;
-</if></for-each>
+<xsl:for-each select="widths/char"><xsl:variable name="char-name" select="@name"/><xsl:variable name="char-num" select="document('charlist.xml')/font-mappings/map[@adobe-name=$char-name]/@win-ansi"/><xsl:if test="$char-num!='-1'">        width[<xsl:value-of select="$char-num"/>] = <xsl:value-of select="@width"/>;
+</xsl:if></xsl:for-each>
     }
 
     public String encoding() {
@@ -32,25 +36,26 @@ public class <value-of select="class-name"/> extends Font {
     }
 
     public int getAscender() {
-	return ascender;
+        return ascender;
     }
 
     public int getCapHeight() {
-	return capHeight;
+        return capHeight;
     }
 
     public int getDescender() {
-	return descender;
+        return descender;
     }
 
     public int getXHeight() {
-	return xHeight;
+        return xHeight;
     }
 
     public int width(int i) {
         return width[i];
     }
 }
-</xt:document>
-</template>
-</transform>
+</redirect:write>
+</xsl:template>
+</xsl:stylesheet>
+
diff --git a/src/codegen/properties.xsl b/src/codegen/properties.xsl
index a48135b77..6bb33db5c 100644
--- a/src/codegen/properties.xsl
+++ b/src/codegen/properties.xsl
@@ -1,128 +1,132 @@
-<transform xmlns="http://www.w3.org/1999/XSL/Transform"
- xmlns:xt="http://www.jclark.com/xt" element-prefixes="xt"
- version="1.0">
-<template match="property" priority="-1">
-<variable name="classname" select="class-name"/>
-<xt:document method="text" href="org/apache/fop/fo/properties/{$classname}.java">
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:lxslt="http://xml.apache.org/xslt"
+                xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
+                extension-element-prefixes="redirect">
+<xsl:output method="text" />
+
+<xsl:template match="property" priority="-1">
+<xsl:variable name="classname" select="class-name"/>
+<redirect:write select="concat('org/apache/fop/fo/properties/', $classname, '.java')">
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.*;
 import org.apache.fop.fo.*;
 import org.apache.fop.apps.FOPException;
 
-public class <value-of select="class-name"/> extends Property {
+public class <xsl:value-of select="class-name"/> extends Property {
 
   public static class Maker extends Property.Maker {
-    public boolean isInherited() { return <value-of select="inherited"/>; }
+    public boolean isInherited() { return <xsl:value-of select="inherited"/>; }
 
     public Property make(PropertyList propertyList, String value) throws FOPException {
-<choose>
-<when test="make">
-      <variable name="datatype" select="datatype"/>
-      <value-of select="$datatype"/> v;
-<if test="make/to-double">
+<xsl:choose>
+<xsl:when test="make">
+      <xsl:variable name="datatype" select="datatype"/>
+      <xsl:value-of select="$datatype"/> v;
+<xsl:if test="make/to-double">
       double d = toDouble(value);
-</if>
-<for-each select="make/if">
-      if (value.equals("<value-of select="@match"/>")) {
-        v = new <value-of select="$datatype"/>(<value-of select="."/>);
+</xsl:if>
+<xsl:for-each select="make/if">
+      if (value.equals("<xsl:value-of select="@match"/>")) {
+        v = new <xsl:value-of select="$datatype"/>(<xsl:value-of select="."/>);
       }
-</for-each>
-<for-each select="make/else-if-number">
+</xsl:for-each>
+<xsl:for-each select="make/else-if-number">
       else if (!Double.isNaN(d)) {
-        v = new <value-of select="$datatype"/>( <value-of select="."/>);
+        v = new <xsl:value-of select="$datatype"/>( <xsl:value-of select="."/>);
       }
-</for-each>
+</xsl:for-each>
       else {
-        v = new <value-of select="datatype"/>(<value-of select="make/else"/>);
+        v = new <xsl:value-of select="datatype"/>(<xsl:value-of select="make/else"/>);
       }
-      return new <value-of select="class-name"/>(propertyList, v);
-</when>
-<otherwise>
-      return new <value-of select="class-name"/>(propertyList, new <value-of select="datatype"/>(value));
-</otherwise>
-</choose>
+      return new <xsl:value-of select="class-name"/>(propertyList, v);
+</xsl:when>
+<xsl:otherwise>
+      return new <xsl:value-of select="class-name"/>(propertyList, new <xsl:value-of select="datatype"/>(value));
+</xsl:otherwise>
+</xsl:choose>
     }
 
     public Property make(PropertyList propertyList) throws FOPException {
-      return make(propertyList, "<value-of select="default"/>");
+      return make(propertyList, "<xsl:value-of select="default"/>");
     }
   }
 
   public static Property.Maker maker() {
-    return new <value-of select="class-name"/>.Maker();
+    return new <xsl:value-of select="class-name"/>.Maker();
   }
 
-  private <value-of select="datatype"/> value;
+  private <xsl:value-of select="datatype"/> value;
 
-  public <value-of select="class-name"/>(PropertyList propertyList, <value-of select="datatype"/> explicitValue) {
+  public <xsl:value-of select="class-name"/>(PropertyList propertyList, <xsl:value-of select="datatype"/> explicitValue) {
     this.propertyList = propertyList;
     this.value = explicitValue;
   }
 
-  public <value-of select="datatype"/> get<value-of select="datatype"/>() {
+  public <xsl:value-of select="datatype"/> get<xsl:value-of select="datatype"/>() {
     return this.value;
   }
 
 }
-</xt:document>
-</template>
+</redirect:write>
+</xsl:template>
 
-<template match="property[datatype/enumeration]">
-<variable name="classname" select="class-name"/>
-<xt:document method="text" href="org/apache/fop/fo/properties/{$classname}.java">
+<xsl:template match="property[datatype/enumeration]">
+<xsl:variable name="classname" select="class-name"/>
+<redirect:write select="concat('org/apache/fop/fo/properties/', $classname, '.java')">
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.*;
 import org.apache.fop.fo.*;
 import org.apache.fop.apps.FOPException;
 
-public class <value-of select="class-name"/> extends Property {
-<for-each select="datatype/enumeration/value">
-  public final static int <value-of select="@const"/> = <number/>;</for-each>
+public class <xsl:value-of select="class-name"/> extends Property {
+<xsl:for-each select="datatype/enumeration/value">
+  public final static int <xsl:value-of select="@const"/> = <xsl:number/>;</xsl:for-each>
 
   public static class Maker extends Property.Maker {
-    public boolean isInherited() { return <value-of select="inherited"/>; }
+    public boolean isInherited() { return <xsl:value-of select="inherited"/>; }
 
     public Property make(PropertyList propertyList, String value) throws FOPException {
       int v;
-      <for-each select="datatype/enumeration/value">
-      if (value.equals("<value-of select="."/>")) { v = <value-of select="@const"/>; }
-      else</for-each>
+      <xsl:for-each select="datatype/enumeration/value">
+      if (value.equals("<xsl:value-of select="."/>")) { v = <xsl:value-of select="@const"/>; }
+      else</xsl:for-each>
       {
-        System.err.println("WARNING: Unknown value for <value-of select="name"/>: " + value);
-        return make(propertyList, "<value-of select="default"/>");
+        System.err.println("WARNING: Unknown value for <xsl:value-of select="name"/>: " + value);
+        return make(propertyList, "<xsl:value-of select="default"/>");
       }
-      return new <value-of select="class-name"/>(propertyList, v);
+      return new <xsl:value-of select="class-name"/>(propertyList, v);
     }
 
     public Property make(PropertyList propertyList) throws FOPException {
-      return make(propertyList, "<value-of select="default"/>");
+      return make(propertyList, "<xsl:value-of select="default"/>");
     }
-    <if test="derive">
+    <xsl:if test="derive">
     public Property compute(PropertyList propertyList) {
       Property computedProperty = null;
-      Property correspondingProperty = propertyList.get("<value-of select="derive/@from"/>");
+      Property correspondingProperty = propertyList.get("<xsl:value-of select="derive/@from"/>");
       if (correspondingProperty != null) {
         int correspondingValue = correspondingProperty.getEnum();
-        <for-each select="derive/if">
-        if (correspondingValue == <value-of select="@match"/>)
-          computedProperty = new <value-of select="$classname"/>(propertyList, <value-of select="."/>);
-        else</for-each>
+        <xsl:for-each select="derive/if">
+        if (correspondingValue == <xsl:value-of select="@match"/>)
+          computedProperty = new <xsl:value-of select="$classname"/>(propertyList, <xsl:value-of select="."/>);
+        else</xsl:for-each>
         ;
       }
       return computedProperty;
     }
-    </if>
+    </xsl:if>
   }
 
   public static Property.Maker maker() {
-    return new <value-of select="class-name"/>.Maker();
+    return new <xsl:value-of select="class-name"/>.Maker();
   }
 
   private int value;
 
-  public <value-of select="class-name"/>(PropertyList propertyList, int explicitValue) {
+  public <xsl:value-of select="class-name"/>(PropertyList propertyList, int explicitValue) {
     this.propertyList = propertyList;
     this.value = explicitValue;
   }
@@ -132,6 +136,7 @@ public class <value-of select="class-name"/> extends Property {
   }
 
 }
-</xt:document>
-</template>
-</transform>
+</redirect:write>
+</xsl:template>
+</xsl:stylesheet>
+
-- 
2.39.5