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

hdoc_to_opale/bibtex_to_opale/Ant/bibtex_to_opale.ant

@@ -2,7 +2,8 @@
 <project basedir=".." name="main" default="convert">
     <property name="InputPath" value="bib2.bib"></property>
     <property name="OutputPath" value="${basedir}\result\ref.scar"></property>
-    
+    <property name="lib" value="${basedir}/lib"/>
+
     <target name="convert">
         <antcall target="preparation"/>
         <antcall target="BibtexToBibXml"/>
@@ -18,7 +19,7 @@
         <antcall target="zip"/>
         <antcall target="CleanDirectory"/>
     </target>
-    
+
     <target name="preparation">
         <delete dir="${basedir}/result"></delete>
         <mkdir dir="${basedir}/result"></mkdir>
@@ -26,52 +27,52 @@
         <mkdir dir="${basedir}/decompressedOpale/ref"></mkdir>
         <mkdir dir="${basedir}/tmp"></mkdir>
     </target>
-    
+
     <target name="CleanDirectory">
         <delete dir="${basedir}/tmp"></delete>
         <delete dir="${basedir}/java"></delete>
         <delete dir="${basedir}/decompressedOpale"></delete>
     </target>
-    
-    
+
+
     <target name="BibtexToBibXml">
         <!-- Convert Bibtex into BibtexXml  -->
         <java
             fork="true"
-            failonerror="true" 
-            jar="lib/bibtex.jar"
+            failonerror="true"
+            jar="${lib}/bibtex.jar"
             >
             <arg value="${InputPath}"/>
             <arg value="${basedir}/tmp"/>
             <arg value="/tmpBibXml.xml"/>
         </java>
     </target>
-    
+
     <target name="BibXmlToHdocBib">
         <!-- Convert from BibXlm to HdocBib -->
-        <xslt classpath="${basedir}/lib/saxon9he.jar" 
-            in="${basedir}\tmp\tmpBibXml.xml" out="${basedir}\tmp\tmpHdocBib.xml" 
+        <xslt classpath="${basedir}/${lib}/saxon9he.jar"
+            in="${basedir}\tmp\tmpBibXml.xml" out="${basedir}\tmp\tmpHdocBib.xml"
             xslresource="${basedir}/XSL/BibToHdoc.xsl"></xslt>
     </target>
-    
+
     <target name="HdocToOpale">
         <!-- Convert from HdocBib to Opale -->
-        <xslt in="${basedir}\tmp\tmpHdocBib.xml" 
-            out="${basedir}/tmp/tempHdoc.xml" 
+        <xslt in="${basedir}\tmp\tmpHdocBib.xml"
+            out="${basedir}/tmp/tempHdoc.xml"
             xslresource="${basedir}/XSL/SeparateXmlt.xsl">
             <param name="in" expression="${basedir}\tmp\tmpHdocBib.xml"></param>
             <param name="out" expression="${basedir}\decompressedOpale\ref"></param>
         </xslt>
         <ant antfile="${basedir}/tmp/tempHdoc.xml"/>
     </target>
-    
+
     <target name="zip">
         <chmod dir="${basedir}/decompressedOpale" perm="777"></chmod>
         <copy file=".wspmeta" todir="${basedir}/decompressedOpale"/>
         <zip basedir="decompressedOpale" destfile="${OutputPath}" encoding="UTF-8"/>
         <chmod dir="${OutputPath}" perm="777"/>
     </target>
-    
-    
-    
-</project>
\ No newline at end of file
+
+
+
+</project>

hdoc_to_opale/hdoc_to_opale.ant

@@ -12,7 +12,6 @@
     <property name="log" location="${basedir}/log"/>
     <property name="schema" location="${basedir}/schema"/>
     <property name="bibtex" location="${basedir}/bibtex_to_opale"/>
-
     <property file="global.properties"/>
 
   	<target name="convert">
@@ -91,6 +90,7 @@
       		</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}"/>
+            <param name="lib" expression="${lib}"/>
           </xslt>
       		<chmod file="${tmp}/${filename}/generateContentPath.xml" perm="777"/>
         </sequential>

hdoc_to_opale/xsl/prepareCourseUcCopies.xsl

@@ -21,7 +21,7 @@
       <property name="filename" location="${{tmp}}/{$filename}"/>
       <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
         <classpath>
-          <pathelement location="../lib/jing.jar"/>
+          <pathelement location="../${lib}/jing.jar"/>
         </classpath>
       </taskdef>
 

hdoc_to_opale/xsl/transformation0.xsl

@@ -9,9 +9,10 @@
         <project name="getContentFileAndTransformIt" basedir="." default="start">
             <property file="global.properties"/>
             <property name="filename" location="${filename}"/>
+            <property name="lib" location="${lib}"/>
             <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
                 <classpath>
-                    <pathelement location="../lib/jing.jar"/>
+                    <pathelement location="../${lib}/jing.jar"/>
                 </classpath>
             </taskdef>
 

opale_to_hdoc/opale_to_hdoc.ant

@@ -27,9 +27,9 @@
 	<!-- Clean : delete old files -->
 	<target name="clean">
 		<!-- delete folders -->
