Merge branch 'TEIC:dev' into lingsig-tests

LingSIG · Oct 26, 2023 · bc14f79 · bc14f79
2 parents d7e3ff6 + 78ea823
commit bc14f79
Show file tree

Hide file tree

Showing 158 changed files with 2,796 additions and 1,031 deletions.
diff --git a/P5/Exemplars/tei_jtei.odd b/P5/Exemplars/tei_jtei.odd
@@ -1948,12 +1948,14 @@
             <attList>
               <attDef ident="notAfter" mode="delete"/>
               <attDef ident="role" mode="delete"/>
+              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <affliation> -->
             </attList>
           </elementSpec>
           <elementSpec ident="application" mode="change">
             <attList>
               <attDef ident="type" mode="delete"/>
               <attDef ident="notAfter" mode="delete"/>
+              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <application> -->
             </attList>
           </elementSpec>
           <elementSpec ident="att" module="tagdocs" mode="change">
@@ -1971,6 +1973,7 @@
             </attList>
           </elementSpec>
           <classSpec ident="att.breaking" module="tei" type="atts" mode="delete"/>
+          <classSpec ident="att.calendarSystem" module="tei" type="atts" mode="delete"/>
           <classSpec ident="att.cReferencing" module="tei" type="atts" mode="delete"/>
           <classSpec ident="att.canonical" module="tei" type="atts" mode="delete"/>
           <classSpec ident="att.citing" module="tei" type="atts" mode="change">
@@ -1993,9 +1996,28 @@
               <attDef ident="group" 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. Note that elements that have @calendar deleted
+	      elsewhere in this ODD have been commented out here, and
+	      those @calendars need to be removed wherever they are
+	      declared in this ODD, too.  —Syd, 2023-10-16
+	  -->
+	  <!-- elementSpec ident="affiliation" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
+	  <!-- elementSpec ident="application" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
+	  <!-- 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="editor" 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="orgName" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
+	  <elementSpec ident="resp" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
+	  <!-- end @calendar removal block -->
           <classSpec ident="att.datable" module="tei" type="atts" mode="change">
             <attList>
-              <attDef ident="calendar" mode="delete"/>
               <attDef ident="period" mode="delete"/>
             </attList>
           </classSpec>
@@ -2143,6 +2165,7 @@
             </constraintSpec>
             <attList>
               <attDef ident="role" mode="delete"/>
+              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <author> -->
             </attList>
           </elementSpec>
           <elementSpec ident="availability" mode="change">
@@ -2374,6 +2397,7 @@
                   <valItem ident="technical"/>
                 </valList>
               </attDef>
+              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <editor> -->
             </attList>
           </elementSpec>
           <elementSpec ident="emph" module="core" mode="change">
@@ -2550,6 +2574,7 @@
               <attDef ident="role" mode="delete"/>
               <attDef ident="notAfter" mode="delete"/>
               <attDef ident="type" mode="delete"/>
+              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <name> -->
             </attList>
           </elementSpec>
           <elementSpec ident="note" mode="change">
@@ -2697,6 +2722,7 @@
               <attDef ident="notAfter" mode="delete"/>
               <attDef ident="role" mode="delete"/>
               <attDef ident="type" mode="delete"/>
+              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <orgName> -->
             </attList>
           </elementSpec>
           <elementSpec ident="pubPlace" mode="change">
@@ -3098,6 +3124,9 @@
                 </sch:rule>
               </constraint>
             </constraintSpec>
+	    <attList> <!-- remove 2024-11-11 when @calender removed from <idno> -->
+              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <idno> -->
+	    </attList> <!-- remove 2024-11-11 when @calender removed from <idno> -->
           </elementSpec>
           <elementSpec ident="graphic" module="core" mode="change">
             <constraintSpec ident="jtei.sch-graphic-dimensions" scheme="schematron">

diff --git a/P5/Exemplars/tei_lite.odd b/P5/Exemplars/tei_lite.odd
@@ -2929,6 +2929,8 @@ $Id$
               <attDef ident="rendition" mode="delete"/>
             </attList>
           </classSpec>
+
+          <classSpec ident="att.calendarSystem" module="tei" type="atts" mode="delete"/>
 
           <classSpec type="atts"
                      ident="att.global.linking"
@@ -2950,11 +2952,25 @@ $Id$
               <attDef ident="to" mode="delete"/>
             </attList>
           </classSpec>
-          <classSpec type="atts" ident="att.datable" module="tei" mode="change">
-            <attList>
-              <attDef ident="calendar" 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/Source/Guidelines/en/CO-CoreElements.xml b/P5/Source/Guidelines/en/CO-CoreElements.xml
@@ -2381,7 +2381,7 @@ of the <ident type="class">att.datable.w3c</ident> and <ident type="class">att.d
 <att>when</att> and <att>calendar</att> attributes will be discussed here:
  <specList>
   <specDesc key="att.datable.w3c" atts="when"/>
