Changeset 1182 for trunk/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/docx2fo.xslt

Timestamp:

08/06/10 21:25:16 (22 months ago)

Author:

jharrop

Message:

Support for page number field <w:fldSimple w:instr=" PAGE \* MERGEFORMAT ">

File:

• trunk/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/docx2fo.xslt (modified) (3 diffs)

trunk/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/docx2fo.xslt

@@ -130 +130 @@
         <xsl:template match="section">
         
+                        <xsl:variable name="pageNumberFormat" 
+                                select="java:org.docx4j.convert.out.pdf.viaXSLFO.Conversion.getPageNumberFormat($wmlPackage, position())" />
+        
+                        <xsl:variable name="pageNumberInitial" 
+                                select="java:org.docx4j.convert.out.pdf.viaXSLFO.Conversion.getPageNumberInitial($wmlPackage, position())" />
 
                         <!-- start page-sequence
@@ -137 +142 @@
                                 which is to be used to layout the text contained in this
                                 page-sequence-->
-                        <fo:page-sequence master-reference="{@name}">
+                                
+                        <fo:page-sequence master-reference="{@name}" format="{$pageNumberFormat}" initial-page-number="{$pageNumberInitial}" >
 
                                 <!--  First Page Header -->
@@ -724 +730 @@
   <xsl:template match="w:continuationSeparator" />
 
-<!--  tmp bookmarks -->
 
   <xsl:template match="w:fldSimple" >
+  
+                <xsl:variable name="childResults">
+                        <xsl:apply-templates/>
+                </xsl:variable>
+                                
                 <xsl:copy-of 
-                        select="java:org.docx4j.convert.out.pdf.viaXSLFO.Conversion.notImplemented(., 'no support for fields' )" />     
-  </xsl:template>
+                        select="java:org.docx4j.convert.out.pdf.viaXSLFO.Conversion.createBlockForFldSimple(
+                                $wmlPackage, ., $childResults)" />
+  </xsl:template>
+  
   <xsl:template match="w:fldChar" >
                 <xsl:copy-of