Skip to content

Commit 504636d

Browse files
committed
Merge branch 'dev' into uhk_2649
2 parents 33c6b96 + dce382e commit 504636d

File tree

8 files changed

+1138
-373
lines changed

8 files changed

+1138
-373
lines changed

P5/Exemplars/tei_jtei.odd

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1875,23 +1875,25 @@
18751875
</div>
18761876
<div>
18771877
<schemaSpec ident="tei_jtei" start="TEI" defaultExceptions="http://www.tei-c.org/ns/1.0 eg:egXML">
1878-
<constraintDecl scheme="schematron">
1878+
<constraintDecl scheme="schematron">
18791879
<sch:ns prefix="sch" uri="http://purl.oclc.org/dsdl/schematron"/>
18801880
<sch:ns prefix="tei" uri="http://www.tei-c.org/ns/1.0"/>
18811881
<sch:ns prefix="xs" uri="http://www.w3.org/2001/XMLSchema"/>
18821882
<sch:ns prefix="xsl" uri="http://www.w3.org/1999/XSL/Transform"/>
18831883
<sch:ns prefix="eg" uri="http://www.tei-c.org/ns/Examples"/>
1884-
<xsl:key name="idrefs" match="@target[starts-with(normalize-space(.), '#')]|@rendition[starts-with(normalize-space(.), '#')]" use="for $i in tokenize(., '\s+') return substring-after($i, '#')"/>
1885-
<sch:let name="double.quotes" value="'[&quot;“”]'"/>
1886-
<sch:let name="apos.typographic" value="'[‘’]'"/>
1887-
<sch:let name="apos.straight" value="''''"/>
1888-
<sch:let name="quotes" value="concat('[', $apos.straight, '&quot;]')"/>
1889-
<sch:let name="div.types.front" value="('abstract', 'acknowledgements', 'authorNotes', 'editorNotes', 'corrections', 'dedication')"/>
1890-
<!-- http://www.tei-c.org/release/doc/tei-p5-doc/VERSION produces
1884+
<sch:pattern>
1885+
<xsl:key name="idrefs" match="@target[starts-with(normalize-space(.), '#')]|@rendition[starts-with(normalize-space(.), '#')]" use="for $i in tokenize(., '\s+') return substring-after($i, '#')"/>
1886+
<sch:let name="double.quotes" value="'[&quot;“”]'"/>
1887+
<sch:let name="apos.typographic" value="'[‘’]'"/>
1888+
<sch:let name="apos.straight" value="''''"/>
1889+
<sch:let name="quotes" value="concat('[', $apos.straight, '&quot;]')"/>
1890+
<sch:let name="div.types.front" value="('abstract', 'acknowledgements', 'authorNotes', 'editorNotes', 'corrections', 'dedication')"/>
1891+
<!-- http://www.tei-c.org/release/doc/tei-p5-doc/VERSION produces
18911892
429 "Too Many Requests" errors -->
1892-
<sch:let name="tei.version.url" value="'https://jenkins.tei-c.org/job/TEIP5/lastStableBuild/artifact/P5/release/doc/tei-p5-doc/VERSION'"/>
1893-
<sch:let name="tei.version" value="if (unparsed-text-available($tei.version.url)) then normalize-space(unparsed-text($tei.version.url)) else ()"/>
1894-
</constraintDecl>
1893+
<sch:let name="tei.version.url" value="'https://jenkins.tei-c.org/job/TEIP5/lastStableBuild/artifact/P5/release/doc/tei-p5-doc/VERSION'"/>
1894+
<sch:let name="tei.version" value="if (unparsed-text-available($tei.version.url)) then normalize-space(unparsed-text($tei.version.url)) else ()"/>
1895+
</sch:pattern>
1896+
</constraintDecl>
18951897
<moduleRef key="tei"/>
18961898
<moduleRef key="core"
18971899
include="abbr author bibl biblScope cit date desc editor email emph foreign gap graphic head hi item label lb list listBibl mentioned name note num p pubPlace publisher q quote ptr ref resp respStmt series soCalled term title"/>

