From f3ddcfe5a0b94a8788a458dddd2f160241060ebf Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Tue, 21 May 2024 22:29:19 -0400 Subject: [PATCH 01/12] =?UTF-8?q?First=20=E2=85=93=20or=20so=20=E2=80=A6?= =?UTF-8?q?=20thus=20NOT=20a=20working=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- P5/Source/Guidelines/en/BIB-Bibliography.xml | 10 ++++++ P5/Source/Specs/teidata.duration.iso.xml | 8 ++--- P5/Source/Specs/teidata.version.Unicode.xml | 28 +++++++++++++++ P5/Source/Specs/teidata.version.semantic.xml | 16 +++++++++ P5/Source/Specs/teidata.version.xml | 37 +++++++------------- 5 files changed, 70 insertions(+), 29 deletions(-) create mode 100644 P5/Source/Specs/teidata.version.Unicode.xml create mode 100644 P5/Source/Specs/teidata.version.semantic.xml diff --git a/P5/Source/Guidelines/en/BIB-Bibliography.xml b/P5/Source/Guidelines/en/BIB-Bibliography.xml index afcbd6e9e5..fe51e0475e 100644 --- a/P5/Source/Guidelines/en/BIB-Bibliography.xml +++ b/P5/Source/Guidelines/en/BIB-Bibliography.xml @@ -3479,6 +3479,16 @@ + + + + Semantic Versioning 2.0.0 + + + + + +
diff --git a/P5/Source/Specs/teidata.duration.iso.xml b/P5/Source/Specs/teidata.duration.iso.xml index 84bd548c1a..011fd5180a 100644 --- a/P5/Source/Specs/teidata.duration.iso.xml +++ b/P5/Source/Specs/teidata.duration.iso.xml @@ -2,14 +2,12 @@ - defines the range of attribute values available for representation of a duration in time - using ISO 8601 standard formats + defines the range of attribute values available for representation of a duration in time using ISO 8601 standard formats. ISO 8601 표준 형식을 사용하여 시간의 지속을 나타내는 속성 값 범위를 정의한다. 以ISO 8601標準格式定義表示一段持續性時間的屬性值範圍 ISO 8601にある標準形式を使い、時間幅を表現する当該属性値の範囲を定義 する。 définit la gamme de valeurs d'attributs exprimant une durée temporaraire utilisant le norme ISO 8601. - define la gama de valores de atributos posibles para - representar la duración en el tiempo usando formatos estàndards ISO 8601. + define la gama de valores de atributos posibles para representar la duración en el tiempo usando formatos estàndards ISO 8601. @@ -81,4 +79,4 @@

Pour des détails complets, voir ISO 8601 Data elements and interchange formats — Information interchange — Representation of dates and times.

- \ No newline at end of file + diff --git a/P5/Source/Specs/teidata.version.Unicode.xml b/P5/Source/Specs/teidata.version.Unicode.xml new file mode 100644 index 0000000000..d2ea26fc1c --- /dev/null +++ b/P5/Source/Specs/teidata.version.Unicode.xml @@ -0,0 +1,28 @@ + + + + + defines the range of attribute values which may be used to specify a Unicode version number. + définit la gamme des valeurs d'attribut exprimant un numéro de version TEI. + + + + +

The value of this attribute follows the pattern specified by + the Unicode consortium for its version number (). A version number + contains digits and fullstop characters only. The first number + supplied identifies the major version number. A second and third + number, for minor and sub-minor version numbers, may also be + supplied.

+ + +

La valeur de cet attribut devrait suivre le format proposé par + le Consortium Unicode pour identifier les versions (). Un numéro de version ne + contient que des chiffres et des points. Le numéro initiale + identifie le numéro majeur de la version. Un deuxième et un + troisième numéro sont aussi disponibles pour la numérotation + facultative des versions mineures ou sous-mineurs.

+ + diff --git a/P5/Source/Specs/teidata.version.semantic.xml b/P5/Source/Specs/teidata.version.semantic.xml new file mode 100644 index 0000000000..df1dc3989e --- /dev/null +++ b/P5/Source/Specs/teidata.version.semantic.xml @@ -0,0 +1,16 @@ + + + + + defines the range of values which may be used as a semantic version number per . + + + + + +

Values of this datatype should follow the rules established by + the Semantic Versioning + specification, version 2.0.0.

+ + diff --git a/P5/Source/Specs/teidata.version.xml b/P5/Source/Specs/teidata.version.xml index 43519979cd..3e330def77 100644 --- a/P5/Source/Specs/teidata.version.xml +++ b/P5/Source/Specs/teidata.version.xml @@ -2,29 +2,18 @@ - defines the range of attribute values which may be used to - specify a TEI or Unicode version number. - définit la gamme des valeurs d'attribut - exprimant un numéro de version TEI. + defines the range of attribute values which may be used to specify a version number. + définit la gamme des valeurs d'attribut exprimant un numéro de version TEI. - - - -

The value of this attribute follows the pattern specified by - the Unicode consortium for its version number (). A version number - contains digits and fullstop characters only. The first number - supplied identifies the major version number. A second and third - number, for minor and sub-minor version numbers, may also be - supplied. -

