Permalink
Browse files

adding Martin Mueller's text for tei simple and hopefully not breakin…

…g much
  • Loading branch information...
1 parent fb1024b commit 40b6bb1eb76979d85f3ca624d19e9a2950df1725 @jamescummings jamescummings committed Oct 17, 2015
Showing with 2,773 additions and 1,973 deletions.
  1. +3 −1 tei-pm.nvdl
  2. +2 −1 tei-pm.odd
  3. +3 −6 tei-pm.rng
  4. +2 −2 teisimple.dtd
  5. +8 −18 teisimple.isosch
  6. +13 −23 teisimple.isosch.xsl
  7. +34 −27 teisimple.odd
  8. +2,534 −1,652 teisimple.odd.html
  9. +15 −25 teisimple.rnc
  10. +10 −20 teisimple.rng
  11. +2 −2 teisimple.xsd
  12. +21 −28 tests/A10231.html
  13. +21 −28 tests/testsimple.html
  14. +21 −28 tests/testsimple2.html
  15. +21 −28 tests/testsimple3.html
  16. +21 −28 tests/testsimple4.html
  17. +21 −28 tests/testsimple5.html
  18. +21 −28 tests/testsimple6.html
View
@@ -11,10 +11,12 @@
<allow/>
</namespace>
<namespace ns="http://www.tei-c.org/ns/Examples">
- <validate schema="tei-pm-examples.rng" useMode="nested">
+<!-- <validate schema="tei-pm-examples.rng" useMode="nested">
<option name="http://www.thaiopensource.com/validate/feasible"/>
</validate>
<attach useMode="allow"/>
+-->
+<allow/>
</namespace>
<!-- allow XInclude without checking -->
View
@@ -322,12 +322,13 @@ links</change>
<oneOrMore xmlns="http://relaxng.org/ns/structure/1.0">
<choice>
<text/>
- <ref name="macro.anyThing"/>
+ <anyName/>
</choice>
</oneOrMore>
</content>
</elementSpec>
+
</schemaSpec>
</div>
</body>
View
@@ -7290,12 +7290,9 @@ Sample values include: 1] TEI(text encoding initiative) ; 2] DBK(docbook) ; 3] X
<define name="egXML">
<element name="egXML" ns="http://www.tei-c.org/ns/Examples">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(example of XML) contains a single well-formed XML fragment demonstrating the use of some XML element or attribute, in which the egXML element itself functions as the root element. [22.1.1. Phrase Level Terms]</a:documentation>
- <zeroOrMore>
- <choice>
- <text/>
- <ref name="macro.anyXML"/>
- </choice>
- </zeroOrMore>
+ <oneOrMore>
+ <text/>
+ </oneOrMore>
<ref name="att.global.attributes"/>
<ref name="att.source.attributes"/>
<optional>
View
@@ -1,7 +1,7 @@
<!--
-DTD generated from ODD source 1970-01-01. Version 0.4: 6th June 2015.This material is dual-licensed.
-[http://creativecommons.org/licenses/by-sa/3.0/] Distributed under a Creative Commons Attribution-ShareAlike 3.0 Unported License [http://www.opensource.org/licenses/BSD-2-Clause] Copyright 2014 TEI Consortium. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. This software is provided by the copyright holders and contributors "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the copyright holder or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage. TEI material can be licensed differently depending on the use you intend to make of it. Hence it is made available under both the CC+BY and BSD-2 licences. The CC+BY licence is generally appropriate for usages which treat TEI content as data or documentation. The BSD-2 licence is generally appropriate for usage of TEI content in a software environment. For further information or clarification, please contact the TEI Consortium.
+DTD generated from ODD source 1970-01-01. Version 0.9: August 2015.This material is dual-licensed.
+[http://creativecommons.org/licenses/by-sa/3.0/] Distributed under a Creative Commons Attribution-ShareAlike 3.0 Unported License [http://www.opensource.org/licenses/BSD-2-Clause] Copyright 2015 TEI Consortium. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. This software is provided by the copyright holders and contributors "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the copyright holder or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage. TEI material can be licensed differently depending on the use you intend to make of it. Hence it is made available under both the CC+BY and BSD-2 licences. The CC+BY licence is generally appropriate for usages which treat TEI content as data or documentation. The BSD-2 licence is generally appropriate for usage of TEI content in a software environment. For further information or clarification, please contact the TEI Consortium.
TEI Edition: Version 2.9.1. Last updated on
15th October 2015, revision 46ac023
TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 2.9.1/
View
@@ -29,19 +29,14 @@ belongs, but this <name/> element has no textual content.</assert>
<rule context="tei:*[@rendition]">
<let name="results"
value="for $val in tokenize(normalize-space(@rendition),'\s+') return starts-with($val,'simple:') or (starts-with($val,'#') and //tei:rendition[@xml:id=substring($val,2)])"/>
- <assert test="every $x in $results satisfies $x"> Error: Each of
- the rendition values in "<value-of select="@rendition"/>"
- must point to a local ID or to a token in the Simple scheme
- (<value-of select="$results"/>)</assert>
+ <assert test="every $x in $results satisfies $x"> Error: Each of the rendition values in "<value-of select="@rendition"/>" must point to a local ID or to a token in the Simple scheme (<value-of select="$results"/>)</assert>
</rule>
</pattern>
<pattern id="teisimple-att.global.rendition-constraint-corresppointer-3">
<rule context="tei:*[@corresp]">
<let name="results"
value="for $t in tokenize(normalize-space(@corresp),'\s+') return starts-with($t,'#') and not(id(substring($t,2)))"/>
- <report test="some $x in $results satisfies $x"> Error: Every
- local pointer in "<value-of select="@corresp"/>" must point to
- an ID in this document (<value-of select="$results"/>)</report>
+ <report test="some $x in $results satisfies $x"> Error: Every local pointer in "<value-of select="@corresp"/>" must point to an ID in this document (<value-of select="$results"/>)</report>
</rule>
</pattern>
<pattern id="teisimple-att.typed-constraint-subtypeTyped-4">
@@ -59,9 +54,7 @@ belongs, but this <name/> element has no textual content.</assert>
<rule context="tei:*[@target]">
<let name="results"
value="for $t in tokenize(normalize-space(@target),'\s+') return starts-with($t,'#') and not(id(substring($t,2)))"/>
- <report test="some $x in $results satisfies $x"> Error: Every
- local pointer in "<value-of select="@target"/>" must point to
- an ID in this document (<value-of select="$results"/>)</report>
+ <report test="some $x in $results satisfies $x"> Error: Every local pointer in "<value-of select="@target"/>" must point to an ID in this document (<value-of select="$results"/>)</report>
</rule>
</pattern>
<pattern id="teisimple-att.spanning-spanTo-constraint-spanTo-2-7">
@@ -130,23 +123,20 @@ The @spanTo attribute of <name/> is required.</assert>
</pattern>
<pattern id="teisimple-bibl-constraint-noEmptyBibl-19">
<rule context="tei:bibl">
- <assert test="child::* or child::text()[normalize-space()]" role="ERROR">
- Element "<name/>" may not be empty.
- </assert>
+ <assert test="child::* or child::text()[normalize-space()]" role="ERROR"> Element "<name/>" may not be
+ empty. </assert>
</rule>
</pattern>
<pattern id="teisimple-choice-constraint-choiceSize-20">
<rule context="tei:choice">
- <assert test="count(*) &gt; 1" role="ERROR">
- Element "<name/>" must have at least two child
- elements.</assert>
+ <assert test="count(*) &gt; 1" role="ERROR"> Element
+ "<name/>" must have at least two child elements.</assert>
</rule>
</pattern>
<pattern id="teisimple-choice-constraint-choiceContent-21">
<rule context="tei:choice">
<assert test="(tei:corr or tei:sic or tei:expan or tei:abbr or tei:reg or tei:orig) and ((tei:corr and tei:sic) or (tei:expan and tei:abbr) or (tei:reg and tei:orig))"
- role="ERROR">
- Element "<name/>" must have corresponding corr/sic, expand/abbr, reg/orig </assert>
+ role="ERROR"> Element "<name/>" must have corresponding corr/sic, expand/abbr, reg/orig </assert>
</rule>
</pattern>
<pattern id="teisimple-div-constraint-abstractModel-structure-l-22">
View
@@ -235,12 +235,9 @@ belongs, but this <xsl:text/>
<xsl:choose>
<xsl:when test="every $x in $results satisfies $x"/>
<xsl:otherwise>
- <xsl:message> Error: Each of
- the rendition values in "<xsl:text/>
+ <xsl:message> Error: Each of the rendition values in "<xsl:text/>
<xsl:value-of select="@rendition"/>
- <xsl:text/>"
- must point to a local ID or to a token in the Simple scheme
- (<xsl:text/>
+ <xsl:text/>" must point to a local ID or to a token in the Simple scheme (<xsl:text/>
<xsl:value-of select="$results"/>
<xsl:text/>) (every $x in $results satisfies $x)</xsl:message>
</xsl:otherwise>
@@ -262,11 +259,9 @@ belongs, but this <xsl:text/>
<!--REPORT -->
<xsl:if test="some $x in $results satisfies $x">
- <xsl:message> Error: Every
- local pointer in "<xsl:text/>
+ <xsl:message> Error: Every local pointer in "<xsl:text/>
<xsl:value-of select="@corresp"/>
- <xsl:text/>" must point to
- an ID in this document (<xsl:text/>
+ <xsl:text/>" must point to an ID in this document (<xsl:text/>
<xsl:value-of select="$results"/>
<xsl:text/>) (some $x in $results satisfies $x)</xsl:message>
</xsl:if>
@@ -334,11 +329,9 @@ belongs, but this <xsl:text/>
<!--REPORT -->
<xsl:if test="some $x in $results satisfies $x">
- <xsl:message> Error: Every
- local pointer in "<xsl:text/>
+ <xsl:message> Error: Every local pointer in "<xsl:text/>
<xsl:value-of select="@target"/>
- <xsl:text/>" must point to
- an ID in this document (<xsl:text/>
+ <xsl:text/>" must point to an ID in this document (<xsl:text/>
<xsl:value-of select="$results"/>
<xsl:text/>) (some $x in $results satisfies $x)</xsl:message>
</xsl:if>
@@ -574,11 +567,10 @@ The @spanTo attribute of <xsl:text/>
<xsl:choose>
<xsl:when test="child::* or child::text()[normalize-space()]"/>
<xsl:otherwise>
- <xsl:message>
- Element "<xsl:text/>
+ <xsl:message> Element "<xsl:text/>
<xsl:value-of select="name(.)"/>
- <xsl:text/>" may not be empty.
- (child::* or child::text()[normalize-space()] / ERROR)</xsl:message>
+ <xsl:text/>" may not be
+ empty. (child::* or child::text()[normalize-space()] / ERROR)</xsl:message>
</xsl:otherwise>
</xsl:choose>
<xsl:apply-templates select="*" mode="M21"/>
@@ -598,11 +590,10 @@ The @spanTo attribute of <xsl:text/>
<xsl:choose>
<xsl:when test="count(*) &gt; 1"/>
<xsl:otherwise>
- <xsl:message>
- Element "<xsl:text/>
+ <xsl:message> Element
+ "<xsl:text/>
<xsl:value-of select="name(.)"/>
- <xsl:text/>" must have at least two child
- elements. (count(*) &gt; 1 / ERROR)</xsl:message>
+ <xsl:text/>" must have at least two child elements. (count(*) &gt; 1 / ERROR)</xsl:message>
</xsl:otherwise>
</xsl:choose>
<xsl:apply-templates select="*" mode="M22"/>
@@ -622,8 +613,7 @@ The @spanTo attribute of <xsl:text/>
<xsl:choose>
<xsl:when test="(tei:corr or tei:sic or tei:expan or tei:abbr or tei:reg or tei:orig) and ((tei:corr and tei:sic) or (tei:expan and tei:abbr) or (tei:reg and tei:orig))"/>
<xsl:otherwise>
- <xsl:message>
- Element "<xsl:text/>
+ <xsl:message> Element "<xsl:text/>
<xsl:value-of select="name(.)"/>
<xsl:text/>" must have corresponding corr/sic, expand/abbr, reg/orig ((tei:corr or tei:sic or tei:expan or tei:abbr or tei:reg or tei:orig) and ((tei:corr and tei:sic) or (tei:expan and tei:abbr) or (tei:reg and tei:orig)) / ERROR)</xsl:message>
</xsl:otherwise>
Oops, something went wrong.

0 comments on commit 40b6bb1

Please sign in to comment.