jing implementation

etherpad_to_hdoc/antce/myantce.ant

@@ -42,11 +42,25 @@
         <echo message="application/x-hdoc+zip" file="${tmp}/tozip/mimetype" />
     </target>
     
+    <target name="jing-hdoc">
+        <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
+            <classpath>
+                <pathelement location="lib/jing.jar"/>
+            </classpath>
+        </taskdef>
+        
+        <jing file="${tmp}/tozip/content.xml" rngfile="schema/xhtml/hdoc1-xhtml.rng"></jing>
+        <echo>content.xml respecte le schema hdoc1-xhtml.rng</echo>
+        
+    </target>
+    
     <!-- Zip Hdoc container -->
     <target name="zip">
         <zip basedir="${tmp}/tozip/" destfile="${out}/output.hdoc" />
     </target>
     
-    <target name="main" depends="start,apply-xslt,construct_hdoc,zip" />
+    <target name="main" depends="start,apply-xslt,construct_hdoc,jing-hdoc,zip">
+        
+    </target>
     
 </project>
\ No newline at end of file

etherpad_to_hdoc/antce/schema/container/hdoc1-container.rng

+<?xml version="1.0" encoding="UTF-8"?>
+<grammar 
+  xmlns="http://relaxng.org/ns/structure/1.0"
+  xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+  datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+  ns="urn:utc.fr:ics:hdoc:container" 
+  >
+  
+  <a:documentation>This schema describes the META-INF/container.xml file for hdoc format</a:documentation>
+  <a:documentation>This schema is a derivation of http://www.idpf.org/epub/30/schema/ocf-container-30.rnc
+    from EPUB Open Container Format (http://www.idpf.org/epub/30/spec/epub30-ocf.html)     
+  </a:documentation>
+  
+  <start>
+    <element name="container">
+      <attribute name="version">
+        <value>1.0</value>
+      </attribute>
+      <element name="rootfiles">        
+          <element name="rootfile">
+              <attribute name="full-path">
+                <data type="anyURI"/>                       
+              </attribute>
+              <attribute name="media-type">
+                <value>text/xml</value>
+              </attribute>              
+          </element>        
+      </element>      
+    </element>
+  </start>
+  
+</grammar>

etherpad_to_hdoc/antce/schema/xhtml/type.rng

+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0"
+    xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+    ns="http://www.utc.fr/ics/hdoc/xhtml">
+
+    <a:documentation>Last update : 2014-12-04</a:documentation>
+    <a:documentation>Changes since last update : 
+        In order to manage quiz : 
+        - Adding multiple-choice-question and fill-in-the-blank to section
+        - Adding question, choice-correct, choice-uncorrect and explanation to div
+        - Adding blank to span
+        - Externalizing ObjectType and VideoType from main schema
+    </a:documentation>
+    
+    <!-- Type Microdata -->
+    <define name="SectionType">
+        <optional>
+            <attribute name="data-hdoc-type">
+                <choice>
+                    <value>introduction</value>
+                    <value>conclusion</value>
+                    <value>unit-of-content</value>
+                    <value>multiple-choice-question</value>
+                    <value>fill-in-the-blank</value> 
+                </choice>
+            </attribute>
+        </optional>
+    </define>
+
+    <define name="DivType">
+        <optional>
+            <attribute name="data-hdoc-type">
+                <choice>
+                    <!-- block management -->
+                    <value>emphasis</value>
+                    <value>complement</value>
+                    <value>definition</value>
+                    <value>example</value>
+                    <value>remark</value>
+                    <value>warning</value>
+                    <value>advice</value> 
+                    <!-- quiz management -->
+                    <value>question</value>
+                    <value>choice-correct</value>
+                    <value>choice-incorrect</value>
+                    <value>explanation</value>
+                </choice>
+            </attribute>
+        </optional>
+    </define>
+
+    <define name="SpanType">
+        <optional>
+            <attribute name="data-hdoc-type">
+                <choice>
+                    <value>syntax</value>
+                    <value>latex</value>
+                    <!-- quiz management -->
+                    <value>blank</value>                    
+                </choice>
+            </attribute>
+        </optional>
+    </define>
+    
+    <define name="ObjectType">
+        <attribute name="type">
+            <choice>                    
+                <value>application/vnd.oasis.opendocument.graphics </value>
+                <value>application/vnd.oasis.opendocument.spreadsheet</value>
+                <value>application/pdf</value>                    
+            </choice>
+        </attribute>
+    </define>
+
+    <define name="VideoType">
+        <attribute name="type">
+            <choice>
+                <value>video/mp4</value>
+                <value>video/ogg</value>
+                <value>video/webm</value>
+            </choice>
+        </attribute>
+    </define>
+</grammar>

etherpad_to_hdoc/antce/xsl/html2xhtml.xsl

@@ -13,7 +13,7 @@
     <xsl:template name="text2xml">
         <xsl:variable name="text" select="unparsed-text($text-uri, $text-encoding)"/>
         <xsl:analyze-string select="$text" regex=".*title.(.*).title.\n.*\n.*\n.*\n.*\n.*\n.*.body.(.*br.*)..body.">
-            <xsl:matching-substring>                
+            <xsl:matching-substring>
                 <head>
                     <title>
                         <xsl:value-of select="normalize-space(regex-group(1))"/>