+ + + + + + + + +

Values matching this datatype may match any of the various + subtypes defined.

 - -

La valeur de cet attribut devrait suivre le format proposé par - le Consortium Unicode pour identifier les versions (). Un numéro de version - ne contient que des chiffres et des points. Le numéro - initiale identifie le numéro majeur de la version. Un deuxième et - un troisième numéro sont aussi disponibles pour la numérotation - facultative des versions mineures ou sous-mineurs. -

- - \ No newline at end of file + From afed1794a93cda16283427c3716b61e16e6e3bab Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Mon, 2 Sep 2024 22:01:40 -0400 Subject: [PATCH 02/12] =?UTF-8?q?A=20working=20version=20of=20version=20su?= =?UTF-8?q?blcasses=20that=20is=20NOT=20ready=20for=20actual=20use,=20yet?= =?UTF-8?q?=20=E2=80=94=20in=20large=20part=20untested,=20and=20prose=20no?= =?UTF-8?q?t=20written.=20This=20version=20is=20simply=20for=20Council=20t?= =?UTF-8?q?o=20see=20if=20they=20like=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- P5/Source/Guidelines/en/BIB-Bibliography.xml | 10 ++ P5/Source/Guidelines/en/ST-Infrastructure.xml | 10 +- P5/Source/Specs/application.xml | 118 ++++++++---------- P5/Source/Specs/att.styleDef.xml | 2 +- P5/Source/Specs/teidata.version.xml | 4 +- P5/Source/Specs/transcriptionDesc.xml | 4 +- 6 files changed, 72 insertions(+), 76 deletions(-) diff --git a/P5/Source/Guidelines/en/BIB-Bibliography.xml b/P5/Source/Guidelines/en/BIB-Bibliography.xml index 7f4c481f67..9ffd21d9d1 100644 --- a/P5/Source/Guidelines/en/BIB-Bibliography.xml +++ b/P5/Source/Guidelines/en/BIB-Bibliography.xml @@ -3748,6 +3748,16 @@ + + + + Semantic Versioning 2.0.0 + + + + + +
diff --git a/P5/Source/Guidelines/en/ST-Infrastructure.xml b/P5/Source/Guidelines/en/ST-Infrastructure.xml index be280599f1..c15ffb224e 100644 --- a/P5/Source/Guidelines/en/ST-Infrastructure.xml +++ b/P5/Source/Guidelines/en/ST-Infrastructure.xml @@ -1288,7 +1288,10 @@ entities in the XML DTD fragments.-->

- + + + + @@ -1302,7 +1305,10 @@ entities in the XML DTD fragments.-->

- + + + + diff --git a/P5/Source/Specs/application.xml b/P5/Source/Specs/application.xml index afad54c82d..8664fa169b 100644 --- a/P5/Source/Specs/application.xml +++ b/P5/Source/Specs/application.xml @@ -3,13 +3,10 @@ provides information about an application which has acted upon the document. 문서에 사용한 애플리케이션에 관한 정보를 제시한다. - proporciona información sobre la aplicación que ha - actuado sobre el documento. + proporciona información sobre la aplicación que ha actuado sobre el documento. 当該文書に作用するソフトウェアに関する情報を示す。 - fournit des informations sur une application qui a été - utilisée pour le traitement du document. - registra informazioni relative a un'applicazione che ha - agito sul documento + fournit des informations sur une application qui a été utilisée pour le traitement du document. + registra informazioni relative a un'applicazione che ha agito sul documento @@ -18,78 +15,61 @@ - - - + - - - - - - + + - - The calendar attribute will be removed from this element - as it will only be allowed on elements that represent dates with their content. This is because the calendar attribute - (unlike datingMethod defined in - att.datable.custom) defines the calendar system of the date - in the original material defined by the parent element, not the calendar to - which the date is normalized. - indicates one or more systems or calendars to which the - date represented by the content of this element belongs. - 날짜 표현 시스템 또는 달력 표시 형식을 표시한다. - 指明該日期表示所使用的曆法計算系統。 - この要素を含むコンテントにおける日付の暦やシステムを示す。 - indique le système ou le calendrier auquel - appartient la date exprimée dans le contenu de l'élément. - indica el sistema o calendario en que se muestra - una fecha. - indica il sistema o calendario al quale la data - appartiene. - - - - - - - @calendar indicates one or more - systems or calendars to which the date represented by the content of this element belongs, - but this element has no textual content. - - - + + The calendar attribute will be removed + from this element as it will only be allowed on elements that + represent dates with their content. This is because the + calendar attribute (unlike datingMethod + defined in att.datable.custom) + defines the calendar system of the date in the original material + defined by the parent element, not the calendar to + which the date is normalized. + indicates one or more systems or calendars to which the date represented by the content of this element belongs. + 날짜 표현 시스템 또는 달력 표시 형식을 표시한다. + 指明該日期表示所使用的曆法計算系統。 + この要素を含むコンテントにおける日付の暦やシステムを示す。 + indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément. + indica el sistema o calendario en que se muestra una fecha. + indica il sistema o calendario al quale la data appartiene. + + + + + + + @calendar indicates one or more + systems or calendars to which the date represented by the content of this element belongs, + but this element has no textual content. + + + - - - - supplies an identifier for the application, independent of its version number or display - name. + + supplies an identifier for the application, independent of its version number or display name. 버전 또는 표시명과 상관없이 애플리케이션의 확인소를 제공한다. - proporciona un identificador para la aplicación, - independientemente de su número de versión o el nombre de la visualización. + proporciona un identificador para la aplicación, independientemente de su número de versión o el nombre de la visualización. 当該ソフトウェアの識別子を示す。これは、版番号や表示名とは異なる。 - fournit un identifiant pour l'application, - indépendamment de son numéro de version ou du nom affiché. - indica un identificatore per l'applicazione, - indipendentemente dal numero di versione o dal nome visualizzato + fournit un identifiant pour l'application, indépendamment de son numéro de version ou du nom affiché. + indica un identificatore per l'applicazione, indipendentemente dal numero di versione o dal nome visualizzato - supplies a version number for the application, independent of its identifier or display - name. + supplies a version number for the application, independent of its identifier or display name. 확인소 또는 표시명과 상관없이 애플리케이션의 버전을 제공한다. - Suministra un número de versión para la aplicación, - independientemente de su identificador o el nombre de la visualización. + Suministra un número de versión para la aplicación, independientemente de su identificador o el nombre de la visualización. 当該ソフトウェアの版番号を示す。識別子や表示名とは異なる。 - fournit un numéro de version pour l'application, - indépendamment de son identifiant ou du nom affiché. - indica un numero di versione per l'applicazione, - indipendentemente dall'identificatore o dal nome visualizzato - + fournit un numéro de version pour l'application, indépendamment de son identifiant ou du nom affiché. + indica un numero di versione per l'applicazione, indipendentemente dall'identificatore o dal nome visualizzato + @@ -103,9 +83,9 @@

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 - ptr elements.

