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

Timestamp:

03/12/08 08:10:43 (4 years ago)

Author:

jharrop

Message:

Ability to marshall to a structure /pkg:package/pkg:part/pkg:xmlData, mimicking Word 2007's ActiveDocument?.WordOpenXML. This seems a better idea than the old wordDocument.

Location:

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

Files:

• WordprocessingMLPackage.java (modified) (4 diffs)
• wordml2html-2007.xslt (modified) (6 diffs)

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

@@ -190 +190 @@
          * our main document and style definition parts.
          * 
-         * For now, I've just edited it a little to accept our parts wrapped
-         * in a <w:wordDocument> element.  Since that's a completely
-         * arbitrary format, it may be better in due course to process
-         * pck:package/pck:part
+         * I've adapted the stylesheet to process the
+         * pck:package/pck:part stuff emitted by Word 2007.
          * 
          */
         
                 // so, put the 2 parts together into a single document 
-        // The JAXB object org.docx4j.wml.WordDocument is
+        // The JAXB object org.docx4j.wml.Package is
         // custom built for this purpose.
         
-        // Create a org.docx4j.wml.WordDocument object
+        // Create a org.docx4j.wml.Package object
         org.docx4j.wml.ObjectFactory factory = new org.docx4j.wml.ObjectFactory();
-        org.docx4j.wml.WordDocument wd = factory.createWordDocument();
+        org.docx4j.wml.Package pkg = factory.createPackage();
+        
         // Set its parts
+        
         // .. the main document part
+        org.docx4j.wml.Package.Part pkgPartDocument = factory.createPackagePart();
+                
                 MainDocumentPart documentPart = getMainDocumentPart(); 
-                org.docx4j.wml.Document wmlDocumentEl = (org.docx4j.wml.Document)documentPart.getJaxbElement();         
-        wd.setDocument(wmlDocumentEl);
+                
+        pkgPartDocument.setName(documentPart.getPartName().getName());
+        pkgPartDocument.setContentType(documentPart.getContentType() );
+                
+        org.docx4j.wml.Package.Part.XmlData XmlDataDoc = factory.createPackagePartXmlData();
+        
+                org.docx4j.wml.Document wmlDocumentEl = (org.docx4j.wml.Document)documentPart.getJaxbElement();
+                
+                XmlDataDoc.setDocument(wmlDocumentEl);
+                pkgPartDocument.setXmlData(XmlDataDoc);
+                pkg.getPart().add(pkgPartDocument);
+                                
         // .. the style part
+        org.docx4j.wml.Package.Part pkgPartStyles = factory.createPackagePart();
+
         org.docx4j.openpackaging.parts.WordprocessingML.StyleDefinitionsPart stylesPart = documentPart.getStyleDefinitionsPart();
+        
+        pkgPartDocument.setName(stylesPart.getPartName().getName());
+        pkgPartDocument.setContentType(stylesPart.getContentType() );
+        
+        org.docx4j.wml.Package.Part.XmlData XmlDataStyles = factory.createPackagePartXmlData();
+        
         org.docx4j.wml.Styles styles = (org.docx4j.wml.Styles)stylesPart.getJaxbElement();
-        wd.setStyles(styles);
+        
+                XmlDataStyles.setStyles(styles);
+                pkgPartStyles.setXmlData(XmlDataStyles);
+                pkg.getPart().add(pkgPartStyles);       
+        
         // Now marshall it
                 JAXBContext jc = Context.jc;
@@ -218 +242 @@
                 org.w3c.dom.Document doc = org.docx4j.XmlUtils.neww3cDomDocument();
 
-                marshaller.marshal(wd, doc);
+                marshaller.marshal(pkg, doc);
                 
                 log.info("wordDocument created for PDF rendering!");
@@ -249 +273 @@
                 javax.xml.transform.Templates template = tfactory.newTemplates(
                                 new javax.xml.transform.stream.StreamSource(is));
-                
                 // Use the template to create a transformer
                 javax.xml.transform.Transformer xformer = template.newTransformer();
@@ -269 +292 @@
                 xformer.setParameter("substituterInstance", fontSubstituter);
                 xformer.setParameter("fontFamilyStack", fontFamilyStack);
-                
                 
                 //DEBUGGING 

trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/wordml2html-2007.xslt

@@ -7 +7 @@
 - xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" 
 
+Works with the output of Word 2007's ActiveDocument.WordOpenXML,
+        which looks like:
+        
+        /pkg:package/pkg:part/pkg:xmlData       
+        
 Version 1.3-.NET-script
 
@@ -23 +28 @@
         xmlns:aml="http://schemas.microsoft.com/aml/2001/core"
         xmlns:w10="urn:schemas-microsoft-com:office:word"
+        xmlns:pkg="http://schemas.microsoft.com/office/2006/xmlPackage"         
         xmlns:msxsl="urn:schemas-microsoft-com:xslt"
         xmlns:ext="http://www.xmllab.net/wordml2html/ext"
@@ -145 +151 @@
 
 
-<xsl:variable name="nsStyles" select="/w:wordDocument[1]/w:styles[1]/w:style"/>
-<xsl:variable name="ndLists" select="/w:wordDocument[1]/w:lists[1]|//w:cfChunk/w:lists"/>
-<xsl:variable name="ndDocPr" select="/w:wordDocument[1]/w:docPr[1]"/>
-<xsl:variable name="ndDocInfo" select="/w:wordDocument[1]/w:docInfo[1]"/>
-<xsl:variable name="ndOfficeDocPr" select="/w:wordDocument[1]/o:DocumentProperties[1]"/>
+<xsl:variable name="nsStyles" select="/pkg:package/pkg:part/pkg:xmlData/w:styles[1]/w:style"/>
+        
+<!-- 2008 03 12: TODO following parts currently not included in our pkg:package -->     
+<xsl:variable name="ndLists" select="/pkg:package/pkg:part/pkg:xmlData/w:lists[1]|/w:cfChunk/w:lists"/>
+<xsl:variable name="ndDocPr" select="/pkg:package/pkg:part/pkg:xmlData/w:docPr[1]"/>
+<xsl:variable name="ndDocInfo" select="/pkg:package/pkg:part/pkg:xmlData/w:docInfo[1]"/>
+<xsl:variable name="ndOfficeDocPr" select="/pkg:package/pkg:part/pkg:xmlData/o:DocumentProperties[1]"/>
 
 
@@ -4967 +4975 @@
 </xsl:template>
 
-
+<!--
 <xsl:template match="/w:wordDocument">
+        -->
+<xsl:template match="/pkg:package">
         <xsl:choose>
                 
@@ -5049 +5059 @@
                                                 <xsl:comment>
                                                         /*font definitions*/
+                                                        <!-- 2008 03 12: TODO font part currently not included in our pkg:package -->
                                                         <xsl:apply-templates select="w:fonts[1]/w:font"/>
                                                         /*element styles*/
                                                         <xsl:choose>
+                                                                <!-- 2008 03 12: TODO docPr currently not included in our pkg:package -->
                                                                 <xsl:when test="w:docPr/w:revisionView/@w:markup = 'off'">
                                                                 del {display:none;}
@@ -5109 +5121 @@
 
 <!-- was <xsl:apply-templates select="w:body|w:cfChunk"/> -->
-                                        <xsl:apply-templates select="w:document/w:body|w:cfChunk"/>
+                                        <xsl:apply-templates select="pkg:part/pkg:xmlData/w:document/w:body|w:cfChunk"/>