-  <specDesc key="att.datable" atts="calendar"/>
+  <specDesc key="att.calendarSystem" atts="calendar"/>
 </specList>
 </p>
 <p>Dates can occur virtually anywhere in a text, but in some contexts

diff --git a/P5/Source/Guidelines/en/DI-PrintDictionaries.xml b/P5/Source/Guidelines/en/DI-PrintDictionaries.xml
@@ -29,7 +29,7 @@ result, many general problems of text encoding are particularly
 pronounced here, and more compromises and alternatives within the
 encoding scheme may be required in the future.<note place="bottom">We
 refer the reader to previous and current discussions of a common
-format for encoding lexical resources. For example, <ptr type="cit" target="#DI-BIBL-1"/>; <ptr type="cit" target="#DI-BIBL-2"/>;<ptr type="cit" target="#DI-BIBL-3"/>; <ptr type="cit" target="#DI-BIBL-4"/>; <ptr type="cit" target="#DI-BIBL-5"/>; <ptr type="cit" target="#DI-BIBL-6"/>; <ptr type="cit" target="#DI-BIBL-7"/>; and <ptr type="cit" target="#DI-BIBL-8"/>; <ptr type="cit" target="#DI-BIBL-9"/>.</note> Two problems are particularly
+format for encoding lexical resources. For example, <ptr type="cit" target="#DI-BIBL-1"/>; <ptr type="cit" target="#DI-BIBL-2"/>; <ptr type="cit" target="#DI-BIBL-3"/>; <ptr type="cit" target="#DI-BIBL-4"/>; <ptr type="cit" target="#DI-BIBL-5"/>; <ptr type="cit" target="#DI-BIBL-6"/>; <ptr type="cit" target="#DI-BIBL-7"/>; and <ptr type="cit" target="#DI-BIBL-8"/>; <ptr type="cit" target="#DI-BIBL-9"/>.</note> Two problems are particularly
 prominent.</p>
 
 <p>First, because the structure of dictionary entries varies widely
@@ -1982,8 +1982,7 @@ derivatives or inflected forms of the entry word, or for compound words, phrases
 collocations, and idioms containing the entry word. </p>
 <p>Related entries can be complex, and may in fact include any of the information to be
 found in a regular entry. Therefore, the <gi>re</gi> element is defined to contain
-the same elements as an <gi>entry</gi> element, with the exception that it may not
-contain any nested <gi>re</gi> elements. </p>
+the same elements as an <gi>entry</gi> element. </p>
 <p>Examples:<q rend="display">
 <hi rend="bold">bevvy</hi>
   <code lang="ipa">(ˈbɛvɪ)</code> <emph>informal</emph> n, pl <hi rend="bold">-vies</hi> <hi rend="bold">1</hi> a drink, esp an

diff --git a/P5/Source/Guidelines/en/ND-NamesDates.xml b/P5/Source/Guidelines/en/ND-NamesDates.xml
@@ -2907,7 +2907,7 @@ Journal r&#xE9;dig&#xE9; par Camille Desmoulins</title>,
           <xi:include href="../../Specs/att.personal.xml"/>
           <xi:include href="../../Specs/model.placeLike.xml"/>
           <xi:include href="../../Specs/att.datable.iso.xml"/>
-          <!--<xi:include href="../../Specs/att.calendarSystem.xml"/>--><!-- Uncomment  this after @calendar is deprecated on att.datable -->
+          <xi:include href="../../Specs/att.calendarSystem.xml"/>
           <xi:include href="../../Specs/att.duration.iso.xml"/>
           <xi:include href="../../Specs/teidata.temporal.iso.xml"/>
           <xi:include href="../../Specs/teidata.duration.iso.xml"/>
@@ -2936,7 +2936,7 @@ Journal r&#xE9;dig&#xE9; par Camille Desmoulins</title>,
         </egXML>
 
         <p>The following attributes can now be used to encode dates using this calendar: <specList>
-            <specDesc key="att.datable" atts="calendar"/>
+            <specDesc key="att.calendarSystem" atts="calendar"/>
             <specDesc key="att.datable.custom"
               atts="when-custom notBefore-custom notAfter-custom from-custom to-custom datingMethod"/>
           </specList>

