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

Timestamp:

03/20/08 03:55:24 (4 years ago)

Author:

jharrop

Message:

Rework so that we pass iText a 'font family name' (with possible magic appendages Bold Italic or BoldItalic?), rather than a postscript font name.
iText works out the corresponding postscript font itself - too smart for our own good!
Decouple Substituter a bit more from FOP's font stuff, to make it easier to use iText exclusively in the future.

Location:

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

Files:

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

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

@@ -31 +31 @@
 import org.apache.log4j.Logger;
 import org.docx4j.fonts.Substituter;
+import org.docx4j.fonts.FontUtils;
 import org.docx4j.jaxb.Context;
 import org.docx4j.openpackaging.contenttype.ContentType;
@@ -445 +446 @@
                 Substituter.FontMapping fm = (Substituter.FontMapping)pairs.getValue();
                 
-                        log.info("Substituting " + fontName + " with " + fm.getPostScriptName() + " from " + fm.getEmbeddedFile() );
-                        if (fm.getEmbeddedFile()!=null) {
+                        log.info("Substituting " + fontName + " with " + fm.getPhysicalFont().getFamilyName() + " from " + fm.getPhysicalFont().getEmbeddedFile() );
+                        if (fm.getPhysicalFont()!=null) {
                                 try {
-                                        if (fm.getEmbeddedFile().endsWith(".pfb")) {
+                                        if (fm.getPhysicalFont().getEmbeddedFile().endsWith(".pfb")) {
                                                 
-                                                String afm = fm.getEmbeddedFile().substring(5, fm.getEmbeddedFile().length()-4 ) + ".afm";  // drop the 'file:'
+//                                              String afm = fm.getPhysicalFont().getEmbeddedFile().substring(5, fm.getPhysicalFont().getEmbeddedFile().length()-4 ) + ".afm";  // drop the 'file:'
+                                                String afm = FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile());
+                                                afm = afm.substring(0, afm.length()-4 ) + ".afm";  // drop the 'file:'
                                                 log.info("Looking for: " + afm);
                                                 
@@ -457 +460 @@
                                         if (f.exists()) {                               
                                                 log.info("Got it");
-                                                renderer.getFontResolver().addFont(afm, BaseFont.CP1252, true, fm.getEmbeddedFile().substring(5));  // drop the 'file:' 
+                                                renderer.getFontResolver().addFont(afm, BaseFont.CP1252, true, FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile()));  // drop the 'file:'     
                                         } else {
                                                 // Should we be doing afm first, or pfm?
-                                                        String pfm = fm.getEmbeddedFile().substring(5, fm.getEmbeddedFile().length()-4 ) + ".pfm";  // drop the 'file:'
+                                                        String pfm = FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile());
+                                                        pfm = pfm.substring(0, pfm.length()-4 ) + ".pfm";  // drop the 'file:'
                                                         log.info("Looking for: " + pfm);
                                                         f = new File(pfm);
                                                 if (f.exists()) {                               
                                                         log.info("Got it");
-                                                        renderer.getFontResolver().addFont(pfm, BaseFont.CP1252, true, fm.getEmbeddedFile().substring(5));  // drop the 'file:'
+                                                        renderer.getFontResolver().addFont(pfm, BaseFont.CP1252, true, FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile() ));  // drop the 'file:'
                                                 } else {
                                                         // Shouldn't happen.
-                                                        log.error("Couldn't find afm or pfm corresponding to " + fm.getEmbeddedFile());
+                                                        log.error("Couldn't find afm or pfm corresponding to " + fm.getPhysicalFont().getEmbeddedFile());
                                                 }
                                         }
-                                        } else {                                
-                                                renderer.getFontResolver().addFont(fm.getEmbeddedFile(), true);
+                                        } else {
+                                                
+                                                renderer.getFontResolver().addFont(FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile()), true);
                                         }
                                 } catch (java.io.IOException e) {
@@ -485 +490 @@
                                  */
                                         e.printStackTrace();
-                                        log.warn("Shouldn't happen - should have been detected upstream ... " +  e.getMessage() + ": " + fm.getEmbeddedFile()); 
+                                        log.warn("Shouldn't happen - should have been detected upstream ... " +  e.getMessage() + ": " + fm.getPhysicalFont().getEmbeddedFile()); 
                                 } catch (Exception e) {
                                         e.printStackTrace();

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

@@ -2650 +2650 @@
         <xsl:choose>
                 <xsl:when test="count(../w:b)=1 and count(../w:i)=1">
+                        <!-- 'BoldItalic' is iText magic string -->
                         <xsl:variable name="targetFont" 
                                 select="java:org.docx4j.fonts.Substituter.getSubstituteFontXsltExtension($substituterInstance, 
-                                                        string($documentFont), 'bolditalic', boolean($fontFamilyStack))" />
+                                                        string($documentFont), 'BoldItalic', boolean($fontFamilyStack))" />
                         font-family:'<xsl:value-of select="$targetFont"/>';                                             
                 </xsl:when>
                 <xsl:when test="count(../w:b)=1">
+                        <!-- 'Bold' is iText magic string -->
                         <xsl:variable name="targetFont" 
                                 select="java:org.docx4j.fonts.Substituter.getSubstituteFontXsltExtension($substituterInstance, 
-                                                        string($documentFont), 'bold', boolean($fontFamilyStack))" />
+                                                        string($documentFont), 'Bold', boolean($fontFamilyStack))" />
                         font-family:'<xsl:value-of select="$targetFont"/>';                                                                     
                 </xsl:when>
                 <xsl:when test="count(../w:i)=1">
+                        <!-- 'Italic' is iText magic string -->
                         <xsl:variable name="targetFont" 
                                 select="java:org.docx4j.fonts.Substituter.getSubstituteFontXsltExtension($substituterInstance, 
-                                                        string($documentFont), 'italic', boolean($fontFamilyStack))" />
+                                                        string($documentFont), 'Italic', boolean($fontFamilyStack))" />
                         font-family:'<xsl:value-of select="$targetFont"/>';                                                                     
                 </xsl:when>