P5/Source/Guidelines/en/FM1-IntroductoryNote.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@
134134
<item>2011–2012: Piotr Bański (University of Warsaw)</item>
135135
<item>2010–2013: Brett Barney (University of Nebraska)</item>
136136
<item>2013–2026: Syd Bauman (Brown University / Northeastern University)</item>
137-
<item>2021–2025: Helena Bermúdez Sabel (Université de Neuchâtel / JinnTec)</item>
137+
<item>2021–2028: Helena Bermúdez Sabel (Université de Neuchâtel / JinnTec)</item>
138138
<item>2016–2027: Elisa Beshero-Bondar (University of Pittsburgh at Greensburg / Penn State Erie, The Behrend College)</item>
139-
<item>2022–2025: Elli Bleeker (Huygens Institute for the History of the Netherlands)</item>
139+
<item>2022–2028: Elli Bleeker (Huygens Institute for the History of the Netherlands)</item>
140140
<item>2003–2006, 2017–2018: Alejandro Bia (University of Alicante) </item>
141141
<item>2019–2020: Vanessa Bigot Juloux (Ecole Pratique des Hautes Etudes / Paris Sciences et Lettres / Andrews University, Michigan)</item>
142142
<item>2004–2007: David Birnbaum (University of Pittsburgh)</item>
@@ -166,7 +166,7 @@
166166
<item>2002: Martin Mueller (Northwestern University)</item>
167167
<item>2013–2014, 2016–2019: Elli Mylonas (Brown University)</item>
168168
<item>2010–2011: Julianne Nyhan (University of Trier / University College London)</item>
169-
<item>2023–2025: Patricia O’Connor (Independent Researcher / University of Maynooth)</item>
169+
<item>2023–2028: Patricia O’Connor (Independent Researcher / University of Maynooth)</item>
170170
<item>2008–2011: Elena Pierazzo (King’s College London)</item>
171171
<item>2006–2007, 2009–2010: Dot Porter (University of Kentucky / Digital Humanities Observatory / Indiana University)</item>
172172
<item>2002–2003: Merillee Proffitt (Research Libraries Group)</item>

P5/Source/Specs/attList.xml

