From 66f7ea35ae7820d7c2195c85093fb5d3c22084a3 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Thu, 19 Sep 2024 14:37:32 -0400 Subject: [PATCH 01/32] Start of first crack, NOT READY for prime- time yet. --- .../en/TD-DocumentationElements.xml | 1 + P5/Source/Specs/constraintDecl.xml | 80 +++++++++++++++++++ P5/Source/Specs/encodingDesc.xml | 30 +++---- P5/Source/Specs/schemaSpec.xml | 58 ++++++-------- 4 files changed, 117 insertions(+), 52 deletions(-) create mode 100644 P5/Source/Specs/constraintDecl.xml diff --git a/P5/Source/Guidelines/en/TD-DocumentationElements.xml b/P5/Source/Guidelines/en/TD-DocumentationElements.xml index d5acac80bc..6dc14fcaf1 100644 --- a/P5/Source/Guidelines/en/TD-DocumentationElements.xml +++ b/P5/Source/Guidelines/en/TD-DocumentationElements.xml @@ -1837,6 +1837,7 @@ xmlns="http://www.tei-c.org/ns/Examples"> + diff --git a/P5/Source/Specs/constraintDecl.xml b/P5/Source/Specs/constraintDecl.xml new file mode 100644 index 0000000000..c8316afa0f --- /dev/null +++ b/P5/Source/Specs/constraintDecl.xml @@ -0,0 +1,80 @@ + + + + + constraint declaration + contains declarations pertaining to formal constraints expressed elsewhere in constraintSpec elements + + + + + + + + + + + + + + + + + supplies the name of the language to which the declarations herein apply + + + + ISO Schematron + + + +

The declarations contained in a particular + constraintDecl (including queryBinding, if + present) apply to the constraintSpec elements whose + scheme matches the scheme of the + constraintDecl.

+ + + + query language binding + specifies the query + language binding for rule-based schema expressions in + constraintSpec elements that have a matching + scheme attribute + + + + + + + + + + + + + + + + +

The suggested values above are the values reserved by the + Schematron specification. Only exslt, + stx, xslt, xslt2, + xslt3, xpath2, and xpath3 are + defined by the specification. Most processors only support one + or more of xslt, xslt2, and + xslt3.

+ + + + + + + + + + + + + + diff --git a/P5/Source/Specs/encodingDesc.xml b/P5/Source/Specs/encodingDesc.xml index 52a8b2eb94..7177fa75b8 100644 --- a/P5/Source/Specs/encodingDesc.xml +++ b/P5/Source/Specs/encodingDesc.xml @@ -15,7 +15,7 @@ source or sources from which it was derived. 전자 텍스트와 그것의 원전 텍스트 혹은 텍스트들 사이의 관련성을 기록한다. 記錄電子文件和其ㄧ個或多個文件來源之間的關係。 電子テキストとその元資料との関係を示す。 - dokumentiert das Verhältnis zwischen dem elektronischen Text und seiner Quelle oder den Quellen, von denen er sich ableitet. + dokumentiert das Verhältnis zwischen dem elektronischen Text und seiner Quelle oder den Quellen, von denen er sich ableitet. documenta la relación entre un texto electrónico y la fuente o fuentes de las que este deriva. documenta la relazione fra un documento elettronico e la o le fonti da cui è derivato. @@ -23,21 +23,17 @@ source or sources from which it was derived. - - - - - - - - + + + +

Basic encoding, capturing lexical information only. All -hyphenation, punctuation, and variant spellings normalized. No -formatting or layout information preserved.

+ hyphenation, punctuation, and variant spellings normalized. No + formatting or layout information preserved.

 @@ -45,14 +41,12 @@ formatting or layout information preserved.

-

Corpus de - textes sélectionnés pour la formation MISAT, Frejus, - juillet 2010. -

+

Corpus de textes sélectionnés pour la formation MISAT, + Frejus, juillet 2010.

 -

Corpus - d'échantillons de 2000 mots pris au début de chaque texte.

+

Corpus d'échantillons de 2000 mots pris au début de + chaque texte.

 @@ -61,4 +55,4 @@ formatting or layout information preserved.

- \ No newline at end of file + diff --git a/P5/Source/Specs/schemaSpec.xml b/P5/Source/Specs/schemaSpec.xml index 02ef7756cf..dd59ae85c7 100644 --- a/P5/Source/Specs/schemaSpec.xml +++ b/P5/Source/Specs/schemaSpec.xml @@ -11,8 +11,7 @@ TEI 구조 스키마 및 문서를 생성한다. 建立一個符合TEI標準的模型以及該模型文件。 TEI準拠のスキーマや文書を示す。 - génère un schéma conforme à la TEI et la - documentation qui l'accompagne. + génère un schéma conforme à la TEI et la documentation qui l'accompagne. genera un esquema TEI-conforme y la documentación relativa. genera uno schema TEI-conforme e la relativa documentazione @@ -31,6 +30,7 @@ + @@ -39,31 +39,24 @@ - specifies entry points to the schema, i.e. which patterns - may be used as the root of documents conforming to - it. + specifies entry points to the schema, i.e. which patterns may be used as the root of documents conforming to it. 스키마에서 표제 항목 지점을 명시한다. 즉, 어떤 요소가 해당 문서의 뿌리로 사용되는 것이 허용되었는지를 명시한다. 指出該模型的初步條件，例如在符合該模型標準的文件中，那些元素可做為文件的根元素。 当該スキーマの開始点を示す。すなわち、TEI準拠文書の根要素となる 要素を示す。 - précise les points d'accès au schéma, - i.e. quels sont les éléments permis comme racine des documents XML qui se - conforment à ce schéma. + précise les points d'accès au schéma, i.e. quels sont les éléments permis comme racine des documents XML qui se conforment à ce schéma. especifica los puntos de acceso al esquema, es decir, qué elementos son los permitidos para ser usados como raíz de los documentos conforme al esquema mismo. specifica i punti di accesso allo schema, cioè quali elementi sono consentiti come radice dei documenti conformi allo schema stesso TEI - specifies a default prefix which will be prepended to all - patterns relating to TEI elements, unless otherwise stated. + specifies a default prefix which will be prepended to all patterns relating to TEI elements, unless otherwise stated. TEI 요소와 관련된 모든 유형에 첨가될 접두사를 명시한다. 이는 TEI로서 동일 이름의 요소를 갖는 외부 스키마가 혼용되는 것을 허용한다. 指明一個附加在所有和TEI元素相關的模式中的前綴。這使得外部模型可以和TEI結合，這些外部模型具有和TEI元素名稱相同的元素。 TEI要素の全パタンに対応する接頭辞を示す。これにより、TEIと同じ名 前を持つ外部スキーマを混在させることができる。 - précise un préfixe qui sera ajouté à tous - les modèles de définition des éléments de la TEI. Cela autorise l'introduction - des schémas externes ayant des éléments de même nom que ceux de la TEI + précise un préfixe qui sera ajouté à tous les modèles de définition des éléments de la TEI. Cela autorise l'introduction des schémas externes ayant des éléments de même nom que ceux de la TEI especifica un prefijo que será antepuesto a todos los patrones relativos a los elementos TEI. indica un prefisso che sarà anteposto a tutti i pattern relativi a elementi TEI; questo consente @@ -76,13 +69,10 @@

Les deux-points, bien qu'ils soient permis à l'intérieur de - la valeur, provoqueront la génération d'un schéma invalide. -

+ la valeur, provoqueront la génération d'un schéma invalide.

 -

- コロンは、値としては認められるが、スキーマ中では使用できない。 -

+

