slurp up lastest from dev

TEIC · Oct 23, 2023 · 1cd975a · 1cd975a
2 parents 3aa76d4 + 78ea823
commit 1cd975a
Show file tree

Hide file tree

Showing 187 changed files with 3,360 additions and 1,547 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/AB-About.xml b/P5/Source/Guidelines/en/AB-About.xml
@@ -821,7 +821,7 @@ Guidelines, to the possible problems which revision might pose for those
 who are already using this version of these Guidelines.  
 </p>
 <p>With TEI P5, a version numbering system is introduced following 
-  <ref target="http://unicode.org/versions/">the pattern specified by 
+  <ref target="https://unicode.org/versions/">the pattern specified by 
     the Unicode Consortium</ref>: the first digit identifies a major 
   version number, the second digit a minor version number, and the 
   third digit a sub-minor version number. The TEI undertakes that no 

diff --git a/P5/Source/Guidelines/en/BIB-Bibliography.xml b/P5/Source/Guidelines/en/BIB-Bibliography.xml
@@ -75,6 +75,11 @@ $Id$
       <bibl xml:id="biblzh-tw_n25" xml:lang="zh-TW">白先勇，〈金大班的最後一夜〉，《台北人》。</bibl>
       <bibl xml:id="biblzh-tw_n26" xml:lang="zh-TW">白先勇，《孽子》。</bibl>
       <bibl xml:id="biblzh-tw_n59" xml:lang="zh-TW">白居易，《憶江南》。</bibl>
+      <bibl xml:id="OTrim1.1">
+        <title>Amheida I: Ostraka from Trimithis Volume 1: Texts from the 2004–2007 Seasons</title>,
+        <editor>Bagnall, R. S. and G. R. Ruffini, with contributions by R. Cribiore and G. Vittmann</editor>
+        (<date>2012</date>).
+      </bibl>
       <bibl xml:id="NZETC01">
         <author>Baker, James K.</author>. <title>Night in Tarras</title>. In <title level="j"
           >Hilltop: A Literary Paper</title>, vol 1 no 2. Wellington: Victoria University College
@@ -6154,7 +6159,7 @@ $Id$
               <surname>Hawke</surname>
             </editor>
             <title level="m">The 'tag' URI Scheme</title>
-            <ptr target="http://www.ietf.org/rfc/rfc4151.txt"/>
+            <ptr target="https://www.ietf.org/rfc/rfc4151.txt"/>
             <idno>RFC 4151</idno>
             <imprint>
               <date>2005</date>

diff --git a/P5/Source/Guidelines/en/CH-LanguagesCharacterSets.xml b/P5/Source/Guidelines/en/CH-LanguagesCharacterSets.xml
@@ -97,7 +97,7 @@ sublanguage), a script, and a region for the language, each possibly
 followed by a variant subtag.</p>
 <p>The authoritative list of registered subtags is maintained by IANA
 and is available at <ptr
-target="http://www.iana.org/assignments/language-subtag-registry"/>.
+target="https://www.iana.org/assignments/language-subtag-registry"/>.
 For a good general overview of the construction of language tags, see
 <ptr
 target="https://www.w3.org/International/articles/language-tags/"/>,

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,6 +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"/>
           <xi:include href="../../Specs/att.duration.iso.xml"/>
           <xi:include href="../../Specs/teidata.temporal.iso.xml"/>
           <xi:include href="../../Specs/teidata.duration.iso.xml"/>
@@ -2935,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>