Skip to content

Commit

Permalink
update of expected results and P5subset
Browse files Browse the repository at this point in the history
  • Loading branch information
HelenaSabel committed Aug 31, 2021
1 parent 1a7fe99 commit 68c42cc
Show file tree
Hide file tree
Showing 15 changed files with 8 additions and 254 deletions.
3 changes: 0 additions & 3 deletions Test/expected-results/test.odd.html
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,6 @@ <h1>
<tr>
<td id="TEI.att.citeStructurePart"><span class="hi"><a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.citeStructurePart.html">att.citeStructurePart</a></span>: <span lang="en">provides attributes for selecting particular elements within a document.</span></td>
</tr>
<tr>
<td id="TEI.att.citeStructurePart"><span class="hi"><a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.citeStructurePart.html">att.citeStructurePart</a></span>: <span lang="en">provides attributes for selecting particular elements within a document.</span></td>
</tr>
<tr>
<td id="TEI.att.citing"><span class="hi"><a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.citing.html">att.citing</a></span>: <span lang="en">provides attributes for specifying the specific part of a bibliographic item being cited.</span> [<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>]</td>
</tr>
Expand Down
9 changes: 0 additions & 9 deletions Test/expected-results/test.rng
Original file line number Diff line number Diff line change
Expand Up @@ -3251,15 +3251,6 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
<ref name="model.entryLike"/>
</choice>
</define>
<define name="att.citeStructurePart.attributes">
<ref name="att.citeStructurePart.attribute.use"/>
</define>
<define name="att.citeStructurePart.attribute.use">
<attribute name="use">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in <code xmlns="http://www.w3.org/1999/xhtml">@match</code>, which will either be a sibling attribute in the case of or on the parent in the case of .</a:documentation>
<text/>
</attribute>
</define>
<define name="att.formula.attributes">
<ref name="att.formula.attribute.formula"/>
</define>
Expand Down
3 changes: 0 additions & 3 deletions Test/expected-results/test15.odd.html
Original file line number Diff line number Diff line change
Expand Up @@ -1303,9 +1303,6 @@ <h1>
<tr itemprop="row">
<td id="TEI.att.citeStructurePart"><span class="hi" itemprop="hi"><a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.citeStructurePart.html">att.citeStructurePart</a></span>: <span lang="en" itemprop="seg">provides attributes for selecting particular elements within a document.</span></td>
</tr>
<tr itemprop="row">
<td id="TEI.att.citeStructurePart"><span class="hi" itemprop="hi"><a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.citeStructurePart.html">att.citeStructurePart</a></span>: <span lang="en" itemprop="seg">provides attributes for selecting particular elements within a document.</span></td>
</tr>
<tr itemprop="row">
<td id="TEI.att.citing"><span class="hi" itemprop="hi"><a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.citing.html">att.citing</a></span>: <span lang="en" itemprop="seg">provides attributes for specifying the specific part of a bibliographic item being cited.</span> [<a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>]</td>
</tr>
Expand Down
10 changes: 0 additions & 10 deletions Test/expected-results/test15.odd.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -1654,16 +1654,6 @@ model.standOffPart =
| listChange
| seg
| listAnnotation
att.citeStructurePart.attributes = att.citeStructurePart.attribute.use
att.citeStructurePart.attribute.use =
[
a:documentation [
"(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in "
ns1:code [ "@match" ]
", which will either be a sibling attribute in the case of or on the parent in the case of ."
]
]
attribute use { text }
att.formula.attributes = att.formula.attribute.formula
att.formula.attribute.formula =
[
Expand Down
10 changes: 0 additions & 10 deletions Test/expected-results/test21.odd.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -2048,16 +2048,6 @@ model.standOffPart =
| seg
| listAnnotation
| zone
att.citeStructurePart.attributes = att.citeStructurePart.attribute.use
att.citeStructurePart.attribute.use =
[
a:documentation [
"(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in "
ns1:code [ "@match" ]
", which will either be a sibling attribute in the case of or on the parent in the case of ."
]
]
attribute use { text }
att.formula.attributes = att.formula.attribute.formula
att.formula.attribute.formula =
[
Expand Down
4 changes: 0 additions & 4 deletions Test/expected-results/test30.dtd
Original file line number Diff line number Diff line change
Expand Up @@ -983,10 +983,6 @@ to %teidata.word; #IMPLIED'>
<!ENTITY % model.standOffPart_sequenceOptional "%model.global.meta;?, %model.biblLike;?, %model.listLike;?, %model.annotationLike;?, listChange?, zone?, seg?, listAnnotation?">
<!ENTITY % model.standOffPart_sequenceOptionalRepeatable "%model.global.meta;*, %model.biblLike;*, %model.listLike;*, %model.annotationLike;*, listChange*, zone*, seg*, listAnnotation*">
<!ENTITY % model.standOffPart_sequenceRepeatable "%model.global.meta;+, %model.biblLike;+, %model.listLike;+, %model.annotationLike;+, listChange+, zone+, seg+, listAnnotation+">
<!ENTITY % Tatt.citeStructurePart.attribute.use '
use %teidata.xpath; #REQUIRED'>
<!ENTITY % Tatt.citeStructurePart.attributes '
%Tatt.citeStructurePart.attribute.use;'>
<!ENTITY % Tatt.formula.attribute.formula '
formula %teidata.xpath; #IMPLIED'>
<!ENTITY % Tatt.formula.attributes '
Expand Down
10 changes: 0 additions & 10 deletions Test/expected-results/test30.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -2018,16 +2018,6 @@ Tmodel.standOffPart =
| Tzone
| Tseg
| TlistAnnotation
Tatt.citeStructurePart.attributes = Tatt.citeStructurePart.attribute.use
Tatt.citeStructurePart.attribute.use =
[
a:documentation [
"(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in "
ns1:code [ "@match" ]
", which will either be a sibling attribute in the case of or on the parent in the case of ."
]
]
attribute use { text }
Tatt.formula.attributes = Tatt.formula.attribute.formula
Tatt.formula.attribute.formula =
[
Expand Down
11 changes: 0 additions & 11 deletions Test/expected-results/test33.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -1751,17 +1751,6 @@ tei_model.standOffPart =
| tei_listChange
| tei_seg
| tei_listAnnotation
tei_att.citeStructurePart.attributes =
tei_att.citeStructurePart.attribute.use
tei_att.citeStructurePart.attribute.use =
[
a:documentation [
"(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in "
ns1:code [ "@match" ]
", which will either be a sibling attribute in the case of or on the parent in the case of ."
]
]
attribute use { text }
tei_att.formula.attributes = tei_att.formula.attribute.formula
tei_att.formula.attribute.formula =
[
Expand Down
151 changes: 0 additions & 151 deletions Test/expected-results/test34.combined.json
Original file line number Diff line number Diff line change
Expand Up @@ -9284,157 +9284,6 @@
{ "type" : "macroRef",
"key" : "macro.phraseSeq" } ] },

{ "ident" : "ruby",
"ns" : "http:\/\/foo.foo\/foo",
"type" : "elementSpec",
"module" : "core",
"desc" :
[ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2020-02-28\" xml:lang=\"en\">contains a\n passage of base text along with its associated ruby gloss(es).<\/desc>" ],
"shortDesc" : "(ruby container) contains a\n passage of base text along with its associated ruby gloss(es).",
"gloss" :
[ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2021-01-30\" xml:lang=\"en\">ruby container<\/gloss>" ],
"altIdent" :
[ ],
"classes" :
{ "model" :
[ "model.phrase" ],
"atts" :
[ "att.global",
"att.typed" ],
"unknown" :
[ ] },
"attributes" :
[ ],
"content" :
[
{ "type" : "alternate",
"minOccurs" : "1",
"maxOccurs" : "1",
"content" :
[
{ "type" : "elementRef",
"key" : "list" },

{ "type" : "elementRef",
"key" : "listChange" },

{ "type" : "elementRef",
"key" : "change" } ] } ] },

{ "ident" : "rs",
"ns" : "http:\/\/foo.foo\/foo",
"type" : "elementSpec",
"module" : "core",
"desc" :
[ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2005-01-14\" xml:lang=\"en\">contains a general purpose name or referring string.<\/desc>" ],
"shortDesc" : "(referencing string) contains a general purpose name or referring string.",
"gloss" :
[ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2005-01-14\" xml:lang=\"en\">referencing string<\/gloss>" ],
"altIdent" :
[ ],
"classes" :
{ "model" :
[ "model.nameLike" ],
"atts" :
[ "att.global",
"att.naming",
"att.typed" ],
"unknown" :
[ ] },
"attributes" :
[ ],
"content" :
[
{ "type" : "macroRef",
"key" : "macro.phraseSeq" } ] },

{ "ident" : "rt",
"ns" : "http:\/\/foo.foo\/foo",
"type" : "elementSpec",
"module" : "core",
"desc" :
[ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2020-02-28\" xml:lang=\"en\">contains a ruby\n text, an annotation closely associated with a passage of the\n main text.<\/desc>" ],
"shortDesc" : "(ruby text) contains a ruby\n text, an annotation closely associated with a passage of the\n main text.",
"gloss" :
[ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2021-01-30\" xml:lang=\"en\">ruby text<\/gloss>" ],
"altIdent" :
[ ],
"classes" :
{ "model" :
[ ],
"atts" :
[ "att.global",
"att.typed",
"att.placement",
"att.transcriptional" ],
"unknown" :
[ ] },
"attributes" :
[
{ "onElement" : true,
"ident" : "target",
"mode" : "add",
"ns" : "",
"usage" : "opt",
"desc" :
[ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2021-01-08\" xml:lang=\"en\">supplies a pointer to the\n base being glossed by this ruby text.<\/desc>" ],
"shortDesc" : "supplies a pointer to the\n base being glossed by this ruby text.",
"gloss" :
[ ],
"altIdent" :
[ ],
"valDesc" :
[ ],
"datatype" :
{ "min" : "1",
"max" : "1",
"dataRef" :
{ "key" : "teidata.pointer" } } },

{ "onElement" : true,
"ident" : "from",
"mode" : "add",
"ns" : "",
"usage" : "opt",
"desc" :
[ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2021-01-06\">points to the starting point of the span of text\n being glossed by this ruby text.<\/desc>" ],
"shortDesc" : "points to the starting point of the span of text\n being glossed by this ruby text.",
"gloss" :
[ ],
"altIdent" :
[ ],
"valDesc" :
[ ],
"datatype" :
{ "min" : "1",
"max" : "1",
"dataRef" :
{ "key" : "teidata.pointer" } } },

{ "onElement" : true,
"ident" : "to",
"mode" : "add",
"ns" : "",
"usage" : "opt",
"desc" :
[ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2021-01-06\">points to the ending point of the span of text\n being glossed.<\/desc>" ],
"shortDesc" : "points to the ending point of the span of text\n being glossed.",
"gloss" :
[ ],
"altIdent" :
[ ],
"valDesc" :
[ ],
"datatype" :
{ "min" : "1",
"max" : "1",
"dataRef" :
{ "key" : "teidata.pointer" } } } ],
"content" :
[
{ "type" : "macroRef",
"key" : "macro.phraseSeq" } ] },

{ "ident" : "ruby",
"ns" : "http:\/\/foo.foo\/foo",
"type" : "elementSpec",
Expand Down
3 changes: 0 additions & 3 deletions Test/expected-results/test34.odd.html
Original file line number Diff line number Diff line change
Expand Up @@ -1000,9 +1000,6 @@ <h2>
<tr>
<td id="TEI.att.citeStructurePart"><span class="hi"><a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.citeStructurePart.html">att.citeStructurePart</a></span>: <span lang="en">provides attributes for selecting particular elements within a document.</span></td>
</tr>
<tr>
<td id="TEI.att.citeStructurePart"><span class="hi"><a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.citeStructurePart.html">att.citeStructurePart</a></span>: <span lang="en">provides attributes for selecting particular elements within a document.</span></td>
</tr>
<tr>
<td id="TEI.att.citing"><span class="hi"><a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.citing.html">att.citing</a></span>: <span lang="en">provides attributes for specifying the specific part of a bibliographic item being cited.</span> [<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>]</td>
</tr>
Expand Down
11 changes: 0 additions & 11 deletions Test/expected-results/test34.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -1756,17 +1756,6 @@ tei_model.standOffPart =
| tei_listChange
| tei_seg
| tei_listAnnotation
tei_att.citeStructurePart.attributes =
tei_att.citeStructurePart.attribute.use
tei_att.citeStructurePart.attribute.use =
[
a:documentation [
"(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in "
ns1:code [ "@match" ]
", which will either be a sibling attribute in the case of or on the parent in the case of ."
]
]
attribute use { text }
tei_att.formula.attributes = tei_att.formula.attribute.formula
tei_att.formula.attribute.formula =
[
Expand Down
11 changes: 0 additions & 11 deletions Test/expected-results/test35.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -1750,17 +1750,6 @@ tei_model.standOffPart =
| tei_listChange
| tei_seg
| tei_listAnnotation
tei_att.citeStructurePart.attributes =
tei_att.citeStructurePart.attribute.use
tei_att.citeStructurePart.attribute.use =
[
a:documentation [
"(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in "
ns1:code [ "@match" ]
", which will either be a sibling attribute in the case of or on the parent in the case of ."
]
]
attribute use { text }
tei_att.formula.attributes = tei_att.formula.attribute.formula
tei_att.formula.attribute.formula =
[
Expand Down
18 changes: 1 addition & 17 deletions Test/expected-results/testdrama.compiled.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6580,23 +6580,7 @@ which contain an XPath expression.</desc>
</alternate>
</content>

</dataSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.citeStructurePart">
<desc versionDate="2016-03-15" xml:lang="en">provides attributes for selecting particular elements
within a document.</desc>
<attList>
<attDef ident="use" usage="req">
<gloss versionDate="2020-02-03" xml:lang="en">use</gloss>
<desc versionDate="2020-02-03" xml:lang="en">supplies an XPath selection pattern using the
syntax defined in <ptr target="#XSLT3"/>. The XPath pattern is relative to the context given
in <att>match</att>, which will either be a sibling attribute in the case of
<tag>citeStructure</tag> or on the parent <tag>citeStructure</tag> in the case of
<tag>citeData</tag>.</desc>
<datatype>
<dataRef key="teidata.xpath"/>
</datatype>
</attDef>
</attList>
</classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.formula">
</dataSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.formula">
<desc versionDate="2019-06-25" xml:lang="en">provides attributes for defining a mathematical formula.</desc>
<attList>
<attDef ident="formula" usage="opt">
Expand Down
6 changes: 6 additions & 0 deletions debian-tei-xsl/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
tei-xsl (7.52.0) natty; urgency=low

* new release from upstream

-- TEI <[email protected]> Tue, 31 Aug 2021 08:40:41 +0000

tei-xsl (7.52.0a) natty; urgency=low

* new release from upstream
Expand Down
2 changes: 1 addition & 1 deletion source/p5subset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</titleStmt>
<editionStmt>
<edition><ref target="#ABTEI4">Version</ref> <ref target="../../readme-4.3.0.html">4.3.0a</ref>. Last updated on
<date when="2021-08-26">26th August 2021</date>, revision <ref target="https://github.com/TEIC/TEI/commit/59a2becc4">59a2becc4</ref></edition>
<date when="2021-08-30">30th August 2021</date>, revision <ref target="https://github.com/TEIC/TEI/commit/d07dfcf91">d07dfcf91</ref></edition>
</editionStmt>
<publicationStmt>
<distributor>TEI Consortium</distributor>
Expand Down

0 comments on commit 68c42cc

Please sign in to comment.