Commit dc2f0d6a authored by bperraud's avatar bperraud

Update schemas according to master versions

parent fe385ac9
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<a:documentation>This schema describes the content file for hdoc format</a:documentation> <a:documentation>This schema describes the content file for hdoc format</a:documentation>
<a:documentation>This schema is a restriction of XHTML (it validates XHTML <a:documentation>This schema is a restriction of XHTML (it validates XHTML
schema, if namespace is changed to http://www.w3.org/1999/xhtml)</a:documentation> schema, if namespace is changed to http://www.w3.org/1999/xhtml)</a:documentation>
<a:documentation>Last update : 2014-12-22</a:documentation> <a:documentation>Last update : 2014-12-22</a:documentation>
<a:documentation>Changes since last update : <a:documentation>Changes since last update :
Adding biblio management via a href='' data-hdoc-type='bibtexml' Adding biblio management via a href='' data-hdoc-type='bibtexml'
</a:documentation> </a:documentation>
<start> <start>
<element name="html"> <element name="html">
<ref name="Head"/> <ref name="Head"/>
...@@ -39,21 +39,21 @@ ...@@ -39,21 +39,21 @@
<value>generator</value> <value>generator</value>
</attribute> </attribute>
<attribute name="content"> <attribute name="content">
<choice> <choice>
<value>SimpleOptim</value> <value>SimpleOptim</value>
<value>HdocConverter/SimpleChain</value> <value>HdocConverter/SimpleChain</value>
<value>SimpleChain</value> <value>SimpleChain</value>
<value>HdocConverter/Etherpad</value> <value>HdocConverter/Etherpad</value>
<value>HdocConverter/Opale3.4</value> <value>HdocConverter/Opale3.4</value>
<value>HdocConverter/Dokiel4.0</value> <value>HdocConverter/Dokiel4.0</value>
<value>HdocConverter/Optim1.2</value> <value>HdocConverter/Optim1.2</value>
<value>HdocConverter/Topaze1.3</value> <value>HdocConverter/Topaze1.3</value>
<value>HdocConverter/wikipedia</value> <value>HdocConverter/wikipedia</value>
<value>HdocConverter/Wordpress</value> <value>HdocConverter/Wordpress</value>
<value>HdocConverter/OpenDocumentText</value> <value>HdocConverter/OpenDocumentText</value>
<value>HdocConverter/LaTeX</value> <value>HdocConverter/LaTeX</value>
<value>HdocConverter/OPML</value> <value>HdocConverter/OPML</value>
<value>HdocConverter/DITA</value> <value>HdocConverter/DITA</value>
</choice> </choice>
</attribute> </attribute>
</element> </element>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<zeroOrMore> <zeroOrMore>
<element name="meta"> <element name="meta">
<attribute name="name"> <attribute name="name">
<choice> <choice>
<value>description</value> <value>description</value>
<value>keywords</value> <value>keywords</value>
<value>author</value> <value>author</value>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<text/> <text/>
</element> </element>
</optional> </optional>
<optional> <optional>
<element name="div"> <element name="div">
<attribute name="data-hdoc-type"> <attribute name="data-hdoc-type">
<value>tags</value> <value>tags</value>
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<ref name="Text"/> <ref name="Text"/>
</element> </element>
</optional> </optional>
</element> </element>
</oneOrMore> </oneOrMore>
</define> </define>
...@@ -245,12 +245,12 @@ ...@@ -245,12 +245,12 @@
<element name="em"> <element name="em">
<ref name="Inline"/> <ref name="Inline"/>
</element> </element>
<element name="i"> <element name="i">
<ref name="Inline"/> <ref name="Inline"/>
</element> </element>
<element name="q"> <element name="q">
<ref name="Inline"/> <ref name="Inline"/>
</element> </element>
<element name="sub"> <element name="sub">
<ref name="Inline"/> <ref name="Inline"/>
</element> </element>
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
<data type="anyURI"/> <data type="anyURI"/>
</attribute> </attribute>
<optional> <optional>
<!-- Biblio reference management --> <!-- Biblio reference management -->
<attribute name="data-hdoc-type"> <attribute name="data-hdoc-type">
<value>bibtexml</value> <value>bibtexml</value>
</attribute> </attribute>
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
<element name="span"> <element name="span">
<ref name="SpanType"/> <ref name="SpanType"/>
<ref name="Inline"/> <ref name="Inline"/>
</element> </element>
</choice> </choice>
</zeroOrMore> </zeroOrMore>
</define> </define>
...@@ -351,8 +351,8 @@ ...@@ -351,8 +351,8 @@
<define name="Object"> <define name="Object">
<element name="object"> <element name="object">
<ref name="ObjectType"/> <ref name="ObjectType"/>
<attribute name="data"> <attribute name="data">
<data type="anyURI"/> <data type="anyURI"/>
</attribute> </attribute>
<empty/> <empty/>
</element> </element>
......
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
ns="http://www.utc.fr/ics/hdoc/xhtml"> ns="http://www.utc.fr/ics/hdoc/xhtml">
<a:documentation>Last update : 2014-12-04</a:documentation> <a:documentation>Last update : 2014-12-04</a:documentation>
<a:documentation>Changes since last update : <a:documentation>Changes since last update :
In order to manage quiz : In order to manage quiz :
- Adding multiple-choice-question and fill-in-the-blank to section - Adding multiple-choice-question and fill-in-the-blank to section
- Adding question, choice-correct, choice-uncorrect and explanation to div - Adding question, choice-correct, choice-uncorrect and explanation to div
- Adding blank to span - Adding blank to span
- Externalizing ObjectType and VideoType from main schema - Externalizing ObjectType and VideoType from main schema
</a:documentation> </a:documentation>
<!-- Type Microdata --> <!-- Type Microdata -->
<define name="SectionType"> <define name="SectionType">
<optional> <optional>
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
<value>activity</value> <value>activity</value>
<value>aims</value> <value>aims</value>
<value>synthesis</value> <value>synthesis</value>
<value>order</value>
<value>match</value>
<value>group</value>
</choice> </choice>
</attribute> </attribute>
</optional> </optional>
...@@ -45,14 +48,24 @@ ...@@ -45,14 +48,24 @@
<value>example</value> <value>example</value>
<value>remark</value> <value>remark</value>
<value>warning</value> <value>warning</value>
<value>advice</value> <value>advice</value>
<value>remind</value>
<value>method</value>
<!-- quiz management --> <!-- quiz management -->
<value>question</value> <value>question</value>
<value>singlechoicequestion</value>
<value>choice</value>
<value>solution</value>
<value>choice-correct</value> <value>choice-correct</value>
<value>choice-incorrect</value> <value>choice-incorrect</value>
<value>explanation</value> <value>explanation</value>
<value>explanation-choice-correct</value> <value>explanation-choice-correct</value>
<value>explanation-choice-incorrect</value> <value>explanation-choice-incorrect</value>
<value>openQuestion</value>
<value>hint</value>
<value>gapText</value>
<value>label</value>
<value>target</value>
</choice> </choice>
</attribute> </attribute>
</optional> </optional>
...@@ -65,18 +78,18 @@ ...@@ -65,18 +78,18 @@
<value>syntax</value> <value>syntax</value>
<value>latex</value> <value>latex</value>
<!-- quiz management --> <!-- quiz management -->
<value>blank</value> <value>blank</value>
</choice> </choice>
</attribute> </attribute>
</optional> </optional>
</define> </define>
<define name="ObjectType"> <define name="ObjectType">
<attribute name="type"> <attribute name="type">
<choice> <choice>
<value>application/vnd.oasis.opendocument.graphics </value> <value>application/vnd.oasis.opendocument.graphics </value>
<value>application/vnd.oasis.opendocument.spreadsheet</value> <value>application/vnd.oasis.opendocument.spreadsheet</value>
<value>application/pdf</value> <value>application/pdf</value>
<value>application/x-listing</value> <value>application/x-listing</value>
</choice> </choice>
</attribute> </attribute>
......
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