Permalink
Browse files

updates

  • Loading branch information...
1 parent 0331d69 commit fb1024baedccd33538c1fad1b1c2e5168c00f04f @jamescummings jamescummings committed Oct 17, 2015
Showing with 5,045 additions and 1,464 deletions.
  1. +0 −3 headerelements.xml
  2. +93 −39 tei-pm.html
  3. +87 −37 tei-pm.isosch
  4. +3 −4 tei-pm.nvdl
  5. +13 −0 tei-pm.odd
  6. +97 −73 tei-pm.odd.html
  7. +215 −118 tei-pm.rng
  8. +55 −63 teisimple.dtd
  9. +68 −12 teisimple.isosch
  10. +235 −73 teisimple.isosch.xsl
  11. +2,915 −286 teisimple.odd
  12. +582 −408 teisimple.odd.html
  13. +455 −263 teisimple.rnc
  14. +174 −44 teisimple.rng
  15. +53 −41 teisimple.xsd
View
@@ -10,7 +10,6 @@
<elementRef key="change"/>
<elementRef key="charDecl"/>
<elementRef key="charProp"/>
- <elementRef key="correspDesc"/>
<elementRef key="editor"/>
<elementRef key="editorialDecl"/>
<elementRef key="email"/>
@@ -30,7 +29,6 @@
<elementRef key="monogr"/>
<elementRef key="msDesc"/>
<elementRef key="msIdentifier"/>
- <elementRef key="particDesc"/>
<elementRef key="person"/>
<elementRef key="physDesc"/>
<elementRef key="profileDesc"/>
@@ -39,7 +37,6 @@
<elementRef key="repository"/>
<elementRef key="resp"/>
<elementRef key="respStmt"/>
- <elementRef key="settingDesc"/>
<elementRef key="sourceDesc"/>
<elementRef key="tag"/>
<elementRef key="teiHeader"/>
View
Oops, something went wrong.
View
@@ -39,7 +39,7 @@ belongs, but this <name/> element has no textual content.</assert>
</pattern>
<pattern id="teipm-att.pointing-targetLang-constraint-targetLang-3">
<rule context="tei:*[not(self::tei:schemaSpec)][@targetLang]">
- <assert test="count(@target)">@targetLang can only be used if @target is specified.</assert>
+ <assert test="@target">@targetLang should only be used on <name/> if @target is specified.</assert>
</rule>
</pattern>
<pattern id="teipm-att.spanning-spanTo-constraint-spanTo-2-4">
@@ -56,30 +56,44 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
</assert>
</rule>
</pattern>
- <pattern id="teipm-ptr-constraint-ptrAtts-6">
+ <pattern id="teipm-p-constraint-abstractModel-p-6">
+ <rule context="tei:p">
+ <report test="(ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure)">
+ Abstract model violation: Paragraphs may not contain other paragraphs or ab elements.
+ </report>
+ </rule>
+ </pattern>
+ <pattern id="teipm-p-constraint-abstractModel-structure-l-7">
+ <rule context="tei:p">
+ <report test="ancestor::tei:l[not(.//tei:note//tei:p[. = current()])]">
+ Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab.
+ </report>
+ </rule>
+ </pattern>
+ <pattern id="teipm-ptr-constraint-ptrAtts-8">
<rule context="tei:ptr">
<report test="@target and @cRef">Only one of the
attributes @target and @cRef may be supplied on <name/>.</report>
</rule>
</pattern>
- <pattern id="teipm-ref-constraint-refAtts-7">
+ <pattern id="teipm-ref-constraint-refAtts-9">
<rule context="tei:ref">
<report test="@target and @cRef">Only one of the
attributes @target' and @cRef' may be supplied on <name/>
</report>
</rule>
</pattern>
- <pattern id="teipm-list-constraint-gloss-list-must-have-labels-8">
+ <pattern id="teipm-list-constraint-gloss-list-must-have-labels-10">
<rule context="tei:list[@type='gloss']">
<assert test="tei:label">The content of a "gloss" list should include a sequence of one or more pairs of a label element followed by an item element</assert>
</rule>
</pattern>
- <pattern id="teipm-biblStruct-constraint-deprecate-altIdentifier-child-9">
+ <pattern id="teipm-biblStruct-constraint-deprecate-altIdentifier-child-11">
<rule context="tei:biblStruct">
<report test="child::tei:idno" role="nonfatal">WARNING: use of deprecated method — the use of the idno element as a direct child of the biblStruct element will be removed from the TEI on 2016-09-18</report>
</rule>
</pattern>
- <pattern id="teipm-relatedItem-constraint-targetorcontent1-10">
+ <pattern id="teipm-relatedItem-constraint-targetorcontent1-12">
<rule context="tei:relatedItem">
<report test="@target and count( child::* ) &gt; 0">
If the @target attribute on <name/> is used, the
@@ -88,27 +102,55 @@ relatedItem element must be empty</report>
or a child element to indicate the related bibliographic item</assert>
</rule>
</pattern>
- <pattern id="teipm-lg-constraint-atleast1oflggapl-11">
+ <pattern id="teipm-l-constraint-abstractModel-structure-l-13">
+ <rule context="tei:l">
+ <report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">
+ Abstract model violation: Lines may not contain lines or lg elements.
+ </report>
+ </rule>
+ </pattern>
+ <pattern id="teipm-lg-constraint-atleast1oflggapl-14">
<rule context="tei:lg">
<assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
must contain at least one child l, lg or gap element.</assert>
</rule>
</pattern>
- <pattern id="teipm-quotation-constraint-quotationContents-12">
+ <pattern id="teipm-lg-constraint-abstractModel-structure-l-15">
+ <rule context="tei:lg">
+ <report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
+ Abstract model violation: Lines may not contain line groups.
+ </report>
+ </rule>
+ </pattern>
+ <pattern id="teipm-quotation-constraint-quotationContents-16">
<rule context="tei:quotation">
<report test="not(@marks) and not (tei:p)">
On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
</rule>
</pattern>
- <pattern id="teipm-att.identified-constraint-spec-in-module-15">
+ <pattern id="teipm-div-constraint-abstractModel-structure-l-19">
+ <rule context="tei:div">
+ <report test="ancestor::tei:l">
+ Abstract model violation: Lines may not contain higher-level structural elements such as div.
+ </report>
+ </rule>
+ </pattern>
+ <pattern id="teipm-div-constraint-abstractModel-structure-p-20">
+ <rule context="tei:div">
+ <report test="ancestor::tei:p or ancestor::tei:ab and not(ancestor::tei:floatingText)">
+ Abstract model violation: p and ab may not contain higher-level structural elements such as div.
+ </report>
+ </rule>
+ </pattern>
+ <pattern id="teipm-att.identified-constraint-spec-in-module-21">
<rule context="tei:elementSpec[@module]|tei:classSpec[@module]|tei:macroSpec[@module]">
<assert test=" (not(ancestor::tei:schemaSpec | ancestor::tei:TEI | ancestor::tei:teiCorpus)) or (not(@module) or (not(//tei:moduleSpec) and not(//tei:moduleRef)) or (//tei:moduleSpec[@ident = current()/@module]) or (//tei:moduleRef[@key = current()/@module])) ">
Specification <value-of select="@ident"/>: the value of the module attribute ("<value-of select="@module"/>")
should correspond to an existing module, via a moduleSpec or
moduleRef</assert>
</rule>
</pattern>
- <pattern id="teipm-att.deprecated-validUntil-constraint-deprecated-16">
+ <pattern id="teipm-att.deprecated-validUntil-constraint-deprecated-22">
<rule context="tei:*[@validUntil]">
<assert test="@validUntil cast as xs:date ge current-date()">
<value-of select="if (@ident) then concat('The ',@ident) else concat('This ',local-name(.),' of ',ancestor::tei:*[@ident][1]/@ident)"/>
@@ -119,90 +161,104 @@ should correspond to an existing module, via a moduleSpec or
</assert>
</rule>
</pattern>
- <pattern id="teipm-moduleRef-constraint-modref-17">
+ <pattern id="teipm-moduleRef-constraint-modref-23">
<rule context="tei:moduleRef">
<report test="* and @key">
Child elements of <name/> are only allowed when an external module is being loaded
</report>
</rule>
</pattern>
- <pattern id="teipm-moduleRef-prefix-constraint-not-same-prefix-18">
+ <pattern id="teipm-moduleRef-prefix-constraint-not-same-prefix-24">
<rule context="tei:moduleRef">
<report test="//*[ not( generate-id(.) eq generate-id( current() ) ) ]/@prefix = @prefix">The prefix attribute
of <name/> should not match that of any other
element (it would defeat the purpose)</report>
</rule>
</pattern>
- <pattern id="teipm-sequence-constraint-sequencechilden-19">
+ <pattern id="teipm-sequence-constraint-sequencechilden-25">
<rule context="tei:sequence">
<assert test="count(*)&gt;1">The sequence element must have at least two child elements</assert>
</rule>
</pattern>
- <pattern id="teipm-alternate-constraint-alternatechilden-20">
+ <pattern id="teipm-alternate-constraint-alternatechilden-26">
<rule context="tei:alternate">
<assert test="count(*)&gt;1">The alternate element must have at least two child elements</assert>
</rule>
</pattern>
- <pattern id="teipm-constraintSpec-constraint-sch-21">
+ <pattern id="teipm-constraintSpec-constraint-sch-27">
<rule context="tei:constraintSpec">
- <report test="tei:constraint/s:* and not(@scheme='schematron')">
- Rules in the Schematron 1.* language must be inside
- a constraintSpec with a value of 'schematron' on the scheme attribute
- </report>
+ <report test="tei:constraint/s:* and @scheme ne 'schematron'">Rules in the Schematron 1.* language must be inside a constraintSpec with a value of 'schematron' on the scheme attribute</report>
</rule>
</pattern>
- <pattern id="teipm-constraintSpec-constraint-isosch-22">
+ <pattern id="teipm-constraintSpec-constraint-isosch-28">
<rule context="tei:constraintSpec">
- <report test="tei:constraint/sch:* and not(@scheme='isoschematron')">
- Rules in the ISO Schematron language must be inside
- a constraintSpec with a value of 'isoschematron' on the scheme attribute
- </report>
+ <report test="tei:constraint/sch:* and @scheme ne 'isoschematron'">Rules in the ISO Schematron language must be inside a constraintSpec with a value of 'isoschematron' on the scheme attribute</report>
</rule>
</pattern>
- <pattern id="teipm-constraintSpec-constraint-needrules-23">
+ <pattern id="teipm-constraintSpec-constraint-xslt-29">
+ <rule context="tei:constraintSpec">
+
+ <report test="tei:constraint/xsl:* and @scheme ne 'XSLT'">Rules in XSLT must be inside a constraintSpec with a value of 'isoschematron' on the scheme attribute</report>
+ </rule>
+ </pattern>
+ <pattern id="teipm-constraintSpec-constraint-needrules-30">
<rule context="tei:macroSpec/tei:constraintSpec[@scheme='isoschematron']/tei:constraint">
<report test="sch:assert|sch:report">An ISO Schematron constraint specification for a macro should not have an 'assert' or 'report' element without a parent 'rule' element</report>
</rule>
</pattern>
- <pattern id="teipm-attDef-constraint-attDefContents-24">
+ <pattern id="teipm-attDef-constraint-attDefContents-31">
<rule context="tei:attDef">
<assert test="ancestor::teix:egXML[@valid='feasible'] or @mode eq 'change' or @mode eq 'delete' or tei:datatype or tei:valList[@type='closed']">Attribute: the definition of the @<value-of select="@ident"/> attribute in the <value-of select="ancestor::*[@ident][1]/@ident"/>
<value-of select="' '"/>
<value-of select="local-name(ancestor::*[@ident][1])"/> should have a closed valList or a datatype</assert>
</rule>
</pattern>
- <pattern id="teipm-attDef-constraint-noDefault4Required-25">
+ <pattern id="teipm-attDef-constraint-noDefault4Required-32">
<rule context="tei:attDef[@usage eq 'req']">
<report test="tei:defaultVal">It does not make sense to make "<value-of select="normalize-space(tei:defaultVal)"/>" the default value of @<value-of select="@ident"/>, because that attribute is required.</report>
</rule>
</pattern>
- <pattern id="teipm-attDef-constraint-defaultIsInClosedList-twoOrMore-26">
+ <pattern id="teipm-attDef-constraint-defaultIsInClosedList-twoOrMore-33">
<rule context="tei:attDef[ tei:defaultVal and tei:valList[@type eq 'closed'] and tei:datatype[ @maxOccurs &gt; 1 or @minOccurs &gt; 1 or @maxOccurs = 'unbounded' ] ]">
<assert test=" tokenize(normalize-space(tei:defaultVal),' ') = tei:valList/tei:valItem/@ident">In the <value-of select="local-name(ancestor::*[@ident][1])"/> defining
<value-of select="ancestor::*[@ident][1]/@ident"/> the default value of the
@<value-of select="@ident"/> attribute is not among the closed list of possible
values</assert>
</rule>
</pattern>
- <pattern id="teipm-attDef-constraint-defaultIsInClosedList-one-27">
+ <pattern id="teipm-attDef-constraint-defaultIsInClosedList-one-34">
<rule context="tei:attDef[ tei:defaultVal and tei:valList[@type eq 'closed'] and tei:datatype[ not(@maxOccurs) or ( if ( @maxOccurs castable as xs:integer ) then ( @maxOccurs cast as xs:integer eq 1 ) else false() )] ]">
<assert test="string(tei:defaultVal) = tei:valList/tei:valItem/@ident">In the <value-of select="local-name(ancestor::*[@ident][1])"/> defining
<value-of select="ancestor::*[@ident][1]/@ident"/> the default value of the
@<value-of select="@ident"/> attribute is not among the closed list of possible
values</assert>
</rule>
</pattern>
- <pattern id="teipm-link-constraint-linkTargets3-28">
+ <pattern id="teipm-link-constraint-linkTargets3-35">
<rule context="tei:link">
<assert test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or on <name/>
</assert>
</rule>
</pattern>
- <pattern id="teipm-join-constraint-joinTargets3-29">
+ <pattern id="teipm-ab-constraint-abstractModel-structure-p-36">
+ <rule context="tei:ab">
+ <report test="(ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure)">
+ Abstract model violation: ab may not contain paragraphs or other ab elements.
+ </report>
+ </rule>
+ </pattern>
+ <pattern id="teipm-ab-constraint-abstractModel-structure-l-37">
+ <rule context="tei:ab">
+ <report test="ancestor::tei:l or ancestor::tei:lg">
+ Abstract model violation: Lines may not contain higher-level divisions such as p or ab.
+ </report>
+ </rule>
+ </pattern>
+ <pattern id="teipm-join-constraint-joinTargets3-38">
<rule context="tei:join">
<assert test="contains(@target,' ')">
You must supply at least two values for @target on <name/>
@@ -219,12 +275,6 @@ You must supply at least two values for @target on <name/>
</report>
</rule>
</pattern>
- <pattern>
- <rule context="tei:moduleSpec|tei:schemaSpec|tei:elementSpec|tei:classSpec|tei:macroSpec|tei:constraintSpec|tei:attDef">
- <report test="@status" role="nonfatal">WARNING: use of deprecated attribute — @status of the <name/> element will be removed from the TEI on 2015-06-19.
- </report>
- </rule>
- </pattern>
<pattern id="teipm-model-paramList-1">
<rule context="tei:param[parent::tei:model/@behaviour='alternate']">
<assert role="error" test="@name='default' or @name='alternate'">
View
@@ -10,15 +10,14 @@
<namespace ns="http://relaxng.org/ns/compatibility/annotations/1.0">
<allow/>
</namespace>
-<!--
- commented this out as there's no such file in the repo
- <namespace ns="http://www.tei-c.org/ns/Examples">
+ <namespace ns="http://www.tei-c.org/ns/Examples">
<validate schema="tei-pm-examples.rng" useMode="nested">
<option name="http://www.thaiopensource.com/validate/feasible"/>
</validate>
<attach useMode="allow"/>
</namespace>
---> <!-- allow XInclude without checking -->
+
+<!-- allow XInclude without checking -->
<namespace ns="http://www.w3.org/2001/XInclude">
<allow/>
</namespace>
View
@@ -315,6 +315,19 @@ links</change>
<moduleRef key="linking"/>
<specGrpRef target="#additions"/>
<specGrpRef target="#changes"/>
+
+
+ <elementSpec ident="egXML" mode="change" module="tagdocs" ns="http://www.tei-c.org/ns/Examples">
+ <content>
+ <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0">
+ <choice>
+ <text/>
+ <ref name="macro.anyThing"/>
+ </choice>
+ </oneOrMore>
+ </content>
+ </elementSpec>
+
</schemaSpec>
</div>
</body>
Oops, something went wrong.

0 comments on commit fb1024b

Please sign in to comment.