コロンは、値としては認められるが、スキーマ中では使用できない。

 @@ -91,16 +81,12 @@ lengua meta langue cible lingua di arrivo - specifies which language to use when creating - the objects in a schema if names for elements or attributes are available in more - than one language + specifies which language to use when creating the objects in a schema if names for elements or attributes are available in more than one language 요소 또는 속성의 이름을 만들기 위해 여러 언어에서 사용가능한 경우, 스키마에서 대상을 만들 때 사용하는 언어를 명시한다. 若元素或屬性名稱所使用的語言有一種以上，說明建立文件模型時要使用那一種語言。 要素や属性の名前が複数言語である場合には、スキーマ中の対象を作成 する際に使用される言語を特定する。 - lorsque des noms pour un élément ou pour - un attribut sont disponibles en plusieurs langues, précise quelle langue - utiliser lors de la création d'objets dans un schéma . + lorsque des noms pour un élément ou pour un attribut sont disponibles en plusieurs langues, précise quelle langue utiliser lors de la création d'objets dans un schéma . indica la lengua que se utiliza para la creación de objetos en el esquema en el caso en que los nombres de elementos o atributos esten disponibles en otras lenguas. indica la lingua da utilizzare per la creazione di oggetti nello schema nel caso in cui i nomi di elementi o attributi siano disponibili in più lingue @@ -111,17 +97,12 @@ lengua de la documentación langue de documentation lingua della documentazione - specifies which - languages to use when creating documentation if the description - for an element, attribute, class or macro is available in more - than one language + specifies which languages to use when creating documentation if the description for an element, attribute, class or macro is available in more than one language 요소, 속성, 부류 또는 매크로에 대한 기술이 여러 언어에서 사용 가능한 경우, 문서를 만들 때 사용하는 언어를 명시한다. 若元素、屬性、元素集或巨集指令描述所使用的語言有一種以上，說明建立文件時要使用那一種語言。 要素、属性、クラス、マクロの解説が複数言語で可能な場合、解説の言 語を特定する。 - lorsque la description pour un élément, - un attribut, une classe ou une macro est disponible en plusieurs langues, - précise quelle langue utiliser lors de la création de la documentation. + lorsque la description pour un élément, un attribut, une classe ou une macro est disponible en plusieurs langues, précise quelle langue utiliser lors de la création de la documentation. indica la lengua que se ha de utilizar para la creación de la documentación en el caso en que las descripciones de elementos, atributos, clases o macros esten disponibles en más lenguas. indica la lingua da utilizzare per la creazione della documentazione nel caso in cui le descrizioni di elementi, attributi, classi o macro siano disponibili in più lingue @@ -131,15 +112,24 @@ - default namespace - exclusions + default namespace exclusions provides a list of namespaces and/or prefixed element names to be excluded by default from anyName in RELAX NG schemas http://www.tei-c.org/ns/1.0 teix:egXML -

Specifies defaults for the except attribute of anyElement. RELAX NG validation (unless DTD Compatibility Mode is turned off) requires that any elements which may take an xml:id be excluded from the content of anyName name classes. For normal TEI purposes, this includes anything in the TEI namespace and the egXML element. The defaultExceptions attribute sets the global defaults for these exclusions. Element prefixes must be declared using a namespace declaration on the parent or an ancestor element.

+

Specifies defaults for the except attribute of + anyElement. RELAX NG validation (unless DTD + Compatibility Mode is turned off) requires that any elements + which may take an xml:id be excluded from the + content of anyName name classes. For normal TEI + purposes, this includes anything in the TEI namespace and the + egXML element. The defaultExceptions + attribute sets the global defaults for these + exclusions. Element prefixes must be declared using a + namespace declaration on the parent or an ancestor + element.

 From 96b051b5eb68a547b04d966d3520a1e6a354c550 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Thu, 19 Sep 2024 20:09:09 -0400 Subject: [PATCH 02/32] First crack at new constraintDecl element in a working, if not ideal, state --- P5/Source/Guidelines/en/BIB-Bibliography.xml | 5 +- .../en/TD-DocumentationElements.xml | 61 ++++++++++++++----- P5/p5.nvdl | 14 ++++- P5/p5valid.nvdl | 14 ++++- 4 files changed, 74 insertions(+), 20 deletions(-) diff --git a/P5/Source/Guidelines/en/BIB-Bibliography.xml b/P5/Source/Guidelines/en/BIB-Bibliography.xml index 1c462292de..f9c3cac2f7 100644 --- a/P5/Source/Guidelines/en/BIB-Bibliography.xml +++ b/P5/Source/Guidelines/en/BIB-Bibliography.xml @@ -1553,13 +1553,10 @@ Press, 141-151. - No source, made up for these Guidelines. - Example is copied from the source of these - Guidelines. + Example is copied from the source of these Guidelines. Undetermined. -
diff --git a/P5/Source/Guidelines/en/TD-DocumentationElements.xml b/P5/Source/Guidelines/en/TD-DocumentationElements.xml index a1168d1603..dd5104901b 100644 --- a/P5/Source/Guidelines/en/TD-DocumentationElements.xml +++ b/P5/Source/Guidelines/en/TD-DocumentationElements.xml @@ -834,15 +834,15 @@ to mark any technical term, thus: passive may be supplied only if the attribute active is supplied.. In the current version of the Guidelines, constraint specifications expressed as Schematron rules have been added, as follows: - + - One of the attributes @name, @ref, or @key must be supplied + @@ -850,6 +850,7 @@ to mark any technical term, thus: + @@ -861,18 +862,49 @@ to mark any technical term, thus:

Note that the tei: prefix needs to be bound to the TEI namespace using the Schematron language ns element, but typically this only - needs to be done once. The following two examples are written - presuming that the namespace binding for tei: has occured - elsewhere. The first example models the constraint that a TEI - div must contain either no subdivisions or at least two - of them: + scheme="Schematron">ns element. This can be done using the + constraintDecl element, which may appear in either the + encodingDesc or schemaSpec element. A + constraintDecl contains declarations specific to all + the constraintSpec elements in the current TEI document + whose scheme matches that of the + constraintDecl. + + + + + + + + + In this example the Schematron query language binding is set (to + xslt3) for use by a Schematron processor, two + namespace prefixes are bound to namespace URIs for later use within + constraint elements, and the + $uses_old_encoding variable is set (to either + true() or false()) so that Schematron + assertions elsewhere in the TEI document can easily test whether + the edition number of the document being checked is 3 or more. (Presumably + in this project there are minor encoding differences between the older + and newer editions which do not merit an entirely different + schema, but do merit the occasional different constraint.)

+

