Changeset 176 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

Timestamp:

03/11/08 10:00:49 (4 years ago)

Author:

jharrop

Message:

Set up fontSubstituter outside of html method, so can use object already created by docx4all.

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java (modified) (2 diffs)

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

@@ -253 +253 @@
                 javax.xml.transform.Transformer xformer = template.newTransformer();
                 
-                log.error(xformer.getClass().getName() );
+                if (!xformer.getClass().getName().equals("org.apache.xalan.transformer.TransformerImpl")) {
+                        log.error("Detected " + xformer.getClass().getName() 
+                                        + ", but require org.apache.xalan.transformer.TransformerImpl. " +
+                                                        "Ensure Xalan 2.7.0 is on your classpath!" );
+                }
                 // 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:
+                
+                // 3.  Ensure that the font names in the XHTML have been mapped to these matches
+                //     possibly via an extension function in the XSLT
+                if (fontSubstituter==null) {
+                        setFontSubstituter();
+                }
+                xformer.setParameter("substituterInstance", fontSubstituter);
+                xformer.setParameter("fontFamilyStack", fontFamilyStack);
+                
+                
+                //DEBUGGING 
+                // use the identity transform if you want to send wordDocument;
+                // otherwise you'll get the XHTML
+                //javax.xml.transform.Transformer xformer = tfactory.newTransformer();
+                
+                xformer.transform(domSource, result);
+
+                log.info("wordDocument transformed to xhtml ..");
+        
+    }
+    
+    public void setFontSubstituter() throws Exception {
+        
                 // 1.  Get a list of all the fonts in the document
                 java.util.Map fontsInUse = this.getMainDocumentPart().fontsInUse();
@@ -275 +300 @@
                 
                 fonts = (org.docx4j.wml.Fonts)fontTablePart.getJaxbElement();
-                fontSubstituter.populateFontMappings(fontsInUse, fonts);
-                
-                // 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", fontSubstituter);
-                xformer.setParameter("fontFamilyStack", fontFamilyStack);
-                
-                
-                //DEBUGGING 
-                // use the identity transform if you want to send wordDocument;
-                // otherwise you'll get the XHTML
-                //javax.xml.transform.Transformer xformer = tfactory.newTransformer();
-                
-                xformer.transform(domSource, result);
-
-                log.info("wordDocument transformed to xhtml ..");
+                fontSubstituter.populateFontMappings(fontsInUse, fonts);        
         
     }