fixes

c2f6f87f · qaomia · 23c394fa · c2f6f87f · c2f6f87f · c2f6f87f
Commit c2f6f87f authored Dec 10, 2015 by qaomia
3 changed files
--- a/etherpad_to_hdoc/antce/myantce.ant
+++ b/etherpad_to_hdoc/antce/myantce.ant
@@ -19,7 +19,7 @@
    <!-- Apply Xslt -->
    <target name="apply-xslt">
        <xslt in="${xsl}/html2xhtml.xsl" out="${tmp}/tmpPad.xhtml" style="${xsl}/html2xhtml.xsl" />
-        <xslt in="${tmp}/tmpPad.html" out="${tmp}/content.xml" style="${xsl}/xhtml2hdoc.xsl" />
+        <xslt in="${tmp}/tmpPad.xhtml" out="${tmp}/content.xml" style="${xsl}/xhtml2hdoc.xsl" />
    </target>
    
    <!-- Builds Hdoc structure -->
@@ -48,4 +48,4 @@
    
    <target name="main" depends="start,apply-xslt,construct_hdoc,zip" />
    
-</project>
\ No newline at end of file
+</project>
--- a/etherpad_to_hdoc/antce/xsl/html2xhtml.xsl
+++ b/etherpad_to_hdoc/antce/xsl/html2xhtml.xsl
@@ -20,8 +20,10 @@
                    </title>
                    <meta charset="utf-8"/>
                </head>
-                <body>             
-                    <xsl:value-of select="replace(normalize-space(regex-group(2)), 'br', 'br/')" disable-output-escaping="yes"/>
+                <body>
+                    <div>
+                        <xsl:value-of select="replace(normalize-space(regex-group(2)), 'br', 'br/')" disable-output-escaping="yes"/>
+                    </div>
                </body>
                
            </xsl:matching-substring>

--- a/etherpad_to_hdoc/antce/xsl/xhtml2hdoc.xsl
+++ b/etherpad_to_hdoc/antce/xsl/xhtml2hdoc.xsl
@@ -3,7 +3,7 @@
    xmlns:xs="http://www.w3.org/2001/XMLSchema"
    exclude-result-prefixes="xs"
    xmlns="http://www.utc.fr/ics/hdoc/xhtml"
-    version="2.0" xpath-default-namespace="http://www.w3.org/1999/xhtml">
+    version="2.0">
    <xsl:output method="xml" indent="yes"></xsl:output>
    
    <xsl:template match="html">