The following two examples are written presuming that the + constraintDecl above is in force, that is that the + Schematron processor will use an xslt3 binding, that + tei: is bound to the TEI namespace, that xi: is + bound to the XInclude namespace, and that the the variable + $uses_old_encoding is defined as a boolean. The + first example models the constraint that a TEI div must + contain either no subdivisions or at least two of them, with the + added complication that larger subdivisions are provided as + separate sectNN.xml files read in + using XInclude: - if it contains any subdivisions, a - division must contain at least two of them + if it contains any + subdivisions, a division must contain at least two of them @@ -891,8 +923,11 @@ to mark any technical term, thus: - - a main title must be supplied + + a main title must be supplied + + + a main title must be supplied @@ -905,7 +940,6 @@ to mark any technical term, thus: - You should provide information in a figure from @@ -920,7 +954,6 @@ to mark any technical term, thus: - A <table> should have a caption, using a <head> element diff --git a/P5/p5.nvdl b/P5/p5.nvdl index 7c5c570c69..2cb487e571 100644 --- a/P5/p5.nvdl +++ b/P5/p5.nvdl @@ -41,8 +41,12 @@ + + @@ -103,7 +107,9 @@ - + + + @@ -113,4 +119,10 @@ + + + + + + diff --git a/P5/p5valid.nvdl b/P5/p5valid.nvdl index 3a256cdfd1..1090af9277 100644 --- a/P5/p5valid.nvdl +++ b/P5/p5valid.nvdl @@ -36,7 +36,13 @@ - + + + + @@ -106,4 +112,10 @@ + + + + + + From 8d39266db0fcfdd625a495894df540d51b6921e0 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Thu, 19 Sep 2024 22:08:35 -0400 Subject: [PATCH 03/32] =?UTF-8?q?Add=20=E2=80=9Conly=201=20constraintDecl?= =?UTF-8?q?=20per=20scheme=E2=80=9D=20constraint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- P5/Source/Specs/constraintDecl.xml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/P5/Source/Specs/constraintDecl.xml b/P5/Source/Specs/constraintDecl.xml index c8316afa0f..a1242932bb 100644 --- a/P5/Source/Specs/constraintDecl.xml +++ b/P5/Source/Specs/constraintDecl.xml @@ -18,6 +18,22 @@ + + + + + + + + Each <constraintDecl> element should have a @scheme attribute that is distinct from that of all the other <constraintDecl>s. + + + + supplies the name of the language to which the declarations herein apply @@ -75,6 +91,6 @@ - + From b7fd3e9c2a042597c10748af6730066e58871c15 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Fri, 20 Sep 2024 18:58:06 -0400 Subject: [PATCH 04/32] Update TEI-to-tei_customization.xslt to handle new constraintDecl element --- P5/Utilities/TEI-to-tei_customization.xslt | 194 +++++++++++++++------ 1 file changed, 145 insertions(+), 49 deletions(-) diff --git a/P5/Utilities/TEI-to-tei_customization.xslt b/P5/Utilities/TEI-to-tei_customization.xslt index 1ab97678df..4cd018a999 100644 --- a/P5/Utilities/TEI-to-tei_customization.xslt +++ b/P5/Utilities/TEI-to-tei_customization.xslt @@ -1,5 +1,5 @@ - - - + + + + + @@ -26,11 +26,11 @@ is not sufficient.) —Syd, 2024-09-19 --> - - - + + + Each <constraintDecl> element should have a @scheme attribute that is distinct from that of all the other <constraintDecl>s. - + From e7538b0906c1796cc97c87bb08f77d3724162095 Mon Sep 17 00:00:00 2001 From: Patricia O Connor Date: Tue, 8 Oct 2024 16:42:29 +0100 Subject: [PATCH 06/32] Updated description of deleted parentheses and corrected typographical to topographical. --- P5/Source/Specs/lb.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/P5/Source/Specs/lb.xml b/P5/Source/Specs/lb.xml index 64bbfdde4b..b073712233 100644 --- a/P5/Source/Specs/lb.xml +++ b/P5/Source/Specs/lb.xml @@ -9,7 +9,7 @@ inicio de línea inizio di riga Zeilenanfang - marks the beginning of a new (typographic) line in some edition or version of a text. + marks the beginning of a topographic line in some edition or version of a text. 텍스트의 편집 또는 버전에서 새로운 (인쇄상의) 행 시작을 표지한다. 標記某版本文本裡 (在印刷上) 的新起行。 ある版における新しい(印刷上の)行の始まりを示す。 From 95e9edf1cf58c60733693f51f4a130eb1bf972fc Mon Sep 17 00:00:00 2001 From: Patricia O Connor Date: Tue, 8 Oct 2024 16:50:42 +0100 Subject: [PATCH 07/32] Updated line break(s) to line beginning(s) --- P5/Source/Specs/lb.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/P5/Source/Specs/lb.xml b/P5/Source/Specs/lb.xml index b073712233..f7d88e22d5 100644 --- a/P5/Source/Specs/lb.xml +++ b/P5/Source/Specs/lb.xml @@ -32,7 +32,7 @@ -

This example shows typographical line breaks within metrical lines, where they occur at different +

This example shows typographical line beginning within metrical lines, where they occur at different places in different editions:

Of Mans First Disobedience, and the Fruit @@ -58,9 +58,9 @@ -

This example encodes typographical line breaks as a means of +

This example encodes typographical line beginning as a means of preserving the visual appearance of a title page. The break -attribute is used to show that the line break does not (as elsewhere) + attribute is used to show that the line beginning does not (as elsewhere) mark the start of a new word.

With Additions, ne-ver before Printed. @@ -89,15 +89,15 @@ soi-xante & dixhuytiesme livre. starts. The n attribute, if used, indicates the number or other value associated with the text between this point and the next lb element, typically the sequence number of the line within the page, or other appropriate unit. This element is intended to be - used for marking actual line breaks on a manuscript or printed page, at the point where they + used for marking line beginnings on a manuscript or printed page, at the point where they occur; it should not be used to tag structural units such as lines of verse (for which the l element is available) except in circumstances where structural units cannot otherwise be marked.

The type attribute may be used to characterize the - line break in any respect. The more specialized attributes + line beginning in any respect. The more specialized attributes break, ed, or edRef should be preferred when the intent is to indicate whether or not the line - break is word-breaking, or to note the source from which it + beginning is word-breaking, or to note the source from which it derives.

From b5d64e6ad2caeef7e76693c262601fc8db2ff0e1 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Tue, 15 Oct 2024 22:42:18 -0400 Subject: [PATCH 08/32] manual merge of schemaSpec.xml --- P5/Source/Specs/schemaSpec.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/P5/Source/Specs/schemaSpec.xml b/P5/Source/Specs/schemaSpec.xml index 8461d5a8f5..fc309a523c 100644 --- a/P5/Source/Specs/schemaSpec.xml +++ b/P5/Source/Specs/schemaSpec.xml @@ -30,10 +30,10 @@ - + - + @@ -54,8 +54,7 @@ specifies a default prefix which will be prepended to all patterns relating to TEI elements, unless otherwise stated. TEI 요소와 관련된 모든 유형에 첨가될 접두사를 명시한다. 이는 TEI로서 동일 이름의 요소를 갖는 외부 스키마가 혼용되는 것을 허용한다. 指明一個附加在所有和TEI元素相關的模式中的前綴。這使得外部模型可以和TEI結合，這些外部模型具有和TEI元素名稱相同的元素。 - TEI要素の全パタンに対応する接頭辞を示す。これにより、TEIと同じ名 - 前を持つ外部スキーマを混在させることができる。 + TEI要素の全パタンに対応する接頭辞を示す。これにより、TEIと同じ名 前を持つ外部スキーマを混在させることができる。 précise un préfixe qui sera ajouté à tous les modèles de définition des éléments de la TEI. Cela autorise l'introduction des schémas externes ayant des éléments de même nom que ceux de la TEI especifica un prefijo que será antepuesto a todos los patrones relativos a los elementos TEI. indica un prefisso che sarà anteposto a tutti i pattern relativi a elementi TEI; questo consente @@ -105,7 +104,7 @@ indica la lengua que se ha de utilizar para la creación de la documentación en el caso en que las descripciones de elementos, atributos, clases o macros esten disponibles en más lenguas. indica la lingua da utilizzare per la creazione della documentazione nel caso in cui le descrizioni di elementi, attributi, classi o macro siano disponibili in più lingue - +

