Changeset 1755 for trunk/docx4j/src/main/java

Timestamp:

02/06/12 17:45:16 (4 months ago)

Author:

jharrop

Message:

Add $pPrNode to java:org.docx4j.convert.out.html.AbstractHtmlExporter.getNumberXmlNode

File:

• trunk/docx4j/src/main/java/org/docx4j/convert/out/html/docx2xhtmlNG2.xslt (modified) (3 diffs)

trunk/docx4j/src/main/java/org/docx4j/convert/out/html/docx2xhtmlNG2.xslt

@@ -21 +21 @@
 
 <!--  <xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" indent="yes"/> -->
+   <!-- Use method="html" if you need IE9 to display quotes properly (it
+                still doesn't use UTF 8 though!). Chrome works either way. 
+                NB, with IE9, and XML output, 
+                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                doesn't help.-->
    
 <xsl:output method="xml" encoding="utf-8" omit-xml-declaration="no" indent="no" 
@@ -226 +231 @@
                               docx4j to populate the fo:block -->
                 
+                <xsl:variable name="pPrNode" select="w:pPr" />                          
                 <xsl:variable name="pStyleVal" select="string( w:pPr/w:pStyle/@w:val )" />  
 
@@ -253 +259 @@
                                         <xsl:copy-of select="
                                                 java:org.docx4j.convert.out.html.AbstractHtmlExporter.getNumberXmlNode( 
-                                                                                $wmlPackage, $pStyleVal, $numId, $levelId)" />                                  
+                                                                                $wmlPackage, $pPrNode, $pStyleVal, $numId, $levelId)" />                                        
                                         <xsl:apply-templates/>                          
                                 </xsl:otherwise>