Skip to content

most oddDecl elements must be descendant of <schemaSpec> or <specGrp> #2855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sydb wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

most oddDecl elements must be descendant of <schemaSpec> or <specGrp> #2855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d79a999
Wrap specification elements that occur in prose with specGrp elements.
sydb Apr 3, 2024
0cb5cba
Conclude said merge
sydb Jan 3, 2026
437c554
First stage in addressing
sydb Jan 4, 2026
ac2b2a7
Added a single test to detest for
sydb Jan 4, 2026
43559c0
Added an entry in DEPRECATIONS
sydb Jan 4, 2026
dc17f9e
complete merge grabbing latest from dev
sydb Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions P5/Source/Guidelines/en/AI-AnalyticMechanisms.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,9 +1225,11 @@ see chapter <ptr target="#TS"/>.
</moduleSpec>
The selection and combination of modules to form a TEI schema is
described in <ptr target="#STIN"/>.
<specGrpRef target="#DAIGA"/>
<specGrpRef target="#DAISP"/>
<specGrpRef target="#DAILC"/>
<specGrp xml:id="AIspecs">
<specGrpRef target="#DAIGA"/>
<specGrpRef target="#DAISP"/>
<specGrpRef target="#DAILC"/>
</specGrp>
</p>
</div>
</div>
30 changes: 18 additions & 12 deletions P5/Source/Guidelines/en/CC-LanguageCorpora.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
<?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"?>
<div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="CC" n="23"><head>Language Corpora</head>
<div xmlns="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" type="div1" xml:id="CC" n="23"><head>Language Corpora</head>
<p>The term <term>language corpus</term> is used to mean a number of
rather different things. It may refer simply to any collection of
linguistic data (for example, written, spoken, signed, or multimodal), although
Expand Down Expand Up @@ -305,19 +305,25 @@ corpora</q>.</p>
<p>When the module defined in this chapter is included in a schema, a
number of additional elements become available within the
<gi>profileDesc</gi> element of the TEI header (discussed in section
<ptr target="#HD4"/>). <specList><specDesc key="textDesc"/><specDesc key="particDesc"/><specDesc key="settingDesc"/></specList> These
elements, members of the <ident type="class">model.profileDescPart</ident>, are discussed in the
<ptr target="#HD4"/>).
<specList>
<specDesc key="textDesc"/>
<specDesc key="particDesc"/>
<specDesc key="settingDesc"/>
</specList>
These elements, members of the <ident
type="class">model.profileDescPart</ident>, are discussed in the
remainder of the chapter.

<specGrp>
<include xmlns="http://www.w3.org/2001/XInclude" href="../../Specs/textDesc.xml"/>
<include xmlns="http://www.w3.org/2001/XInclude" href="../../Specs/particDesc.xml"/>
<include xmlns="http://www.w3.org/2001/XInclude" href="../../Specs/settingDesc.xml"/>
<xi:include xmlns="http://www.w3.org/2001/XInclude" href="../../Specs/textDesc.xml"/>
<xi:include xmlns="http://www.w3.org/2001/XInclude" href="../../Specs/particDesc.xml"/>
<xi:include href="../../Specs/settingDesc.xml"/>
</specGrp>
<specGrpRef target="#DCCAHTD"/>

<specGrpRef target="#DCCAHSE"/>
</p>
<specGrp xml:id="CCspecs">
<specGrpRef target="#DCCAHTD"/>
<specGrpRef target="#DCCAHSE"/>
</specGrp>
</p>

<div type="div3" xml:id="CCAHTD"><head>The Text Description</head>
<p>The <gi>textDesc</gi> element provides a full description of the
Expand Down Expand Up @@ -964,4 +970,4 @@ elements, or silently omitted, as appropriate.</item></list></p>
described in <ptr target="#STIN"/>.</p>
</div>

</div>
</div>
13 changes: 8 additions & 5 deletions P5/Source/Guidelines/en/CE-CertaintyResponsibility.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
<?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"?>
<div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="CE" n="17"><head>Certainty, Precision, and Responsibility</head>
<div xmlns="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" type="div1" xml:id="CE" n="17"><head>Certainty, Precision, and Responsibility</head>
<p>Encoders of text often find it useful to indicate that some aspects
of the encoded text are problematic or uncertain, and to indicate who is
responsible for various aspects of the markup of the electronic text.
Expand Down Expand Up @@ -448,10 +448,13 @@ in a given situation, encoders should provide their own controlled
vocabulary and document it in the <gi>encodingDesc</gi> or
<gi>tagUsage</gi> elements of the TEI header.</p>-->
<specGrp>
<include xmlns="http://www.w3.org/2001/XInclude" href="../../Specs/precision.xml"/>
<include xmlns="http://www.w3.org/2001/XInclude" href="../../Specs/certainty.xml"/>
<xi:include href="../../Specs/precision.xml"/>
<xi:include href="../../Specs/certainty.xml"/>
</specGrp>
<specGrpRef target="#DCERESP"/></div>
<specGrp xml:id="CEspecs">
<specGrpRef target="#DCERESP"/>
</specGrp>
</div>
</div>