Lines changed: 64 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
33
<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
4-
<elementSpec xmlns="http://www.tei-c.org/ns/1.0" module="tagdocs" xml:id="gi-attList" ident="attList">
4+
<elementSpec xmlns="http://www.tei-c.org/ns/1.0" module="tagdocs" xml:id="gi-attList" ident="attList" xmlns:sch="http://purl.oclc.org/dsdl/schematron">
55
<gloss versionDate="2020-12-20" xml:lang="en">attribute list</gloss>
66
<gloss versionDate="2007-06-12" xml:lang="fr">liste d'attributs</gloss>
77
<desc versionDate="2005-01-14" xml:lang="en">contains documentation for all the attributes associated with this element, as a series of <gi>attDef</gi> elements.</desc>
@@ -21,6 +21,66 @@
2121
<elementRef key="attList"/>
2222
</alternate>
2323
</content>
24+
<constraintSpec ident="no_duplicate_attrs" scheme="schematron" xml:lang="en">
25+
<desc>Because it is illegal in XML to have two attributes with the
26+
same name on the same element instance, it is illegal in TEI to
27+
have two <gi>attDef</gi> elements with the same values of
28+
<att>ns</att> and <att>ident</att> in a single <gi>attList</gi>,
29+
unless the parent <gi>attList</gi> has an <att>org</att> of
30+
<val>choice</val>. This applies regardless of the <att>mode</att>
31+
of each <gi>attDef</gi>.</desc>
32+
<constraint>
33+
<sch:rule context="tei:attList[ not( ancestor::tei:attList ) ]">
34+
<!--
35+
Set up a dummy string that contains at least 1 character that
36+
is not legal in a URI, and thus cannot be a namespace.
37+
-->
38+
<sch:let name="notanamespace" value="'☮🄯'"/>
39+
<!-- generate a sequence of my <attDef> descendants -->
40+
<sch:let name="defs" value="descendant::tei:attDef"/>
41+
<!--
42+
get a sequence of @ns & @ident combinations of those
43+
<attDef>s, except ignore those whose parent is an
44+
<attList> that is an alternation, and for which we have
45+
already recorded this @ident. Thus if we see
46+
<attList org="choice">
47+
<attDef ident="klaatu"/>
48+
<attDef ident="bodsworth"/>
49+
<attDef ident="rugglesby"/>
50+
<attDef ident="klaatu"/>
51+
</attList>
52+
The sequence should be ('klaatu','bodsworth','rugglesby','').
53+
-->
54+
<sch:let name="nsidents"
55+
value="for $ad in $defs return
56+
if ( $ad[
57+
parent::tei:attList[ @org eq 'choice']
58+
and
59+
preceding-sibling::tei:attDef[
60+
@ident eq $ad/@ident
61+
and
62+
( @ns, $notanamespace )[1] eq ( $ad/@ns, $notanamespace )[1]
63+
]
64+
]
65+
)
66+
then ''
67+
else normalize-space( if ($ad/@ns) then 'Q{'||$ad/@ns||'}'||$ad/@ident else $ad/@ident )
68+
"/>
69+
<!-- get a sequence of any that occur 2+ times: -->
70+
<sch:let name="dups" value="for $a in $nsidents return ( $nsidents[ . eq $a ][2] )"/>
71+
<!-- remove any duplicates from the list of duplicates (-: -->
72+
<sch:let name="distinct_dups" value="distinct-values( $dups )"/>
73+
<!--
74+
if there are any values in list of distinct duplicates (other than null),
75+
warn user about them:
76+
-->
77+
<sch:assert test="count( $distinct_dups[ . ne ''] ) eq 0">
78+
Within the attribute list defined in <sch:value-of select="ancestor::*[@ident][1]/@ident"/>,
79+
the following attributes have been defined multiple times: <sch:value-of select="$distinct_dups"/>.
80+
</sch:assert>
81+
</sch:rule>
82+
</constraint>
83+
</constraintSpec>
2484
<attList>
2585
<attDef ident="org">
2686
<gloss versionDate="2007-07-04" xml:lang="en">organization</gloss>
@@ -103,7 +163,9 @@
103163
<datatype maxOccurs="unbounded"><dataRef key="teidata.pointer"/></datatype>
104164
</attDef>
105165
<attDef ident="mutual" usage="opt">
106-
<desc versionDate="2005-07-24" xml:lang="en">supplies a list of participants amongst all of whom the relationship holds equally.</desc>
166+
<desc versionDate="2005-07-24" xml:lang="en">supplies a list
167+
of participants amongst all of whom the relationship holds
168+
equally.</desc>
107169
<datatype maxOccurs="unbounded"><dataRef key="teidata.pointer"/></datatype>
108170
</attDef>
109171
</attList>

P5/Source/Specs/stage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<desc versionDate="2007-05-04" xml:lang="es">indica el tipo de acotación.</desc>
4242
<desc versionDate="2007-01-21" xml:lang="it">indica il tipo di direttiva di scena</desc>
4343
<desc versionDate="2017-06-13" xml:lang="de">beschreibt die Art der Regieanweisung.</desc>
44-
<datatype maxOccurs="unbounded" minOccurs="0"><dataRef key="teidata.enumerated"/></datatype>
44+
<datatype maxOccurs="unbounded" minOccurs="1"><dataRef key="teidata.enumerated"/></datatype>
4545
<valList type="semi">
4646
<valItem ident="setting">
4747
<desc versionDate="2007-06-27" xml:lang="en">describes a setting.</desc>

0 commit comments

Comments
 (0)