Although multiple languages may be specified, the current From 7e8193ba6bef3e305221d6579c19eb5f60007228 Mon Sep 17 00:00:00 2001 From: Klaus Rettinghaus Date: Mon, 11 Nov 2024 11:13:47 +0100 Subject: [PATCH 09/32] Remove dead link --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index d0a8d2f973..b69206dbbe 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,5 @@ The [TEI](https://www.tei-c.org) is an international and interdisciplinary stand This repository contains the sources for building the [TEI P5 Guidelines](https://www.tei-c.org/release/doc/tei-p5-doc/en/html/index.html) and [schemas](https://www.tei-c.org/guidelines/customization/). If you want to work on the Guidelines, you should look in the [P5 directory](https://github.com/TEIC/TEI/tree/dev/P5). -Some notes on working with Git and on this GitHub repository may be found in the following documents: +Some notes on working with Git and on this GitHub repository may be found in the following document: * [Git README](https://github.com/TEIC/TEI/blob/master/Documents/Git-README.md) -* [Using the TEI GitHub Repository](https://www.tei-c.org/guidelines/p5/using-the-tei-github-repository/) From b154af96b532854839766aa5171293b3e0bbcfc7 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Wed, 4 Dec 2024 12:38:50 -0500 Subject: [PATCH 10/32] Non-working version: The bug addressed by #2629 prevents this from building. Committing now so I can apply that bug-fix here. --- P5/Source/Guidelines/en/ST-Infrastructure.xml | 4 +- P5/Source/Specs/att.handFeatures.xml | 48 +++---------------- P5/Source/Specs/handNote.xml | 13 +++-- P5/Source/Specs/language.xml | 3 +- 4 files changed, 17 insertions(+), 51 deletions(-) diff --git a/P5/Source/Guidelines/en/ST-Infrastructure.xml b/P5/Source/Guidelines/en/ST-Infrastructure.xml index 3cc784b21a..d6a82a163d 100644 --- a/P5/Source/Guidelines/en/ST-Infrastructure.xml +++ b/P5/Source/Guidelines/en/ST-Infrastructure.xml @@ -892,6 +892,8 @@ one, or vice versa, should be done with care.

+ + @@ -1424,4 +1426,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/att.handFeatures.xml b/P5/Source/Specs/att.handFeatures.xml index bb6c286ced..2d2260c114 100644 --- a/P5/Source/Specs/att.handFeatures.xml +++ b/P5/Source/Specs/att.handFeatures.xml @@ -10,6 +10,9 @@ fournit des attributs décrivant les caractéristiques de la main par laquelle un manuscrit est écrit. indica degli attributi che descrivono aspetti delle mano utilizzata per la scrittura del manoscritto + + + gives a name or other identifier for the scribe @@ -66,50 +69,11 @@ writing medium, e.g. pencil. describe la tinta o el tipo de tinta, p.ej. marrón, u otros instrumentos de escritura, p.ej. lápiz. - - specifies how widely this hand is used in the manuscript. - 이 필적이 원고에서 사용된 범위를 명시한다. - 当該筆致が、当該手書き資料中で、どの程度出現しているかを示す。 - spécifie la fréquence d'apparition de cette -main dans le manuscrit. - specifica in quale misura è utilizzata la mano in questione nel manoscritto - especifica en qué medida es utilizada la mano en el manuscrito. - - - - only this hand is used throughout the manuscript - 이 필적만이 원고 전체에 사용되었다. - 当該筆致だけで全てが書かれている。 - il n'y a que cette main dans le -manuscrit. - unica mano utilizzata nel manoscritto - al interno del manuscrito se utiliza sólo esta mano. - - - this hand is used through most of the manuscript - 이 필적이 원고 대부분에서 사용되었다. - 当該筆致で、殆どが書かれている。 - cette main est utilisée dans la -majeure partie du manuscrit. - mano utilizzata nella maggior parte del manoscritto - esta es la mano que se utiliza en la mayor parte del manuscrito. - - - this hand is used occasionally in the manuscript - 이 필적이 원고에서 가끔 사용되었다. - 当該筆致で、所々が書かれている。 - cette main est utilisée -occasionnellement dans le manuscrit. - mano utilizzata solo di rado nel manoscritto - esta mano se usa sólo ocasionalmente en el manuscrito. - - - -

Usually either script or scriptRef, -and similarly, either scribe or -scribeRef, will be supplied.

+

Usually either script or scriptRef, and + similarly, either scribe or scribeRef, will + be supplied.

通常は script または scriptRef そして同様に、 scribe あるいは scribeRef が用いられるだろう。

diff --git a/P5/Source/Specs/handNote.xml b/P5/Source/Specs/handNote.xml index bc693f05c0..4f2c416dcd 100644 --- a/P5/Source/Specs/handNote.xml +++ b/P5/Source/Specs/handNote.xml @@ -25,14 +25,13 @@ + other than scope here. Christian Thomas, I + think it was, is planning to send me (Syd) one ?> - - -

Written in insular - phase II half-uncial with interlinear Old English gloss in an Anglo-Saxon pointed - minuscule.

- - + WINITA — need example, preferably one that uses an attribute + other than scope here. Christian Thomas, I + think it was, is planning to send me (Syd) one. diff --git a/P5/Source/Specs/language.xml b/P5/Source/Specs/language.xml index 6835731d24..e3462eacde 100644 --- a/P5/Source/Specs/language.xml +++ b/P5/Source/Specs/language.xml @@ -17,7 +17,8 @@ all'interno di un testo. - + + From 3beae081efaf3ca9ebc58fa73e946506cc3e3a1c Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Wed, 4 Dec 2024 17:59:56 -0500 Subject: [PATCH 11/32] Replace placeholder with real example of handNotes, courtesy of Christian Thomas. This commit will not build as is, it needs the change to p5odds of #2630 before it will build properly. --- P5/Source/Guidelines/en/BIB-Bibliography.xml | 11 ++++++++- P5/Source/Specs/handNote.xml | 25 +++++++++++++++----- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/P5/Source/Guidelines/en/BIB-Bibliography.xml b/P5/Source/Guidelines/en/BIB-Bibliography.xml index b1276811d7..a01e414eb1 100644 --- a/P5/Source/Guidelines/en/BIB-Bibliography.xml +++ b/P5/Source/Guidelines/en/BIB-Bibliography.xml @@ -851,6 +851,15 @@ 《梁山伯與祝英台》 電影《梁山伯與祝英台》，舊版。 〈歷代漢文大藏經概述〉，李圓淨，原載《南行》第六期（南行學社編印）。 + + Libelt, Karol. + Wykłady Humboldta na uniwersytecie Berlińskim: notaty prelekcyj tych po uczniu Jego Karolu Libelcie, + Deutsches Textarchiv, + 2024-04-02. + urn:nbn:de:kobv:b4-30960-7, + + + Lillo, George. The London Merchant (1731), epilogue. 林覺民，《與妻訣別書》。 @@ -6462,4 +6471,4 @@ with TEI P3. --> - \ No newline at end of file + diff --git a/P5/Source/Specs/handNote.xml b/P5/Source/Specs/handNote.xml index 4f2c416dcd..e78e8dc609 100644 --- a/P5/Source/Specs/handNote.xml +++ b/P5/Source/Specs/handNote.xml @@ -25,13 +25,26 @@ - other than scope here. Christian Thomas, I - think it was, is planning to send me (Syd) one ?> - WINITA — need example, preferably one that uses an attribute - other than scope here. Christian Thomas, I - think it was, is planning to send me (Syd) one. + + + + Handwriting of the copyist Karol Libelt, brown ink, in contemporary script. + A note, pencil, unknown author. + writer of the title page Józef Łepkowski, Pencil. + Note on the title page, pencil, by Józef Korzeniowski. + + + + + + + Hand des Nachschreibers Karol Libelt, braune Tinte, vorwiegend in Kurrentschrift. + Eine Anmerkung, Bleistift, unbekannter Verfasser. + Schreiber des Titelblattes Józef Łepkowski, Bleistift. + Anmerkung auf dem Titelblatt, Bleistift, von Józef Korzeniowski. + + From 22090d9b0c9ece24a948a6cca2882ea81c4906b0 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Thu, 5 Dec 2024 10:03:16 -0500 Subject: [PATCH 12/32] forgot to add file\! --- P5/Source/Specs/att.impreciseScope.xml | 42 ++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 P5/Source/Specs/att.impreciseScope.xml diff --git a/P5/Source/Specs/att.impreciseScope.xml b/P5/Source/Specs/att.impreciseScope.xml new file mode 100644 index 0000000000..2dcbaaa994 --- /dev/null +++ b/P5/Source/Specs/att.impreciseScope.xml @@ -0,0 +1,42 @@ + + + + + provides attributes to describe, in general terms, the scope of an element’s application. + + + indicates the scope of application of the element + + + + only this particular feature is used throughout the document + + + this feature is used through most of the document + + + this feature is used occasionally through the document + + + + + + + + An invented language the children call Wikwah. + + + + + + + +

Written in insular phase II half-uncial with + interlinear Old English gloss in an Anglo-Saxon + pointed minuscule.

+ + + + + + From 76a5f6e16280c07187d2a11566b5327a7e3e05bb Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Fri, 6 Dec 2024 13:46:27 -0500 Subject: [PATCH 13/32] corrections per Christian Thomas --- P5/Source/Specs/handNote.xml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/P5/Source/Specs/handNote.xml b/P5/Source/Specs/handNote.xml index e78e8dc609..12129a8b36 100644 --- a/P5/Source/Specs/handNote.xml +++ b/P5/Source/Specs/handNote.xml @@ -12,12 +12,9 @@ 원고 내에서 구분되는 특별한 문체 또는 기법을 기술한다. 描述在手稿中可明顯辨識出的特殊風格或書寫手法。 手書き資料中にある特定のスタイルまたは筆致を示す。 - décrit un style d'écriture ou une main qui sont - reconnus dans un manuscrit. - describe un determinado estilo o una determinada mano - al interno de un manuscrito. - descrive un determinato stile o una determinata mano - all'interno di un manoscritto + décrit un style d'écriture ou une main qui sont reconnus dans un manuscrit. + describe un determinado estilo o una determinada mano al interno de un manuscrito. + descrive un determinato stile o una determinata mano all'interno di un manoscritto @@ -26,13 +23,13 @@ - + - Handwriting of the copyist Karol Libelt, brown ink, in contemporary script. + Handwriting of the copyist Karol Libelt, brown ink, in German cursive script. A note, pencil, unknown author. - writer of the title page Józef Łepkowski, Pencil. - Note on the title page, pencil, by Józef Korzeniowski. + writer of the title page Józef Łepkowski, pencil. + Note on the title page, pencil, by Józef Korzeniowski. @@ -41,17 +38,19 @@ Hand des Nachschreibers Karol Libelt, braune Tinte, vorwiegend in Kurrentschrift. Eine Anmerkung, Bleistift, unbekannter Verfasser. - Schreiber des Titelblattes Józef Łepkowski, Bleistift. - Anmerkung auf dem Titelblatt, Bleistift, von Józef Korzeniowski. + Schreiber des Titelblattes Józef Łepkowski, Bleistift. + Anmerkung auf dem Titelblatt, Bleistift, von Józef Korzeniowski. - Premier scribe : inconnu - - Premier rubricateur : inconnu - + + Premier scribe : inconnu + + + Premier rubricateur : inconnu + From 261fe83f403d431154a99f8f92f6141e7fe6a354 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Fri, 6 Dec 2024 13:58:34 -0500 Subject: [PATCH 14/32] agreeing w/ Christian Thomas, removing persNames from examples in handNote tagdoc --- P5/Source/Specs/handNote.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/P5/Source/Specs/handNote.xml b/P5/Source/Specs/handNote.xml index 12129a8b36..6987212087 100644 --- a/P5/Source/Specs/handNote.xml +++ b/P5/Source/Specs/handNote.xml @@ -28,8 +28,8 @@ Handwriting of the copyist Karol Libelt, brown ink, in German cursive script. A note, pencil, unknown author. - writer of the title page Józef Łepkowski, pencil. - Note on the title page, pencil, by Józef Korzeniowski. + writer of the title page Józef Łepkowski, pencil. + Note on the title page, pencil, by Józef Korzeniowski. @@ -38,8 +38,8 @@ Hand des Nachschreibers Karol Libelt, braune Tinte, vorwiegend in Kurrentschrift. Eine Anmerkung, Bleistift, unbekannter Verfasser. - Schreiber des Titelblattes Józef Łepkowski, Bleistift. - Anmerkung auf dem Titelblatt, Bleistift, von Józef Korzeniowski. + Schreiber des Titelblattes Józef Łepkowski, Bleistift. + Anmerkung auf dem Titelblatt, Bleistift, von Józef Korzeniowski. From 9d13457b0e627f8c909677e9f6385fe6ca395a3f Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Fri, 6 Dec 2024 15:37:14 -0500 Subject: [PATCH 15/32] Change name of new class from att.impreciseScope to att.scope, per suggestion @martindholmes and agreement on TEI-CORRESP-SIG list. --- P5/Source/Specs/{att.impreciseScope.xml => att.scope.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename P5/Source/Specs/{att.impreciseScope.xml => att.scope.xml} (100%) diff --git a/P5/Source/Specs/att.impreciseScope.xml b/P5/Source/Specs/att.scope.xml similarity index 100% rename from P5/Source/Specs/att.impreciseScope.xml rename to P5/Source/Specs/att.scope.xml From f911c9b3706abdee64b06f9ce3c28d87624d812c Mon Sep 17 00:00:00 2001 From: ebeshero Date: Sat, 7 Dec 2024 14:45:25 -0500 Subject: [PATCH 16/32] replacing impreciseScope with scope in ST and specs re #1516 and corresp sig list discussion --- P5/Source/Guidelines/en/ST-Infrastructure.xml | 4 ++-- P5/Source/Specs/att.handFeatures.xml | 2 +- P5/Source/Specs/att.scope.xml | 2 +- P5/Source/Specs/language.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/P5/Source/Guidelines/en/ST-Infrastructure.xml b/P5/Source/Guidelines/en/ST-Infrastructure.xml index d6a82a163d..bb2b191529 100644 --- a/P5/Source/Guidelines/en/ST-Infrastructure.xml +++ b/P5/Source/Guidelines/en/ST-Infrastructure.xml @@ -892,8 +892,8 @@ one, or vice versa, should be done with care.

- - + + diff --git a/P5/Source/Specs/att.handFeatures.xml b/P5/Source/Specs/att.handFeatures.xml index 2d2260c114..fc304efb84 100644 --- a/P5/Source/Specs/att.handFeatures.xml +++ b/P5/Source/Specs/att.handFeatures.xml @@ -11,7 +11,7 @@ de la main par laquelle un manuscrit est écrit. indica degli attributi che descrivono aspetti delle mano utilizzata per la scrittura del manoscritto - + diff --git a/P5/Source/Specs/att.scope.xml b/P5/Source/Specs/att.scope.xml index 2dcbaaa994..6516833acc 100644 --- a/P5/Source/Specs/att.scope.xml +++ b/P5/Source/Specs/att.scope.xml @@ -1,7 +1,7 @@ - + provides attributes to describe, in general terms, the scope of an element’s application. diff --git a/P5/Source/Specs/language.xml b/P5/Source/Specs/language.xml index e3462eacde..e6d77b3ebf 100644 --- a/P5/Source/Specs/language.xml +++ b/P5/Source/Specs/language.xml @@ -17,7 +17,7 @@ all'interno di un testo. - + From 6db1f7bf2b67c1887bab85e6b3f57e710758b7fc Mon Sep 17 00:00:00 2001 From: ebeshero Date: Sat, 7 Dec 2024 15:08:42 -0500 Subject: [PATCH 17/32] spot revisions to replace impreciseScope with scope --- P5/Source/Specs/att.scope.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/P5/Source/Specs/att.scope.xml b/P5/Source/Specs/att.scope.xml index 6516833acc..eb86af9115 100644 --- a/P5/Source/Specs/att.scope.xml +++ b/P5/Source/Specs/att.scope.xml @@ -19,7 +19,7 @@ - + @@ -29,7 +29,7 @@ - +

Written in insular phase II half-uncial with interlinear Old English gloss in an Anglo-Saxon From 9878e04d83c0c9ca5d8061c001ea8067b6a9cf27 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Sat, 7 Dec 2024 15:47:21 -0500 Subject: [PATCH 18/32] Change att.impreciseScope to att.scope --- P5/Source/Guidelines/en/ST-Infrastructure.xml | 4 ++-- P5/Source/Specs/att.handFeatures.xml | 8 +++----- P5/Source/Specs/att.scope.xml | 6 +++--- P5/Source/Specs/language.xml | 10 ++++------ 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/P5/Source/Guidelines/en/ST-Infrastructure.xml b/P5/Source/Guidelines/en/ST-Infrastructure.xml index d6a82a163d..bb2b191529 100644 --- a/P5/Source/Guidelines/en/ST-Infrastructure.xml +++ b/P5/Source/Guidelines/en/ST-Infrastructure.xml @@ -892,8 +892,8 @@ one, or vice versa, should be done with care.

- - + + diff --git a/P5/Source/Specs/att.handFeatures.xml b/P5/Source/Specs/att.handFeatures.xml index 2d2260c114..fc6d6a51e9 100644 --- a/P5/Source/Specs/att.handFeatures.xml +++ b/P5/Source/Specs/att.handFeatures.xml @@ -2,16 +2,14 @@ - provides attributes describing aspects of the hand in which a - manuscript is written. + provides attributes describing aspects of the hand in which a manuscript is written. 원고가 쓰여진 필적의 측면을 기술하는 속성을 제공한다. proporciona atributos que describen los aspectos de la mano que ha escrito un manuscrito. 手書き資料の筆致に関する情報を表す情報を示す。 - fournit des attributs décrivant les caractéristiques -de la main par laquelle un manuscrit est écrit. + fournit des attributs décrivant les caractéristiques de la main par laquelle un manuscrit est écrit. indica degli attributi che descrivono aspetti delle mano utilizzata per la scrittura del manoscritto - + diff --git a/P5/Source/Specs/att.scope.xml b/P5/Source/Specs/att.scope.xml index 2dcbaaa994..eb86af9115 100644 --- a/P5/Source/Specs/att.scope.xml +++ b/P5/Source/Specs/att.scope.xml @@ -1,7 +1,7 @@ - + provides attributes to describe, in general terms, the scope of an element’s application. @@ -19,7 +19,7 @@ - + @@ -29,7 +29,7 @@ - +

Written in insular phase II half-uncial with interlinear Old English gloss in an Anglo-Saxon diff --git a/P5/Source/Specs/language.xml b/P5/Source/Specs/language.xml index e3462eacde..c9408915cd 100644 --- a/P5/Source/Specs/language.xml +++ b/P5/Source/Specs/language.xml @@ -6,18 +6,16 @@ langue Sprache characterizes a single language or sublanguage used within a text. - caractérise une langue ou une variété de langue utilisée - dans un texte. + caractérise une langue ou une variété de langue utilisée dans un texte. 텍스트 내에서 사용되는 언어 또는 특수 언어의 특징을 기술한다. 個別敘述文本中使用的語言或次要語言。 テキスト中にあるひとつの言語または特殊言語を示す。 - beschreibt eine einzelne Sprache oder eine Subsprache, die innerhalb eines Textes verwendet wird. + beschreibt eine einzelne Sprache oder eine Subsprache, die innerhalb eines Textes verwendet wird. caracteriza una lengua o jerga empleada en un texto. - indica una lingua o un linguaggio secondario utilizzato - all'interno di un testo. + indica una lingua o un linguaggio secondario utilizzato all'interno di un testo. - + From 82e9a84f16e9c9f183610b48dbd7ef19f17d6563 Mon Sep 17 00:00:00 2001 From: Patricia O Connor Date: Tue, 10 Dec 2024 20:02:02 +0000 Subject: [PATCH 19/32] Updated typographical to topographical, line breaks to line beginnings, added clarification to example in line spec --- P5/Source/Specs/lb.xml | 4 ++-- P5/Source/Specs/line.xml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/P5/Source/Specs/lb.xml b/P5/Source/Specs/lb.xml index f7d88e22d5..b772dbfa38 100644 --- a/P5/Source/Specs/lb.xml +++ b/P5/Source/Specs/lb.xml @@ -32,7 +32,7 @@ -

This example shows typographical line beginning within metrical lines, where they occur at different +

This example shows topographical line beginning within metrical lines, where they occur at different places in different editions:

Of Mans First Disobedience, and the Fruit @@ -58,7 +58,7 @@ -

This example encodes typographical line beginning as a means of +

This example encodes topographical line beginning as a means of preserving the visual appearance of a title page. The break attribute is used to show that the line beginning does not (as elsewhere) mark the start of a new word.

diff --git a/P5/Source/Specs/line.xml b/P5/Source/Specs/line.xml index e7fb065918..192284ab80 100644 --- a/P5/Source/Specs/line.xml +++ b/P5/Source/Specs/line.xml @@ -21,6 +21,7 @@ +

This example shows topographical lines as a means of preserving the visual appearance of a poem:

@@ -53,7 +54,7 @@ said

This element should be used only to mark up writing which is topographically organized as a series of lines, horizontal or vertical. It should not be used to mark lines of verse (for which use -l) nor to mark linebreaks within text which has been encoded +l) nor to mark line beginnings within text which has been encoded using structural elements such as p (for which use lb).

From 5cdeae3a3105177583f8dd5fc4e38ea7ea201484 Mon Sep 17 00:00:00 2001 From: Patricia O Connor Date: Wed, 11 Dec 2024 19:35:52 +0000 Subject: [PATCH 20/32] Recommended changes applied --- P5/Source/Specs/lb.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/P5/Source/Specs/lb.xml b/P5/Source/Specs/lb.xml index bf42ee6302..287259b895 100644 --- a/P5/Source/Specs/lb.xml +++ b/P5/Source/Specs/lb.xml @@ -32,8 +32,7 @@ -

This example shows topographical line beginning within metrical lines, where they occur at different - places in different editions:

+

This example shows the encoding of the beginning of each topographic line within metrical lines, where they occur in both the 1667 and 1674 editions:

Of Mans First Disobedience, and the Fruit Of that Forbidden Tree, whose mortal tast @@ -89,15 +88,15 @@ soi-xante & dixhuytiesme livre. starts. The n attribute, if used, indicates the number or other value associated with the text between this point and the next lb element, typically the sequence number of the line within the page, or other appropriate unit. This element is intended to be - used for marking line beginnings on a manuscript or printed page, at the point where they + used for marking the beginning of each line on a manuscript or printed page, at the point where they occur; it should not be used to tag structural units such as lines of verse (for which the l element is available) except in circumstances where structural units cannot otherwise be marked.

The type attribute may be used to characterize the line beginning in any respect. The more specialized attributes break, ed, or edRef should be preferred when the - intent is to indicate whether or not the line - beginning is word-breaking, or to note the source from which it + intent is to indicate whether or not the beginning of a new line + is word-breaking, or to note the source from which it derives.

From 94ffbcf441db0b2dcc81d4d3c81a1985f9d0f96e Mon Sep 17 00:00:00 2001 From: Gustavo Riva Date: Sat, 14 Dec 2024 17:12:51 +0100 Subject: [PATCH 21/32] Restore missing part of example in guidelines chapter 23 (#2635) --- P5/Source/Guidelines/en/TD-DocumentationElements.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/P5/Source/Guidelines/en/TD-DocumentationElements.xml b/P5/Source/Guidelines/en/TD-DocumentationElements.xml index 456a133475..47e03fa01b 100644 --- a/P5/Source/Guidelines/en/TD-DocumentationElements.xml +++ b/P5/Source/Guidelines/en/TD-DocumentationElements.xml @@ -134,7 +134,8 @@ an XML Document Type Declaration.
Element and Attribute Descriptions -

Within the body of a document using this module, the … the brief prose descriptions these provide for elements and attributes. +

Within the body of a document using this module, the following elements may be used to reference parts of the specification elements +discussed in section , in particular the brief prose descriptions these provide for elements and attributes. From 46b55101be0f0f0ea3d0ba487597b1b859bc0263 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Wed, 18 Dec 2024 17:08:54 -0500 Subject: [PATCH 22/32] =?UTF-8?q?Fix=20build=20by=20adding=20xml:lang=3Den?= =?UTF-8?q?=20to=20constraintDecl=E2=80=99s=20constraintSpec.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- P5/Source/Specs/constraintDecl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/P5/Source/Specs/constraintDecl.xml b/P5/Source/Specs/constraintDecl.xml index e6d5360a24..62e2e9b6a6 100644 --- a/P5/Source/Specs/constraintDecl.xml +++ b/P5/Source/Specs/constraintDecl.xml @@ -18,7 +18,7 @@ - +

section below.

The following table lists the modules defined by the current release of these Guidelines: - - - - Module name - Where defined - Formal public identifier - - - tei - - TEI Infrastructure - - - header - - Common Metadata - - - core - - Common Core - - - textstructure - - Default Text Structure - - - gaiji - - Character and Glyph Documentation - - - verse - - Verse - - - drama - - Performance Texts - - - spoken - - Transcribed Speech - - - cmc - - TEI-CMC - - - dictionaries - - Dictionaries - - - msdescription - - Manuscript Description - - - transcr - - Transcription of Primary Sources - - - textcrit - - Text Criticism - - - namesdates - - Names, dates, persons and places - - - figures - - Tables, Formulæ, Notated Music, Figures - - - corpus - - Metadata for Language Corpora - - - linking - - Linking, Segmentation, and Alignment - - - analysis - - Analysis and Interpretation - - - iso-fs - - Feature Structures - - - nets - - Graphs, networks, and trees - - - certainty - - Certainty and Uncertainty - - - tagdocs - - Documentation Elements - + + + + Module name + Where defined + Formal public identifier + + + tei + + TEI Infrastructure + + + header + + Common Metadata + + + core + + Common Core + + + textstructure + + Default Text Structure + + + gaiji + + Character and Glyph Documentation + + + verse + + Verse + + + drama + + Performance Texts + + + spoken + + Transcribed Speech + + + cmc + + TEI-CMC + + + dictionaries + + Dictionaries + + + msdescription + + Manuscript Description + + + transcr + + Transcription of Primary Sources + + + textcrit + + Text Criticism + + + namesdates + + Names, dates, persons and places + + + figures + + Tables, Formulæ, Notated Music, Figures + + + corpus + + Metadata for Language Corpora + + + linking + + Linking, Segmentation, and Alignment + + + analysis + + Analysis and Interpretation + + + iso-fs + + Feature Structures + + + nets + + Graphs, networks, and trees + + + certainty + + Certainty and Uncertainty + + + tagdocs + + Documentation Elements +

For each module listed above, the corresponding chapter gives a full description of the @@ -555,11 +555,11 @@ Georgie, and Dim, ... </p>

- -

+ +

-

+

@@ -586,10 +586,10 @@ Georgie, and Dim, ... </p> document, rather than to control how it should be formatted.

In the TEI scheme, it is possible to supply information about the appearance of elements within a source document in the following distinct ways: - One or more properties may be specified as the - default for a set of elements (based on an external - scheme, by default CSS), using rendition elements - and their selector attributes; + One or more properties may be specified as the + default for a set of elements (based on an external + scheme, by default CSS), using rendition elements + and their selector attributes; One or more properties may be specified for individual element occurrences, using the rend attribute with any convenient set of one or more sequence-indeterminate tokens; @@ -622,15 +622,15 @@ Georgie, and Dim, ... </p> by pointing to a bibliographic citation for a quotation to indicate the source from which it derives. The target of the pointer may be an entry in a bibliographic list of some kind, or a pointer to a digital version of the source itself.

-

As with other TEI pointers, the value of this attribute - is expressed as any form of URI, for example an absolute - URL, a relative URL, or a private scheme URI that is - expanded to a relative or absolute URL as documented in a - prefixDef. In the following typical example a - relative bare name URL value is used - to point to a bibl elsewhere in the bibliography - of the document which contains a bibliographic source for - the quotation itself: +

As with other TEI pointers, the value of this attribute + is expressed as any form of URI, for example an absolute + URL, a relative URL, or a private scheme URI that is + expanded to a relative or absolute URL as documented in a + prefixDef. In the following typical example a + relative bare name URL value is used + to point to a bibl elsewhere in the bibliography + of the document which contains a bibliographic source for + the quotation itself:

@@ -862,70 +862,85 @@ one, or vice versa, should be done with care.

- + + + + - - - - - - - - - - + + + - - - - - - - - + + - - - - - + + + - - - - - - - - - + + + - - - + + + + + + + + + + + + + + - - + + +
@@ -1149,11 +1164,11 @@ one, or vice versa, should be done with care.

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

- +

Attributes of type teidata.word, such as age on diff --git a/P5/Test/expected-results/detest_xml_schematron.log b/P5/Test/expected-results/detest_xml_schematron.log index 7a5532c45d..482eddf011 100644 --- a/P5/Test/expected-results/detest_xml_schematron.log +++ b/P5/Test/expected-results/detest_xml_schematron.log @@ -1,12 +1,12 @@ The @generatedBy attribute is for use within a <post> element. (ancestor-or-self::tei:post) The @generatedBy attribute is for use within a <post> element. (ancestor-or-self::tei:post) -The abbr element should not be categorized in detail with @subtype unless also categorized in general with @type (@type) -The div element should not be categorized in detail with @subtype unless also categorized in general with @type (@type) The element indicated by @spanTo (#ds2) must follow the current element delSpan (id(substring(@spanTo,2)) and following::*[@xml:id=substring(current()/@spanTo,2)]) The element indicated by @spanTo (notMeaningful) must follow the current element delSpan (id(substring(@spanTo,2)) and following::*[@xml:id=substring(current()/@spanTo,2)]) @schemeVersion can only be used if @scheme is specified. (@scheme and not(@scheme = 'free')) +The abbr element should not be categorized in detail with @subtype unless also categorized in general with @type (@type) +The div element should not be categorized in detail with @subtype unless also categorized in general with @type (@type) @calendar indicates one or more systems or calendars to which the date represented by the content of this element belongs, but this date element has no textual content. (string-length( normalize-space(.) ) gt 0) The content of a "gloss" list should include a sequence of one or more pairs of a label element followed by an item element (tei:label) An lg element must contain at least one child l, lg, or gap element. (count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) > 0) From 27f3233e9002d9b18fe96bc78e58c50c06cf13a7 Mon Sep 17 00:00:00 2001 From: martindholmes Date: Fri, 3 Jan 2025 16:15:54 -0800 Subject: [PATCH 26/32] Fixing two typos in links to the bibliography. --- P5/Source/Guidelines/en/CMC-ComputerMediatedCommunication.xml | 2 +- P5/Source/Specs/post.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/P5/Source/Guidelines/en/CMC-ComputerMediatedCommunication.xml b/P5/Source/Guidelines/en/CMC-ComputerMediatedCommunication.xml index 0c6c731815..2e2695e3ac 100644 --- a/P5/Source/Guidelines/en/CMC-ComputerMediatedCommunication.xml +++ b/P5/Source/Guidelines/en/CMC-ComputerMediatedCommunication.xml @@ -951,7 +951,7 @@ See the file COPYING.txt for details. icon-based emoji.

Alternatively, e.g. when w is not regularly used to encode tokens in the TEI document, c may be used to mark an emoji. For example, the source post Da kostet - ein Haarschnitt 50 € 😱 (from the corpus , in + ein Haarschnitt 50 € 😱 (from the corpus , in English A haircut there costs 50 € 😱) might be encoded as follows: Da kostet ein Haarschnitt 50 € 😱 diff --git a/P5/Source/Specs/post.xml b/P5/Source/Specs/post.xml index dae4fc0c32..49818bcc53 100644 --- a/P5/Source/Specs/post.xml +++ b/P5/Source/Specs/post.xml @@ -223,7 +223,7 @@ See the file COPYING.txt for details. timelines, as individual comments following a status update on Facebook pages, as posts in forum threads, as contributions on Wikipedia talk pages or in the comments section of a weblog. [Element adopted from the DeRiK schema. - Aspects of the model adopted from the CoMeRe Schema]. The + Aspects of the model adopted from the CoMeRe Schema]. The post element is a member of the model class model.common (via model.CMC). This allows for using (and combining) occurrences of post, u, incident, and kinesicin one and the same div in order to From 25c29251f6cf6667927b81ae6f25ee25edc282c1 Mon Sep 17 00:00:00 2001 From: Patricia O Connor Date: Mon, 13 Jan 2025 18:41:56 +0000 Subject: [PATCH 27/32] Add reviewers recommended changes --- P5/Source/Specs/lb.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/P5/Source/Specs/lb.xml b/P5/Source/Specs/lb.xml index 287259b895..4d51431ea6 100644 --- a/P5/Source/Specs/lb.xml +++ b/P5/Source/Specs/lb.xml @@ -32,7 +32,7 @@ -

This example shows the encoding of the beginning of each topographic line within metrical lines, where they occur in both the 1667 and 1674 editions:

+

This example shows the encoding of the beginning of each new topographic line within a metrical line, indicating where it occurs in both the 1667 and 1674 editions:

Of Mans First Disobedience, and the Fruit Of that Forbidden Tree, whose mortal tast @@ -57,9 +57,9 @@ -

This example encodes topographical line beginning as a means of +

This example shows the encoding of the beginning of a new topographical line as a means of preserving the visual appearance of a title page. The break - attribute is used to show that the line beginning does not (as elsewhere) + attribute is used to show that the beginning of the new line does not (as elsewhere) mark the start of a new word.

With Additions, ne-ver before Printed. @@ -88,14 +88,14 @@ soi-xante & dixhuytiesme livre. starts. The n attribute, if used, indicates the number or other value associated with the text between this point and the next lb element, typically the sequence number of the line within the page, or other appropriate unit. This element is intended to be - used for marking the beginning of each line on a manuscript or printed page, at the point where they - occur; it should not be used to tag structural units such as lines of verse (for which the + used for marking the beginning of each new topographic line on a manuscript or printed page, at the point where it + occurs; it should not be used to tag structural units such as lines of verse (for which the l element is available) except in circumstances where structural units cannot otherwise be marked.

The type attribute may be used to characterize the line beginning in any respect. The more specialized attributes break, ed, or edRef should be preferred when the - intent is to indicate whether or not the beginning of a new line + intent is to indicate whether or not the beginning of the new topographic line is word-breaking, or to note the source from which it derives.

From 85533add3ac95a6d23212b7dc5f0241044a2e716 Mon Sep 17 00:00:00 2001 From: martindholmes Date: Mon, 13 Jan 2025 14:53:47 -0800 Subject: [PATCH 28/32] Fix missing s per @sydb. --- P5/Source/Guidelines/en/WD-NonStandardCharacters.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/P5/Source/Guidelines/en/WD-NonStandardCharacters.xml b/P5/Source/Guidelines/en/WD-NonStandardCharacters.xml index c6c7c38b0e..4ef5ef9070 100644 --- a/P5/Source/Guidelines/en/WD-NonStandardCharacters.xml +++ b/P5/Source/Guidelines/en/WD-NonStandardCharacters.xml @@ -1246,7 +1246,7 @@ precinct at Dodona. (L.H. Jeffery Archive) ΑΣΣΑΙ

The 180-degree rotation around the Y (vertical) axis here - describes what is happening in the RTL line in boustrophedon; the order of glyphs + describes what is happening in the RTL lines in boustrophedon; the order of glyphs is reversed, and so is their individual orientation (in fact, we see them from the back, as it were). seg elements have been used here because these are clearly not lines From d522bf972050109e9c880333139e07871c90fc27 Mon Sep 17 00:00:00 2001 From: sabine seifert Date: Tue, 14 Jan 2025 01:28:34 +0100 Subject: [PATCH 29/32] Added dateline to att.written (#2644) so that hand attribute is available Guessing @trishaoconnor did not notice this one was assigned to her; merging on her behalf tonight so we need not discuss at meeting tomorrow. --- P5/Source/Specs/dateline.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/P5/Source/Specs/dateline.xml b/P5/Source/Specs/dateline.xml index a175ace081..14a73025c3 100644 --- a/P5/Source/Specs/dateline.xml +++ b/P5/Source/Specs/dateline.xml @@ -25,6 +25,7 @@ + From 17da6b45cefcc6fee85810660ce5c6d9bb4db421 Mon Sep 17 00:00:00 2001 From: Gustavo Riva Date: Tue, 14 Jan 2025 01:31:43 +0100 Subject: [PATCH 30/32] Removing conflicting sup css rules in teic.css and guidelines.css. Adding css rule for a.notelink (#2636) --- P5/guidelines.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/P5/guidelines.css b/P5/guidelines.css index a00628fdbd..f73cc9f311 100644 --- a/P5/guidelines.css +++ b/P5/guidelines.css @@ -630,6 +630,10 @@ div.note ul { } span.noteLabel { } +a.notelink { + text-decoration: none; +} + /* images */ div.figure { text-align: left; @@ -812,10 +816,7 @@ span.icon { font-weight: bold; font-size: large; } -sup { - vertical-align: top; - font-size: 70%; -} + /* paragraphs */ p, div.p { margin-top: 0.3em; From ba43ca5ca63040579dd77f08e9545228bfd20516 Mon Sep 17 00:00:00 2001 From: Martin Holmes Date: Tue, 14 Jan 2025 12:01:02 -0800 Subject: [PATCH 31/32] Normalizing Japanese punctuation per issue #2337. (#2648) --- P5/Source/Specs/att.patternReplacement.xml | 2 +- P5/Source/Specs/att.placement.xml | 2 +- P5/Source/Specs/certainty.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/P5/Source/Specs/att.patternReplacement.xml b/P5/Source/Specs/att.patternReplacement.xml index 1f3d2acd9e..c6bbe969b1 100644 --- a/P5/Source/Specs/att.patternReplacement.xml +++ b/P5/Source/Specs/att.patternReplacement.xml @@ -91,7 +91,7 @@

- 文字列$1, $2などは、属性matchPatternにある正規表現に該当するグループに(開き括弧を左から右の順番で数えて)対応するものである。処理ソフトウェアは、当該正規表現に対応するグループに置換することが期待されている。

+ 文字列$1、$2などは、属性matchPatternにある正規表現に該当するグループに(開き括弧を左から右の順番で数えて)対応するものである。処理ソフトウェアは、当該正規表現に対応するグループに置換することが期待されている。

ドル記号に続く数値が(後方参照として用いられるのではなく)置換パターンとして必要な場合には、そのドル記号は%24と書かれなければならない。

diff --git a/P5/Source/Specs/att.placement.xml b/P5/Source/Specs/att.placement.xml index 150de792e4..b646fef54c 100644 --- a/P5/Source/Specs/att.placement.xml +++ b/P5/Source/Specs/att.placement.xml @@ -42,7 +42,7 @@ in the margin (left, right, or both) dans la marge (gauche, droite ou les deux en même temps) - 余白（左left, 右right, 左右both） + 余白（左left、右right、左右both） on the opposite, i.e. facing, page diff --git a/P5/Source/Specs/certainty.xml b/P5/Source/Specs/certainty.xml index c6bbb0494a..d4af7598af 100644 --- a/P5/Source/Specs/certainty.xml +++ b/P5/Source/Specs/certainty.xml @@ -241,7 +241,7 @@ ambiguity-free system for indicating certainty.

当該属性値として考えられるものは、他のcertainty要素の識別子またはそのリストである。従って、このcertainty要素を繋げて確率ネットワークを作ることができる。この確率ネットワークは、最終的には条件の付かない(given属性がない) certainty要素を起点として作られるだろう。この要素のネットワークの意味は、以下のように解釈することができる。あるcertainty要素を前提条件として参照している場合、 この要素が表す不確実さは前提条件側ではなく、当該要素に由来するものである。例えば、上の例では、最初のcertainty要素は、新しい筆写者がmsmである確信度を示している。2番目のものは、新しい筆写者がmsmである場合に、 Essexが人名である確信度を示している。この2番目のcertainty要素にあるのは、msmが新しい筆写者である確信度が0.6であるということではなく、msmは新しい筆写者であるとしていることに注意して欲しい。このように確率ネットワークを作ることが推奨される。

-

果敢な人は、他の要素や散文的記述を参照し、要素alt, join, noteなどの素性構造向け連結子を使い、 複雑な確率ネットワークを作ろうとするかもしれない。しかし、当該のcertainty要素が、確信度を明瞭に示す包括的な解決策であるとは、現時点では考えていない。 +

果敢な人は、他の要素や散文的記述を参照し、要素alt、join、noteなどの素性構造向け連結子を使い、 複雑な確率ネットワークを作ろうとするかもしれない。しかし、当該のcertainty要素が、確信度を明瞭に示す包括的な解決策であるとは、現時点では考えていない。

From ecf0b7ccc850936676f6f14a9d9fb6026d0f628a Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Wed, 15 Jan 2025 19:18:40 -0500 Subject: [PATCH 32/32] Emergency fix: extended lifetime of "context-required" deprecation warning for 1 month so we do not get errors until after release next week. --- P5/Source/Specs/constraintSpec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/P5/Source/Specs/constraintSpec.xml b/P5/Source/Specs/constraintSpec.xml index b936185206..1495d3fa27 100644 --- a/P5/Source/Specs/constraintSpec.xml +++ b/P5/Source/Specs/constraintSpec.xml @@ -63,7 +63,7 @@ - + The use of ISO Schematron sch:assert and sch:report elements without a parent sch:rule