</div>
Expand Down Expand Up @@ -607,4 +610,4 @@ The selection and combination of modules to form a TEI schema is described in
<ptr target="#STIN"/>.

</p>
</div></div>
</div></div>
38 changes: 20 additions & 18 deletions P5/Source/Guidelines/en/CO-CoreElements.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5988,23 +5988,25 @@ were dialogue in a play. The following example is taken from a 19th century
</moduleSpec>
The selection and combination of modules to form a TEI schema is
described in <ptr target="#STIN"/>.</p>
<specGrpRef target="#DCOPA"/>
<specGrpRef target="#DCOHQ"/>
<specGrpRef target="#DCONA"/>
<specGrpRef target="#DCONU"/>
<specGrpRef target="#DCODA"/>
<specGrpRef target="#DCOAB"/>
<specGrpRef target="#DCOEDC"/>
<specGrpRef target="#DCOEDR"/>
<specGrpRef target="#DCOEDA"/>
<specGrpRef target="#DCOAD"/>
<specGrpRef target="#DCOXR"/>
<specGrpRef target="#DCOLI"/>
<specGrpRef target="#DCONO"/>
<specGrpRef target="#DCOGR"/>
<specGrpRef target="#DCORSM"/>
<specGrpRef target="#DCOBI"/>
<specGrpRef target="#DCOVE"/>
<specGrpRef target="#DCODR"/>
<specGrp xml:id="DCspecs">
<specGrpRef target="#DCOPA"/>
<specGrpRef target="#DCOHQ"/>
<specGrpRef target="#DCONA"/>
<specGrpRef target="#DCONU"/>
<specGrpRef target="#DCODA"/>
<specGrpRef target="#DCOAB"/>
<specGrpRef target="#DCOEDC"/>
<specGrpRef target="#DCOEDR"/>
<specGrpRef target="#DCOEDA"/>
<specGrpRef target="#DCOAD"/>
<specGrpRef target="#DCOXR"/>
<specGrpRef target="#DCOLI"/>
<specGrpRef target="#DCONO"/>
<specGrpRef target="#DCOGR"/>
<specGrpRef target="#DCORSM"/>
<specGrpRef target="#DCOBI"/>
<specGrpRef target="#DCOVE"/>
<specGrpRef target="#DCODR"/>
</specGrp>
</div>
</div>
14 changes: 13 additions & 1 deletion P5/Source/Guidelines/en/DEPRECATIONS.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,17 @@
attributes, attribute values, datatypes etc.) which are deprecated
in this revision of the TEI Guidelines (revision <?insert revision?> of TEI P5 <?insert version?>).</p>
</div>
<div>
<list>
<item>Members of model.oddDecl are currently permitted in many
places. After <emph rend="bold">2026-09-03</emph> this feature
(which some would call a bug) will be altered so that most such
elements will need to occur within a <gi>specGrp</gi> or
<gi>schemaSpec</gi> (or <gi>egXML</gi>) element. The affected
elements are: <gi>classSpec</gi>, <gi>constraintSpec</gi>,
<gi>dataSpec</gi>, <gi>elementSpec</gi>, <gi>macroSpec</gi>,
<gi>outputRendition</gi>, and <gi>specGrpRef</gi>.</item>
</list>
</div>
<divGen type="deprecationcat"/>
</div>
</div>
36 changes: 17 additions & 19 deletions P5/Source/Guidelines/en/DI-PrintDictionaries.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
<?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"?>
<div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="DI" n="12">
<div xmlns="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" type="div1" xml:id="DI" n="12">
<head>Dictionaries</head>

<p>This chapter defines a module for encoding lexical resources of all
Expand Down Expand Up @@ -284,24 +284,22 @@ derived headwords.
</egXML>
</p>

<specGrpRef target="#DEDIMV"/>
<include xmlns="http://www.w3.org/2001/XInclude" href="../../Specs/model.entryLike.xml"/>
<include xmlns="http://www.w3.org/2001/XInclude" href="../../Specs/att.entryLike.xml"/>
<specGrpRef target="#DEDITPFO"/>
<specGrpRef target="#DEDIHW"/>
<specGrpRef target="#DDIEN"/>
<specGrpRef target="#DDITPFO"/>
<specGrpRef target="#DDITPGR"/>
<specGrpRef target="#DDITPDE"/>
<specGrpRef target="#DDITPET"/>
<specGrpRef target="#DDITPUS"/>
<specGrpRef target="#DDITPXR"/>
<specGrpRef target="#DDITPRE"/>
<specGrpRef target="#DDIHW"/>

<specGrp xml:id="DEDIMV" n="Attributes for dictionary work">
<include xmlns="http://www.w3.org/2001/XInclude" href="../../Specs/att.lexicographic.xml"/>
<include xmlns="http://www.w3.org/2001/XInclude" href="../../Specs/att.partials.xml"/>
<specGrp n="Specifications for dictionary work">
<xi:include href="../../Specs/att.lexicographic.xml"/>
<xi:include href="../../Specs/att.partials.xml"/>
<xi:include href="../../Specs/model.entryLike.xml"/>
<xi:include href="../../Specs/att.entryLike.xml"/>
<specGrpRef target="#DEDITPFO"/>
<specGrpRef target="#DEDIHW"/>
<specGrpRef target="#DDIEN"/>
<specGrpRef target="#DDITPFO"/>
<specGrpRef target="#DDITPGR"/>
<specGrpRef target="#DDITPDE"/>
<specGrpRef target="#DDITPET"/>
<specGrpRef target="#DDITPUS"/>
<specGrpRef target="#DDITPXR"/>
<specGrpRef target="#DDITPRE"/>
<specGrpRef target="#DDIHW"/>
</specGrp>

