Commit 2e21fd43 authored by Ivan D'halluin's avatar Ivan D'halluin

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

parents b6a8928d e41b779e
<?xml version="1.0" encoding="UTF-8"?>
<project name="project" default="clean" basedir=".">
<property file="build.properties"/>
<property name="InputPath" value="test.zip" />
<property name="OutputPath" value="result.zip" />
<taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
<classpath>
<pathelement location="${libdir}/jing.jar"/>
</classpath>
</taskdef>
<target name="init">
<mkdir dir="${outdir}"/>
<chmod perm="777" dir="${outdir}"></chmod>
<mkdir dir="${srcdir}"/>
<chmod perm="777" dir="${srcdir}"></chmod>
</target>
<target name="unzipSource" depends="init">
<echo>Fichier en entree : ${InputPath}</echo>
<echo>Fichier de sortie : ${OutputPath}</echo>
<unzip src="${InputPath}" dest="${srcdir}"></unzip>
</target>
<target name="buildOutput" depends="unzipSource">
<xslt classpath="${libdir}/saxon9he.jar" style="${xsldir}/termToRef.xsl" basedir="${srcdir}" destdir="${outdir}" followsymlinks="false" extension=".ref">
<include name="**/*.term"/>
</xslt>
<!--<jing rngfile="${rngdir}/op_glos.rng">
<fileset dir="${outdir}">
<include name="**/*.ref"/>
</fileset>
</jing>-->
</target>
<target name="exportOutput" depends="buildOutput">
<copy file="opale.wspmeta" tofile="${outdir}/.wspmeta"></copy>
<zip basedir="${outdir}" destfile="${OutputPath}" encoding="UTF-8"></zip>
</target>
<target name="clean" depends="exportOutput">
<delete dir="${srcdir}" />
<delete dir="${outdir}" />
</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
......
#!/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;
</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)]">
......
# Converter lexique_to_opale
In order to use this converter, follow those steps :
0. Create an input and an output directory
1. Copy your Lexique file(s) (.scar or .zip) into the input directory.
2. Execute the run that correspond to your OS.
3. You will find the result into the output directory. The names of the output are linked to the hour it was processed.
# Converter lexique_to_optim
In order to use this converter, follow those steps :
0. Create an input and an output dir
1. Copy your Lexique file(s) (.scar or .zip) into the input directory.
2. Execute the run that correspond to your OS.
3. You will find the result into the output directory. The name of the output files depends of the hour it was processed.
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet
version="2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xpath-default-namespace="http://www.utc.fr/ics/hdoc/xhtml"
xmlns="http://www.utc.fr/ics/hdoc/xhtml"
>
<xsl:output method="xml" indent="yes"/>
<xsl:template match="map">
<xsl:processing-instruction name="oxygen">
RNGSchema="http://scenari.utc.fr/hdoc/schemas/xhtml/hdoc1-xhtml.rng" type="xml"
</xsl:processing-instruction>
<html>
<head>
<xsl:apply-templates mode="header"></xsl:apply-templates>
</head>
<body>
<xsl:apply-templates/>
</body>
</html>
</xsl:template>
<xsl:template match="node[1]" mode="header">
<title><xsl:value-of select="@TEXT"/></title>
<meta charset="utf-8"/>
<meta name="author" content=""/>
</xsl:template>
<xsl:template match="node">
<xsl:element name="section" >
<header>
<h1>
<xsl:value-of select="@TEXT"/>
</h1>
</header>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
<xsl:template match="node[not(node) and (preceding-sibling::node/node or following-sibling::node/node)]" priority="5">
<xsl:element name="section">
<xsl:attribute name="data-hdoc-type">unit-of-content</xsl:attribute>
<xsl:element name="header">
<xsl:element name="h1"><xsl:value-of select="@TEXT"/></xsl:element>
</xsl:element>
<xsl:element name="div" >
<xsl:element name="h6" >
<xsl:value-of select="@TEXT"/>
</xsl:element>
<p></p>
<xsl:apply-templates/>
</xsl:element>
</xsl:element>
</xsl:template>
<xsl:template match="node[not(node)]">
<xsl:element name="div" >
<xsl:element name="h6" >
<xsl:value-of select="@TEXT"/>
</xsl:element>
<p> </p>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
<xsl:template match="richcontent"/>
</xsl:stylesheet>
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0"
xmlns="urn:utc.fr:ics:hdoc:container"
>
<xsl:template match="*">
<xsl:processing-instruction name="oxygen">
RNGSchema="http://scenari.utc.fr/hdoc/schemas/container/hdoc1-container.rng" type="xml"
</xsl:processing-instruction>
<xsl:element name="container" >
<xsl:attribute name="version">1.0</xsl:attribute>
<rootfiles>
<rootfile full-path="content.xml" media-type="text/xml"/>
</rootfiles>
</xsl:element>
</xsl:template>
</xsl:stylesheet>
......@@ -27,7 +27,7 @@
<!-- Header in hdoc -->
<xsl:template match="node[1]" mode="header">
<title>
<xsl:value-of select="utc:string-remove-order(@TEXT)"/>
<xsl:value-of select="utc:remove-language(@TEXT)"/>
<xsl:value-of select="richcontent"/>
</title>
<meta charset="utf-8"/>
......@@ -39,7 +39,7 @@
<xsl:element name="section">
<header>
<h1>
<xsl:value-of select="utc:string-remove-order(@TEXT)"/>
<xsl:value-of select="utc:remove-language(@TEXT)"/>
<xsl:value-of select="richcontent"/>
</h1>
</header>
......@@ -49,7 +49,7 @@
<header><h1>Introduction</h1>
<xsl:element name="div">
<xsl:attribute name="data-hdoc-type">introduction</xsl:attribute>
<xsl:value-of select="utc:string-remove-order(utc:string-remove-all(child::*[contains(@TEXT, '#intro')][1]/@TEXT, '#intro '))"/>
<xsl:value-of select="utc:remove-language(child::*[contains(@TEXT, '#intro')][1]/@TEXT)"/>
</xsl:element>
</header>
</xsl:element>
......@@ -63,7 +63,7 @@
<footer>
<xsl:element name="div">
<xsl:attribute name="data-hdoc-type">conclusion</xsl:attribute>
<xsl:value-of select="utc:string-remove-order(utc:string-remove-all(child::*[contains(@TEXT, '#conclu')][1]/@TEXT, '#conclu '))"/>
<xsl:value-of select="utc:remove-language(child::*[contains(@TEXT, '#conclu')][1]/@TEXT)"/>
</xsl:element>
</footer>
</xsl:element>
......@@ -84,7 +84,7 @@
</xsl:if>
<header>
<h1>
<xsl:value-of select="utc:string-remove-order(@TEXT)"/>
<xsl:value-of select="utc:remove-language(@TEXT)"/>
<xsl:value-of select="richcontent"/>
</h1>
</header>
......@@ -95,7 +95,7 @@
<!-- Paragraph -->
<xsl:template match="node[contains(@TEXT, '#p')]" priority="2">
<xsl:element name="p">
<xsl:value-of select="utc:string-remove-order(utc:string-remove-all(@TEXT, '#p '))"/>
<xsl:value-of select="utc:remove-language(@TEXT)"/>
</xsl:element>
</xsl:template>
......@@ -104,9 +104,9 @@
<xsl:element name="a">
<xsl:attribute name="href">
<xsl:text>#</xsl:text>
<xsl:value-of select="utc:string-remove-order(utc:string-remove-all(@TEXT, '#a '))"/>
<xsl:value-of select="utc:remove-language(@TEXT)"/>
</xsl:attribute>
<xsl:value-of select="utc:string-remove-order(utc:string-remove-all(@TEXT, '#a '))"/>
<xsl:value-of select="utc:remove-language(@TEXT)"/>
</xsl:element>
</xsl:template>
......@@ -114,43 +114,14 @@
<xsl:template match="node[contains(@TEXT, '#intro')] | node[contains(@TEXT, '#conclu')]" priority="3"/>
<xsl:template match="richcontent">
<xsl:value-of select="utc:string-remove-order(html/body/p)"/>
<xsl:value-of select="utc:remove-language(html/body/p)"/>
</xsl:template>
<!-- Utility functions -->
<xsl:function name="utc:string-remove-all" as="xs:string">
<xsl:param name="text" as="xs:string"/>
<xsl:param name="replace" as="xs:string"/>
<xsl:variable name="ret">
<xsl:call-template name="string-remove-all">
<xsl:with-param name="text" select="$text"/>
<xsl:with-param name="replace" select="$replace"/>
</xsl:call-template>
</xsl:variable>
<xsl:value-of select="$ret"/>
</xsl:function>
<xsl:template name="string-remove-all">
<xsl:param name="text" as="xs:string"/>
<xsl:param name="replace" as="xs:string"/>
<xsl:choose>
<xsl:when test="contains($text, $replace)">
<xsl:value-of select="substring-before($text,$replace)"