Commit d3d22556 authored by qaomia's avatar qaomia

conflicts fixed

parents c2f6f87f 407f4ea7
......@@ -19,16 +19,17 @@
<!-- Apply Xslt -->
<target name="apply-xslt">
<xslt in="${xsl}/html2xhtml.xsl" out="${tmp}/tmpPad.xhtml" style="${xsl}/html2xhtml.xsl" />
<xslt in="${tmp}/tmpPad.xhtml" out="${tmp}/content.xml" style="${xsl}/xhtml2hdoc.xsl" />
<xslt in="${tmp}/tmpPad.xhtml" out="${tmp}/tozip/content.xml" style="${xsl}/xhtml2hdoc.xsl" />
</target>
<!-- Builds Hdoc structure -->
<target name="construct_hdoc">
<mkdir dir="${tmp}/META-INF" />
<mkdir dir="${tmp}/tozip/" />
<mkdir dir="${tmp}/tozip/META-INF" />
<!-- container -->
<touch file="${tmp}/META-INF/container.xml" />
<echoxml file="${tmp}/META-INF/container.xml">
<touch file="${tmp}/tozip/META-INF/container.xml" />
<echoxml file="${tmp}/tozip/META-INF/container.xml">
<container version="1.0">
<rootfiles>
<rootfile full-path="${rootfilename}" media-type="text/xml" />
......@@ -38,14 +39,14 @@
<!-- mimetype -->
<touch file="${tmp}/mimetype" />
<echo message="application/x-hdoc+zip" file="${tmp}/mimetype" />
<echo message="application/x-hdoc+zip" file="${tmp}/tozip/mimetype" />
</target>
<!-- Zip Hdoc container -->
<target name="zip">
<zip basedir="${tmp}" destfile="${out}/output.hdoc" />
<zip basedir="${tmp}tozip/" destfile="${out}/output.hdoc" />
</target>
<target name="main" depends="start,apply-xslt,construct_hdoc,zip" />
</project>
</project>
\ No newline at end of file
......@@ -4,11 +4,11 @@
xmlns:regexp="http://exslt.org/regular-expressions" extension-element-prefixes="regexp">
<xsl:output method="xhtml" indent="yes" />
<xsl:output method="xml" indent="yes" />
<xsl:strip-space elements="*"/>
<xsl:param name="text-encoding" as="xs:string" select="'utf-8'"/>
<xsl:param name="text-uri" as="xs:string" select="'../input/pad.html'"/>
<xsl:param name="text-uri" as="xs:string" select="'../input/NF29_HdocEtherpad.html'"/>
<xsl:template name="text2xml">
<xsl:variable name="text" select="unparsed-text($text-uri, $text-encoding)"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment