Skip to content

Commit 07c90be

Browse files
ebesheroebeshero
authored
Merge pull request #740 from TEIC/updateP5subset
updating expected results and p5 subset during Stylesheets meeting
2 parents a3d0ca5 + 8aef8f4 commit 07c90be

13 files changed

+227
-172
lines changed

‎Test/expected-results/test.odd.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ <h2>Table of contents</h2>
150150
<td class="Attribute">
151151
<span class="att">next [att.global.linking]</span>
152152
</td>
153-
<td>
154-
<span xml:lang="en" lang="en">points to the next element of a virtual aggregate of which the current element is part.</span>
155-
</td>
153+
<td>(
154+
<span xml:lang="en" lang="en">next</span>)
155+
<span xml:lang="en" lang="en">points to the next element of a virtual aggregate of which the current element is part.</span></td>
156156
</tr>
157157
</table>
158158
</div></li>

‎Test/expected-results/test.rng

+1-1
Original file line numberDiff line numberDiff line change
@@ -9912,7 +9912,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
99129912
<define name="att.global.linking.attribute.next">
99139913
<optional>
99149914
<attribute name="next">
9915-
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to the next element of a virtual aggregate of which the current element is part.</a:documentation>
9915+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(next) points to the next element of a virtual aggregate of which the current element is part.</a:documentation>
99169916
<data type="anyURI">
99179917
<param name="pattern">\S+</param>
99189918
</data>

‎Test/expected-results/test15.odd.rnc

+19-5
Original file line numberDiff line numberDiff line change
@@ -5497,7 +5497,7 @@ att.global.linking.attribute.copyOf =
54975497
}?
54985498
att.global.linking.attribute.next =
54995499

5500-
## points to the next element of a virtual aggregate of which the current element is part.
5500+
## (next) points to the next element of a virtual aggregate of which the current element is part.
55015501
attribute next {
55025502
xsd:anyURI { pattern = "\S+" }
55035503
}?
@@ -6671,7 +6671,12 @@ event =
66716671
(idno*,
66726672
model.headLike*,
66736673
(model.pLike+ | model.labelLike+ | eventName+),
6674-
(model.noteLike | model.biblLike | linkGrp | link | idno | ptr)*,
6674+
(model.noteLike
6675+
| model.biblLike
6676+
| model.ptrLike
6677+
| linkGrp
6678+
| link
6679+
| idno)*,
66756680
model.eventLike*,
66766681
(model.personLike | listPerson)*,
66776682
(model.placeLike | listPlace)*,
@@ -6956,7 +6961,11 @@ org =
69566961
| model.placeLike
69576962
| model.orgPart
69586963
| model.milestoneLike)*),
6959-
(model.noteLike | model.biblLike | linkGrp | link | ptr)*,
6964+
(model.noteLike
6965+
| model.biblLike
6966+
| model.ptrLike
6967+
| linkGrp
6968+
| link)*,
69606969
model.personLike*),
69616970
att.global.attributes,
69626971
att.editLike.attributes,
@@ -6975,7 +6984,7 @@ person =
69756984

69766985
## (person) provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a historical source. [14.3.2. The Person Element 16.2.2. The Participant Description]
69776986
element person {
6978-
(model.pLike+ | (model.personPart | model.global | ptr)*),
6987+
(model.pLike+ | (model.personPart | model.global | model.ptrLike)*),
69796988
att.global.attributes,
69806989
att.editLike.attributes,
69816990
att.sortable.attributes,
@@ -7127,7 +7136,12 @@ place =
71277136
| model.placeStateLike
71287137
| model.eventLike
71297138
| name)*),
7130-
(model.noteLike | model.biblLike | idno | ptr | linkGrp | link)*,
7139+
(model.noteLike
7140+
| model.biblLike
7141+
| model.ptrLike
7142+
| idno
7143+
| linkGrp
7144+
| link)*,
71317145
(model.placeLike | listPlace)*),
71327146
att.global.attributes,
71337147
att.editLike.attributes,

‎Test/expected-results/test21.odd.rnc

+19-5
Original file line numberDiff line numberDiff line change
@@ -4765,7 +4765,12 @@ event =
47654765
(idno*,
47664766
model.headLike*,
47674767
(model.pLike+ | model.labelLike+ | eventName+),
4768-
(model.noteLike | model.biblLike | linkGrp | link | idno | ptr)*,
4768+
(model.noteLike
4769+
| model.biblLike
4770+
| model.ptrLike
4771+
| linkGrp
4772+
| link
4773+
| idno)*,
47694774
model.eventLike*,
47704775
(model.personLike | listPerson)*,
47714776
(model.placeLike | listPlace)*,
@@ -5050,7 +5055,11 @@ org =
50505055
| model.placeLike
50515056
| model.orgPart
50525057
| model.milestoneLike)*),
5053-
(model.noteLike | model.biblLike | linkGrp | link | ptr)*,
5058+
(model.noteLike
5059+
| model.biblLike
5060+
| model.ptrLike
5061+
| linkGrp
5062+
| link)*,
50545063
model.personLike*),
50555064
att.global.attributes,
50565065
att.editLike.attributes,
@@ -5069,7 +5078,7 @@ person =
50695078

50705079
## (personne) fournit des informations sur un individu identifiable, par exemple un participant à une interaction linguistique, ou une personne citée dans une source historique. [14.3.2. The Person Element 16.2.2. The Participant Description]
50715080
element person {
5072-
(model.pLike+ | (model.personPart | model.global | ptr)*),
5081+
(model.pLike+ | (model.personPart | model.global | model.ptrLike)*),
50735082
att.global.attributes,
50745083
att.editLike.attributes,
50755084
att.sortable.attributes,
@@ -5226,7 +5235,12 @@ place =
52265235
| model.placeStateLike
52275236
| model.eventLike
52285237
| name)*),
5229-
(model.noteLike | model.biblLike | idno | ptr | linkGrp | link)*,
5238+
(model.noteLike
5239+
| model.biblLike
5240+
| model.ptrLike
5241+
| idno
5242+
| linkGrp
5243+
| link)*,
52305244
(model.placeLike | listPlace)*),
52315245
att.global.attributes,
52325246
att.editLike.attributes,
@@ -6720,7 +6734,7 @@ att.global.linking.attribute.copyOf =
67206734
}?
67216735
att.global.linking.attribute.next =
67226736

6723-
## pointe vers l'élément suivant d'un ensemble virtuel dont l'élément en question est une partie.
6737+
## (suivant) pointe vers l'élément suivant d'un ensemble virtuel dont l'élément en question est une partie.
67246738
attribute next {
67256739
xsd:anyURI { pattern = "\S+" }
67266740
}?

‎Test/expected-results/test30.dtd

+4-4
Original file line numberDiff line numberDiff line change
@@ -1907,7 +1907,7 @@ type %teidata.enumerated; #IMPLIED >
19071907
%Tatt.global.attributes;
19081908
%Tatt.cmc.attributes; >
19091909
<!--doc:(event) contains data relating to anything of significance that happens in time. [14.3.1. Basic Principles] -->
1910-
<!ELEMENT event (((idno)*,(%model.headLike;)*,((%model.pLike;)+|(%model.labelLike;)+|(eventName)+),(%model.noteLike;|%model.biblLike;|linkGrp|link|idno|ptr)*,(%model.eventLike;)*,(%model.personLike;|listPerson)*,(%model.placeLike;|listPlace)*,(%model.objectLike;)*,(relation|listRelation)*))>
1910+
<!ELEMENT event (((idno)*,(%model.headLike;)*,((%model.pLike;)+|(%model.labelLike;)+|(eventName)+),(%model.noteLike;|%model.biblLike;|%model.ptrLike;|linkGrp|link|idno)*,(%model.eventLike;)*,(%model.personLike;|listPerson)*,(%model.placeLike;|listPlace)*,(%model.objectLike;)*,(relation|listRelation)*))>
19111911
<!ATTLIST event xmlns CDATA "http://www.tei-c.org/ns/1.0">
19121912
<!ATTLIST event
19131913
%Tatt.global.attributes;
@@ -2701,7 +2701,7 @@ code %teidata.pointer; #IMPLIED >
27012701
%Tatt.cmc.attributes;
27022702
%Tatt.written.attributes; >
27032703
<!--doc:(organization) provides information about an identifiable organization such as a business, a tribe, or any other grouping of people. [14.3.3. Organizational Data] -->
2704-
<!ELEMENT org (((%model.headLike;)*,((%model.pLike;)*|(%model.labelLike;|%model.nameLike;|%model.placeLike;|%model.orgPart;|%model.milestoneLike;)*),(%model.noteLike;|%model.biblLike;|linkGrp|link|ptr)*,(%model.personLike;)*))>
2704+
<!ELEMENT org (((%model.headLike;)*,((%model.pLike;)*|(%model.labelLike;|%model.nameLike;|%model.placeLike;|%model.orgPart;|%model.milestoneLike;)*),(%model.noteLike;|%model.biblLike;|%model.ptrLike;|linkGrp|link)*,(%model.personLike;)*))>
27052705
<!ATTLIST org xmlns CDATA "http://www.tei-c.org/ns/1.0">
27062706
<!ATTLIST org
27072707
%Tatt.global.attributes;
@@ -2776,7 +2776,7 @@ Elements] -->
27762776
evidence %teidata.enumerated; #IMPLIED
27772777
value NMTOKENS #IMPLIED >
27782778
<!--doc:(person) provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a historical source. [14.3.2. The Person Element 16.2.2. The Participant Description] -->
2779-
<!ELEMENT person ((%model.pLike;)+|(%model.personPart;|%model.global;|ptr)*)>
2779+
<!ELEMENT person ((%model.pLike;)+|(%model.personPart;|%model.global;|%model.ptrLike;)*)>
27802780
<!ATTLIST person xmlns CDATA "http://www.tei-c.org/ns/1.0">
27812781
<!ATTLIST person
27822782
%Tatt.global.attributes;
@@ -2809,7 +2809,7 @@ sex CDATA #IMPLIED
28092809
gender CDATA #IMPLIED
28102810
age %teidata.enumerated; #IMPLIED >
28112811
<!--doc:(place) contains data about a geographic location. [14.3.4. Places] -->
2812-
<!ELEMENT place (((%model.headLike;)*,((%model.pLike;)*|(%model.labelLike;|%model.placeStateLike;|%model.eventLike;|name)*),(%model.noteLike;|%model.biblLike;|idno|ptr|linkGrp|link)*,(%model.placeLike;|listPlace)*))>
2812+
<!ELEMENT place (((%model.headLike;)*,((%model.pLike;)*|(%model.labelLike;|%model.placeStateLike;|%model.eventLike;|name)*),(%model.noteLike;|%model.biblLike;|%model.ptrLike;|idno|linkGrp|link)*,(%model.placeLike;|listPlace)*))>
28132813
<!ATTLIST place xmlns CDATA "http://www.tei-c.org/ns/1.0">
28142814
<!ATTLIST place
28152815
%Tatt.global.attributes;

‎Test/expected-results/test30.rnc

+10-5
Original file line numberDiff line numberDiff line change
@@ -5784,10 +5784,10 @@ Tevent =
57845784
(Tmodel.pLike+ | Tmodel.labelLike+ | TeventName+),
57855785
(Tmodel.noteLike
57865786
| Tmodel.biblLike
5787+
| Tmodel.ptrLike
57875788
| TlinkGrp
57885789
| Tlink
5789-
| Tidno
5790-
| Tptr)*,
5790+
| Tidno)*,
57915791
Tmodel.eventLike*,
57925792
(Tmodel.personLike | TlistPerson)*,
57935793
(Tmodel.placeLike | TlistPlace)*,
@@ -6073,7 +6073,11 @@ Torg =
60736073
| Tmodel.placeLike
60746074
| Tmodel.orgPart
60756075
| Tmodel.milestoneLike)*),
6076-
(Tmodel.noteLike | Tmodel.biblLike | TlinkGrp | Tlink | Tptr)*,
6076+
(Tmodel.noteLike
6077+
| Tmodel.biblLike
6078+
| Tmodel.ptrLike
6079+
| TlinkGrp
6080+
| Tlink)*,
60776081
Tmodel.personLike*),
60786082
Tatt.global.attributes,
60796083
Tatt.editLike.attributes,
@@ -6092,7 +6096,8 @@ Tperson =
60926096

60936097
## (person) provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a historical source. [14.3.2. The Person Element 16.2.2. The Participant Description]
60946098
element person {
6095-
(Tmodel.pLike+ | (Tmodel.personPart | Tmodel.global | Tptr)*),
6099+
(Tmodel.pLike+
6100+
| (Tmodel.personPart | Tmodel.global | Tmodel.ptrLike)*),
60966101
Tatt.global.attributes,
60976102
Tatt.editLike.attributes,
60986103
Tatt.sortable.attributes,
@@ -6246,8 +6251,8 @@ Tplace =
62466251
| Tname)*),
62476252
(Tmodel.noteLike
62486253
| Tmodel.biblLike
6254+
| Tmodel.ptrLike
62496255
| Tidno
6250-
| Tptr
62516256
| TlinkGrp
62526257
| Tlink)*,
62536258
(Tmodel.placeLike | TlistPlace)*),

‎Test/expected-results/test33.rnc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5573,7 +5573,7 @@ tei_att.global.linking.attribute.copyOf =
55735573
}?
55745574
tei_att.global.linking.attribute.next =
55755575

5576-
## points to the next element of a virtual aggregate of which the current element is part.
5576+
## (next) points to the next element of a virtual aggregate of which the current element is part.
55775577
attribute next {
55785578
xsd:anyURI { pattern = "\S+" }
55795579
}?

‎Test/expected-results/test34.combined.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -15099,8 +15099,8 @@
1509915099
"ns" : "",
1510015100
"usage" : "opt",
1510115101
"desc" :
15102-
[ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2010-02-10\" xml:lang=\"en\">signals an intention about how white space should be \n managed by applications.<\/desc>" ],
15103-
"shortDesc" : "signals an intention about how white space should be \n managed by applications.",
15102+
[ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2010-02-10\" xml:lang=\"en\">signals an intention about how white space should be managed by applications.<\/desc>" ],
15103+
"shortDesc" : "signals an intention about how white space should be managed by applications.",
1510415104
"gloss" :
1510515105
[ ],
1510615106
"altIdent" :
@@ -15234,9 +15234,9 @@
1523415234
"usage" : "opt",
1523515235
"desc" :
1523615236
[ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2005-10-10\" xml:lang=\"en\">points to the next element of a virtual aggregate of which the current element is part.<\/desc>" ],
15237-
"shortDesc" : "points to the next element of a virtual aggregate of which the current element is part.",
15237+
"shortDesc" : "(next) points to the next element of a virtual aggregate of which the current element is part.",
1523815238
"gloss" :
15239-
[ ],
15239+
[ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2025-02-06\" xml:lang=\"en\">next<\/gloss>" ],
1524015240
"altIdent" :
1524115241
[ ],
1524215242
"valDesc" :

‎Test/expected-results/test34.rnc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5576,7 +5576,7 @@ tei_att.global.linking.attribute.copyOf =
55765576
}?
55775577
tei_att.global.linking.attribute.next =
55785578

5579-
## points to the next element of a virtual aggregate of which the current element is part.
5579+
## (next) points to the next element of a virtual aggregate of which the current element is part.
55805580
attribute next {
55815581
xsd:anyURI { pattern = "\S+" }
55825582
}?

‎Test/expected-results/test35.rnc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5554,7 +5554,7 @@ tei_att.global.linking.attribute.copyOf =
55545554
}?
55555555
tei_att.global.linking.attribute.next =
55565556

5557-
## points to the next element of a virtual aggregate of which the current element is part.
5557+
## (next) points to the next element of a virtual aggregate of which the current element is part.
55585558
attribute next {
55595559
xsd:anyURI { pattern = "\S+" }
55605560
}?

0 commit comments

Comments
 (0)