Merge branch 'dev' into trishaoconnor_2367

TEIC · Dec 10, 2024 · 3ab8c66 · 3ab8c66
2 parents 82e9a84 + f3fe4a6
commit 3ab8c66
Show file tree

Hide file tree

Showing 880 changed files with 8,426 additions and 10,072 deletions.
diff --git a/P5/Exemplars/isofs.odd b/P5/Exemplars/isofs.odd
@@ -38,7 +38,7 @@
 	 <moduleRef key="tei"/>
 	 <moduleRef key="iso-fs"/>
 	 <elementSpec ident="fLib" mode="change">
-	   <constraintSpec ident="c1" scheme="schematron" mode="add">
+	   <constraintSpec ident="c1" scheme="schematron" mode="add" xml:lang="zxx">
 	     <constraint>
 	       <ns xmlns="http://purl.oclc.org/dsdl/schematron" prefix="tei" uri="http://www.tei-c.org/ns/1.0"/>
 	     </constraint>

diff --git a/P5/Exemplars/tei_enrich.odd b/P5/Exemplars/tei_enrich.odd
@@ -3451,7 +3451,7 @@ which should be supported by a more detailed description using the
           <!-- constrain date attributes -->
 
           <elementSpec ident="date" mode="change" module="core">
-            <constraintSpec scheme="schematron" ident="dates">
+            <constraintSpec scheme="schematron" ident="dates" xml:lang="en">
               <constraint>
 		<sch:rule context="tei:date">
                   <sch:assert test="@when  or  (@notAfter and @notBefore)  or  (@from and @to)">

diff --git a/P5/Exemplars/tei_jtei.odd b/P5/Exemplars/tei_jtei.odd
diff --git a/P5/Exemplars/tei_lite.odd b/P5/Exemplars/tei_lite.odd
@@ -2952,25 +2952,6 @@ $Id$
               <attDef ident="to" mode="delete"/>
             </attList>
           </classSpec>
-	  <!--
-	      start @calendar removal section
-	      This whole block should be removed along with the
-	      2024-11-11 removal of @calendar from individual TEI
-	      elements.  —Syd, 2023-10-16
-	  -->
-	  <elementSpec ident="author" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="change" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="creation" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="editor" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="funder" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="idno" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="licence" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="name" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="principal" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="resp" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="sponsor" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="title" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <!-- end @calendar removal block -->
           <classSpec type="atts"
                      ident="att.internetMedia"
                      module="tei"

diff --git a/P5/Exemplars/tei_simplePrint.odd b/P5/Exemplars/tei_simplePrint.odd
@@ -3481,7 +3481,7 @@ live without God in the world, and only mind earthly things.
             <classSpec type="atts" ident="att.pointing" mode="change">
               <attList>
                 <attDef ident="target" mode="change">
-                  <constraintSpec ident="validtarget" scheme="schematron">
+                  <constraintSpec ident="validtarget" scheme="schematron" xml:lang="en">
                     <constraint>
                       <sch:rule context="tei:*[@target]">
 			<!-- If & when we are confident the processor
@@ -3501,7 +3501,7 @@ live without God in the world, and only mind earthly things.
               </attList>
             </classSpec>
             <classSpec type="atts" ident="att.global.rendition" mode="change">
-              <constraintSpec ident="renditionpointer" scheme="schematron">
+              <constraintSpec ident="renditionpointer" scheme="schematron" xml:lang="en">
                 <constraint>
                   <sch:rule context="tei:*[@rendition]">
                     <sch:let name="results"
@@ -3516,7 +3516,7 @@ live without God in the world, and only mind earthly things.
                   </sch:rule>
                 </constraint>
               </constraintSpec>
-              <constraintSpec ident="corresppointer" scheme="schematron">
+              <constraintSpec ident="corresppointer" scheme="schematron" xml:lang="en">
                 <constraint>
                   <sch:rule context="tei:*[@corresp]">
                     <sch:let name="results"
@@ -4000,7 +4000,7 @@ live without God in the world, and only mind earthly things.
             </elementSpec>
 
             <elementSpec ident="bibl" mode="change">
-              <constraintSpec mode="add" ident="noEmptyBibl" scheme="schematron">
+              <constraintSpec mode="add" ident="noEmptyBibl" scheme="schematron" xml:lang="en">
                 <constraint>
 		   <sch:rule context="tei:bibl">		   		  
                      <sch:assert test="child::* or child::text()[normalize-space()]" role="ERROR">
@@ -4118,7 +4118,7 @@ live without God in the world, and only mind earthly things.
               </model>
             </elementSpec>
             <elementSpec ident="choice" mode="change">
-              <constraintSpec ident="choiceContent" scheme="schematron" mode="add">
+              <constraintSpec ident="choiceContent" scheme="schematron" mode="add" xml:lang="en">
                 <constraint>
 		  <sch:rule context="tei:choice">
 		    <sch:assert test="( tei:corr and tei:sic )
@@ -5092,7 +5092,7 @@ live without God in the world, and only mind earthly things.
 
             </elementSpec>
             <elementSpec ident="text" mode="change">
-              <constraintSpec ident="headeronlyelement" scheme="schematron">
+              <constraintSpec ident="headeronlyelement" scheme="schematron" xml:lang="en">
                 <constraint>
                   <!-- <sch:rule
                     context="tei:att | tei:biblFull | tei:biblStruct | tei:change | tei:charDecl | tei:charProp | tei:editor

diff --git a/P5/Exemplars/tei_tite.odd b/P5/Exemplars/tei_tite.odd
@@ -923,9 +923,15 @@ some say, "No."
      <!-- delete assorted attributes -->
 
      <elementSpec ident="date" mode="change" module="core">
-      <attList>
-       <attDef ident="calendar" mode="delete"/>
-      </attList>
+      <classes mode="change">
+        <memberOf key="att.global"/>
+        <!-- <memberOf key="att.calendarSystem"/> -->
+        <memberOf key="att.datable"/>
+        <memberOf key="att.editLike"/>
+        <memberOf key="att.typed"/>
+        <memberOf key="model.dateLike"/>
+        <memberOf key="model.publicationStmtPart.detail"/>
+      </classes>
      </elementSpec>
 
      <elementSpec ident="time" mode="change" module="core">

diff --git a/P5/Source/Guidelines/en/AB-About.xml b/P5/Source/Guidelines/en/AB-About.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
-
-
 <?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
-
 <div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="AB" n="1">
 <head>About These Guidelines</head>
 
@@ -306,7 +303,7 @@ provided within the documentation using the <gi>gloss</gi> element
 
 <p>All named objects other than elements and attributes have one of
 the following prefixes, which indicate whether the object is a module,
-an attribute class, a model class, a datatype, or a macro: <table>
+an attribute class, a model class, a datatype, or a macro: <table xml:id="ABSTRUNC-table-vo">
 <row role="label">
 <cell>Component</cell>
 <cell>Name</cell>
@@ -834,4 +831,4 @@ compatible features, or of correcting errors in existing features.</p>
   information on how to find specific versions of TEI releases (Guidelines,
   schemas etc.). Notice of errors detected and enhancements requested may 
   be submitted at <ptr target="https://github.com/TEIC/TEI/issues"/>.</p>
-</div></div>
+</div></div>