Skip to content

Commit

Permalink
enforce type attribute on correspAction
Browse files Browse the repository at this point in the history
  • Loading branch information
@peterstadler
peterstadler committed Jul 10, 2022
1 parent dc46e72 commit 54e31d7
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 78 deletions.
38 changes: 7 additions & 31 deletions compiled-ODD/guidelines-de-wegaLetters.compiled.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12444,7 +12444,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
</listRef>
</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" rend="change" module="header" ident="correspDesc"><gloss versionDate="2014-01-13" xml:lang="en">correspondence
description</gloss><gloss versionDate="2021-02-02" xml:lang="it">descrizione di corrispondenza epistolare</gloss><desc versionDate="2015-01-29" xml:lang="en">contains a description
of the actions related to one act of correspondence.</desc><desc versionDate="2021-02-02" xml:lang="it">contiene una descrizione delle azioni intorno a un atto di corrispondenza epistolare.</desc><classes/><content><alternate minOccurs="1" maxOccurs="1"><classRef key="model.correspDescPart" minOccurs="1" maxOccurs="unbounded"/><classRef key="model.pLike" minOccurs="1" maxOccurs="unbounded"/></alternate></content><attList><attDef ident="n">
of the actions related to one act of correspondence.</desc><desc versionDate="2021-02-02" xml:lang="it">contiene una descrizione delle azioni intorno a un atto di corrispondenza epistolare.</desc><classes><memberOf key="att.canonical"/></classes><content><alternate minOccurs="1" maxOccurs="1"><classRef key="model.correspDescPart" minOccurs="1" maxOccurs="unbounded"/><classRef key="model.pLike" minOccurs="1" maxOccurs="unbounded"/></alternate></content><attList><attDef ident="n">
<valList type="closed">
<valItem ident="revealed">
<desc xml:lang="en" versionDate="2017-10-20">specifies correpondence which is only revealed (by secondary sources).</desc>
Expand Down Expand Up @@ -12479,31 +12479,12 @@ should be supplied for the <att>scheme</att> attribute.</p>
</egXML>
</exemplum><listRef>
<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD44CD">2.4.6. Correspondence Description</ref>
</listRef></elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="correspAction">
<gloss versionDate="2015-10-26" xml:lang="en">correspondence action</gloss>
<desc versionDate="2014-09-05" xml:lang="en">contains a structured
</listRef></elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" rend="change" module="header" ident="correspAction"><gloss versionDate="2015-10-26" xml:lang="en">correspondence action</gloss><desc versionDate="2014-09-05" xml:lang="en">contains a structured
description of the place, the name of a person/organization and the
date related to the sending/receiving of a message or any other
action related to the correspondence.</desc>
<classes>
<memberOf key="att.global"/>
<memberOf key="att.typed"/>

<memberOf key="model.correspDescPart"/>
</classes>
<content>
<alternate>
<classRef key="model.correspActionPart" minOccurs="1" maxOccurs="unbounded"/>
<classRef key="model.pLike" minOccurs="1" maxOccurs="unbounded"/>
</alternate>
</content>
<attList>
<attDef ident="type" mode="change" usage="opt">
<desc versionDate="2015-01-29" xml:lang="en">describes the nature of the action.</desc>
<datatype>
action related to the correspondence.</desc><classes><memberOf key="att.typed"/><memberOf key="model.correspDescPart"/></classes><content><alternate minOccurs="1" maxOccurs="1"><classRef key="model.correspActionPart" minOccurs="1" maxOccurs="unbounded"/><classRef key="model.pLike" minOccurs="1" maxOccurs="unbounded"/></alternate></content><attList><attDef ident="subtype" mode="delete"/><attDef ident="type" mode="change" rend="change" usage="req"><desc versionDate="2015-01-29" xml:lang="en">describes the nature of the action.</desc><datatype>
<dataRef key="teidata.enumerated"/>
</datatype>
<valList type="semi" mode="add">
</datatype><valList type="semi" mode="add">
<valItem ident="sent">
<desc versionDate="2015-02-09" xml:lang="en">information concerning the sending or dispatch of a message.</desc>
</valItem>
Expand All @@ -12521,22 +12502,17 @@ should be supplied for the <att>scheme</att> attribute.</p>
<desc versionDate="2015-02-09" xml:lang="en">information concerning the
forwarding of a message.</desc>
</valItem>
</valList>
</attDef>
</attList>
<exemplum xml:lang="en">
</valList></attDef></attList><exemplum xml:lang="en">
<egXML xmlns="http://www.tei-c.org/ns/Examples">
<correspAction type="sent">
<persName>Adelbert von Chamisso</persName>
<settlement>Vertus</settlement>
<date when="1807-01-29"/>
</correspAction>
</egXML>
</exemplum>
<listRef>
</exemplum><listRef>
<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD44CD">2.4.6. Correspondence Description</ref>
</listRef>
</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="correspContext">
</listRef></elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="correspContext">
<gloss xml:lang="en" versionDate="2014-01-13">correspondence context</gloss>
<gloss xml:lang="de" versionDate="2014-01-13">Korrespondenzstelle</gloss>

