From cb6eef62a2b83fa3e5141a200513c657e4c78ec6 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Thu, 25 Jan 2024 21:32:51 -0500 Subject: [PATCH] Updated P5 subset: Updated source/p5subset.xml from current dev version of TEI repo, and updated tests to match. --- Test/expected-results/test.isosch | 2 +- Test/expected-results/test.odd.html | 2 +- Test/expected-results/test.rng | 4 +-- Test/expected-results/test15.odd.rnc | 7 +++-- Test/expected-results/test21.odd.rnc | 7 +++-- Test/expected-results/test30.dtd | 6 ++-- Test/expected-results/test30.rnc | 8 ++--- Test/expected-results/test33.rnc | 3 +- Test/expected-results/test34.rnc | 3 +- Test/expected-results/test35.rnc | 3 +- Test/expected-results/testdrama.compiled.xml | 2 +- Test2/expected-results/testAttValQuant.rng | 2 +- Test2/expected-results/testPure1.rng | 2 +- source/p5subset.xml | 32 ++++++++------------ 14 files changed, 40 insertions(+), 43 deletions(-) diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch index cdbe7e965..5877f4663 100644 --- a/Test/expected-results/test.isosch +++ b/Test/expected-results/test.isosch @@ -71,7 +71,7 @@ The element indicated by @spanTo () must follow the - + @calendar indicates one or more systems or calendars to which the date represented by the content of this element belongs, diff --git a/Test/expected-results/test.odd.html b/Test/expected-results/test.odd.html index 4ff7d078f..5f70dc96d 100644 --- a/Test/expected-results/test.odd.html +++ b/Test/expected-results/test.odd.html @@ -3914,7 +3914,7 @@

surface : - defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and transcriptions of the writing within them.[ + defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them.[ 11.1. Digital Facsimiles 11.2.2. Embedded Transcription] diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng index 4651d584d..89b8fd4cb 100644 --- a/Test/expected-results/test.rng +++ b/Test/expected-results/test.rng @@ -4080,7 +4080,7 @@ Suggested values include: 1] full (full form); 2] pref (prefix); 3] suff (suffix - + @calendar indicates one or more systems or calendars to which the date represented by the content of this element belongs, @@ -7865,7 +7865,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 - defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and transcriptions of the writing within them. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] + defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc index 7dbff0aef..330fb6a6d 100644 --- a/Test/expected-results/test15.odd.rnc +++ b/Test/expected-results/test15.odd.rnc @@ -2089,7 +2089,8 @@ att.calendarSystem.attribute.calendar = } }? sch:pattern [ - id = "test15-att.calendarSystem-calendar-calendar-constraint-rule-10" + id = + "test15-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10" "\x{a}" ~ " " sch:rule [ @@ -7527,7 +7528,7 @@ event = model.headLike*, (model.pLike+ | model.labelLike+ | eventName+), (model.noteLike | model.biblLike | linkGrp | link | idno | ptr)*, - (event | listEvent)*, + model.eventLike*, (model.personLike | listPerson)*, (model.placeLike | listPlace)*, model.objectLike*, @@ -7850,7 +7851,7 @@ listEvent = (model.headLike*, desc*, (relation | listRelation)*, - ((event | listEvent)+, (relation | listRelation)*)+), + (model.eventLike+, (relation | listRelation)*)+), att.global.attributes, att.typed.attributes, att.declarable.attributes, diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc index e8f82cff8..9fe9b929a 100644 --- a/Test/expected-results/test21.odd.rnc +++ b/Test/expected-results/test21.odd.rnc @@ -2431,7 +2431,8 @@ att.calendarSystem.attribute.calendar = } }? sch:pattern [ - id = "test21-att.calendarSystem-calendar-calendar-constraint-rule-10" + id = + "test21-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10" "\x{a}" ~ " " sch:rule [ @@ -5402,7 +5403,7 @@ event = model.headLike*, (model.pLike+ | model.labelLike+ | eventName+), (model.noteLike | model.biblLike | linkGrp | link | idno | ptr)*, - (event | listEvent)*, + model.eventLike*, (model.personLike | listPerson)*, (model.placeLike | listPlace)*, model.objectLike*, @@ -5725,7 +5726,7 @@ listEvent = (model.headLike*, desc*, (relation | listRelation)*, - ((event | listEvent)+, (relation | listRelation)*)+), + (model.eventLike+, (relation | listRelation)*)+), att.global.attributes, att.typed.attributes, att.declarable.attributes, diff --git a/Test/expected-results/test30.dtd b/Test/expected-results/test30.dtd index 0232382a3..6bdca4db4 100644 --- a/Test/expected-results/test30.dtd +++ b/Test/expected-results/test30.dtd @@ -1875,7 +1875,7 @@ calendar CDATA #IMPLIED > - + %Tatt.typed.attributes; ordered %teidata.truthValue; "true" > - + %Tatt.editLike.attributes; %Tatt.dimensions.attributes; reason CDATA #IMPLIED > - + - + @calendar indicates one or more diff --git a/Test2/expected-results/testAttValQuant.rng b/Test2/expected-results/testAttValQuant.rng index f1dcc5797..07c4b1d0d 100644 --- a/Test2/expected-results/testAttValQuant.rng +++ b/Test2/expected-results/testAttValQuant.rng @@ -3457,7 +3457,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line; + id="tavq-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"> + id="testPure1-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"> The TEI Guidelines - P5 Version 4.7.0a. Last updated on - 16th November 2023, revision 486847356 + P5 Version 4.8.0a. Last updated on + 22nd January 2024, revision a6432f272 TEI Consortium @@ -16,7 +16,7 @@ Distributed under a Creative Commons Attribution 3.0 Unported License. -

Copyright 2023 TEI Consortium.

+

Copyright 2024 TEI Consortium.

All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the @@ -46304,8 +46304,7 @@ associated. defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of -that space, zones of interest within that space, and transcriptions of the - writing within them. +that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them. 직사각형의 좌표 공간과 그 내부에서 기록 표면부를 정의한다. 수의적으로 그 공간의 하나 이상의 그림 표상과 관심 있는 직사각형 공간을 모아놓는다. define una superficie escrita en coordinadas rectangulares, agrupando opcionalmente una o más representaciones gráficas de ese espacio, y las zonas rectangulares de interés dentro de él. 矩形の座標により、書記の表面を定義する。選択的に、空間や矩形範囲中のひ @@ -52080,10 +52079,7 @@ different witnesses. - - - - + @@ -52942,8 +52938,7 @@ different witnesses. list of events liste d'événements list di eventi - contains a list of descriptions, each of which provides information - about an identifiable event. + contains a list of descriptions, each of which provides information about an identifiable event. contient une liste de descriptions, chacune d'entre elles fournissant des informations sur un événement connu. contiene una lista di descrizioni, ognuna delle quali fornisce informazioni a proposito di un determinato evento. @@ -52963,14 +52958,11 @@ different witnesses. - - - - - - - - + + + + + @@ -56285,7 +56277,7 @@ one initial. - + @calendar indicates one or more