Skip to content

H
hdoc
Commit dc2f0d6a authored by bperraud's avatar bperraud
Browse files
Options

Update schemas according to master versions

parent fe385ac9
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 26 deletions
hdoc_to_pdf/schemas/xhtml/hdoc1-xhtml.rng
View file @ dc2f0d6a
......@@ -7,12 +7,12 @@
<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
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>Changes since last update :
<a:documentation>Changes since last update :
Adding biblio management via a href='' data-hdoc-type='bibtexml'
</a:documentation>
<start>
<element name="html">
<ref name="Head"/>
......@@ -39,21 +39,21 @@
<value>generator</value>
</attribute>
<attribute name="content">
<choice>
<choice>
<value>SimpleOptim</value>
<value>HdocConverter/SimpleChain</value>
<value>SimpleChain</value>
<value>HdocConverter/SimpleChain</value>
<value>SimpleChain</value>
<value>HdocConverter/Etherpad</value>
<value>HdocConverter/Opale3.4</value>
<value>HdocConverter/Dokiel4.0</value>
<value>HdocConverter/Optim1.2</value>
<value>HdocConverter/Topaze1.3</value>
<value>HdocConverter/Optim1.2</value>
<value>HdocConverter/Topaze1.3</value>
<value>HdocConverter/wikipedia</value>
<value>HdocConverter/Wordpress</value>
<value>HdocConverter/OpenDocumentText</value>
<value>HdocConverter/LaTeX</value>
<value>HdocConverter/OPML</value>
<value>HdocConverter/DITA</value>
<value>HdocConverter/DITA</value>
</choice>
</attribute>
</element>
......@@ -62,7 +62,7 @@
<zeroOrMore>
<element name="meta">
<attribute name="name">
<choice>
<choice>
<value>description</value>
<value>keywords</value>
<value>author</value>
......@@ -152,7 +152,7 @@
<text/>
</element>
</optional>
<optional>
<optional>
<element name="div">
<attribute name="data-hdoc-type">
<value>tags</value>
......@@ -200,7 +200,7 @@
<ref name="Text"/>
</element>
</optional>
</element>
</oneOrMore>
</define>
......@@ -245,12 +245,12 @@
<element name="em">
<ref name="Inline"/>
</element>
<element name="i">
<element name="i">
<ref name="Inline"/>
</element>
<element name="q">
<ref name="Inline"/>
</element>
</element>
<element name="sub">
<ref name="Inline"/>
</element>
......@@ -262,7 +262,7 @@
<data type="anyURI"/>
</attribute>
<optional>
<!-- Biblio reference management -->
<!-- Biblio reference management -->
<attribute name="data-hdoc-type">
<value>bibtexml</value>
</attribute>
......@@ -272,7 +272,7 @@
<element name="span">
<ref name="SpanType"/>
<ref name="Inline"/>
</element>
</element>
</choice>
</zeroOrMore>
</define>
......@@ -351,8 +351,8 @@
<define name="Object">
<element name="object">
<ref name="ObjectType"/>
<attribute name="data">
<data type="anyURI"/>
<attribute name="data">
<data type="anyURI"/>
</attribute>
<empty/>
</element>
......
hdoc_to_pdf/schemas/xhtml/type.rng
View file @ dc2f0d6a
......@@ -5,14 +5,14 @@
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 :
<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>
......@@ -29,6 +29,9 @@
<value>activity</value>
<value>aims</value>
<value>synthesis</value>
<value>order</value>
<value>match</value>
<value>group</value>
</choice>
</attribute>
</optional>
......@@ -45,14 +48,24 @@
<value>example</value>
<value>remark</value>
<value>warning</value>
<value>advice</value>
<value>advice</value>
<value>remind</value>
<value>method</value>
<!-- quiz management -->
<value>question</value>
<value>singlechoicequestion</value>
<value>choice</value>
<value>solution</value>
<value>choice-correct</value>
<value>choice-incorrect</value>
<value>explanation</value>
<value>explanation-choice-correct</value>
<value>explanation-choice-incorrect</value>
<value>openQuestion</value>
<value>hint</value>
<value>gapText</value>
<value>label</value>
<value>target</value>
</choice>
</attribute>
</optional>
......@@ -65,18 +78,18 @@
<value>syntax</value>
<value>latex</value>
<!-- quiz management -->
<value>blank</value>
<value>blank</value>
</choice>
</attribute>
</optional>
</define>
<define name="ObjectType">
<attribute name="type">
<choice>
<choice>
<value>application/vnd.oasis.opendocument.graphics </value>
<value>application/vnd.oasis.opendocument.spreadsheet</value>
<value>application/pdf</value>
<value>application/pdf</value>
<value>application/x-listing</value>
</choice>
</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