Updated P5 subset:

Updated source/p5subset.xml from current dev version of TEI repo, and updated tests to match.
TEIC · Jan 26, 2024 · cb6eef6 · cb6eef6
1 parent fcb9cbf
commit cb6eef6
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 43 deletions.
diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch
@@ -71,7 +71,7 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
             </assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-att.calendarSystem-calendar-calendar-10">
+   <pattern id="schematron-constraint-test-att.calendarSystem-calendar-calendar_attr_on_empty_element-10">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @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
@@ -3914,7 +3914,7 @@ <h1>
               <span class="hi">
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-surface.html">surface</a>
               </span>: 
-              <span xml:lang="en" lang="en">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.</span>[
+              <span xml:lang="en" lang="en">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.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">11.2.2. Embedded Transcription</a>]</td>
             </tr>

diff --git 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
       </attribute>
     </optional>
   </define>
-  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.calendarSystem-calendar-calendar-constraint-rule-10">
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
       <sch:assert test="string-length( normalize-space(.) ) gt 0"> @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
   </define>
   <define name="surface">
     <element name="surface">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">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]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">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]</a:documentation>
       <group>
         <zeroOrMore>
           <choice>

diff --git 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
@@ -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
@@ -1875,7 +1875,7 @@ calendar CDATA  #IMPLIED >
 <!ATTLIST epigraph
  %Tatt.global.attributes; >
 <!--doc:(event) contains data relating to anything of significance that happens in time. [13.3.1. Basic Principles] -->
-<!ELEMENT event (((idno)*,(%model.headLike;)*,((%model.pLike;)+|(%model.labelLike;)+|(eventName)+),(%model.noteLike;|%model.biblLike;|linkGrp|link|idno|ptr)*,(event|listEvent)*,(%model.personLike;|listPerson)*,(%model.placeLike;|listPlace)*,(%model.objectLike;)*,(relation|listRelation)*))>
+<!ELEMENT event (((idno)*,(%model.headLike;)*,((%model.pLike;)+|(%model.labelLike;)+|(eventName)+),(%model.noteLike;|%model.biblLike;|linkGrp|link|idno|ptr)*,(%model.eventLike;)*,(%model.personLike;|listPerson)*,(%model.placeLike;|listPlace)*,(%model.objectLike;)*,(relation|listRelation)*))>
 <!ATTLIST event xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST event
  %Tatt.global.attributes;
@@ -2339,7 +2339,7 @@ type %teidata.enumerated;  #IMPLIED >
  %Tatt.typed.attributes;
 ordered %teidata.truthValue;  "true"  >
 <!--doc:(list of events) contains a list of descriptions, each of which provides information about an identifiable event. [13.3.1. Basic Principles] -->
-<!ELEMENT listEvent (((%model.headLike;)*,(desc)*,(relation|listRelation)*,((event|listEvent)+,(relation|listRelation)*)+))>
+<!ELEMENT listEvent (((%model.headLike;)*,(desc)*,(relation|listRelation)*,((%model.eventLike;)+,(relation|listRelation)*)+))>
 <!ATTLIST listEvent xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listEvent
  %Tatt.global.attributes;
@@ -3293,7 +3293,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.editLike.attributes;
  %Tatt.dimensions.attributes;
 reason CDATA  #IMPLIED >
-<!--doc: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] -->
+<!--doc: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] -->
 <!ELEMENT surface (((%model.global;|%model.labelLike;|%model.graphicLike;)*,((zone|line|path|surface|surfaceGrp),(%model.global;)*)*))>
 <!ATTLIST surface xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST surface

diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc
@@ -2352,7 +2352,7 @@ Tatt.calendarSystem.attribute.calendar =
   }?
 sch:pattern [
   id =
-    "testbasic-att.calendarSystem-calendar-calendar-constraint-rule-10"
+    "testbasic-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -6681,7 +6681,7 @@ Tevent =
       | Tlink
       | Tidno
       | Tptr)*,