</div>
Expand Down
11 changes: 6 additions & 5 deletions P5/Source/Guidelines/en/DR-PerformanceTexts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ of performance texts. The <ident type="class">model.stageLike</ident>
class supplies a set of elements for stage directions and similar
items such as camera movements, which can occur between or within
speeches. </p>

<specGrpRef target="#DDRFAB"/>
<specGrpRef target="#DDRSTA"/>
<specGrpRef target="#DDROTH"/>
<specGrp xml:id="DRspecs">
<specGrpRef target="#DDRFAB"/>
<specGrpRef target="#DDRSTA"/>
<specGrpRef target="#DDROTH"/>
</specGrp>

<div type="div2" xml:id="DRFAB"><head>Front and Back Matter
</head>
Expand Down Expand Up @@ -1404,4 +1405,4 @@ within a speech or between speeches.
The selection and combination of modules to form a TEI schema is described in
<ptr target="#STIN"/>.</p>
</div>
</div>
</div>
16 changes: 9 additions & 7 deletions P5/Source/Guidelines/en/DS-DefaultTextStructure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1801,13 +1801,15 @@ monsters, Reader, with thy quill.</p>
<desc xml:lang="pt" versionDate="2018-07-12">Estrutura do texto por defeito</desc>
<desc xml:lang="ja" versionDate="2018-07-12">テキスト構造モジュール</desc>
</moduleSpec>
<specGrpRef target="#DDSTEXT"/>
<specGrpRef target="#DDSDIV"/>
<specGrpRef target="#DDSDIVN"/>
<specGrpRef target="#DDSDIVX"/>
<specGrpRef target="#DDSBACK"/>
<specGrpRef target="#DDSFRONT"/>
<specGrp xml:id="DSspecs">
<specGrpRef target="#DDSTEXT"/>
<specGrpRef target="#DDSDIV"/>
<specGrpRef target="#DDSDIVN"/>
<specGrpRef target="#DDSDIVX"/>
<specGrpRef target="#DDSBACK"/>
<specGrpRef target="#DDSFRONT"/>
</specGrp>
The selection and combination of modules to form a TEI schema is
described in <ptr target="#STIN"/>.</p>
</div>
</div>
</div>
12 changes: 7 additions & 5 deletions P5/Source/Guidelines/en/FT-TablesFormulaeGraphics.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,10 +1095,12 @@ discussion at .</note-->
</moduleSpec>
The selection and combination of modules to form a TEI
schema is described in <ptr target="#STIN"/>.
<specGrpRef target="#DFTTAB"/>
<specGrpRef target="#DFTFOR"/>
<specGrpRef target="#DFTNTM"/>
<specGrpRef target="#DFTGRA"/>
<specGrp xml:id="FTspecs">
<specGrpRef target="#DFTTAB"/>
<specGrpRef target="#DFTFOR"/>
<specGrpRef target="#DFTNTM"/>
<specGrpRef target="#DFTGRA"/>
</specGrp>
</p>
</div>
</div>
</div>
10 changes: 6 additions & 4 deletions P5/Source/Guidelines/en/GD-GraphsNetworksTrees.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,9 +1316,11 @@ representing such information: see in particular chapters <ptr target="#MS"/>, <

The selection and combination of modules to form a TEI schema is
described in <ptr target="#STIN"/>.
<specGrpRef target="#DGDGR"/>
<specGrpRef target="#DGDTR"/>
<specGrpRef target="#DGDAL"/>
<specGrp xml:id="GDspecs">
<specGrpRef target="#DGDGR"/>
<specGrpRef target="#DGDTR"/>
<specGrpRef target="#DGDAL"/>
</specGrp>
</p>
</div>
</div>
</div>
4 changes: 3 additions & 1 deletion P5/Source/Guidelines/en/HD-Header.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,7 +1778,9 @@ more than one language, as in the following example:
longitude according to the 1984 World Geodetic System (WGS84).
<specList><specDesc key="geoDecl" atts="datum"/></specList>
</p>
<include xmlns="http://www.w3.org/2001/XInclude" href="../../Specs/geoDecl.xml"/>
<specGrp>
<xi:include href="../../Specs/geoDecl.xml"/>
</specGrp>
</div>
<div type="div3" xml:id="HDUDECL"><head>The Unit Declaration</head>
<p>When documents feature units of measurement that are not listed in the <ref target="https://www.bipm.org/en/publications/si-brochure/">International System of Units</ref>, the <gi>unitDecl</gi> element may be used in the encoding description to provide definitions and information about their origins and equivalents.
Expand Down
Loading