diff --git a/P5/Source/Guidelines/en/ST-Infrastructure.xml b/P5/Source/Guidelines/en/ST-Infrastructure.xml
@@ -1415,7 +1415,7 @@ entities in the XML DTD fragments.--></p>
         <desc xml:lang="zh-TW" versionDate="2018-07-09">所有TEI模組可用的元素集、資料類型、巨集指令之宣告</desc>
         <desc xml:lang="it" versionDate="2018-07-09">Dichiarazione di classi, tipi di dati (datatype)e macro disponibili in tutti i moduli TEI</desc>
         <desc xml:lang="pt" versionDate="2018-07-09">Declaraçoes de classes, tipos de dados, e macros disponíveis em todos os módulos TEI </desc>
-        <desc xml:lang="ja" versionDate="2018-07-09">全TEIモジュールで使用可能なデータ型，クラス，マクロ．</desc>
+        <desc xml:lang="ja" versionDate="2018-07-09">全TEIモジュールで使用可能なデータ型，クラス，マクロ。</desc>
       </moduleSpec>
     </p>
     <p>The order in which declarations are made within the infrastructure module is critical, since

diff --git a/P5/Source/Specs/acquisition.xml b/P5/Source/Specs/acquisition.xml
@@ -4,7 +4,7 @@ Dual-licensed under CC-by and BSD2 licences
 See the file COPYING.txt for details
 $Date$
 $Id$
---><?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"?><elementSpec xmlns="http://www.tei-c.org/ns/1.0" module="msdescription" xml:id="ACQUISITION" ident="acquisition">
+--><?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"?><elementSpec xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="msdescription" xml:id="ACQUISITION" ident="acquisition">
   <gloss xml:lang="en" versionDate="2007-06-12">acquisition</gloss>
   <gloss xml:lang="es" versionDate="2022-06-16">adquisición</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">acquisition</gloss>
@@ -26,6 +26,39 @@ institution.</desc>
   <content>
     <macroRef key="macro.specialPara"/>
   </content>
+  <attList>
+    <attDef ident="calendar" usage="opt" validUntil="2024-11-11">
+        <desc type="deprecationInfo" versionDate="2023-05-11" xml:lang="en">The <att>calendar</att> attribute will be removed from this element
+            as it will only be allowed on elements that represent dates with their content. This is because the <att>calendar</att> attribute
+            (unlike <att>datingMethod</att> defined in
+            <ident type="class">att.datable.custom</ident>) defines the calendar system of the date
+            in the original material defined by the parent element, <emph>not</emph> the calendar to
+            which the date is normalized.</desc>
+        <desc versionDate="2021-04-26" xml:lang="en">indicates one or more systems or calendars to which the
+            date represented by the content of this element belongs.</desc>
+        <desc versionDate="2007-12-20" xml:lang="ko">날짜 표현 시스템 또는 달력 표시 형식을 표시한다.</desc>
+        <desc versionDate="2007-05-02" xml:lang="zh-TW">指明該日期表示所使用的曆法計算系統。</desc>
+        <desc xml:lang="ja" versionDate="2019-02-03">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
+        <desc versionDate="2009-01-06" xml:lang="fr">indique le système ou le calendrier auquel
+            appartient la date exprimée dans le contenu de l'élément.</desc>
+        <desc versionDate="2007-05-04" xml:lang="es">indica el sistema o calendario en que se muestra
+            una fecha.</desc>
+        <desc versionDate="2007-01-21" xml:lang="it">indica il sistema o calendario al quale la data
+            appartiene.</desc>
+        <datatype minOccurs="1" maxOccurs="unbounded">
+            <dataRef key="teidata.pointer"/>
+        </datatype>
+        <constraintSpec scheme="schematron" ident="calendar-check-acquisition">
+            <constraint>
+                <sch:rule 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,
+                        but this <sch:name/> element has no textual content.</sch:assert>
+                </sch:rule>
+            </constraint>
+        </constraintSpec>
+    </attDef>
+  </attList>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND">
       <acquisition>Left to the <name type="place">Bodleian</name> by 

diff --git a/P5/Source/Specs/actor.xml b/P5/Source/Specs/actor.xml
@@ -13,8 +13,7 @@ $Id$
   <desc versionDate="2007-05-02" xml:lang="zh-TW">角色名單中的演員姓名。</desc>
   <desc versionDate="2008-04-06" xml:lang="es">Nombre de un actor que aparece dentro de la lista del reparto.</desc>
   <desc versionDate="2018-12-18" xml:lang="ja">登場人物リスト中の役者名を示す。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">Nom d'un acteur apparaissant dans une
-    distribution.</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">nom d'un acteur apparaissant dans une distribution.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">nome di un attore che appare nella lista dei personaggi.</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -90,4 +89,4 @@ $Id$
   <listRef>
     <ptr target="#DRCAST" type="div3"/>
   </listRef>
-</elementSpec>
+</elementSpec>