From 2322b81207fd8502a8decbebcbdbf184a3d1b7f6 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Fri, 28 Jul 2023 23:55:19 -0400 Subject: [PATCH] Copy over latest p5subset, and fix tests accordingly. --- Test/expected-results/test.rng | 2 +- Test/expected-results/test15.odd.html | 8 +- Test/expected-results/test15.odd.rnc | 2 +- Test/expected-results/test30.rnc | 8 +- Test/expected-results/test33.rnc | 2 +- Test/expected-results/test34.combined.json | 4 +- Test/expected-results/test34.rnc | 2 +- Test/expected-results/test35.rnc | 2 +- Test/expected-results/testdrama.compiled.xml | 103 ++++++++--- Test2/expected-results/testAttValQuant.rng | 2 +- Test2/expected-results/testPure1.rng | 2 +- debian-tei-xsl/debian/changelog | 6 + source/p5subset.xml | 184 +++++++++++++------ 13 files changed, 223 insertions(+), 104 deletions(-) diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng index 0b5859fb1..e2a2bd35c 100644 --- a/Test/expected-results/test.rng +++ b/Test/expected-results/test.rng @@ -4277,7 +4277,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written ( soCalled (so called) authorial distance foreign - (foreign) + (foreign) foreign words distinct (distinct) linguistically distinct term diff --git a/Test/expected-results/test15.odd.html b/Test/expected-results/test15.odd.html index 4fde374c7..1f538641c 100644 --- a/Test/expected-results/test15.odd.html +++ b/Test/expected-results/test15.odd.html @@ -1173,7 +1173,7 @@

( foreign) - palabras extranjeras
+ palabras extranjeras
distinct
@@ -1263,7 +1263,7 @@

orig para pubPlace - publisher + publisher q quote rb @@ -1794,7 +1794,7 @@

anchor : ( punto de anclaje) - enlanza un indentificador con una posición al interno del texto, independientemente del hecho que esta sea o no a un elemento textual.[ + enlanza un indentificador con una posición al interno del texto, independientemente del hecho que esta corresponda o no a un elemento textual.[ 8.4.2. Synchronization and Overlap 16.5. Correspondence and Alignment] @@ -4280,7 +4280,7 @@

publisher : ( - publisher) + editorial) proporciona el nombre de la organización responsable de la publicación o la distribución de un elemento bibliográfico.[ 3.12.2.4. Imprint, Size of a Document, and Reprint Information 2.2.4. Publication, Distribution, Licensing, etc.] diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc index 1a69302d5..391585008 100644 --- a/Test/expected-results/test15.odd.rnc +++ b/Test/expected-results/test15.odd.rnc @@ -2155,7 +2155,7 @@ q = ## (so called) authorial distance "soCalled" | - ## (foreign) + ## (foreign) foreign words "foreign" | ## (distinct) linguistically distinct diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc index 3d5ef19d6..a655a6238 100644 --- a/Test/expected-results/test30.rnc +++ b/Test/expected-results/test30.rnc @@ -2581,7 +2581,7 @@ Tq = ## (so called) authorial distance "soCalled" | - ## (foreign) + ## (foreign) foreign words "foreign" | ## (distinct) linguistically distinct @@ -6488,9 +6488,9 @@ Tfacsimile = sch:report [ test = "child::text()[ normalize-space(.) ne '']" "\x{a}" ~ - " A facsimile element represents a text with images, thus\x{a}" ~ - " transcribed text should not be present within it.\x{a}" ~ - " " + " A facsimile element represents a text with images, thus\x{a}" ~ + " transcribed text should not be present within it.\x{a}" ~ + " " ] "\x{a}" ~ " " diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc index d14e38820..3a870d1f6 100644 --- a/Test/expected-results/test33.rnc +++ b/Test/expected-results/test33.rnc @@ -2305,7 +2305,7 @@ tei_q = ## (so called) authorial distance "soCalled" | - ## (foreign) + ## (foreign) foreign words "foreign" | ## (distinct) linguistically distinct diff --git a/Test/expected-results/test34.combined.json b/Test/expected-results/test34.combined.json index cade8ab2b..c16e11fdb 100644 --- a/Test/expected-results/test34.combined.json +++ b/Test/expected-results/test34.combined.json @@ -8609,8 +8609,8 @@ { "ident" : "foreign", "desc" : - [ ], - "shortDesc" : "(foreign) ", + [ "foreign words<\/desc>" ], + "shortDesc" : "(foreign) foreign words", "gloss" : [ "foreign<\/gloss>" ], "altIdent" : diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc index b8b34fac4..c1bcce422 100644 --- a/Test/expected-results/test34.rnc +++ b/Test/expected-results/test34.rnc @@ -2310,7 +2310,7 @@ tei_q = ## (so called) authorial distance "soCalled" | - ## (foreign) + ## (foreign) foreign words "foreign" | ## (distinct) linguistically distinct diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc index 76ab95154..cfba7812e 100644 --- a/Test/expected-results/test35.rnc +++ b/Test/expected-results/test35.rnc @@ -2303,7 +2303,7 @@ tei_q = ## (so called) authorial distance "soCalled" | - ## (foreign) + ## (foreign) foreign words "foreign" | ## (distinct) linguistically distinct diff --git a/Test/expected-results/testdrama.compiled.xml b/Test/expected-results/testdrama.compiled.xml index 5e7550766..9dd6f59b2 100644 --- a/Test/expected-results/testdrama.compiled.xml +++ b/Test/expected-results/testdrama.compiled.xml @@ -242,13 +242,6 @@ d'un certain type. 何らかのコード化された値を用いて、名付けられたエンティティを識別する外部的に定義された手段を提供する。 - - - - [New Zealand Parliament, Legislative Council] - - - @@ -256,16 +249,11 @@ - +

The value may be a unique identifier from a database, or any other externally-defined - string identifying the referent.

-

No particular syntax is proposed for the values of the key attribute, since - its form will depend entirely on practice within a given project. For the same reason, this - attribute is not recommended in data interchange, since there is no way of ensuring - that the values used by one project are distinct from those used by another. In such - a situation, a preferable approach for magic tokens which follows standard practice - on the Web is to use a ref attribute whose value is a tag URI as defined in - RFC 4151.

+ string identifying the referent. + No particular syntax is proposed for the values of the key attribute, since + its form will depend entirely on practice within a given project.

La valeur peut être un identifiant unique dans une base de données, ou toute autre chaîne @@ -283,11 +271,11 @@ définition complète de l'entité nommée au moyen d'un ou plusieurs URIs. 一つ以上のURIを用いて、名付けられたエンティティの完全な定義かIDを参照するための明確な手段を提供する。 - - - Seamus Heaney - - + + + Seamus Heaney + +

The value must point directly to one or more XML elements or other resources by means of one or more URIs, separated by whitespace. If more than one is supplied the implication is that the name identifies several distinct entities.

 @@ -297,6 +285,50 @@

値は1つまたは複数のXML要素あるいは、空白によって区切られた1つまたは複数のURIを指し示すものでなければならない。1つ以上の値が与えられているときは、その名前が複数の異るエンティティに対応することを示唆する。

 + +

In this contrived example, a canonical reference to the same + organisation is provided in four different ways.

+ + + New Zealand Parliament, Legislative Council + +   + + New Zealand Parliament, Legislative Council + +   + + New Zealand Parliament, Legislative Council + +   + + New Zealand Parliament, Legislative Council + + +

The first presumes the availability of an internet connection + and a processor that can resolve a URI (most can). The second + requires, in addition, a prefixDef that declares how the + nzvm prefix should be interpreted. The third does not + require an internet connection, but does require that a file named + named_entities.xml be in the same + directory as the TEI document. The fourth requires that an entire + external system for key resolution be available.

+ + + +

The key attribute is more flexible and + general-purpose, but its use in interchange requires that + documentation about how the key is to be resolved be sent to the + recipient of the TEI document. In contrast values of the + ref attribute are resolved using the widely accepted + protocols for a URI, and thus less documentation, if any, is + likely required by the recipient in data interchange.

+

These guidelines provide no semantic basis or suggested + precedence when both key and ref are + provided. For this reason simultaneous use of both is not + recommended unless documentation explaining the use is provided, + probably in an ODD customizaiton, for interchange.

+ 13.1.1. Linking Names and Their Referents @@ -4125,9 +4157,9 @@ dans lequel les traits encodés portant cet attribut sont supposés être apparu + identifies the unit of information conveyed by the element, e.g. columns, pages, volume, entry. identifie le type d'information que transmet l'élément, par exemple colonnes, pages, volume, inscription, etc. - identifies the unit of information conveyed by the element, e.g. columns, pages, volume, entry. 当該要素が伝える情報の単位を特定する。たとえば、カラム (columns)、頁 (pages)、巻 (volume)、エントリ (entry) 等。 @@ -8058,6 +8090,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches... foreign fremdartig + foreign words palabras extranjeras mots étrangers parole straniere @@ -15309,6 +15342,7 @@ epistemology, methodology and history of publisher + editorial éditeur Verlag provides the name of the organization responsible for the publication or distribution of a @@ -16412,9 +16446,17 @@ relatedItem element must be empty + +

This element may be used to transcribe which character is + speaking in a dramatic text as indicated by the source text; the + who attribute of an sp element may be used to + point to another element (typically a role) which + provides information about the character speaking. Either or both + may be used.

+

Cet élément est utilisé pour indiquer quel personnage prend la parole dans une pièce de - théâtre ; l'attribut who est utilisé pour pointer vers un autre élément qui fournit des + théâtre ; l'attribut who est utilisé pour pointer vers un autre élément qui fournit des informations sur ce personnage. L'un et ou l'autre peuvent être utilisés.

 @@ -18008,6 +18050,16 @@ material ungefähr 10MB + +

Das measure-Element kann dazu verwendet werden, um normalisierte oder + maschinenlesbare Versionen der Größen-Angaben bereitzustellen.

+ + + Ungefähr vier Megabyte + Textumfang 245 Seiten + + + 198 pages @@ -18022,9 +18074,6 @@ material 10片3.5吋磁碟片 - -

Das measure-Element kann dazu verwendet werden, um normalisierte oder maschinenlesbare Versionen der Größen-Angaben bereitzustellen.

- 2.2.3. Type and Extent of File 2.2. The File Description @@ -28191,7 +28240,7 @@ the date of the entire document, not for any subset or part of it.

在文件中某一位置附上識別符碼，無論該位置是否符合一個文字性元素。 テキスト中のある地点に対して識別子を付与する。テキスト要素と対応するかは問われない。 attache un identifiant à un point du texte, que ce point corresponde ou non à un élément textuel. - enlanza un indentificador con una posición al interno del texto, independientemente del hecho que esta sea o no a un elemento textual. + enlanza un indentificador con una posición al interno del texto, independientemente del hecho que esta corresponda o no a un elemento textual. aggancia un indentificatore a una posizione all'interno del testo indipendentemente dal fatto che questa corrisponda o meno a un elemento testuale fügt an einer Stelle im Text eine Kennung ein, unabhängig von der Textstruktur. diff --git a/Test2/expected-results/testAttValQuant.rng b/Test2/expected-results/testAttValQuant.rng index 57c8638e0..eb6be5e95 100644 --- a/Test2/expected-results/testAttValQuant.rng +++ b/Test2/expected-results/testAttValQuant.rng @@ -3668,7 +3668,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written ( soCalled (so called) authorial distance foreign - (foreign) + (foreign) foreign words distinct (distinct) linguistically distinct term diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng index 08c4a9111..97bb0a7ec 100644 --- a/Test2/expected-results/testPure1.rng +++ b/Test2/expected-results/testPure1.rng @@ -4069,7 +4069,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written ( soCalled (so called) authorial distance foreign - (foreign) + (foreign) foreign words distinct (distinct) linguistically distinct term diff --git a/debian-tei-xsl/debian/changelog b/debian-tei-xsl/debian/changelog index 36f1cd55d..03dc8ade3 100644 --- a/debian-tei-xsl/debian/changelog +++ b/debian-tei-xsl/debian/changelog @@ -1,3 +1,9 @@ +tei-xsl (7.56.0a) natty; urgency=low + + * new release from upstream + + -- TEI Fri, 28 Jul 2023 12:04:36 -0400 + tei-xsl (7.55.0a) natty; urgency=low * new release from upstream diff --git a/source/p5subset.xml b/source/p5subset.xml index 5c2d4cc50..9097c810e 100644 --- a/source/p5subset.xml +++ b/source/p5subset.xml @@ -6,8 +6,8 @@ The TEI Guidelines - Version 4.7.0a. Last updated on - 11th April 2023, revision bec660a72 + P5 Version 4.7.0a. Last updated on + 16th July 2023, revision df882688d TEI Consortium @@ -384,13 +384,6 @@ Instance d'un certain type. 何らかのコード化された値を用いて、名付けられたエンティティを識別する外部的に定義された手段を提供する。 - - - - [New Zealand Parliament, Legislative Council] - - - @@ -398,16 +391,11 @@ Instance - +

The value may be a unique identifier from a database, or any other externally-defined - string identifying the referent.

-

No particular syntax is proposed for the values of the key attribute, since - its form will depend entirely on practice within a given project. For the same reason, this - attribute is not recommended in data interchange, since there is no way of ensuring - that the values used by one project are distinct from those used by another. In such - a situation, a preferable approach for magic tokens which follows standard practice - on the Web is to use a ref attribute whose value is a tag URI as defined in - RFC 4151.

+ string identifying the referent. + No particular syntax is proposed for the values of the key attribute, since + its form will depend entirely on practice within a given project.

La valeur peut être un identifiant unique dans une base de données, ou toute autre chaîne @@ -425,11 +413,11 @@ Instance définition complète de l'entité nommée au moyen d'un ou plusieurs URIs. 一つ以上のURIを用いて、名付けられたエンティティの完全な定義かIDを参照するための明確な手段を提供する。 - - - Seamus Heaney - - + + + Seamus Heaney + +

The value must point directly to one or more XML elements or other resources by means of one or more URIs, separated by whitespace. If more than one is supplied the implication is that the name identifies several distinct entities.

 @@ -439,6 +427,56 @@ Instance

値は1つまたは複数のXML要素あるいは、空白によって区切られた1つまたは複数のURIを指し示すものでなければならない。1つ以上の値が与えられているときは、その名前が複数の異るエンティティに対応することを示唆する。

 + +

In this contrived example, a canonical reference to the same + organisation is provided in four different ways.

+ + + New Zealand Parliament, Legislative Council + +   + + New Zealand Parliament, Legislative Council + +   + + New Zealand Parliament, Legislative Council + +   + + New Zealand Parliament, Legislative Council + + +

The first presumes the availability of an internet connection + and a processor that can resolve a URI (most can). The second + requires, in addition, a prefixDef that declares how the + nzvm prefix should be interpreted. The third does not + require an internet connection, but does require that a file named + named_entities.xml be in the same + directory as the TEI document. The fourth requires that an entire + external system for key resolution be available.

+ + + +

The key attribute is more flexible and + general-purpose, but its use in interchange requires that + documentation about how the key is to be resolved be sent to the + recipient of the TEI document. In contrast values of the + ref attribute are resolved using the widely accepted + protocols for a URI, and thus less documentation, if any, is + likely required by the recipient in data interchange.

+

These guidelines provide no semantic basis or suggested + precedence when both key and ref are + provided. For this reason simultaneous use of both is not + recommended unless documentation explaining the use is provided, + probably in an ODD customizaiton, for interchange.

+ @@ -5321,9 +5359,9 @@ dans lequel les traits encodés portant cet attribut sont supposés être apparu + identifies the unit of information conveyed by the element, e.g. columns, pages, volume, entry. identifie le type d'information que transmet l'élément, par exemple colonnes, pages, volume, inscription, etc. - identifies the unit of information conveyed by the element, e.g. columns, pages, volume, entry. 当該要素が伝える情報の単位を特定する。たとえば、カラム (columns)、頁 (pages)、巻 (volume)、エントリ (entry) 等。 @@ -9485,6 +9523,16 @@ material ungefähr 10MB + +

Das measure-Element kann dazu verwendet werden, um normalisierte oder + maschinenlesbare Versionen der Größen-Angaben bereitzustellen.

+ + + Ungefähr vier Megabyte + Textumfang 245 Seiten + + + 198 pages @@ -9499,9 +9547,6 @@ material 10片3.5吋磁碟片 - -

Das measure-Element kann dazu verwendet werden, um normalisierte oder maschinenlesbare Versionen der Größen-Angaben bereitzustellen.

- @@ -10519,7 +10564,7 @@ définissant les droits d'utilisation. -
Computer Files Derived from Other Computer Files
+
TEI documents derived from other TEI documents
The Encoding Description encoding description @@ -16268,6 +16313,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches... foreign fremdartig + foreign words palabras extranjeras mots étrangers parole straniere @@ -23714,6 +23760,7 @@ epistemology, methodology and history of publisher + editorial éditeur Verlag provides the name of the organization responsible for the publication or distribution of a @@ -24837,9 +24884,17 @@ relatedItem element must be empty + +

This element may be used to transcribe which character is + speaking in a dramatic text as indicated by the source text; the + who attribute of an sp element may be used to + point to another element (typically a role) which + provides information about the character speaking. Either or both + may be used.

+

Cet élément est utilisé pour indiquer quel personnage prend la parole dans une pièce de - théâtre ; l'attribut who est utilisé pour pointer vers un autre élément qui fournit des + théâtre ; l'attribut who est utilisé pour pointer vers un autre élément qui fournit des informations sur ce personnage. L'un et ou l'autre peuvent être utilisés.

 @@ -29887,7 +29942,7 @@ otherwise available in the document character set-->. for uppercase equivalences, lowercase for lowercase equivalences, and simplified for simplified characters. The g elements contained by this element can point to either another - char or glyphelement or contain a character + char or glyph element or contain a character that is intended to be the target of this mapping.

@@ -31239,6 +31294,9 @@ and simplified for simplified characters. The + + + @@ -39545,9 +39603,9 @@ headword such as noun, verb, or adjective. ningún guión pas de trait d'union nessun trattino + indicates that the headword, though a prefix or suffix, loses its hyphen indica che il lemma, sebbene prefisso o suffisso, perde il trattino - indicates that the headword, though a prefix or suffix, loses its hyphen 접두사 또는 접미사일지라도 표제어의 하이픈이 소실되었음을 표시한다. indica que el lema, aunque sea un prefijo o un sufijo, no contiene su guión @@ -41294,20 +41352,12 @@ manuscripts or other objects, not necessarily located within a single repository - - - - - - - - - - - - - - + + + + + + @@ -41322,20 +41372,24 @@ manuscripts or other objects, not necessarily located within a single repository - B 106 - Cote de la Bibliothèque royale au XVIIIe siècle. + B 106 + Cote de la Bibliothèque royale au XVIIIe siècle. - 台北市中正區 - 國立歷史博物館 - MS.El.26.C.9 + 台北市中正區 + 國立歷史博物館 + MS.El.26.C.9 + +

An identifying number of some kind must be supplied if + known; if it is not known, this should be stated.

+

Un numéro identifiant quelconque doit être fourni s'il est connu ; si on ne le connaît pas, cela devrait être signalé.

@@ -41345,10 +41399,6 @@ manuscripts or other objects, not necessarily located within a single repository すべきである。

- -

An identifying number of some kind must be supplied if - known; if it is not known, this should be stated.

- @@ -50945,6 +50995,18 @@ different witnesses. French + + + + + + Mixtepec-Mixtec + English + Spanish + + + + Anglais britannique @@ -51280,11 +51342,11 @@ raiders and saved the town from capture. + provides information about relationships identified amongst people, places, and + organizations, either informally as prose or as formally expressed relation links. donne des informations sur les relations qui existent entre des personnes, des lieux, ou des organisations, soit de manière informelle en prose, soit de manière formelle. - provides information about relationships identified amongst people, places, and - organizations, either informally as prose or as formally expressed relation links. 비공식적으로 산문체 또는 공식적으로 표현된 관계 연결을 통하여 사람, 장소, 그리고 조직 사이에 식별되는 관련성에 관한 정보를 제공한다. 描述一項語言互動中參與者之間的關係或社交關聯。 @@ -53485,8 +53547,8 @@ specification.

nombre canónico nome canonico nom canonique - contient la définition de tout nom ou partie de nom dans leur forme canonique. contains the definition for a canonical name or name component of any kind. + contient la définition de tout nom ou partie de nom dans leur forme canonique. 표준 이름 또는 어떤 종류의 이름부 정의를 포함한다. 包含一標準名稱或任何部分名稱的定義。 各種名前の、標準的な名前または名前の部分の定義を示す。 @@ -56586,7 +56648,7 @@ Information with a Text 在文件中某一位置附上識別符碼，無論該位置是否符合一個文字性元素。 テキスト中のある地点に対して識別子を付与する。テキスト要素と対応するかは問われない。 attache un identifiant à un point du texte, que ce point corresponde ou non à un élément textuel. - enlanza un indentificador con una posición al interno del texto, independientemente del hecho que esta sea o no a un elemento textual. + enlanza un indentificador con una posición al interno del texto, independientemente del hecho que esta corresponda o no a un elemento textual. aggancia un indentificatore a una posizione all'interno del testo indipendentemente dal fatto che questa corrisponda o meno a un elemento testuale fügt an einer Stelle im Text eine Kennung ein, unabhängig von der Textstruktur. @@ -68118,9 +68180,9 @@ déclaration de même nom dans la définition courante. - + - + which could be wrapped in a <sequence> element. @@ -70127,6 +70189,7 @@ should correspond to an existing module, via a moduleSpec or + @@ -70416,6 +70479,7 @@ should correspond to an existing module, via a moduleSpec or +