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

Timestamp:

03/15/08 14:54:12 (4 years ago)

Author:

jharrop

Message:

Support for .pfb fonts.

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

@@ -21 +21 @@
 
 
+import java.io.File;
 import java.io.OutputStream;
 import java.util.Iterator;
@@ -46 +47 @@
 import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
+
+import com.lowagie.text.pdf.BaseFont;
 
 
@@ -445 +448 @@
                         if (fm.getEmbeddedFile()!=null) {
                                 try {
-                                        renderer.getFontResolver().addFont(fm.getEmbeddedFile(), true);
-                                } catch (com.lowagie.text.DocumentException e) {
-                                        log.error("Shouldn't happen - should have been detected upstream ... " + e.getMessage()); 
+                                        if (fm.getEmbeddedFile().endsWith(".pfb")) {
+                                                
+                                                String afm = fm.getEmbeddedFile().substring(5, fm.getEmbeddedFile().length()-4 ) + ".afm";  // drop the 'file:'
+                                                log.info("Looking for: " + afm);
+                                                
+                                                // Given the check in substituter, we expect to find one or the other.
+                                                File f = new File(afm);
+                                        if (f.exists()) {                               
+                                                log.info("Got it");
+                                                renderer.getFontResolver().addFont(afm, BaseFont.CP1252, true, fm.getEmbeddedFile().substring(5));  // 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:'
+                                                        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:'
+                                                } else {
+                                                        // Shouldn't happen.
+                                                        log.error("Couldn't find afm or pfm corresponding to " + fm.getEmbeddedFile());
+                                                }
+                                        }
+                                        } else {                                
+                                                renderer.getFontResolver().addFont(fm.getEmbeddedFile(), true);
+                                        }
                                 } catch (java.io.IOException e) {
                                 
@@ -454 +480 @@
 java.io.IOException: Unsupported font type
         at org.xhtmlrenderer.pdf.ITextFontResolver.addFont(ITextFontResolver.java:199)
+        
+        .pfb not supported, even with iText 2.0.8
+        
                                  */
+                                        e.printStackTrace();
                                         log.warn("Shouldn't happen - should have been detected upstream ... " +  e.getMessage() + ": " + fm.getEmbeddedFile()); 
+                                } catch (Exception e) {
+                                        e.printStackTrace();
+                                        log.error("Shouldn't happen - should have been detected upstream ... " + e.getMessage()); 
                                 }
                         } else {