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

Timestamp:

03/10/08 04:34:14 (4 years ago)

Author:

jharrop

Message:

Sketch out using font-family cascade for HTML output. Not implemented in populateFontMappings yet, though.

Location:

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

Files:

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

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

@@ -166 +166 @@
         
 
-        /** Create an html version of the document. 
+        /** Create an html version of the document, using CSS font family
+         *  stacks.  This is appropriate if the HTML is intended for
+         *  viewing in a web browser, rather than an intermediate step
+         *  on the way to generating PDF output. 
          * 
          * @param result
@@ -173 +176 @@
          * */ 
     public void html(javax.xml.transform.Result result) throws Exception {
+
+        html(result, true);
+    }
+    
+        /** Create an html version of the document. 
+         * 
+         * @param result
+         *            The javax.xml.transform.Result object to transform into 
+         * 
+         * */ 
+    public void html(javax.xml.transform.Result result, boolean fontFamilyStack) throws Exception {
         
         /*
@@ -264 +278 @@
                 //     possibly via an extension function in the XSLT
                 xformer.setParameter("substituterInstance", s);
+                xformer.setParameter("fontFamilyStack", fontFamilyStack);
                 
                 
@@ -308 +323 @@
                 org.w3c.dom.Document xhtmlDoc = org.docx4j.XmlUtils.neww3cDomDocument();
                 javax.xml.transform.dom.DOMResult result = new javax.xml.transform.dom.DOMResult(xhtmlDoc);
-                html(result);
+                html(result, false); // false -> don't use HTML fonts.
                                 
                 // Now render the XHTML

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

@@ -29 +29 @@
         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" />
@@ -38 +35 @@
 <!-- Used in extension function for mapping fonts -->           
 <xsl:param name="substituterInstance"/> <!-- select="'passed in'"-->    
+<xsl:param name="fontFamilyStack"/> <!-- select="'passed in'"-->        
         
 
@@ -2638 +2636 @@
 <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))" />
+        <xsl:variable name="targetFont" select="java:org.docx4j.fonts.Substituter.getSubstituteFontXsltExtension($substituterInstance, string($documentFont), boolean($fontFamilyStack))" />
         font-family:<xsl:value-of select="$targetFont"/>;
 </xsl:template>