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

Timestamp:

03/21/09 21:01:38 (3 years ago)

Author:

jharrop

Message:

Font stuff should be working now for html export, pdf via html, and pdf via xsl fo. Still to test, and do bold/italics.

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

@@ -36 +36 @@
 import org.apache.log4j.Logger;
 import org.docx4j.convert.out.xmlPackage.XmlPackage;
-import org.docx4j.fonts.Substituter;
+import org.docx4j.fonts.Mapper;
 import org.docx4j.fonts.FontUtils;
 import org.docx4j.jaxb.Context;
@@ -244 +244 @@
     
     
-    
-    public void setFontSubstituter(Substituter fs) throws Exception {
-        if (fs == null) {
+/* There should be a mapper per document,
+ * but PhysicalFonts should be system wide.
+ * 
+ * The only way PhysicalFonts will change
+ * is if fonts are added/removed while
+ * docx4j is executing (which can happen eg if an
+ * obfuscated font part is read)
+ */
+
+    public void setFontMapper(Mapper fm) throws Exception {
+        if (fm == null) {
                 throw new IllegalArgumentException("Font Substituter cannot be null.");
         }
@@ -254 +262 @@
                 // 2.  For each font, find the closest match on the system (use OO's VCL.xcu to do this)
                 //     - do this in a general way, since docx4all needs this as well to display fonts           
-                fontSubstituter = fs;
+                fontMapper = fm;
                 org.docx4j.wml.Fonts fonts = null;
                 FontTablePart fontTablePart= this.getMainDocumentPart().getFontTablePart();     
@@ -266 +274 @@
                 
                 fonts = (org.docx4j.wml.Fonts)fontTablePart.getJaxbElement();
-                fontSubstituter.populateFontMappings(fontsInUse, fonts);        
+                fontMapper.populateFontMappings(fontsInUse, fonts);     
         
     }
 
-    public Substituter getFontSubstituter() {
-                return fontSubstituter;
-        }
-
-        private Substituter fontSubstituter;
-    
-        
+    public Mapper getFontMapper() {
+                return fontMapper;
+        }
+
+        private Mapper fontMapper;
+        
 
         public static WordprocessingMLPackage createPackage() throws InvalidFormatException {