Commit b708820a authored by Baptiste Perraud's avatar Baptiste Perraud

Merge branch 'master' of https://gitlab.utc.fr/crozatst/hdoc

parents 21a81fe8 92eca99d
...@@ -6,8 +6,8 @@ http://www.gnu.org/licenses/gpl-3.0.txt ...@@ -6,8 +6,8 @@ http://www.gnu.org/licenses/gpl-3.0.txt
## Credits ## Credits
- 2016 - 2016
- - Etienne Chognard - Etienne Chognard
- - Fabien Boucaud - Fabien Boucaud
- 2015 - 2015
- Jean-Côme Douteau - Jean-Côme Douteau
- Gabrielle Rit - Gabrielle Rit
...@@ -85,4 +85,4 @@ Currently available on: https://framemo.org/framapad_to_opale ...@@ -85,4 +85,4 @@ Currently available on: https://framemo.org/framapad_to_opale
- br -> p - br -> p
## Capitalisation ## Capitalisation
Using regular expression with xsl is a good way to parse a non xml file. Using regular expression with xsl is a good way to parse a non xml file.
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project basedir="." name="myantce" default="main"> <project basedir="." name="myantce" default="main">
<property file="etherpad_to_hdoc.properties"/> <property file="framapad_to_hdoc.properties"/>
<!-- import classes --> <!-- import classes -->
<taskdef resource="net/sf/antcontrib/antlib.xml"/> <taskdef resource="net/sf/antcontrib/antlib.xml"/>
<taskdef name="htmlcleaner" classname="org.htmlcleaner.HtmlCleanerForAnt"/> <taskdef name="htmlcleaner" classname="org.htmlcleaner.HtmlCleanerForAnt"/>
......
@echo off @echo off
set lib=lib set lib=lib
set ant=etherpad_to_hdoc.ant set ant=framapad_to_hdoc.ant
set antparam=-Dprogram.param=%1 set antparam=-Dprogram.param=%1
set scJarList=%lib%\* set scJarList=%lib%\*
......
#!/bin/sh #!/bin/sh
lib="lib" lib="lib"
ant="etherpad_to_hdoc.ant" ant="framapad_to_hdoc.ant"
antparam="-Dprogram.param=$1" antparam="-Dprogram.param=$1"
#Recherche de java et controle que se soit une version SUN #Recherche de java et controle que se soit une version SUN
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project basedir="." name="myantce" default="main"> <project basedir="." name="myantce" default="main">
<property file="etherpad_to_opale.properties"/> <property file="framapad_to_opale.properties"/>
<!-- CHECK FOR OS FAMILY --> <!-- CHECK FOR OS FAMILY -->
<condition property="is_windows"> <condition property="is_windows">
<os family="windows"/> <os family="windows"/>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<include name="*.html"/> <include name="*.html"/>
</fileset> </fileset>
</copy> </copy>
<exec dir="../etherpad_to_hdoc" executable="run.bat"/> <exec dir="../framapad_to_hdoc" executable="run.bat"/>
</target> </target>
<target name="to_hdoc_unix" if="${is_unix}"> <target name="to_hdoc_unix" if="${is_unix}">
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
<include name="*.html"/> <include name="*.html"/>
</fileset> </fileset>
</copy> </copy>
<exec executable="/bin/bash" dir="../etherpad_to_hdoc"> <exec executable="/bin/bash" dir="../framapad_to_hdoc">
<arg value="../etherpad_to_hdoc/run.sh"/> <arg value="../framapad_to_hdoc/run.sh"/>
</exec> </exec>
</target> </target>
...@@ -90,4 +90,4 @@ ...@@ -90,4 +90,4 @@
<antcall target="to_opale_windows"/> <antcall target="to_opale_windows"/>
<antcall target="to_opale_end"/> <antcall target="to_opale_end"/>
</target> </target>
</project> </project>
\ No newline at end of file
...@@ -5,8 +5,8 @@ xsl = ${basedir}/xsl ...@@ -5,8 +5,8 @@ xsl = ${basedir}/xsl
lib = ${basedir}/lib lib = ${basedir}/lib
log = ${basedir}/log log = ${basedir}/log
eth_in = ../etherpad_to_hdoc/input eth_in = ../framapad_to_hdoc/input
eth_out = ../etherpad_to_hdoc/output eth_out = ../framapad_to_hdoc/output
opa_in = ../hdoc_to_opale/input opa_in = ../hdoc_to_opale/input
opa_out = ../hdoc_to_opale/output opa_out = ../hdoc_to_opale/output
rootfilename = content.xml rootfilename = content.xml
\ No newline at end of file
@echo off @echo off
set lib=lib set lib=lib
set ant=etherpad_to_opale.ant set ant=framapad_to_opale.ant
set antparam=-Dprogram.param=%1 set antparam=-Dprogram.param=%1
set scJarList=%lib%\* set scJarList=%lib%\*
......
#!/bin/sh #!/bin/sh
lib="lib" lib="lib"
ant="etherpad_to_opale.ant" ant="framapad_to_opale.ant"
antparam="-Dprogram.param=$1" antparam="-Dprogram.param=$1"
#Recherche de java et controle que se soit une version SUN #Recherche de java et controle que se soit une version SUN
......
libdir=${basedir}/lib lib=${basedir}/lib
rngdir=${basedir}/rng log=${basedir}/log
xsldir=${basedir}/xsl xsl=${basedir}/xsl
srcdir=${basedir}/in in=${basedir}/input
outdir=${basedir}/out out=${basedir}/output
InputPath=${basedir}/input tmp=${basedir}/tmp
OutputPath=${basedir}/output \ No newline at end of file
...@@ -3,49 +3,42 @@ ...@@ -3,49 +3,42 @@
<taskdef resource="net/sf/antcontrib/antlib.xml"/> <taskdef resource="net/sf/antcontrib/antlib.xml"/>
<property name="in" location="${basedir}/input"/> <property file="build.properties"/>
<property name="out" location="${basedir}/output"/>
<property name="tmp" location="${basedir}/tmp"/> <target name="convert">
<property name="xsl" location="${basedir}/xsl"/> <!-- Preparation for the file transformation : delete old folders and create new folders -->
<property name="lib" location="${basedir}/lib"/> <mkdir dir="${tmp}"/>
<property name="log" location="${basedir}/log"/> <delete dir="${out}" failonerror="false"/>
<mkdir dir="${out}"/>
<target name="convert"> <delete dir="${log}" failonerror="false"/>
<echo message="DEBUT"/> <mkdir dir="${log}"/>
<echo message="DEBUT"/>
<!-- Convert all the hdoc files in the directory ${in} to data xml files that will be imported to basex later.
<mkdir dir="${tmp}"/> Fonctions "UnzipHdocFile" and "content" will be called. -->
<delete dir="${out}" failonerror="false"/> <for param="inputFile">
<path>
<mkdir dir="${out}"/> <fileset dir="${in}" includes="**/*.hdoc"/>
<delete dir="${log}" failonerror="false"/> </path>
<mkdir dir="${log}"/> <sequential>
<local name="filename"/>
<basename property="filename" file="@{inputFile}"/>
<for param="inputFile">
<path> <antcall target="UnzipHdocFile">
<fileset dir="${in}" includes="**/*.hdoc"/> <param name="filename" value="${filename}"/>
</path> </antcall>
<antcall target="content">
<sequential> <param name="filename" value="${filename}"/>
<local name="filename"/> </antcall>
<basename property="filename" file="@{inputFile}"/> <echo message="FIN"/>
</sequential>
<antcall target="UnzipHdocFile"> </for>
<param name="filename" value="${filename}"/>
</antcall> <!-- Clean-->
<delete dir="${tmp}" failonerror="false"/>
<antcall target="content"> </target>
<param name="filename" value="${filename}"/>
</antcall>
<echo message="FIN"/>
</sequential>
</for>
</target>
<target name="UnzipHdocFile"> <target name="UnzipHdocFile">
<!-- Unzip the input hdoc file. Decompressed folder is named "decompressedHdoc" : this name is the only one which <!-- Unzip the input hdoc file. Decompressed folder is named "decompressedHdoc" : this name is the only one which
...@@ -56,15 +49,13 @@ ...@@ -56,15 +49,13 @@
</target> </target>
<target name="content" > <target name="content" >
<xslt in="${tmp}/${filename}/decompressedHdoc/content.xml" out="${out}/${filename}_data.xml" style="${xsl}/transformation.xsl" processor="org.apache.tools.ant.taskdefs.optional.TraXLiaison"> <!-- Transformation of a xml file decompressed from hdoc file to data xml file to be imported to basex.
The transformation will be done in terms of the xsl file in ${xsl}.-->
<param name="filename" expression="${filename}"/> <xslt in="${tmp}/${filename}/decompressedHdoc/content.xml" out="${out}/${filename}_data.xml" style="${xsl}/transformation.xsl" processor="org.apache.tools.ant.taskdefs.optional.TraXLiaison">
<param name="lib" expression="${lib}"/> <param name="filename" expression="${filename}"/>
</xslt> <param name="lib" expression="${lib}"/>
<echo message="${filename}" /> </xslt>
<delete dir="${tmp}" failonerror="false"/> <echo message="${filename}" />
</target> </target>
</project> </project>
\ No newline at end of file
...@@ -149,3 +149,11 @@ The opale_to_hdoc converter transcribes an Opale publication to a hdoc format. O ...@@ -149,3 +149,11 @@ The opale_to_hdoc converter transcribes an Opale publication to a hdoc format. O
The source code converter is available and can be completed in order to The source code converter is available and can be completed in order to
improve it and manage more Opale elements. improve it and manage more Opale elements.
Modified by Benoit Villain (12/12/2016)
------------------
Les divisions et les parties d'un grain n'étaient pas traitées... Contrairement à ce que mentionne le README...
J'ai donc apporté les modifications nécessaires pour que les divisions et les parties (récursives) soient bel et bien transformées en "section" hdoc.
This diff is collapsed.
...@@ -423,8 +423,10 @@ ...@@ -423,8 +423,10 @@
<xsl:template match="div[@id='toctitle']/h2" priority="1"/> <xsl:template match="div[@id='toctitle']/h2" priority="1"/>
<!-- Ignoring end of file h2: see also, etc... --> <!-- Ignoring end of file h2: see also, etc... -->
<xsl:template match="h2[not(following-sibling::p intersect following-sibling::h2[1]/preceding-sibling::p)]"/> <!-- <xsl:template match="h2[not(following-sibling::p intersect following-sibling::h2[1]/preceding-sibling::p)]"/>-->
<xsl:template match=" h2[following-sibling::ul[li/a[@class='external text'] and preceding-sibling::h2]][last()]"/>
<xsl:template match=" h2[following-sibling::div[@class='references-small decimal'] and preceding-sibling::h2][last()]"/>
<xsl:template match="div[@id='mw-navigation']/h2"/>
<!-- Ignoring divs by default: they are not relevant to us --> <!-- Ignoring divs by default: they are not relevant to us -->
<xsl:template match="div" mode="#all"/> <xsl:template match="div" mode="#all"/>
......
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