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

Timestamp:

03/18/09 02:47:00 (3 years ago)

Author:

jharrop

Message:

For PDF font embeddings, use UTF-8 encoding

File:

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

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

@@ -312 +312 @@
                 // 4.  Use addFont code like that below as necessary for the fonts
                 
-                        // See https://xhtmlrenderer.dev.java.net/r7/users-guide-r7.html#xil_32
+                        // See https://xhtmlrenderer.dev.java.net/guide/users-guide-r7.html#xil_32
                 org.xhtmlrenderer.extend.FontResolver resolver = renderer.getFontResolver();            
                                 
@@ -377 +377 @@
                                 if (f.exists()) {                               
                                         log.info("Got it");
-                                        renderer.getFontResolver().addFont(afm, BaseFont.CP1252, true, FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile()));  // drop the 'file:'     
+//                                      renderer.getFontResolver().addFont(afm, BaseFont.CP1252, true, FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile()));  // drop the 'file:'     
+                                        renderer.getFontResolver().addFont(afm, BaseFont.IDENTITY_H, true, FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile()));  // drop the 'file:' 
                                                 log.info("Substituting " + fontName + " with embedding " + fm.getPhysicalFont().getFamilyName() + " from " + fm.getPhysicalFont().getEmbeddedFile() );
                                 } else {
@@ -387 +388 @@
                                         if (f.exists()) {                               
                                                 log.info("Got it");
-                                                renderer.getFontResolver().addFont(pfm, BaseFont.CP1252, true, FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile() ));  // drop the 'file:'
+//                                              renderer.getFontResolver().addFont(pfm, BaseFont.CP1252, true, FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile() ));  // drop the 'file:'
+                                                renderer.getFontResolver().addFont(pfm, BaseFont.IDENTITY_H, true, FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile() ));  // drop the 'file:'
                                                         log.info("Substituting " + fontName + " with embedding " + fm.getPhysicalFont().getFamilyName() + " from " + fm.getPhysicalFont().getEmbeddedFile() );
                                         } else {