+ 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 + ptr elements.

@@ -131,4 +111,4 @@ - \ No newline at end of file + diff --git a/P5/Source/Specs/att.styleDef.xml b/P5/Source/Specs/att.styleDef.xml index c51ad1314c..2ab467fe78 100644 --- a/P5/Source/Specs/att.styleDef.xml +++ b/P5/Source/Specs/att.styleDef.xml @@ -61,7 +61,7 @@ If no value for the @scheme attribute is provided, then the default assumption s supplies a version number for the style language provided in scheme. - + diff --git a/P5/Source/Specs/teidata.version.xml b/P5/Source/Specs/teidata.version.xml index 3e330def77..0519d05c35 100644 --- a/P5/Source/Specs/teidata.version.xml +++ b/P5/Source/Specs/teidata.version.xml @@ -6,8 +6,8 @@ définit la gamme des valeurs d'attribut exprimant un numéro de version TEI. - - + + diff --git a/P5/Source/Specs/transcriptionDesc.xml b/P5/Source/Specs/transcriptionDesc.xml index ea2b4a1bd2..bff8b24f27 100644 --- a/P5/Source/Specs/transcriptionDesc.xml +++ b/P5/Source/Specs/transcriptionDesc.xml @@ -26,7 +26,7 @@ supplies a version number for the encoding conventions used, if any. - + @@ -38,4 +38,4 @@ - \ No newline at end of file + From ee6c3e8ec7b6baedd58847a98ee5e71cdcf59fb9 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Mon, 2 Sep 2024 22:12:54 -0400 Subject: [PATCH 03/12] Use new version number subclass for TEI version numbers (this solves the problem for which the original ticket was opened, IIRC). --- P5/Source/Specs/TEI.xml | 2 +- P5/Source/Specs/teiCorpus.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/P5/Source/Specs/TEI.xml b/P5/Source/Specs/TEI.xml index 729dd547f0..391ee8fa1d 100644 --- a/P5/Source/Specs/TEI.xml +++ b/P5/Source/Specs/TEI.xml @@ -71,7 +71,7 @@ gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird. especifica el número de versión de las Directrices TEI frente a las cuales este documento es válido. versione dello schema TEI - +

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 diff --git a/P5/Source/Specs/teiCorpus.xml b/P5/Source/Specs/teiCorpus.xml index 20e651a103..692a24ced3 100644 --- a/P5/Source/Specs/teiCorpus.xml +++ b/P5/Source/Specs/teiCorpus.xml @@ -50,7 +50,7 @@ La versión del esquema TEI La versione dello schema TEI gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird. - +

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 @@ -167,4 +167,4 @@ - \ No newline at end of file + From 40c3e71071a02022ece77461a6f4e45fa2dfccef Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Mon, 2 Sep 2024 22:37:55 -0400 Subject: [PATCH 04/12] forgot to git add the file. Sigh. --- P5/Source/Specs/teidata.version.calendar.xml | 57 +++++++++++++++++++ ....xml => teidata.version.versionNumber.xml} | 13 ++--- 2 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 P5/Source/Specs/teidata.version.calendar.xml rename P5/Source/Specs/{teidata.versionNumber.xml => teidata.version.versionNumber.xml} (56%) diff --git a/P5/Source/Specs/teidata.version.calendar.xml b/P5/Source/Specs/teidata.version.calendar.xml new file mode 100644 index 0000000000..a564fac72e --- /dev/null +++ b/P5/Source/Specs/teidata.version.calendar.xml @@ -0,0 +1,57 @@ + + + + + defines the range of values which may be used as a calendar-based version number per . + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Values of this datatype should follow the rules established by + the Calendar Versioning + convention, as of 2024-05-21.