-     (Tevent | TlistEvent)*,
+     Tmodel.eventLike*,
      (Tmodel.personLike | TlistPerson)*,
      (Tmodel.placeLike | TlistPlace)*,
      Tmodel.objectLike*,
@@ -7004,7 +7004,7 @@ TlistEvent =
     (Tmodel.headLike*,
      Tdesc*,
      (Trelation | TlistRelation)*,
-     ((Tevent | TlistEvent)+, (Trelation | TlistRelation)*)+),
+     (Tmodel.eventLike+, (Trelation | TlistRelation)*)+),
     Tatt.global.attributes,
     Tatt.typed.attributes,
     Tatt.declarable.attributes,
@@ -8152,7 +8152,7 @@ TsourceDoc =
   }
 Tsurface =
 
-  ## 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]
   element surface {
     ((Tmodel.global | Tmodel.labelLike | Tmodel.graphicLike)*,
      ((Tzone | Tline | Tpath | Tsurface | TsurfaceGrp),

diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc
@@ -2062,7 +2062,8 @@ tei_att.calendarSystem.attribute.calendar =
     }
   }?
 sch:pattern [
-  id = "foo-att.calendarSystem-calendar-calendar-constraint-rule-10"
+  id =
+    "foo-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [

diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc
@@ -2067,7 +2067,8 @@ tei_att.calendarSystem.attribute.calendar =
     }
   }?
 sch:pattern [
-  id = "foo-att.calendarSystem-calendar-calendar-constraint-rule-10"
+  id =
+    "foo-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [

diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc
@@ -2062,7 +2062,8 @@ tei_att.calendarSystem.attribute.calendar =
     }
   }?
 sch:pattern [
-  id = "foo-att.calendarSystem-calendar-calendar-constraint-rule-10"
+  id =
+    "foo-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [

diff --git a/Test/expected-results/testdrama.compiled.xml b/Test/expected-results/testdrama.compiled.xml
@@ -7146,7 +7146,7 @@ one initial.</desc>
       <datatype minOccurs="1" maxOccurs="unbounded">
         <dataRef key="teidata.pointer"/>
       </datatype>
-      <constraintSpec ident="calendar" scheme="schematron">
+      <constraintSpec ident="calendar_attr_on_empty_element" scheme="schematron">
         <constraint>
           <sch:rule context="tei:*[@calendar]">
             <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more

diff --git 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;
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="tavq-att.calendarSystem-calendar-calendar-constraint-rule-10">
+            id="tavq-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"

diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
@@ -3908,7 +3908,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.calendarSystem-calendar-calendar-constraint-rule-10">
+            id="testPure1-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"

diff --git a/source/p5subset.xml b/source/p5subset.xml
@@ -6,8 +6,8 @@
         <title>The TEI Guidelines</title>
       </titleStmt>
       <editionStmt>
-        <edition>P5 <ref target="#ABTEI4">Version</ref> <ref target="../../readme-4.7.0.html">4.7.0a</ref>. Last updated on
-        <date when="2023-11-16">16th November 2023</date>, revision <ref target="https://github.com/TEIC/TEI/commit/486847356">486847356</ref></edition>
+        <edition>P5 <ref target="#ABTEI4">Version</ref> <ref target="../../readme-4.8.0.html">4.8.0a</ref>. Last updated on
+        <date when="2024-01-22">22nd January 2024</date>, revision <ref target="https://github.com/TEIC/TEI/commit/a6432f272">a6432f272</ref></edition>
       </editionStmt>
       <publicationStmt>
         <distributor>TEI Consortium</distributor>
@@ -16,7 +16,7 @@
             Distributed under a Creative Commons Attribution 3.0 Unported License.
           </licence>
           <licence target="http://www.opensource.org/licenses/BSD-2-Clause">
-            <p>Copyright 2023 TEI Consortium.</p>
+            <p>Copyright 2024 TEI Consortium.</p>
             <p>All rights reserved.</p>     
             <p>Redistribution and use in source and binary forms, with
             or without modification, are permitted provided that the
@@ -46304,8 +46304,7 @@ associated.</desc>
 <elementSpec ident="surface" module="transcr">
   <desc versionDate="2011-11-20" xml:lang="en">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.</desc>
+that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">직사각형의 좌표 공간과 그 내부에서 기록 표면부를 정의한다. 수의적으로 그 공간의 하나 이상의 그림 표상과 관심 있는 직사각형 공간을 모아놓는다.</desc>
   <desc versionDate="2008-04-06" xml:lang="es">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.</desc>
   <desc versionDate="2008-04-06" xml:lang="ja">矩形の座標により、書記の表面を定義する。選択的に、空間や矩形範囲中のひ
@@ -52080,10 +52079,7 @@ different witnesses.
         <elementRef key="idno"/>
         <elementRef key="ptr"/>
       </alternate>
-      <alternate minOccurs="0" maxOccurs="unbounded">
-        <elementRef key="event" minOccurs="1" maxOccurs="1"/>
-        <elementRef key="listEvent" minOccurs="1" maxOccurs="1"/>
-      </alternate>
+      <classRef key="model.eventLike" minOccurs="0" maxOccurs="unbounded"/>
       <alternate minOccurs="0" maxOccurs="unbounded">
         <classRef key="model.personLike" minOccurs="1" maxOccurs="1"/>
         <elementRef key="listPerson" minOccurs="1" maxOccurs="1"/>
@@ -52942,8 +52938,7 @@ different witnesses.
   <gloss versionDate="2009-01-21" xml:lang="en">list of events</gloss>
   <gloss xml:lang="fr" versionDate="2009-03-19">liste d'événements</gloss>
   <gloss versionDate="2021-02-02" xml:lang="it">list di eventi</gloss>
-  <desc versionDate="2009-01-21" xml:lang="en">contains a list of descriptions, each of which provides information
-    about an identifiable event.</desc>
+  <desc versionDate="2009-01-21" xml:lang="en">contains a list of descriptions, each of which provides information about an identifiable event.</desc>
   <desc versionDate="2009-03-19" xml:lang="fr">contient une liste de descriptions, chacune d'entre elles fournissant des informations sur un événement connu.</desc>
   <desc versionDate="2021-02-02" xml:lang="it">contiene una lista di descrizioni, ognuna delle quali fornisce informazioni a proposito di un determinato evento.</desc>
   <classes>
@@ -52963,14 +52958,11 @@ different witnesses.
         <elementRef key="listRelation" minOccurs="1" maxOccurs="1"/>
       </alternate>
       <sequence minOccurs="1" maxOccurs="unbounded">
-	<alternate minOccurs="1" maxOccurs="unbounded">
-	  <elementRef key="event" minOccurs="1" maxOccurs="1"/>
-	  <elementRef key="listEvent" minOccurs="1" maxOccurs="1"/>
-	</alternate>
-	<alternate minOccurs="0" maxOccurs="unbounded">
-	  <elementRef key="relation" minOccurs="1" maxOccurs="1"/>
-	  <elementRef key="listRelation" minOccurs="1" maxOccurs="1"/>
-	</alternate>
+        <classRef key="model.eventLike" minOccurs="1" maxOccurs="unbounded"/>
+        <alternate minOccurs="0" maxOccurs="unbounded">
+          <elementRef key="relation" minOccurs="1" maxOccurs="1"/>
+          <elementRef key="listRelation" minOccurs="1" maxOccurs="1"/>
+        </alternate>
       </sequence>
     </sequence>
   </content>
@@ -56285,7 +56277,7 @@ one initial.</desc>
       <datatype minOccurs="1" maxOccurs="unbounded">
         <dataRef key="teidata.pointer"/>
       </datatype>
-      <constraintSpec ident="calendar" scheme="schematron">
+      <constraintSpec ident="calendar_attr_on_empty_element" scheme="schematron">
         <constraint>
           <sch:rule context="tei:*[@calendar]">
             <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more