Commit f220ac24 authored by Jean-Baptiste Martin's avatar Jean-Baptiste Martin

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

parents 9870e0e3 bdf04449
*/input/
*/tmp/
*/output/
wikipedia_to_hdoc/result/*
wikipedia_to_hdoc/tmp/*
wikipedia_to_hdoc/hdoc_to_opale/tmp/*
wikipedia_to_hdoc/output/*
mindmapping_to_opale/result/*
mindmapping_to_opale/tmp/*
mindmapping_to_lexique/result/*
mindmapping_to_lexique/tmp/*
mindmapping_to_optim/result/*
mindmapping_to_optim/tmp/*
mindmapping_to_hdoc/result/*
mindmapping_to_hdoc/tmp/*
\ No newline at end of file
*/input/*
*/tmp/*
*/output/*
!*/input/sample.*
\ No newline at end of file
Usage
-----
Put the `.hdoc` files in the input folder, run `run.bat` or `run.sh` according to your operating system and get the .scar in the output folder.
Now, the script is able to manage several files.
Todo list
---------
- Refactor the ant script
- Resolve bugs
- (Optional) Port to XSLT 2.0
Bugs
----
- Table cell size
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project name="hdoc_to_opale" basedir="." default="convert">
<property name="in" location="${basedir}/input"/>
<property name="out" location="${basedir}/output"/>
<property name="tmp" location="${basedir}/tmp"/>
<property name="xsl" location="${basedir}/xsl"/>
<property name="lib" location="${basedir}/lib"/>
<property name="log" location="${basedir}/log"/>
<property name="schema" location="${basedir}/schema"/>
<property name="bibtex" location="${basedir}/bibtex_to_opale"/>
<property file="global.properties"/>
<taskdef resource="net/sf/antcontrib/antlib.xml"/>
<taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
<classpath>
<pathelement location="lib/jing.jar"/>
</classpath>
</taskdef>
<target name="convert">
<!-- This is the main target : it is called whether by the project (as the default target) or by the user/converter
website, if specified in the command line. Basically, this target consists in several targets/ant buildfiles calls. -->
<antcall target="CleanDirectory"/>
<antcall target="UnzipHdocFile"/>
<antcall target="ValidateInput" />
<antcall target="FindContentFiles"/>
<for param="inputFile">
<path>
<fileset dir="${in}" includes="**/*.hdoc"/>
</path>
<sequential>
<local name="filename"/>
<basename property="filename" file="@{inputFile}"/>
<ant antfile="${tmp}/${filename}/generateContentPath.xml">
<property name="filename" value="${filename}"/>
</ant>
</sequential>
</for>
<antcall target="ValidateOutput"/>
<antcall target="DivideOutput"/>
<antcall target="ZipOutput"/>
<antcall target="ZipDividedOutput"/>
</target>
<target name="CleanDirectory">
<delete>
<fileset dir="${tmp}">
<include name="*"/>
</fileset>
</delete>
</target>
<target name="UnzipHdocFile">
<!-- Unzip the input hdoc file. Decompressed folder is named "decompressedHdoc" : this name is the only one which
refers to the hdoc file furthermore in this project. -->
<for param="inputFile">
<path>
<fileset dir="${in}" includes="**/*.hdoc"/>
</path>
<sequential>
<local name="filename"/>
<basename property="filename" file="@{inputFile}"/>
<unzip src="${in}/${filename}" dest="${tmp}/${filename}/decompressedHdoc"/>
<chmod dir="${tmp}/${filename}/decompressedHdoc" perm="777"/>
</sequential>
</for>
</target>
<target name="FindContentFiles">
<!-- Finds the absolute path of container.xml and applies transformation0.xsl on it.-->
<for param="inputFile">
<path>
<fileset dir="${in}" includes="**/*.hdoc"/>
</path>
<sequential>
<local name="filename"/>
<basename property="filename" file="@{inputFile}"/>
<first id="first">
<fileset dir="${tmp}/${filename}/decompressedHdoc/META-INF" includes="**/container.xml"/>
</first>
<xslt in="${toString:first}" out="${tmp}/${filename}/generateContentPath.xml" style="${xsl}/transformation0.xsl" processor="org.apache.tools.ant.taskdefs.optional.TraXLiaison">
<param name="filename" expression="${filename}"/>
</xslt>
<chmod file="${tmp}/${filename}/generateContentPath.xml" perm="777"/>
</sequential>
</for>
</target>
<target name="ZipOutput">
<for param="inputFile">
<path>
<fileset dir="${in}" includes="**/*.hdoc"/>
</path>
<sequential>
<local name="filename"/>
<basename property="filename" file="@{inputFile}"/>
<propertyregex property="properFilename" input="${filename}" regexp=".hdoc" replace="" casesensitive="false" override="true" />
<copy file="${bibtex}/.wspmeta" todir="${tmp}/${filename}/decompressedOpale"/>
<mkdir dir="${tmp}/${filename}/decompressedOpale/res"/>
<ant antfile="${tmp}/${filename}/moveRessourceFiles.xml"/>
<zip basedir="${tmp}/${filename}/decompressedOpale" destfile="${out}/${properFilename}/output.scar" encoding="UTF-8"/>
</sequential>
</for>
</target>
<target name="ZipDividedOutput">
<for param="inputFile">
<path>
<fileset dir="${in}" includes="**/*.hdoc"/>
</path>
<sequential>
<local name="filename"/>
<basename property="filename" file="@{inputFile}"/>
<propertyregex property="properFilename" input="${filename}" regexp=".hdoc" replace="" casesensitive="false" override="true" />
<copy file="${bibtex}/.wspmeta" todir="${tmp}/${filename}/decompressedOpaleDivided"/>
<copy todir="${tmp}/${filename}/decompressedOpaleDivided/res" >
<fileset dir="${tmp}/${filename}/decompressedOpale/res" includes="**"/>
</copy>
<copy todir="${tmp}/${filename}/decompressedOpaleDivided/references" >
<fileset dir="${tmp}/${filename}/decompressedOpale/references" includes="**"/>
</copy>
<zip basedir="${tmp}/${filename}/decompressedOpaleDivided" destfile="${out}/${properFilename}/dividedOutput.scar" encoding="UTF-8"/>
</sequential>
</for>
</target>
<!-- Validating the XML container file -->
<target name="ValidateInput">
<for param="inputFile">
<path>
<fileset dir="${in}" includes="**/*.hdoc"/>
</path>
<sequential>
<local name="filename"/>
<basename property="filename" file="@{inputFile}"/>
<jing file="${tmp}/${filename}/decompressedHdoc/META-INF/container.xml" rngfile="${schema}/hdoc1-container.rng"></jing>
</sequential>
</for>
</target>
<!-- Validating the XML output -->
<target name="ValidateOutput">
<for param="inputFile">
<path>
<fileset dir="${in}" includes="**/*.hdoc"/>
</path>
<sequential>
<local name="filename"/>
<basename property="filename" file="@{inputFile}"/>
<jing file="${tmp}/${filename}/decompressedOpale/main.xml" rngfile="${schema}/op_ue.rng"></jing>
</sequential>
</for>
</target>
<target name="DivideOutput">
<for param="inputFile">
<path>
<fileset dir="${in}" includes="**/*.hdoc"/>
</path>
<sequential>
<local name="filename"/>
<basename property="filename" file="@{inputFile}"/>
<mkdir dir="${tmp}/${filename}/decompressedOpaleDivided"/>
<!-- Adding IDS to the general output file -->
<xslt
in="${tmp}/${filename}/decompressedOpale/main.xml"
out="${tmp}/${filename}/outputWithCourseUcIds.xml"
style="${xsl}/addCourseUcIds.xsl"
processor="org.apache.tools.ant.taskdefs.optional.TraXLiaison"
/>
<!-- Generating the root file (with refs to other files) -->
<xslt
in="${tmp}/${filename}/outputWithCourseUcIds.xml"
out="${tmp}/${filename}/decompressedOpaleDivided/main.xml"
style="${xsl}/addCourseUcReferences.xsl"
processor="org.apache.tools.ant.taskdefs.optional.TraXLiaison"
/>
<!-- Generating the ANT file that will copy the files -->
<xslt
in="${tmp}/${filename}/outputWithCourseUcIds.xml"
out="${tmp}/${filename}/exportUnits.ant"
style="${xsl}/prepareCourseUcCopies.xsl"
processor="org.apache.tools.ant.taskdefs.optional.TraXLiaison"
>
<param name="filename" expression="${filename}"/>
</xslt>
<!-- Executing that ANT file -->
<ant antfile="${tmp}/${filename}/exportUnits.ant"/>
</sequential>
</for>
</target>
</project>
@echo off
set lib=lib
set ant=myantce.ant
set ant=hdoc_to_opale.ant
set antparam=-Dprogram.param=%1
set scJarList=%lib%\*
......
#!/bin/sh
lib="lib"
ant="myantce.ant"
ant="hdoc_to_opale.ant"
antparam="-Dprogram.param=$1"
#Recherche de java et controle que se soit une version SUN
......
......@@ -30,11 +30,8 @@
<target name="buildOutput" depends="unzipSource">
<<<<<<< HEAD
<xslt classpath="${libdir}/saxon9he.jar" style="${xsldir}/lexique_to_hdoc.xsl" basedir="${srcdir}" destdir="${outdir}" followsymlinks="false" extension=".xml">
=======
<xslt classpath="${libdir}/saxon9he.jar" style="${xsldir}/lexique_to_hdoc.xsl.xsl" basedir="${srcdir}" destdir="${outdir}" followsymlinks="false" extension=".xml">
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<include name="**/*.term"/>
</xslt>
<!--<jing rngfile="${rngdir}/op_glos.rng">
......@@ -47,10 +44,7 @@
TODO rajouter le container.xml dans le fichier META-INF et qui pointe sur le fichier transformé : un mkdir avec les inputs à transformer en parametre?-->
<target name="exportOutput" depends="buildOutput">
<copy file="mimetype" tofile="${outdir}/mimetype"></copy>
<<<<<<< HEAD
<copydir src="META-INF" dest="${OutputPath}/hdoc-${nameInputsId}"></copydir>
=======
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<copydir src="${outdir}/${nameInputsId}" dest="${OutputPath}/hdoc-${nameInputsId}"></copydir>
<!--<zip basedir="${outdir}" destfile="${OutputPath}/opale-${nameInputsId}" encoding="UTF-8"></zip>-->
</target>
......
......@@ -47,6 +47,10 @@
TODO rajouter le container.xml dans le fichier META-INF et qui pointe sur le fichier transformé : un mkdir avec les inputs à transformer en parametre?-->
<target name="exportOutput" depends="buildOutput">
<copy file="mimetype" tofile="${outdir}/mimetype"></copy>
<<<<<<< HEAD
<copydir src="META-INF" dest="${OutputPath}/hdoc-${nameInputsId}"></copydir>
=======
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<copydir src="${outdir}/${nameInputsId}" dest="${OutputPath}/hdoc-${nameInputsId}"></copydir>
<!--<zip basedir="${outdir}" destfile="${OutputPath}/opale-${nameInputsId}" encoding="UTF-8"></zip>-->
</target>
......
#!/bin/sh
lib="lib"
ant="lexique_to_opale.ant"
ant="test_lexique_to_opale.ant"
antparam="-Dprogram.param=$1"
#Recherche de java et controle que se soit une version SUN
......
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
<<<<<<< HEAD
xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"
xmlns:lx="scpf.org:lexicon"
xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive"
......@@ -10,17 +8,11 @@
exclude-result-prefixes="xs"
version="2.0">
=======
xmlns:hodoc="http://www.utc.fr/ics/hdoc/xhtml"
exclude-result-prefixes="xs"
version="1.0">
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:output method="xml" indent="yes" />
<xsl:template match="/">
<!-- <sc:item xmlns:sc="http://www.utc.fr/ics/scenari/v3/core">
<op:glos xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive" xmlns:op="utc.fr:ics/opale3"> -->
<html xmlns:hodoc="http://www.utc.fr/ics/hdoc/xhtml">
<head>
<!--
......@@ -38,7 +30,6 @@
<xsl:value-of select="sc:item/lx:term/lx:termM/sp:name"></xsl:value-of>
</h2>
<!--grammaire et type du mot en italique entre crochets -->
<<<<<<< HEAD
<xsl:if test="sc:item/lx:term/lx:termM/sp:grammar">
<i>
[<xsl:apply-templates select="sc:item/lx:term/lx:termM/sp:grammar"></xsl:apply-templates>]
......@@ -49,12 +40,7 @@
[<xsl:apply-templates select="sc:item/lx:term/lx:termM/sp:type"></xsl:apply-templates>]
</i>
</xsl:if>
=======
<i>
[<xsl:apply-templates select="sc:item/lx:term/lx:termM/sp:grammar"></xsl:apply-templates>]
[<xsl:apply-templates select="sc:item/lx:term/lx:termM/sp:type"></xsl:apply-templates>]
</i>
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<p span="def_content">
<xsl:apply-templates select="/sc:item/lx:term"></xsl:apply-templates>
</p>
......@@ -88,11 +74,9 @@
</xsl:template>
<xsl:template match="lx:term">
<<<<<<< HEAD
<!-- Definition(s) dans le span="def_content-->
=======
<!-- Definition(s) -->
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:choose>
<xsl:when test="count(sp:def) > 1">
<ol>
......@@ -112,44 +96,32 @@
GESTION DES DEFINITIONS
-->
<xsl:template match="lx:term/sp:def/lx:definition" mode="inList">
<xsl:template match="lx:definition" mode="inList">
<li>
<<<<<<< HEAD
<xsl:apply-templates select="sp:desc/lx:defTxt"></xsl:apply-templates>
=======
<xsl:apply-templates select="sp:desc/lx:defTxt/*"></xsl:apply-templates>
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:apply-templates select="sp:source"></xsl:apply-templates>
<xsl:apply-templates select="sp:moreInfo"></xsl:apply-templates>
<xsl:apply-templates select="sp:desc/sc:extBlock"></xsl:apply-templates>
</li>
</xsl:template>
<xsl:template match="lx:term/sp:def/lx:definition">
<<<<<<< HEAD
<xsl:apply-templates select="sp:desc/lx:defTxt"></xsl:apply-templates>
<xsl:template match="lx:definition">
<xsl:apply-templates select="sp:desc/lx:defTxt"></xsl:apply-templates>
<xsl:apply-templates select="sp:source"></xsl:apply-templates>
<xsl:apply-templates select="sp:moreInfo"></xsl:apply-templates>
<xsl:apply-templates select="sp:desc/sc:extBlock"></xsl:apply-templates>
=======
<xsl:apply-templates select="sp:desc/lx:defTxt/*"></xsl:apply-templates>
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:apply-templates select="sp:source"></xsl:apply-templates>
<xsl:apply-templates select="sp:moreInfo"></xsl:apply-templates>
</xsl:template>
<!-- Information Complémentaire -->
<xsl:template match="sp:moreInfo">
<<<<<<< HEAD
<p span="moreinfo">
<i> complément : </i> <br/>
=======
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:apply-templates select="lx:moreInfoM/sp:title"></xsl:apply-templates>
<ul>
<xsl:apply-templates select="lx:txt/*"></xsl:apply-templates>
</ul>
<<<<<<< HEAD
</p>
=======
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
</xsl:template>
<xsl:template match="lx:moreInfoM/sp:title">
......@@ -158,7 +130,6 @@
</p>
</xsl:template>
<<<<<<< HEAD
<!-- Copie du contenu de la balise lx:defTxt -->
<xsl:template match="lx:defTxt/lx_defTxt_blocs/sc:para" >
<p class="def_text">
......@@ -178,74 +149,44 @@
</p>
</xsl:template>
-->
=======
<!-- Copie du contenu de la balise lx:defTxt et moreInfo -->
<xsl:template match="lx:defTxt//*|lx:defTxt//@*|sp:moreInfo/lx:txt//*|sp:moreInfo/lx:txt//@*" >
<li>
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
</xsl:copy>
</li>
</xsl:template>
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<!--
FILTRAGE DES CONTENUS DE LA DEFINITION
-->
<!-- Tableaux -->
<<<<<<< HEAD
<xsl:template match="sc:table">
<br/>
<table border="1">
<caption> <xsl:value-of select="sc:caption"/></caption>
<xsl:apply-templates select="sc:row"/>
=======
<xsl:template match="sc:table" priority="2" >
<table>
<caption> <xsl:value-of select="sc:caption"/></caption>
<xsl:apply-templates select="sc:row"/>
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
</table>
</xsl:template>
<xsl:template match="sc:row">
<tr>
<<<<<<< HEAD
<xsl:for-each select="sc:cell">
<td>
<xsl:value-of select="sc:para"/>
=======
<xsl:for-each select="sc:cell/sc:para">
<td>
<xsl:value-of select="."/>
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
</td>
</xsl:for-each>
</tr>
</xsl:template>
<<<<<<< HEAD
<!--images -->
<xsl:template match="lx:defTxt/sc:extBlock[@role='img']">
<xsl:variable name="img_uri"> <xsl:value-of select="@sc:refUri"/></xsl:variable>
<img scr="$img_uri">
</img>
</xsl:template>
=======
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<!-- Les liens vers d'autres termes,les imagettes ne sont pas reprise mais leur contenu oui
<xsl:template match="sc:inlineImg|sc:uLink" priority="2">
<xsl:apply-templates select="*|text()"></xsl:apply-templates>
</xsl:template>
<<<<<<< HEAD
reprend le contenu des citations Lexique et les met entre guillemets
=======
<!-- reprend le contenu des citations Lexique et les met entre guillemets
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:template match="sc:phrase[@role='quote']" priority="2">
&#171;&#160;<xsl:apply-templates select="*|text()"></xsl:apply-templates>&#160;&#187;
</xsl:template>
......@@ -274,10 +215,7 @@
-->
<xsl:template match="lx:definition/sp:source[@sc:refUri]">
<<<<<<< HEAD
<br/>
=======
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<!--<xsl:variable name="path" select="resolve-uri(replace(@sc:refUri,'^/',''),concat('file:/',replace($srcdir,'\\','/')))"></xsl:variable>-->
<xsl:apply-templates select="document(@sc:refUri)/sc:item/lx:source/lx:sourceM"></xsl:apply-templates>
</xsl:template>
......@@ -287,19 +225,14 @@
</xsl:template>
<xsl:template match="lx:source/lx:sourceM[sp:url]">
<<<<<<< HEAD
<p span="source">
=======
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:text>Source : </xsl:text>
<xsl:variable name="url"> <xsl:value-of select="sp:url/text()"></xsl:value-of></xsl:variable>
<a href="$url">
<xsl:value-of select="sp:title"></xsl:value-of>
</a>
<<<<<<< HEAD
</p>
=======
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
</xsl:template>
<xsl:template match="lx:source/lx:sourceM[not(sp:url)]">
......
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
<<<<<<< HEAD
xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"
xmlns:lx="scpf.org:lexicon"
xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive"
......@@ -10,17 +8,11 @@
exclude-result-prefixes="xs"
version="2.0">
=======
xmlns:hodoc="http://www.utc.fr/ics/hdoc/xhtml"
exclude-result-prefixes="xs"
version="1.0">
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:output method="xml" indent="yes" />
<xsl:template match="/">
<!-- <sc:item xmlns:sc="http://www.utc.fr/ics/scenari/v3/core">
<op:glos xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive" xmlns:op="utc.fr:ics/opale3"> -->
<html xmlns:hodoc="http://www.utc.fr/ics/hdoc/xhtml">
<head>
<!--
......@@ -38,7 +30,6 @@
<xsl:value-of select="sc:item/lx:term/lx:termM/sp:name"></xsl:value-of>
</h2>
<!--grammaire et type du mot en italique entre crochets -->
<<<<<<< HEAD
<xsl:if test="sc:item/lx:term/lx:termM/sp:grammar">
<i>
[<xsl:apply-templates select="sc:item/lx:term/lx:termM/sp:grammar"></xsl:apply-templates>]
......@@ -49,12 +40,7 @@
[<xsl:apply-templates select="sc:item/lx:term/lx:termM/sp:type"></xsl:apply-templates>]
</i>
</xsl:if>
=======
<i>
[<xsl:apply-templates select="sc:item/lx:term/lx:termM/sp:grammar"></xsl:apply-templates>]
[<xsl:apply-templates select="sc:item/lx:term/lx:termM/sp:type"></xsl:apply-templates>]
</i>
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<p span="def_content">
<xsl:apply-templates select="/sc:item/lx:term"></xsl:apply-templates>
</p>
......@@ -88,11 +74,9 @@
</xsl:template>
<xsl:template match="lx:term">
<<<<<<< HEAD
<!-- Definition(s) dans le span="def_content-->
=======
<!-- Definition(s) -->
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:choose>
<xsl:when test="count(sp:def) > 1">
<ol>
......@@ -112,44 +96,32 @@
GESTION DES DEFINITIONS
-->
<xsl:template match="lx:term/sp:def/lx:definition" mode="inList">
<xsl:template match="lx:definition" mode="inList">
<li>
<<<<<<< HEAD
<xsl:apply-templates select="sp:desc/lx:defTxt"></xsl:apply-templates>
=======
<xsl:apply-templates select="sp:desc/lx:defTxt/*"></xsl:apply-templates>
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:apply-templates select="sp:source"></xsl:apply-templates>
<xsl:apply-templates select="sp:moreInfo"></xsl:apply-templates>
<xsl:apply-templates select="sp:desc/sc:extBlock"></xsl:apply-templates>
</li>
</xsl:template>
<xsl:template match="lx:term/sp:def/lx:definition">
<<<<<<< HEAD
<xsl:apply-templates select="sp:desc/lx:defTxt"></xsl:apply-templates>
<xsl:template match="lx:definition">
<xsl:apply-templates select="sp:desc/lx:defTxt"></xsl:apply-templates>
<xsl:apply-templates select="sp:source"></xsl:apply-templates>
<xsl:apply-templates select="sp:moreInfo"></xsl:apply-templates>
<xsl:apply-templates select="sp:desc/sc:extBlock"></xsl:apply-templates>
=======
<xsl:apply-templates select="sp:desc/lx:defTxt/*"></xsl:apply-templates>
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:apply-templates select="sp:source"></xsl:apply-templates>
<xsl:apply-templates select="sp:moreInfo"></xsl:apply-templates>
</xsl:template>
<!-- Information Complémentaire -->
<xsl:template match="sp:moreInfo">
<<<<<<< HEAD
<p span="moreinfo">
<i> complément : </i> <br/>
=======
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:apply-templates select="lx:moreInfoM/sp:title"></xsl:apply-templates>
<ul>
<xsl:apply-templates select="lx:txt/*"></xsl:apply-templates>
</ul>
<<<<<<< HEAD
</p>
=======
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
</xsl:template>
<xsl:template match="lx:moreInfoM/sp:title">
......@@ -158,7 +130,6 @@
</p>
</xsl:template>
<<<<<<< HEAD
<!-- Copie du contenu de la balise lx:defTxt -->
<xsl:template match="lx:defTxt/lx_defTxt_blocs/sc:para" >
<p class="def_text">
......@@ -178,74 +149,44 @@
</p>
</xsl:template>
-->
=======
<!-- Copie du contenu de la balise lx:defTxt et moreInfo -->
<xsl:template match="lx:defTxt//*|lx:defTxt//@*|sp:moreInfo/lx:txt//*|sp:moreInfo/lx:txt//@*" >
<li>
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
</xsl:copy>
</li>
</xsl:template>
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<!--
FILTRAGE DES CONTENUS DE LA DEFINITION
-->
<!-- Tableaux -->
<<<<<<< HEAD
<xsl:template match="sc:table">
<br/>
<table border="1">
<caption> <xsl:value-of select="sc:caption"/></caption>
<xsl:apply-templates select="sc:row"/>
=======
<xsl:template match="sc:table" priority="2" >
<table>
<caption> <xsl:value-of select="sc:caption"/></caption>
<xsl:apply-templates select="sc:row"/>
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
</table>
</xsl:template>
<xsl:template match="sc:row">
<tr>
<<<<<<< HEAD
<xsl:for-each select="sc:cell">
<td>
<xsl:value-of select="sc:para"/>
=======
<xsl:for-each select="sc:cell/sc:para">
<td>
<xsl:value-of select="."/>
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
</td>
</xsl:for-each>
</tr>
</xsl:template>
<<<<<<< HEAD
<!--images -->
<xsl:template match="sc:extBlock[@role='img']">
<xsl:template match="lx:defTxt/sc:extBlock[@role='img']">
<xsl:variable name="img_uri"> <xsl:value-of select="@sc:refUri"/></xsl:variable>
<img scr="$img_uri">
</img>
</xsl:template>
=======
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<!-- Les liens vers d'autres termes,les imagettes ne sont pas reprise mais leur contenu oui
<xsl:template match="sc:inlineImg|sc:uLink" priority="2">
<xsl:apply-templates select="*|text()"></xsl:apply-templates>
</xsl:template>
<<<<<<< HEAD
reprend le contenu des citations Lexique et les met entre guillemets
=======
<!-- reprend le contenu des citations Lexique et les met entre guillemets
>>>>>>> e6164602e4169b2cb7eaf6215434ae0ed8be47a3
<xsl:template match="sc:phrase[@role='quote']" priority="2">
&#171;&#160;<xsl:apply-templates select="*|text()"></xsl:apply-templates>&#160;&#187;