+ + diff --git a/P5/Source/Specs/teidata.versionNumber.xml b/P5/Source/Specs/teidata.version.versionNumber.xml similarity index 56% rename from P5/Source/Specs/teidata.versionNumber.xml rename to P5/Source/Specs/teidata.version.versionNumber.xml index a4599773fd..e31958b769 100644 --- a/P5/Source/Specs/teidata.versionNumber.xml +++ b/P5/Source/Specs/teidata.version.versionNumber.xml @@ -1,12 +1,9 @@ - - defines the range of attribute values used for version numbers. + + defines the range of values which may be used as a TEI version number. - - - -

- - \ No newline at end of file + + + From 6da041d47085a43d606736fe6dcba1b61a08c431 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Mon, 11 Nov 2024 12:50:27 -0500 Subject: [PATCH 05/12] Fix copy-paste err. --- P5/Source/Guidelines/en/BIB-Bibliography.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/P5/Source/Guidelines/en/BIB-Bibliography.xml b/P5/Source/Guidelines/en/BIB-Bibliography.xml index 426382b6bb..56fdd4ef57 100644 --- a/P5/Source/Guidelines/en/BIB-Bibliography.xml +++ b/P5/Source/Guidelines/en/BIB-Bibliography.xml @@ -3614,7 +3614,7 @@ - Semantic Versioning 2.0.0 + Calendar Versioning @@ -6482,4 +6482,4 @@ with TEI P3. -->

- \ No newline at end of file + From c759ba90f6f57676e3508e9d9ce7c304e1badfc3 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Mon, 13 Jan 2025 21:03:19 -0500 Subject: [PATCH 06/12] Change name of one of the version sub-classes --- P5/Source/Guidelines/en/ST-Infrastructure.xml | 6 +++--- P5/Source/Specs/TEI.xml | 2 +- P5/Source/Specs/application.xml | 2 +- P5/Source/Specs/att.gaijiProp.xml | 2 ++ P5/Source/Specs/att.styleDef.xml | 8 +++++++- P5/Source/Specs/teiCorpus.xml | 2 +- ...ersion.versionNumber.xml => teidata.version.teiP5.xml} | 2 +- P5/Source/Specs/teidata.version.xml | 2 +- P5/Source/Specs/transcriptionDesc.xml | 2 +- 9 files changed, 18 insertions(+), 10 deletions(-) rename P5/Source/Specs/{teidata.version.versionNumber.xml => teidata.version.teiP5.xml} (94%) diff --git a/P5/Source/Guidelines/en/ST-Infrastructure.xml b/P5/Source/Guidelines/en/ST-Infrastructure.xml index e0c5bff59a..91b6e78888 100644 --- a/P5/Source/Guidelines/en/ST-Infrastructure.xml +++ b/P5/Source/Guidelines/en/ST-Infrastructure.xml @@ -1291,7 +1291,7 @@ entities in the XML DTD fragments.-->

- + @@ -1308,7 +1308,7 @@ entities in the XML DTD fragments.-->

- + @@ -1430,4 +1430,4 @@ entities in the XML DTD fragments.-->

similarly predeclares a number of patterns with null (notAllowed) values. These issues are further discussed in chapter .

