Skip to content
Snippets Groups Projects
Commit 7a6f0cfc authored by Max-Ferdinand Zeterberg's avatar Max-Ferdinand Zeterberg
Browse files

Merge branch '8-certainty-fur-mehr-elemente' into 'master' 

Resolve "Certainty für mehr Elemente"

Closes #8

See merge request !17
parents 2e515d55 387ceb45
No related branches found
No related tags found
1 merge request!17Resolve "Certainty für mehr Elemente"
Hide whitespace changes
Inline Side-by-side
Showing
with 205 additions and 31 deletions
schema/edxml.rng
+ 205
− 31
View file @ 7a6f0cfc
...@@ -16,6 +16,19 @@ ...@@ -16,6 +16,19 @@
<attribute name="ana"/> <attribute name="ana"/>
</define> </define>
<define name="attr.cert">
<attribute name="cert">
<list>
<choice>
<value>high</value>
<a:documentation>(default) Die Aussage ist sicher und lässt sich zweifelsfrei belegen.</a:documentation>
<value>low</value>
<a:documentation>Die Aussage ist unsicher. Sie lässt sich nicht zweifelsfrei belegen.</a:documentation>
</choice>
</list>
</attribute>
</define>
<define name="attr.copy"> <define name="attr.copy">
<attribute name="copy"> <attribute name="copy">
<data type="boolean"/> <data type="boolean"/>
...@@ -324,15 +337,8 @@ ...@@ -324,15 +337,8 @@
<ref name="attr.ana"/> <ref name="attr.ana"/>
</optional> </optional>
<optional> <optional>
<attribute name="cert"> <ref name="attr.cert"/>
<list>
<value>uncertain</value>
</list>
</attribute>
</optional> </optional>
<zeroOrMore>
<ref name="model.transcriptional"/>
</zeroOrMore>
<text/> <text/>
</element> </element>
</define> </define>
...@@ -613,6 +619,53 @@ ...@@ -613,6 +619,53 @@
</element> </element>
</define> </define>
<define name="elem.relations">
<element name="relations">
<element name="head">
<text/>
</element>
<zeroOrMore>
<ref name="elem.relation"/>
</zeroOrMore>
</element>
</define>
<define name="elem.relation">
<element name="relation">
<attribute name="type"/>
<attribute name="source">
<data type="anyURI"/>
<sch:pattern>
<sch:rule context="edxml:relation/@source">
<sch:let name="id" value="substring-after(., '#')"/>
<sch:assert test="//*[@xml:id = $id]" role="error">(ID '<sch:value-of
select="$id"/>' gibt's nicht!): Die ID in @<sch:name/> gibt es in
diesem Dokument nicht!</sch:assert>
</sch:rule>
</sch:pattern>
</attribute>
<attribute name="target">
<data type="anyURI"/>
<sch:pattern>
<sch:rule context="edxml:relation/@target">
<sch:let name="id" value="substring-after(., '#')"/>
<sch:assert test="//*[@xml:id = $id]" role="error">(ID '<sch:value-of
select="$id"/>' gibt's nicht!): Die ID in @<sch:name/> gibt es in
diesem Dokument nicht!</sch:assert>
</sch:rule>
</sch:pattern>
</attribute>
<text/>
</element>
</define>
<define name="elem.ref">
<element name="ref">
<attribute name="target"/>
<text/>
</element>
</define>
<define name="elem.phr"> <define name="elem.phr">
<element name="phr"> <element name="phr">
<optional> <optional>
...@@ -892,10 +945,15 @@ ...@@ -892,10 +945,15 @@
<define name="elem.translation"> <define name="elem.translation">
<element name="translation"> <element name="translation">
<ref name="attr.xml.lang"/> <ref name="attr.xml.lang"/>
<optional>
<ref name="attr.cert"/>
</optional>
<interleave> <interleave>
<!--<ref name="group.inline.elements"/>--> <!--<ref name="group.inline.elements"/>-->
<ref name="model.philological.translit"/> <ref name="model.philological.translit"/>
<ref name="elem.hi"/> <zeroOrMore>
<ref name="elem.hi"/>
</zeroOrMore>
<text/> <text/>
</interleave> </interleave>
</element> </element>
...@@ -1006,6 +1064,9 @@ ...@@ -1006,6 +1064,9 @@
<optional> <optional>
<ref name="attr.ana"/> <ref name="attr.ana"/>
</optional> </optional>
<optional>
<ref name="attr.cert"/>
</optional>
<optional> <optional>
<ref name="attr.corresp"/> <ref name="attr.corresp"/>
</optional> </optional>
...@@ -1575,16 +1636,16 @@ ...@@ -1575,16 +1636,16 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="elem.tei.availability"> <define name="elem.tei.availability">
<element name="tei:availability"> <element name="tei:availability">
<ref name="elem.tei.licence"></ref> <ref name="elem.tei.licence"/>
</element> </element>
</define> </define>
<define name="elem.tei.licence"> <define name="elem.tei.licence">
<element name="tei:licence"> <element name="tei:licence">
<ref name="attr.tei.target"></ref> <ref name="attr.tei.target"/>
</element> </element>
</define> </define>
...@@ -1593,7 +1654,14 @@ ...@@ -1593,7 +1654,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1611,7 +1679,14 @@ ...@@ -1611,7 +1679,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1620,7 +1695,14 @@ ...@@ -1620,7 +1695,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1629,7 +1711,14 @@ ...@@ -1629,7 +1711,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1638,7 +1727,14 @@ ...@@ -1638,7 +1727,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1647,7 +1743,14 @@ ...@@ -1647,7 +1743,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1656,7 +1759,14 @@ ...@@ -1656,7 +1759,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1668,7 +1778,15 @@ ...@@ -1668,7 +1778,15 @@
<optional> <optional>
<ref name="attr.tei.degree"/> <ref name="attr.tei.degree"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
<!-- Hier könnte man noch eine Schematron-Validierung einbauen: Wenn ein ancestor-Element surface/textBlock/transcription ist, dann darf tei.damage kein text() enthalten, sondern nur elem.g -->
</element> </element>
</define> </define>
...@@ -1677,7 +1795,14 @@ ...@@ -1677,7 +1795,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1686,7 +1811,14 @@ ...@@ -1686,7 +1811,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1695,7 +1827,14 @@ ...@@ -1695,7 +1827,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1704,7 +1843,14 @@ ...@@ -1704,7 +1843,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1713,7 +1859,14 @@ ...@@ -1713,7 +1859,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1722,7 +1875,14 @@ ...@@ -1722,7 +1875,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1731,7 +1891,14 @@ ...@@ -1731,7 +1891,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1740,7 +1907,14 @@ ...@@ -1740,7 +1907,14 @@
<optional> <optional>
<ref name="attr.xml.id"/> <ref name="attr.xml.id"/>
</optional> </optional>
<text/> <oneOrMore>
<optional>
<ref name="elem.g"/>
</optional>
<optional>
<text/>
</optional>
</oneOrMore>
</element> </element>
</define> </define>
...@@ -1753,9 +1927,9 @@ ...@@ -1753,9 +1927,9 @@
</choice> </choice>
</attribute> </attribute>
</define> </define>
<define name="attr.tei.target"> <define name="attr.tei.target">
<attribute name="target"/> <attribute name="target"/>
</define> </define>
</grammar> </grammar>
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