Expand Down
43 changes: 20 additions & 23 deletions schema/de/wegaLetters.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
ns="http://www.tei-c.org/ns/1.0"><!--
Schema generated from ODD source 2022-05-31T18:48:10Z. .
Schema generated from ODD source 2022-07-10T20:13:50Z. .
TEI Edition: Version 4.4.0. Last updated on
19th April 2022, revision ff9cc28b0
TEI Edition Location: https://www.tei-c.org/Vault/P5/Version 4.4.0/
Expand Down Expand Up @@ -4986,6 +4986,7 @@ relatedItem element must be empty</sch:report>
<ref name="model.pLike"/>
</oneOrMore>
</choice>
<ref name="att.canonical.attributes"/>
<optional>
<attribute name="n">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
Expand All @@ -5009,29 +5010,25 @@ relatedItem element must be empty</sch:report>
<ref name="model.pLike"/>
</oneOrMore>
</choice>
<ref name="att.global.attributes"/>
<ref name="att.typed.attribute.subtype"/>
<optional>
<attribute name="type">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes the nature of the action.
<attribute name="type">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes the nature of the action.
Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] forwarded</a:documentation>
<choice>
<value>sent</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the sending or dispatch of a message.</a:documentation>
<value>received</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the receipt of a message.</a:documentation>
<value>transmitted</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.</a:documentation>
<value>redirected</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the redirection of an unread message.</a:documentation>
<value>forwarded</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the forwarding of a message.</a:documentation>
<data type="token">
<param name="pattern">[^\p{C}\p{Z}]+</param>
</data>
</choice>
</attribute>
</optional>
<choice>
<value>sent</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the sending or dispatch of a message.</a:documentation>
<value>received</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the receipt of a message.</a:documentation>
<value>transmitted</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.</a:documentation>
<value>redirected</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the redirection of an unread message.</a:documentation>
<value>forwarded</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the forwarding of a message.</a:documentation>
<data type="token">
<param name="pattern">[^\p{C}\p{Z}]+</param>
</data>
</choice>
</attribute>
<empty/>
</element>
</define>
Expand Down
43 changes: 20 additions & 23 deletions schema/en/wegaLetters.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
ns="http://www.tei-c.org/ns/1.0"><!--
Schema generated from ODD source 2022-05-31T18:48:21Z. .
Schema generated from ODD source 2022-07-10T20:13:59Z. .
TEI Edition: Version 4.4.0. Last updated on
19th April 2022, revision ff9cc28b0
TEI Edition Location: https://www.tei-c.org/Vault/P5/Version 4.4.0/
Expand Down Expand Up @@ -4986,6 +4986,7 @@ relatedItem element must be empty</sch:report>
<ref name="model.pLike"/>
</oneOrMore>
</choice>
<ref name="att.canonical.attributes"/>
<optional>
<attribute name="n">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
Expand All @@ -5009,29 +5010,25 @@ relatedItem element must be empty</sch:report>
<ref name="model.pLike"/>
</oneOrMore>
</choice>
<ref name="att.global.attributes"/>
<ref name="att.typed.attribute.subtype"/>
<optional>
<attribute name="type">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes the nature of the action.
<attribute name="type">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes the nature of the action.
Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] forwarded</a:documentation>
<choice>
<value>sent</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the sending or dispatch of a message.</a:documentation>
<value>received</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the receipt of a message.</a:documentation>
<value>transmitted</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.</a:documentation>
<value>redirected</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the redirection of an unread message.</a:documentation>
<value>forwarded</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the forwarding of a message.</a:documentation>
<data type="token">
<param name="pattern">[^\p{C}\p{Z}]+</param>
</data>
</choice>
</attribute>
</optional>
<choice>
<value>sent</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the sending or dispatch of a message.</a:documentation>
<value>received</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the receipt of a message.</a:documentation>
<value>transmitted</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.</a:documentation>
<value>redirected</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the redirection of an unread message.</a:documentation>
<value>forwarded</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the forwarding of a message.</a:documentation>
<data type="token">
<param name="pattern">[^\p{C}\p{Z}]+</param>
</data>
</choice>
</attribute>
<empty/>
</element>
</define>
Expand Down
13 changes: 12 additions & 1 deletion src/Specs/schemaSpec-letters.odd.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@
</elementSpec>

<elementSpec ident="correspDesc" module="header" mode="change">
<classes>
<classes mode="change">
<memberOf key="att.global" mode="delete"/>
<memberOf key="att.declarable" mode="delete"/>
<memberOf key="att.typed" mode="delete"/>
Expand All @@ -556,5 +556,16 @@
</attDef>
</attList>
</elementSpec>

<elementSpec ident="correspAction" module="header" mode="change">
<classes mode="change">
<memberOf key="att.global" mode="delete"/>
<memberOf key="att.sortable" mode="delete"/>
</classes>
<attList>
<attDef ident="type" mode="change" usage="req"/>
<attDef ident="subtype" mode="delete"/>
</attList>
</elementSpec>

</schemaSpec>

0 comments on commit 54e31d7

Please sign in to comment.