- \ No newline at end of file + diff --git a/P5/Source/Specs/TEI.xml b/P5/Source/Specs/TEI.xml index 526e564184..6539b3d6e8 100644 --- a/P5/Source/Specs/TEI.xml +++ b/P5/Source/Specs/TEI.xml @@ -71,7 +71,7 @@ gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird. especifica el número de versión de las Directrices TEI frente a las cuales este documento es válido. versione dello schema TEI - +

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 diff --git a/P5/Source/Specs/application.xml b/P5/Source/Specs/application.xml index f7a15560a2..66f0c24619 100644 --- a/P5/Source/Specs/application.xml +++ b/P5/Source/Specs/application.xml @@ -40,7 +40,7 @@ 当該ソフトウェアの版番号を示す。識別子や表示名とは異なる。 fournit un numéro de version pour l'application, indépendamment de son identifiant ou du nom affiché. indica un numero di versione per l'applicazione, indipendentemente dall'identificatore o dal nome visualizzato - + diff --git a/P5/Source/Specs/att.gaijiProp.xml b/P5/Source/Specs/att.gaijiProp.xml index 55491d09f2..cf823ec0b4 100644 --- a/P5/Source/Specs/att.gaijiProp.xml +++ b/P5/Source/Specs/att.gaijiProp.xml @@ -56,6 +56,8 @@ + + diff --git a/P5/Source/Specs/att.styleDef.xml b/P5/Source/Specs/att.styleDef.xml index be7a15af78..7cedec60af 100644 --- a/P5/Source/Specs/att.styleDef.xml +++ b/P5/Source/Specs/att.styleDef.xml @@ -52,7 +52,13 @@ supplies a version number for the style language provided in scheme. - + + diff --git a/P5/Source/Specs/teiCorpus.xml b/P5/Source/Specs/teiCorpus.xml index c96f18f88b..046dbab5b2 100644 --- a/P5/Source/Specs/teiCorpus.xml +++ b/P5/Source/Specs/teiCorpus.xml @@ -50,7 +50,7 @@ La versión del esquema TEI La versione dello schema TEI gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird. - +

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 diff --git a/P5/Source/Specs/teidata.version.versionNumber.xml b/P5/Source/Specs/teidata.version.teiP5.xml similarity index 94% rename from P5/Source/Specs/teidata.version.versionNumber.xml rename to P5/Source/Specs/teidata.version.teiP5.xml index e31958b769..6c7ebb77dd 100644 --- a/P5/Source/Specs/teidata.version.versionNumber.xml +++ b/P5/Source/Specs/teidata.version.teiP5.xml @@ -1,7 +1,7 @@ - + defines the range of values which may be used as a TEI version number. diff --git a/P5/Source/Specs/teidata.version.xml b/P5/Source/Specs/teidata.version.xml index 0519d05c35..5fa611432c 100644 --- a/P5/Source/Specs/teidata.version.xml +++ b/P5/Source/Specs/teidata.version.xml @@ -9,7 +9,7 @@ - + diff --git a/P5/Source/Specs/transcriptionDesc.xml b/P5/Source/Specs/transcriptionDesc.xml index 1ad3cbb04d..486088b31d 100644 --- a/P5/Source/Specs/transcriptionDesc.xml +++ b/P5/Source/Specs/transcriptionDesc.xml @@ -26,7 +26,7 @@ supplies a version number for the encoding conventions used, if any. - + From a4c2d5dc91a89dcc235839eaa346310f2d8948f8 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Tue, 21 May 2024 22:29:19 -0400 Subject: [PATCH 07/12] =?UTF-8?q?rebase=20=E2=80=9CFirst=20=E2=85=93=20or?= =?UTF-8?q?=20so=20=E2=80=A6=20thus=20NOT=20a=20working=20version=E2=80=9D?= =?UTF-8?q?=20after=20manual=20merge=20of=20teidata.duration.iso=20&=20tei?= =?UTF-8?q?data.version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- P5/Source/Guidelines/en/BIB-Bibliography.xml | 10 ++++++ P5/Source/Specs/teidata.duration.iso.xml | 6 ++-- P5/Source/Specs/teidata.version.Unicode.xml | 28 ++++++++++++++++ P5/Source/Specs/teidata.version.semantic.xml | 16 +++++++++ P5/Source/Specs/teidata.version.xml | 35 +++++++------------- 5 files changed, 68 insertions(+), 27 deletions(-) create mode 100644 P5/Source/Specs/teidata.version.Unicode.xml create mode 100644 P5/Source/Specs/teidata.version.semantic.xml diff --git a/P5/Source/Guidelines/en/BIB-Bibliography.xml b/P5/Source/Guidelines/en/BIB-Bibliography.xml index 6e1c2f4b97..94502229b0 100644 --- a/P5/Source/Guidelines/en/BIB-Bibliography.xml +++ b/P5/Source/Guidelines/en/BIB-Bibliography.xml @@ -3607,6 +3607,16 @@ + + + + Semantic Versioning 2.0.0 + + + + + +

diff --git a/P5/Source/Specs/teidata.duration.iso.xml b/P5/Source/Specs/teidata.duration.iso.xml index a393745d92..d0268ff298 100644 --- a/P5/Source/Specs/teidata.duration.iso.xml +++ b/P5/Source/Specs/teidata.duration.iso.xml @@ -2,14 +2,12 @@ - defines the range of attribute values available for representation of a duration in time - using ISO 8601 standard formats. + defines the range of attribute values available for representation of a duration in time using ISO 8601 standard formats. ISO 8601 표준 형식을 사용하여 시간의 지속을 나타내는 속성 값 범위를 정의한다. 以ISO 8601標準格式定義表示一段持續性時間的屬性值範圍 ISO 8601にある標準形式を使い、時間幅を表現する当該属性値の範囲を定義 する。 définit la gamme de valeurs d'attributs exprimant une durée temporaraire utilisant le norme ISO 8601. - define la gama de valores de atributos posibles para - representar la duración en el tiempo usando formatos estàndards ISO 8601. + define la gama de valores de atributos posibles para representar la duración en el tiempo usando formatos estàndards ISO 8601. diff --git a/P5/Source/Specs/teidata.version.Unicode.xml b/P5/Source/Specs/teidata.version.Unicode.xml new file mode 100644 index 0000000000..d2ea26fc1c --- /dev/null +++ b/P5/Source/Specs/teidata.version.Unicode.xml @@ -0,0 +1,28 @@ + + + + + defines the range of attribute values which may be used to specify a Unicode version number. + définit la gamme des valeurs d'attribut exprimant un numéro de version TEI. + + + + +

