Changeset 876 for trunk/docx4j/src/main/java/org/docx4j/fonts/PhysicalFont.java

Timestamp:

08/23/09 13:26:07 (3 years ago)

Author:

jharrop

Message:

Make it easier to use non-patched fop.jar

File:

• trunk/docx4j/src/main/java/org/docx4j/fonts/PhysicalFont.java (modified) (4 diffs)

trunk/docx4j/src/main/java/org/docx4j/fonts/PhysicalFont.java

@@ -6 +6 @@
 import org.apache.fop.fonts.EmbedFontInfo;
 import org.apache.log4j.Logger;
-import org.docx4j.convert.out.pdf.viaXSLFO.Conversion;
 
 /**
@@ -31 +30 @@
         PhysicalFont(String name, EmbedFontInfo embedFontInfo) {
                 
-                // Sanity check
-                if (embedFontInfo.getPostScriptName()==null) {
-                        log.error("Not set!");
-                        //log.error(((org.apache.fop.fonts.FontTriplet)fontInfo.getFontTriplets().get(0)).getName());
+                try {
+                        // Sanity check
+                        if (embedFontInfo.getPostScriptName()==null) {
+                                log.error("Not set!");
+                                //log.error(((org.apache.fop.fonts.FontTriplet)fontInfo.getFontTriplets().get(0)).getName());
+                        }
+                } catch (Exception e1) {
+                        // NB getPanose() only exists in our patched FOP
+                        if (!loggedWarningAlready) {
+                                log.warn("Not using patched FOP; getPostScriptName() method missing.");
+                                loggedWarningAlready = true;
+                        }                                                       
                 }
                 
@@ -44 +51 @@
         
 //      setName(fontInfo.getPostScriptName());
-        setEmbeddedFile(embedFontInfo.getEmbedFile());
-        setPanose(embedFontInfo.getPanose());           
+        
+                setEmbeddedFile(embedFontInfo.getEmbedFile());
+        try {
+                setPanose(embedFontInfo.getPanose());           
+                } catch (Exception e) {
+                        // NB getPanose() only exists in our patched FOP
+                        if (!loggedWarningAlready) {
+                                log.warn("Not using patched FOP; getPanose() method missing.");
+                                loggedWarningAlready = true;
+                        }                                                       
+                }
         }
+        
+        private static boolean loggedWarningAlready = false;
         
         // postscript name eg 
@@ -81 +99 @@
         }
         
-        org.apache.fop.fonts.Panose panose;
-        public org.apache.fop.fonts.Panose getPanose() {
+        org.foray.font.format.Panose panose;
+        public org.foray.font.format.Panose getPanose() {
                 return panose;
         }
-        public void setPanose(org.apache.fop.fonts.Panose panose) {
+        public void setPanose(org.foray.font.format.Panose panose) {
                 this.panose = panose;
         }