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

Timestamp:

03/22/08 03:23:25 (4 years ago)

Author:

jharrop

Message:

log statements

File:

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

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

@@ -28 +28 @@
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
+import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.apache.log4j.Logger;
@@ -446 +447 @@
                 Substituter.FontMapping fm = (Substituter.FontMapping)pairs.getValue();
                 
-                        log.info("Substituting " + fontName + " with " + fm.getPhysicalFont().getFamilyName() + " from " + fm.getPhysicalFont().getEmbeddedFile() );
                         if (fm.getPhysicalFont()!=null) {
                                 try {
@@ -461 +461 @@
                                                 log.info("Got it");
                                                 renderer.getFontResolver().addFont(afm, BaseFont.CP1252, true, FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile()));  // drop the 'file:'     
+                                                        log.info("Substituting " + fontName + " with embedding " + fm.getPhysicalFont().getFamilyName() + " from " + fm.getPhysicalFont().getEmbeddedFile() );
                                         } else {
                                                 // Should we be doing afm first, or pfm?
@@ -470 +471 @@
                                                         log.info("Got it");
                                                         renderer.getFontResolver().addFont(pfm, BaseFont.CP1252, true, FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile() ));  // drop the 'file:'
+                                                                log.info("Substituting " + fontName + " with embedding " + fm.getPhysicalFont().getFamilyName() + " from " + fm.getPhysicalFont().getEmbeddedFile() );
                                                 } else {
                                                         // Shouldn't happen.
@@ -475 +477 @@
                                                 }
                                         }
-                                        } else {
-                                                
+                                        } else {                                
                                                 renderer.getFontResolver().addFont(FontUtils.pathFromURL(fm.getPhysicalFont().getEmbeddedFile()), true);
+                                                log.info("Substituting " + fontName + " with embedding " + fm.getPhysicalFont().getFamilyName() + " from " + fm.getPhysicalFont().getEmbeddedFile() );
                                         }
                                 } catch (java.io.IOException e) {
@@ -500 +502 @@
             }
                 
+            // TESTING
+//          xhtmlDoc = org.docx4j.XmlUtils.neww3cDomDocument();
+//          try {
+//                      javax.xml.parsers.DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+//                      dbf.setNamespaceAware(true);
+//                      dbf.newDocumentBuilder().newDocument();
+//              
+//                      xhtmlDoc = dbf.newDocumentBuilder().parse(new File("C:\\Users\\jharrop\\workspace\\docx4all\\sample-docs\\comic.html"));
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }         
+            
                 renderer.setDocument(xhtmlDoc, null);
                 renderer.layout();