The value of this attribute follows the pattern specified by + the Unicode consortium for its version number (). A version number + contains digits and fullstop characters only. The first number + supplied identifies the major version number. A second and third + number, for minor and sub-minor version numbers, may also be + supplied.

+ + +

La valeur de cet attribut devrait suivre le format proposé par + le Consortium Unicode pour identifier les versions (). Un numéro de version ne + contient que des chiffres et des points. Le numéro initiale + identifie le numéro majeur de la version. Un deuxième et un + troisième numéro sont aussi disponibles pour la numérotation + facultative des versions mineures ou sous-mineurs.

+ + diff --git a/P5/Source/Specs/teidata.version.semantic.xml b/P5/Source/Specs/teidata.version.semantic.xml new file mode 100644 index 0000000000..df1dc3989e --- /dev/null +++ b/P5/Source/Specs/teidata.version.semantic.xml @@ -0,0 +1,16 @@ + + + + + defines the range of values which may be used as a semantic version number per . + + + + + +

Values of this datatype should follow the rules established by + the Semantic Versioning + specification, version 2.0.0.

+ + diff --git a/P5/Source/Specs/teidata.version.xml b/P5/Source/Specs/teidata.version.xml index f63a1b3b6f..3e330def77 100644 --- a/P5/Source/Specs/teidata.version.xml +++ b/P5/Source/Specs/teidata.version.xml @@ -2,29 +2,18 @@ - defines the range of attribute values which may be used to - specify a TEI or Unicode version number. - définit la gamme des valeurs d'attribut - exprimant un numéro de version TEI. + defines the range of attribute values which may be used to specify a version number. + définit la gamme des valeurs d'attribut exprimant un numéro de version TEI. - - - -

The value of this attribute follows the pattern specified by - the Unicode consortium for its version number (). A version number - contains digits and fullstop characters only. The first number - supplied identifies the major version number. A second and third - number, for minor and sub-minor version numbers, may also be - supplied. -

- - -

La valeur de cet attribut devrait suivre le format proposé par - le Consortium Unicode pour identifier les versions (). Un numéro de version - ne contient que des chiffres et des points. Le numéro - initiale identifie le numéro majeur de la version. Un deuxième et - un troisième numéro sont aussi disponibles pour la numérotation - facultative des versions mineures ou sous-mineurs. -

+ + + + + + + + +

Values matching this datatype may match any of the various + subtypes defined.

 From c57d1dbedabf421bc3674d7a1ce504512f551cd9 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Mon, 2 Sep 2024 22:01:40 -0400 Subject: [PATCH 08/12] =?UTF-8?q?rebase=20=E2=80=9CA=20working=20version?= =?UTF-8?q?=20of=20version=20sublcasses=20that=20is=20NOT=20ready=20?= =?UTF-8?q?=E2=80=A6=E2=80=9D=20after=20manual=20merge=20of=20application?= =?UTF-8?q?=20and=20att.styleDef?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- P5/Source/Guidelines/en/BIB-Bibliography.xml | 10 ++++++++++ P5/Source/Guidelines/en/ST-Infrastructure.xml | 10 ++++++++-- P5/Source/Specs/application.xml | 8 ++++---- P5/Source/Specs/att.styleDef.xml | 2 +- P5/Source/Specs/teidata.version.xml | 4 ++-- P5/Source/Specs/transcriptionDesc.xml | 2 +- 6 files changed, 26 insertions(+), 10 deletions(-) diff --git a/P5/Source/Guidelines/en/BIB-Bibliography.xml b/P5/Source/Guidelines/en/BIB-Bibliography.xml index 94502229b0..975f7b081c 100644 --- a/P5/Source/Guidelines/en/BIB-Bibliography.xml +++ b/P5/Source/Guidelines/en/BIB-Bibliography.xml @@ -3617,6 +3617,16 @@ + + + + Semantic Versioning 2.0.0 + + + + + +
diff --git a/P5/Source/Guidelines/en/ST-Infrastructure.xml b/P5/Source/Guidelines/en/ST-Infrastructure.xml index f745f121a9..6500560421 100644 --- a/P5/Source/Guidelines/en/ST-Infrastructure.xml +++ b/P5/Source/Guidelines/en/ST-Infrastructure.xml @@ -1309,7 +1309,10 @@ entities in the XML DTD fragments.-->

- + + + + @@ -1323,7 +1326,10 @@ entities in the XML DTD fragments.-->

- + + + + diff --git a/P5/Source/Specs/application.xml b/P5/Source/Specs/application.xml index 40e6405c7b..f7a15560a2 100644 --- a/P5/Source/Specs/application.xml +++ b/P5/Source/Specs/application.xml @@ -40,7 +40,7 @@ 当該ソフトウェアの版番号を示す。識別子や表示名とは異なる。 fournit un numéro de version pour l'application, indépendamment de son identifiant ou du nom affiché. indica un numero di versione per l'applicazione, indipendentemente dall'identificatore o dal nome visualizzato - + @@ -54,9 +54,9 @@

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 - ptr elements.

