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

Timestamp:

03/08/08 22:45:15 (4 years ago)

Author:

jharrop

Message:

Use Panose as main means for getting substitute font.

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java (modified) (2 diffs)

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

@@ -39 +39 @@
 import org.docx4j.openpackaging.parts.Part;
 import org.docx4j.openpackaging.parts.PartName;
+import org.docx4j.openpackaging.parts.WordprocessingML.FontTablePart;
 import org.docx4j.openpackaging.parts.WordprocessingML.GlossaryDocumentPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
@@ -253 +254 @@
                 
                 // 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
+                //     - do this in a general way, since docx4all needs this as well to display fonts           
                 Substituter s = new Substituter();
-                s.populateFontMappings(fontsInUse);
+                FontTablePart fontTablePart= this.getMainDocumentPart().getFontTablePart();             
+                org.docx4j.wml.Fonts fonts = (org.docx4j.wml.Fonts)fontTablePart.getJaxbElement();              
+                
+                s.populateFontMappings(fontsInUse, fonts);
                 
                 // 3.  Ensure that the font names in the XHTML have been mapped to these matches