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

Timestamp:

05/08/08 14:35:29 (4 years ago)

Author:

jharrop

Message:

HtmlSettings? object for configuring html output.

File:

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

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

@@ -319 +319 @@
         html(result, true);
     }
-    
+
+    public void html(javax.xml.transform.Result result, boolean fontFamilyStack) throws Exception {
+
+                // Prep parameters
+        HtmlSettings htmlSettings = new HtmlSettings();
+        htmlSettings.setFontFamilyStack(fontFamilyStack);
+        
+                html(result, htmlSettings);
+    }
     
         /** Create an html version of the document. 
@@ -327 +335 @@
          * 
          * */ 
-    public void html(javax.xml.transform.Result result, boolean fontFamilyStack) throws Exception {
+    public void html(javax.xml.transform.Result result, HtmlSettings htmlSettings) throws Exception {
         
         /*
@@ -352 +360 @@
                 
                 // Prep parameters
-                Map<String, Object> transformParameters = new java.util.HashMap<String,Object>();
-                // ..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) {
-                        log.debug("Creating new Substituter.");
-                        setFontSubstituter(new Substituter());
-                } else {
-                        log.debug("Using existing Substituter.");
-                }
-                transformParameters.put("substituterInstance", fontSubstituter);
-                transformParameters.put("fontFamilyStack", fontFamilyStack);
-                
+                if (htmlSettings==null) {
+                        htmlSettings = new HtmlSettings();
+                        // ..Ensure that the font names in the XHTML have been mapped to these matches
+                        //     possibly via an extension function in the XSLT
+                }
+                
+                if (htmlSettings.getFontSubstituter()==null) {
+                        if (fontSubstituter==null) {
+                                log.debug("Creating new Substituter.");
+                                setFontSubstituter(new Substituter());
+                        } else {
+                                log.debug("Using existing Substituter.");
+                        }
+                        htmlSettings.setFontSubstituter(fontSubstituter);
+                }
                 
                 // Now do the transformation
-                org.docx4j.XmlUtils.transform(doc, xslt, transformParameters, result);
+                org.docx4j.XmlUtils.transform(doc, xslt, htmlSettings.getSettings(), result);
                 
                 log.info("wordDocument transformed to xhtml ..");
@@ -637 +648 @@
                 
         }
+
+        public static class HtmlSettings {
+                
+                Boolean fontFamilyStack = Boolean.FALSE;                
+                public void setFontFamilyStack(boolean val) {
+                        fontFamilyStack = new Boolean(val);
+                }
+                
+                Boolean docxWiki = Boolean.FALSE;               
+                public void setDocxWiki(boolean val) {
+                        docxWiki = new Boolean(val);
+                }
+
+                Substituter fontSubstituter = null;             
+                public void setFontSubstituter(Substituter fontSubstituter) {
+                        this.fontSubstituter = fontSubstituter;
+                }
+                public Substituter getFontSubstituter() {
+                        return fontSubstituter;
+                }
+                
+                
+                Map<String, Object> getSettings() {
+                        Map<String, Object> settings = new java.util.HashMap<String, Object>();
+                        
+                        settings.put("fontFamilyStack", fontFamilyStack);
+                        settings.put("docxWiki", docxWiki);
+                        settings.put("substituterInstance", fontSubstituter);
+                        
+                        return settings;
+                }
+                
+        }
         
 }