+ 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 + ptr elements.

diff --git a/P5/Source/Specs/att.styleDef.xml b/P5/Source/Specs/att.styleDef.xml index 0f0e6e0828..7b24a253a5 100644 --- a/P5/Source/Specs/att.styleDef.xml +++ b/P5/Source/Specs/att.styleDef.xml @@ -61,7 +61,7 @@ If no value for the @scheme attribute is provided, then the default assumption s supplies a version number for the style language provided in scheme. - + diff --git a/P5/Source/Specs/teidata.version.xml b/P5/Source/Specs/teidata.version.xml index 3e330def77..0519d05c35 100644 --- a/P5/Source/Specs/teidata.version.xml +++ b/P5/Source/Specs/teidata.version.xml @@ -6,8 +6,8 @@ définit la gamme des valeurs d'attribut exprimant un numéro de version TEI. - - + + diff --git a/P5/Source/Specs/transcriptionDesc.xml b/P5/Source/Specs/transcriptionDesc.xml index 08232bd2a7..1ad3cbb04d 100644 --- a/P5/Source/Specs/transcriptionDesc.xml +++ b/P5/Source/Specs/transcriptionDesc.xml @@ -26,7 +26,7 @@ supplies a version number for the encoding conventions used, if any. - + From 5a4a46895ff9c303061fb9080a343143fe68221c Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Mon, 2 Sep 2024 22:12:54 -0400 Subject: [PATCH 09/12] Use new version number subclass for TEI version numbers (this solves the problem for which the original ticket was opened, IIRC). --- P5/Source/Specs/TEI.xml | 2 +- P5/Source/Specs/teiCorpus.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/P5/Source/Specs/TEI.xml b/P5/Source/Specs/TEI.xml index 0950c3d568..526e564184 100644 --- a/P5/Source/Specs/TEI.xml +++ b/P5/Source/Specs/TEI.xml @@ -71,7 +71,7 @@ gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird. especifica el número de versión de las Directrices TEI frente a las cuales este documento es válido. versione dello schema TEI - +

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 diff --git a/P5/Source/Specs/teiCorpus.xml b/P5/Source/Specs/teiCorpus.xml index d1032273da..c96f18f88b 100644 --- a/P5/Source/Specs/teiCorpus.xml +++ b/P5/Source/Specs/teiCorpus.xml @@ -50,7 +50,7 @@ La versión del esquema TEI La versione dello schema TEI gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird. - +

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 From 204e11fa6725c0ffbe8127efa015c0fbe1fe1b25 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Mon, 2 Sep 2024 22:37:55 -0400 Subject: [PATCH 10/12] =?UTF-8?q?rebase=20=E2=80=9Cforgot=20to=20git=20add?= =?UTF-8?q?=20the=20file.=20Sigh.=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- P5/Source/Specs/teidata.version.calendar.xml | 57 +++++++++++++++++++ ....xml => teidata.version.versionNumber.xml} | 11 ++-- 2 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 P5/Source/Specs/teidata.version.calendar.xml rename P5/Source/Specs/{teidata.versionNumber.xml => teidata.version.versionNumber.xml} (58%) diff --git a/P5/Source/Specs/teidata.version.calendar.xml b/P5/Source/Specs/teidata.version.calendar.xml new file mode 100644 index 0000000000..a564fac72e --- /dev/null +++ b/P5/Source/Specs/teidata.version.calendar.xml @@ -0,0 +1,57 @@ + + + + + defines the range of values which may be used as a calendar-based version number per . + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Values of this datatype should follow the rules established by + the Calendar Versioning + convention, as of 2024-05-21.

+ + diff --git a/P5/Source/Specs/teidata.versionNumber.xml b/P5/Source/Specs/teidata.version.versionNumber.xml similarity index 58% rename from P5/Source/Specs/teidata.versionNumber.xml rename to P5/Source/Specs/teidata.version.versionNumber.xml index 5c25e5fbb0..e31958b769 100644 --- a/P5/Source/Specs/teidata.versionNumber.xml +++ b/P5/Source/Specs/teidata.version.versionNumber.xml @@ -1,12 +1,9 @@ - - defines the range of attribute values used for version numbers. + + defines the range of values which may be used as a TEI version number. - - - -