-		<!--delete dir="${UnzipSourcePath}"/-->
-		<!--delete dir="${TmpPath}"/-->
-		<!--delete dir="${HdocPath}"/-->
+		<delete dir="${UnzipSourcePath}"/>
+		<delete dir="${TmpPath}"/>
+		<delete dir="${HdocPath}"/>
 	</target>
 	
 	<!-- Check if only one xml file -->

opale_to_hdoc/xsl/opale_to_hdoc_regle2.xsl

@@ -12,6 +12,10 @@
       xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive"
       xmlns:op="utc.fr:ics/opale3">
     
+    <xsl:template match="sc:item">
+        <xsl:apply-templates/>
+    </xsl:template>
+    
     <!-- MODULE  -->
     <xsl:template match="op:ue">
         
@@ -109,7 +113,11 @@
             </header>
             
             <!-- currently : grain & introduction & conclusion -->
-            <xsl:apply-templates select="./op:courseUa/child::*[name() != 'op:uM'][name() != 'sp:quest']"/>
+<!--            <xsl:apply-templates select="./op:courseUa/child::*[name() != 'op:uM'][name() != 'sp:quest']"/>-->
+            <xsl:apply-templates select="./op:courseUa/sp:courseUc"/>
+            <xsl:apply-templates select="./op:courseUa/sp:intro"/>
+            <xsl:apply-templates select="./op:courseUa/sp:conclu"/>
+            <xsl:apply-templates select="./op:courseUa/sp:obj"/>
            
             <!-- overview questions : regroup questions into a section-->
             <xsl:if test="./op:courseUa/sp:quest">
@@ -140,7 +148,8 @@
             </header>
             
             <!-- call for blocs and parts -->
-            <xsl:apply-templates select="./op:expUc/child::*[name() != 'op:uM']"/>
+<!--            <xsl:apply-templates select="./op:expUc/child::*[name() != 'op:uM']"/>-->
+            <xsl:apply-templates select="./op:expUc/sp:pb/op:pb/*"/>
             
             <footer>
                 <xsl:apply-templates select="./op:expUc/op:uM/sp:info/op:info/sp:keywds"/>
@@ -186,6 +195,12 @@
         </section>
     </xsl:template>
     
+    <xsl:template match="sp:filtered">
+        <xsl:if test="op:filter/sp:exclude/text() = 'short'">
+            <xsl:apply-templates select="./op:res/*"/>
+        </xsl:if>
+    </xsl:template>
+    
     <!-- Overview questions (fr : question de synthèse) -->
     <xsl:template match="sp:quest">
         <xsl:apply-templates select="./op:txt/*"/>
@@ -437,4 +452,6 @@
         </p>
     </xsl:template>
     
+    <xsl:template match="*"></xsl:template>
+    
 </xsl:stylesheet>

optim_to_hdoc/README

@@ -7,8 +7,7 @@ Put `.scar` files in the input folder, run `run.bat` or `run.sh` and get results
 Todo list
 ---------
 
-- tests more files (with As We May)
-- add schema validation
+- tests more files
 - clean output of optim source files
 - resolve bugs
 - test the entier process from optim to opale
@@ -17,7 +16,8 @@ Todo list
 Bugs
 ----
 
-- references of sections or fragments inside a paragraphe ;
+- references of sections or fragments inside a paragraphe
+- can create divs with only h6
 
 
 Transformation

optim_to_hdoc/optim_to_hdoc.ant

@@ -2,6 +2,11 @@
 <project basedir="." name="optim_to_hdoc">
   
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+  <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
+		<classpath>
+			<pathelement location="lib/jing.jar"/>
+		</classpath>
+	</taskdef>
   
   <property name="in" location="${basedir}/input"/>
   <property name="out" location="${basedir}/output"/>
@@ -27,7 +32,7 @@
     </path>
     <sequential>
       <local name="archive_name"/>
-      <basename property="archive_name" file="@{archive}"/>
+      <basename property="archive_name" file="@{archive}" suffix=".scar"/>
       <unzip src="@{archive}" dest="${tmp}/extract/${archive_name}"></unzip>
     </sequential>
   </for>
@@ -49,7 +54,6 @@
   <echo message="Convert to hdoc..."/>
   
   <xslt basedir="${tmp}/internationalisation" destdir="${out}" style="${xsl}/optim_to_hdoc.xsl"/>
-  
 
   <echo message="Copy ressources files..."/>
 
@@ -78,6 +82,16 @@
         <fileset dir="@{folder}" includes="*.html" />
       </first>
       <move file="${toString:first}" tofile="@{folder}/content.xml"/>
+      <trycatch property="foo" reference="bar">
+        <try>
+          <jing file="@{folder}/META-INF/container.xml" rngfile="../schemas/container/hdoc1-container.rng"></jing>
+          <jing file="@{folder}/content.xml" rngfile="../schemas/xhtml/hdoc1-xhtml.rng"></jing>
+        </try>
+        <catch>
+          <echo>Validation error of hdoc output</echo>
+        </catch>
+      </trycatch>
+      
     </sequential>
   </for>