Skip to content

version number, take 2 #2599

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

Draft
sydb wants to merge 17 commits into
base: dev
Choose a base branch
from
Draft

version number, take 2 #2599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f3ddcfe
First ⅓ or so … thus NOT a working version
sydb May 22, 2024
d3d4fc0
grab latest from dev
sydb Sep 2, 2024
afed179
A working version of version sublcasses that is NOT ready
sydb Sep 3, 2024
ee6c3e8
Use new version number subclass for TEI version numbers (this
sydb Sep 3, 2024
40c3e71
forgot to git add the file. Sigh.
sydb Sep 3, 2024
443850d
conclude after manual merges
sydb Nov 11, 2024
6da041d
Fix copy-paste err.
sydb Nov 11, 2024
d10e19c
finish commit
sydb Nov 28, 2024
c759ba9
Change name of one of the version sub-classes
sydb Jan 14, 2025
a4c2d5d
rebase “First ⅓ or so … thus NOT a working version” after manual merg…
sydb May 22, 2024
c57d1db
rebase “A working version of version sublcasses that is NOT ready …” …
sydb Sep 3, 2024
5a4a468
Use new version number subclass for TEI version numbers (this
sydb Sep 3, 2024
204e11f
rebase “forgot to git add the file. Sigh.”
sydb Sep 3, 2024
7a2bd11
Fix copy-paste err.
sydb Nov 11, 2024
21a83f4
Change name of one of the version sub-classes
sydb Jan 14, 2025
3925b36
concluding a merge
sydb Jan 14, 2025
cb0526b
… after 2 manual merges
sydb Jul 22, 2025
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
20 changes: 20 additions & 0 deletions P5/Source/Guidelines/en/BIB-Bibliography.xml
View file
Open in desktop
Comment thread
sydb marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -3607,6 +3607,26 @@
</imprint>
</monogr>
</biblStruct>
<biblStruct xml:id="BIB_semVer">
<!-- This probably needs to be fleshed out more —Syd, 2024-05-21 -->
<monogr>
<title>Semantic Versioning 2.0.0</title>
<ptr target="https://semver.org/#semantic-versioning-200"/>
<imprint>
<date when="2023-12-19"/>
</imprint>
</monogr>
</biblStruct>
<biblStruct>
<!-- This probably needs to be fleshed out more —Syd, 2024-09-02 -->
<monogr>
<title>Calendar Versioning</title>
<ptr target="https://calver.org/"/>
<imprint>
<date when="2019-07-01"/>
</imprint>
</monogr>
</biblStruct>
</listBibl>
</div>
<div xml:id="BIB-RDG">
Expand Down
10 changes: 8 additions & 2 deletions P5/Source/Guidelines/en/ST-Infrastructure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,10 @@ entities in the XML DTD fragments.--></p>
<specDesc key="teidata.pointer"/>
<specDesc key="teidata.authority"/>
<specDesc key="teidata.version"/>
<specDesc key="teidata.versionNumber"/>
<specDesc key="teidata.version.semantic"/>
<specDesc key="teidata.version.calendar"/>
<specDesc key="teidata.version.Unicode"/>
<specDesc key="teidata.version.teiP5"/>
<specDesc key="teidata.replacement"/>
<specDesc key="teidata.xpath"/>
</specList>
Expand All @@ -1323,7 +1326,10 @@ entities in the XML DTD fragments.--></p>
<xi:include href="../../Specs/teidata.pointer.xml"/>
<xi:include href="../../Specs/teidata.authority.xml"/>
<xi:include href="../../Specs/teidata.version.xml"/>
<xi:include href="../../Specs/teidata.versionNumber.xml"/>
<xi:include href="../../Specs/teidata.version.semantic.xml"/>
<xi:include href="../../Specs/teidata.version.calendar.xml"/>
<xi:include href="../../Specs/teidata.version.Unicode.xml"/>
<xi:include href="../../Specs/teidata.version.teiP5.xml"/>
<xi:include href="../../Specs/teidata.replacement.xml"/>
<xi:include href="../../Specs/teidata.xpath.xml"/>
</specGrp>
Expand Down
2 changes: 1 addition & 1 deletion P5/Source/Specs/TEI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<desc versionDate="2018-07-18" xml:lang="de">gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird.</desc>
<desc versionDate="2022-05-02" xml:lang="es">especifica el número de versión de las Directrices TEI frente a las cuales este documento es válido.</desc>
<desc versionDate="2007-01-21" xml:lang="it">versione dello schema TEI</desc>
<datatype><dataRef key="teidata.version"/></datatype>
<datatype><dataRef key="teidata.version.teiP5"/></datatype>
<remarks versionDate="2018-01-24" xml:lang="en">
<p>Major editions of the Guidelines have long been informally referred to by a name made up
of the letter P (for Proposal) followed by a digit. The current release is one of the many
Expand Down
8 changes: 4 additions & 4 deletions P5/Source/Specs/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<desc versionDate="2018-12-28" xml:lang="ja">当該ソフトウェアの版番号を示す。識別子や表示名とは異なる。</desc>
<desc versionDate="2008-03-30" xml:lang="fr">fournit un numéro de version pour l'application, indépendamment de son identifiant ou du nom affiché.</desc>
<desc versionDate="2007-11-06" xml:lang="it">indica un numero di versione per l'applicazione, indipendentemente dall'identificatore o dal nome visualizzato</desc>
<datatype><dataRef key="teidata.versionNumber"/></datatype>
<datatype><dataRef key="teidata.version"/></datatype>
</attDef>
</attList>
<exemplum xml:lang="en">
Expand All @@ -54,9 +54,9 @@
</appInfo>
</egXML>
<p>This example shows an appInfo element documenting the fact that version 1.5 of the Image
Markup Tool1 application has an interest in two parts of a document which was last saved on
June 6 2006. The parts concerned are accessible at the URLs given as target for the two
<gi>ptr</gi> elements. </p>
Markup Tool1 application has an interest in two parts of a document which was last saved on
June 6 2006. The parts concerned are accessible at the URLs given as target for the two
<gi>ptr</gi> elements. </p>
</exemplum>
<exemplum versionDate="2008-04-06" xml:lang="fr">
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-application-egXML-ox" source="#NONE">
Expand Down
2 changes: 2 additions & 0 deletions P5/Source/Specs/att.gaijiProp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
<valItem ident="13.0"/>
<valItem ident="14.0"/>
<valItem ident="15.0"/>
<valItem ident="15.1.0"/>
<valItem ident="16.0"/>
<valItem ident="unassigned"/>
</valList>
</attDef>
Expand Down
40 changes: 19 additions & 21 deletions P5/Source/Specs/att.styleDef.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,15 @@
<!-- © 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"?>
<classSpec xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tei" type="atts" ident="att.styleDef">
<desc versionDate="2015-02-15" xml:lang="en">provides attributes to specify the name of a formal definition
language used to provide formatting or rendition information.</desc>
<desc versionDate="2015-02-15" xml:lang="en">provides attributes to specify the name of a formal definition language used to provide formatting or rendition information.</desc>
<attList>
<attDef ident="scheme">
<desc versionDate="2012-10-06" xml:lang="en">identifies the language used to describe the rendition.</desc>
<desc versionDate="2007-12-20" xml:lang="ko">모양을 기술하는 언어를 식별한다.</desc>
<desc versionDate="2008-04-06" xml:lang="es">identifica el lenguaje usado para describir la
interpretación.</desc>
<desc versionDate="2008-04-06" xml:lang="es">identifica el lenguaje usado para describir la interpretación.</desc>
<desc versionDate="2008-04-05" xml:lang="ja">当該描出を解説する言語を特定する。</desc>
<desc versionDate="2008-03-30" xml:lang="fr">identifie la langue employée pour décrire le rendu.</desc>
<desc versionDate="2007-11-06" xml:lang="it">identifica la lingua utilizzata per descrivere la
resa</desc>
<desc versionDate="2007-11-06" xml:lang="it">identifica la lingua utilizzata per descrivere la resa</desc>
<datatype><dataRef key="teidata.enumerated"/></datatype>
<valList type="closed">
<valItem ident="css">
Expand All @@ -27,11 +24,9 @@
<valItem ident="xslfo">
<desc versionDate="2012-10-06" xml:lang="en">Extensible Stylesheet Language Formatting Objects</desc>
<desc versionDate="2007-12-20" xml:lang="ko">확장가능 스타일시트 언어</desc>
<desc versionDate="2008-04-06" xml:lang="es">Objetos extensibles del formato del lenguaje de
Stylesheet</desc>
<desc versionDate="2008-04-06" xml:lang="es">Objetos extensibles del formato del lenguaje de Stylesheet</desc>
<desc versionDate="2008-04-05" xml:lang="ja">XSL-FO</desc>
<desc versionDate="2008-03-30" xml:lang="fr">langage XSL (Extensible Stylesheet )Formatting
Objects</desc>
<desc versionDate="2008-03-30" xml:lang="fr">langage XSL (Extensible Stylesheet )Formatting Objects</desc>
<desc versionDate="2007-11-06" xml:lang="it">linguaggio XSL-FO</desc>
</valItem>
<valItem ident="free">
Expand All @@ -45,23 +40,25 @@
<valItem ident="other">
<desc versionDate="2012-10-06" xml:lang="en">A user-defined rendition description language</desc>
<desc versionDate="2007-12-20" xml:lang="ko">사용자 정의 해석 기술 언어</desc>
<desc versionDate="2008-04-06" xml:lang="es">Un idioma descriptivo de interpretación definido
por el usario.</desc>
<desc versionDate="2008-04-06" xml:lang="es">Un idioma descriptivo de interpretación definido por el usario.</desc>
<desc versionDate="2008-04-05" xml:lang="ja">利用者が決めた、描出記述言語。</desc>
<desc versionDate="2008-03-30" xml:lang="fr">langue de description de l'interprétation définie
par l'utilisateur</desc>
<desc versionDate="2007-11-06" xml:lang="it">linguaggio di descrizione della resa definito
dall'utente</desc>
<desc versionDate="2008-03-30" xml:lang="fr">langue de description de l'interprétation définie par l'utilisateur</desc>
<desc versionDate="2007-11-06" xml:lang="it">linguaggio di descrizione della resa definito dall'utente</desc>
</valItem>
</valList>
<remarks versionDate="2013-04-11" xml:lang="en">
<p>
If no value for the @scheme attribute is provided, then the default assumption should be that CSS is in use. </p>
<p>If no value for the @scheme attribute is provided, then the default assumption should be that CSS is in use.</p>
</remarks>
</attDef>
<attDef ident="schemeVersion" usage="opt">
<desc versionDate="2013-04-12" xml:lang="en">supplies a version number for the style language provided in <att>scheme</att>.</desc>
<datatype><dataRef key="teidata.versionNumber"/></datatype>
<datatype><dataRef key="teidata.version.Unicode"/></datatype>
<!--
All version numbers of XSLFO (1.0, & 1.1) and of CSS (1, 2,
2.1, & 3) are expressible using teidata.version.Unicode. If
other possible values are added to @scheme, the datatype
used here may need to be revised. —Syd, 2025-01-13
-->
<constraintSpec ident="schemeVersionRequiresScheme" scheme="schematron" xml:lang="en">
<constraint>
<sch:rule context="tei:*[@schemeVersion]">
Expand All @@ -72,8 +69,9 @@ If no value for the @scheme attribute is provided, then the default assumption s
</constraint>
</constraintSpec>
<remarks versionDate="2013-04-12" xml:lang="en">
<p>If <att>schemeVersion</att> is used, then <att>scheme</att> should also appear, with a value
other than <val>free</val>.</p>
<p>If <att>schemeVersion</att> is used, then <att>scheme</att>
should also appear, with a value other than
<val>free</val>.</p>
</remarks>
</attDef>
</attList>
Expand Down
2 changes: 1 addition & 1 deletion P5/Source/Specs/teiCorpus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<desc versionDate="2007-05-04" xml:lang="es">La versión del esquema TEI</desc>
<desc versionDate="2007-01-21" xml:lang="it">La versione dello schema TEI</desc>
<desc versionDate="2017-06-13" xml:lang="de">gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird.</desc>
<datatype><dataRef key="teidata.version"/></datatype>
<datatype><dataRef key="teidata.version.teiP5"/></datatype>
<remarks versionDate="2018-01-24" xml:lang="en">
<p>Major editions of the Guidelines have long been informally referred to by a name made up
of the letter P (for Proposal) followed by a digit. The current release is one of the many
Expand Down
Loading