- + + From 7a2bd115a610e0ebc8a555ca15b68fb0646fa637 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Mon, 11 Nov 2024 12:50:27 -0500 Subject: [PATCH 11/12] Fix copy-paste err. --- P5/Source/Guidelines/en/BIB-Bibliography.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/P5/Source/Guidelines/en/BIB-Bibliography.xml b/P5/Source/Guidelines/en/BIB-Bibliography.xml index 975f7b081c..30e02f7d9f 100644 --- a/P5/Source/Guidelines/en/BIB-Bibliography.xml +++ b/P5/Source/Guidelines/en/BIB-Bibliography.xml @@ -3620,7 +3620,7 @@ - Semantic Versioning 2.0.0 + Calendar Versioning From 21a83f48fa31671bead09e8584e6a95bab5d1127 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Mon, 13 Jan 2025 21:03:19 -0500 Subject: [PATCH 12/12] Change name of one of the version sub-classes --- P5/Source/Guidelines/en/ST-Infrastructure.xml | 4 ++-- P5/Source/Specs/TEI.xml | 2 +- P5/Source/Specs/application.xml | 2 +- P5/Source/Specs/att.gaijiProp.xml | 2 ++ P5/Source/Specs/att.styleDef.xml | 8 +++++++- P5/Source/Specs/teiCorpus.xml | 2 +- ...ersion.versionNumber.xml => teidata.version.teiP5.xml} | 2 +- P5/Source/Specs/teidata.version.xml | 2 +- P5/Source/Specs/transcriptionDesc.xml | 2 +- 9 files changed, 17 insertions(+), 9 deletions(-) rename P5/Source/Specs/{teidata.version.versionNumber.xml => teidata.version.teiP5.xml} (94%) diff --git a/P5/Source/Guidelines/en/ST-Infrastructure.xml b/P5/Source/Guidelines/en/ST-Infrastructure.xml index 6500560421..220d2eb5c0 100644 --- a/P5/Source/Guidelines/en/ST-Infrastructure.xml +++ b/P5/Source/Guidelines/en/ST-Infrastructure.xml @@ -1312,7 +1312,7 @@ entities in the XML DTD fragments.-->

- + @@ -1329,7 +1329,7 @@ entities in the XML DTD fragments.-->

- + diff --git a/P5/Source/Specs/TEI.xml b/P5/Source/Specs/TEI.xml index 526e564184..6539b3d6e8 100644 --- a/P5/Source/Specs/TEI.xml +++ b/P5/Source/Specs/TEI.xml @@ -71,7 +71,7 @@ gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird. especifica el número de versión de las Directrices TEI frente a las cuales este documento es válido. versione dello schema TEI - +

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 diff --git a/P5/Source/Specs/application.xml b/P5/Source/Specs/application.xml index f7a15560a2..66f0c24619 100644 --- a/P5/Source/Specs/application.xml +++ b/P5/Source/Specs/application.xml @@ -40,7 +40,7 @@ 当該ソフトウェアの版番号を示す。識別子や表示名とは異なる。 fournit un numéro de version pour l'application, indépendamment de son identifiant ou du nom affiché. indica un numero di versione per l'applicazione, indipendentemente dall'identificatore o dal nome visualizzato - + diff --git a/P5/Source/Specs/att.gaijiProp.xml b/P5/Source/Specs/att.gaijiProp.xml index 55491d09f2..cf823ec0b4 100644 --- a/P5/Source/Specs/att.gaijiProp.xml +++ b/P5/Source/Specs/att.gaijiProp.xml @@ -56,6 +56,8 @@ + + diff --git a/P5/Source/Specs/att.styleDef.xml b/P5/Source/Specs/att.styleDef.xml index 7b24a253a5..3e42316f2f 100644 --- a/P5/Source/Specs/att.styleDef.xml +++ b/P5/Source/Specs/att.styleDef.xml @@ -61,7 +61,13 @@ If no value for the @scheme attribute is provided, then the default assumption s supplies a version number for the style language provided in scheme. - + + diff --git a/P5/Source/Specs/teiCorpus.xml b/P5/Source/Specs/teiCorpus.xml index c96f18f88b..046dbab5b2 100644 --- a/P5/Source/Specs/teiCorpus.xml +++ b/P5/Source/Specs/teiCorpus.xml @@ -50,7 +50,7 @@ La versión del esquema TEI La versione dello schema TEI gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird. - +

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 diff --git a/P5/Source/Specs/teidata.version.versionNumber.xml b/P5/Source/Specs/teidata.version.teiP5.xml similarity index 94% rename from P5/Source/Specs/teidata.version.versionNumber.xml rename to P5/Source/Specs/teidata.version.teiP5.xml index e31958b769..6c7ebb77dd 100644 --- a/P5/Source/Specs/teidata.version.versionNumber.xml +++ b/P5/Source/Specs/teidata.version.teiP5.xml @@ -1,7 +1,7 @@ - + defines the range of values which may be used as a TEI version number. diff --git a/P5/Source/Specs/teidata.version.xml b/P5/Source/Specs/teidata.version.xml index 0519d05c35..5fa611432c 100644 --- a/P5/Source/Specs/teidata.version.xml +++ b/P5/Source/Specs/teidata.version.xml @@ -9,7 +9,7 @@ - + diff --git a/P5/Source/Specs/transcriptionDesc.xml b/P5/Source/Specs/transcriptionDesc.xml index 1ad3cbb04d..486088b31d 100644 --- a/P5/Source/Specs/transcriptionDesc.xml +++ b/P5/Source/Specs/transcriptionDesc.xml @@ -26,7 +26,7 @@ supplies a version number for the encoding conventions used, if any. - +