Changeset 153 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages

Timestamp:

02/29/08 15:07:04 (4 years ago)

Author:

jharrop

Message:

Font replacement in HTML (for PDF output) is now basically working.

Location:

trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages

Files:

• WordprocessingMLPackage.java (modified) (4 diffs)
• wordml2html-2007.xslt (modified) (2 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

@@ -32 +32 @@
 
 import org.apache.log4j.Logger;
+import org.docx4j.fonts.Substituter;
 import org.docx4j.jaxb.Context;
 import org.docx4j.openpackaging.Base;
@@ -210 +211 @@
                 
                 log.info("wordDocument created for PDF rendering!");
-                
-                
-                
+
+/*              
+ *              We want to use plain old Xalan J, not xsltc
+ * 
+ *              Following is not necessary provided Xalan is on the classpath.
+ *                                                                 ==================================
+ * 
+                System.setProperty("javax.xml.transform.TransformerFactory", "FQCN");
+
+                examples of FQCN:
+                
+                  com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
+                  org.apache.xalan.xsltc.trax.TransformerFactoryImpl
+                
+                        
+*/              
                 // Now transform this into XHTML
                 javax.xml.transform.TransformerFactory tfactory = javax.xml.transform.TransformerFactory.newInstance();
@@ -228 +242 @@
                 // Use the template to create a transformer
                 javax.xml.transform.Transformer xformer = template.newTransformer();
-
+                
+                log.error(xformer.getClass().getName() );
+                // com.sun.org.apache.xalan.internal.xsltc.trax.TransformerImpl won't work
+                // with our extension function.
+
+                // Handle fonts - this is platform specific
+                // Algorithm - to be implemented:
+                // 1.  Get a list of all the fonts in the document
+                java.util.Map fontsInUse = this.getMainDocumentPart().fontsInUse();
+                
+                // 2.  For each font, find the closest match on the system (use OO's VCL.xcu to do this)
+                //     - do this in a general way, since docx4all needs this as well to display fonts
+                Substituter s = new Substituter();
+                s.populateFontMappings(fontsInUse);
+                
+                // 3.  Ensure that the font names in the XHTML have been mapped to these matches
+                //     possibly via an extension function in the XSLT
+                xformer.setParameter("substituterInstance", s);
+                
+                
                 //DEBUGGING 
                 // use the identity transform if you want to send wordDocument;
@@ -275 +308 @@
                 // Now render the XHTML
                 org.xhtmlrenderer.pdf.ITextRenderer renderer = new org.xhtmlrenderer.pdf.ITextRenderer();
-                
-                // TODO: Handle fonts
-                // - this is platform specific
-                // Algorithm - to be implemented:
-                // 1.  Get a list of all the fonts in the document
-                // 2.  For each font, find the closest match on the system (use OO's VCL.xcu to do this)
-                //     - do this in a general way, since docx4all needs this as well to display fonts
-                // 3.  Ensure that the font names in the XHTML have been mapped to these matches
-                //     possibly via an extension function in the XSLT
+                                
                 // 4.  Use addFont code like that below as necessary for the fonts
                 

trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/wordml2html-2007.xslt

@@ -25 +25 @@
         xmlns:msxsl="urn:schemas-microsoft-com:xslt"
         xmlns:ext="http://www.xmllab.net/wordml2html/ext"
+        xmlns:java="http://xml.apache.org/xalan/java"
         version="1.0"
-        exclude-result-prefixes="msxsl ext w o v WX aml w10">
-
-
+        exclude-result-prefixes="java msxsl ext w o v WX aml w10">      
+
+        <!--    xmlns:substituterClass= "org.docx4j.fonts.Substituter"
+        extension-element-prefixes="substituterClass"   
+-->
+        
 <xsl:output method="xml" encoding="utf-8" omit-xml-declaration="no" indent="yes" />
         <!-- doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" -->
 
+<!-- Used in extension function for mapping fonts -->           
+<xsl:param name="substituterInstance"/> <!-- select="'passed in'"-->    
+        
 
 <xsl:variable name="paraStyleID_Default">Normal</xsl:variable>
@@ -2623 +2630 @@
 
        Basic support for fonts -->
+
+
+<!-- 
 <xsl:template match="w:rFonts" mode="rpr">font-family:<xsl:value-of select="@w:ascii"/>;</xsl:template>
-
+-->
+        
+<xsl:template match="w:rFonts" mode="rpr">
+        <xsl:variable name="documentFont"><xsl:value-of select="string(@w:ascii)"/></xsl:variable>
+        <xsl:variable name="targetFont" select="java:org.docx4j.fonts.Substituter.getPdfSubstituteFont($substituterInstance, string($documentFont))" />
+        font-family:<xsl:value-of select="$targetFont"/>;
+</xsl:template>