Merge in the enormous progress made in dev branch into this one, whic…

…h required manually merging 4 files (P5/Test/detest.xml, P5/Test/expected-results/detest_odd_schematron.log, P5/Test/expected-results/detest_xml_relaxng.log, and P5/Test/expected-results/detest_xml_schematron.log) and updating the Makefile
TEIC · Nov 27, 2023 · d2f20d1 · d2f20d1
2 parents 98154c4 + 15e10e0
commit d2f20d1
Show file tree

Hide file tree

Showing 279 changed files with 5,869 additions and 4,038 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,13 +34,4 @@ jobs:
       - name: Run tests from the Test directory
         run: |
           cd P5
-          make clean validate test XSL=${GITHUB_WORKSPACE}/Stylesheets
-      
-      - name: Slack Notification
-        if: always()
-        continue-on-error: true
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_COLOR: ${{ job.status }}
-          MSG_MINIMAL: commit,actions url
+          make clean validate test XSL=${GITHUB_WORKSPACE}/Stylesheets
diff --git a/.travis.yml b/.travis.yml
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">
@@ -3096,6 +3122,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/Makefile b/P5/Makefile
@@ -257,7 +257,7 @@ readus:
 	cp VERSION release/tei-p5-doc/share/doc/tei-p5-doc
 	@echo BUILD: Make web pages for release notes
 	for i in ReleaseNotes/readme*xml; do \
-	echo ${ANT} -f ${XSL}/html/build-to.xml -lib Utilities/lib/${SAXONJAR} -Dprofiledir=${XSL}/profiles -Dprofile=readme \
+	${ANT} -f ${XSL}/html/build-to.xml -lib Utilities/lib/${SAXONJAR} -Dprofiledir=${XSL}/profiles -Dprofile=readme \
 	-DinputFile=`pwd`/$$i -DoutputFile=`pwd`/release/tei-p5-doc/share/doc/tei-p5-doc/`basename $$i .xml`.html; \
 	done
 

diff --git a/P5/ReleaseNotes/readme-0.4.1.xml b/P5/ReleaseNotes/readme-0.4.1.xml
@@ -31,8 +31,7 @@
 	<list>
 	  <item>Revision of the TEI class system continues, with the definition
 	    of several new classes following on from a systematic review of all
-	    content models by the Council (see <ptr
-	      target="http://www.tei-c.org/Council/tcw07.xml"/>).</item>
+	    content models by the Council (see <ptr target="http://www.tei-c.org/Council/tcw07.xml"/>).</item>
 
 	  <item>
 	    Detailed proposals for the encoding of personal data (for example in

diff --git a/P5/ReleaseNotes/readme-0.6.xml b/P5/ReleaseNotes/readme-0.6.xml
@@ -28,9 +28,7 @@
     <body>
 
       <p>Changes since the last packaged release (0.5, October 2006)
-      are listed briefly below (please refer to the file <name
-      type="file">ChangeLog</name> in directory <name
-      type="dir">ReleaseNotes</name> at the Sourceforge archive for a
+      are listed briefly below (please refer to the file <name type="file">ChangeLog</name> in directory <name type="dir">ReleaseNotes</name> at the Sourceforge archive for a
       full list).</p>
 
       <p>This (somewhat delayed) release contains a large number of

diff --git a/P5/ReleaseNotes/readme-1.1.xml b/P5/ReleaseNotes/readme-1.1.xml
@@ -19,17 +19,15 @@
       </sourceDesc>
     </fileDesc>
     <revisionDesc>
-      <change who="http://users.ox.ac.uk/~lou"
-	      when="2007-07-28">created retrospectively from svn ChangeLog</change>
+      <change who="http://users.ox.ac.uk/~lou" when="2007-07-28">created retrospectively from svn ChangeLog</change>
     </revisionDesc>
   </teiHeader>
   <text>
     <body>
 
       <p>This is a maintenance release, implementing several changes
             agreed following the review of outstanding feature requests
-	    undertaken at the Council meeting in Galway in April (see <ref
-	    target="http://www.tei-c.org/Council/Working/tcw12.xml">Working
+	    undertaken at the Council meeting in Galway in April (see <ref target="http://www.tei-c.org/Council/Working/tcw12.xml">Working
 	    Paper TCW12</ref> for a complete list)</p>
 
 <p>In addition to these specific responses to feature requests, a

diff --git a/P5/ReleaseNotes/readme-1.2.xml b/P5/ReleaseNotes/readme-1.2.xml
@@ -19,8 +19,7 @@
       </sourceDesc>
     </fileDesc>
     <revisionDesc>
-      <change who="http://users.ox.ac.uk/~lou"
-	      when="2007-10-28">created retrospectively from svn ChangeLog</change>
+      <change who="http://users.ox.ac.uk/~lou" when="2007-10-28">created retrospectively from svn ChangeLog</change>
     </revisionDesc>
   </teiHeader>
   <text>
@@ -49,14 +48,14 @@ them to declare @type locally (1848442 1970880 2100015)</item>
 <item>Clarified and exemplified use of <att>period</att> attribute
 (1927987)</item>
 <item>Changed <gi>egXML</gi> so that its content references a
-new macro <ident>anyXML</ident>; this has the side effect that DTD
-language cannot be used (2021933). </item>
-<item>Introduced new class <ident>att.canonical</ident> to support all kinds of
+new macro <name type="macro">anyXML</name>; this has the side effect that DTD
+language cannot be used (2021933).</item>
+<item>Introduced new class <name type="class">att.canonical</name> to support all kinds of
 canonical name referencing (1852101 1977702)</item>
 <item>Changed content model for <gi>monogr</gi> to permit <gi>idno</gi>
 (1930148)</item>
 <item>Made consistent usage of @extent as alternative to other more
-precise attributes inherited from <ident>att.dimensions</ident> (1925125)</item>
+precise attributes inherited from <name type="class">att.dimensions</name> (1925125)</item>
 <item>Merged in French translations for <gi>remarks</gi> components of
 all element specifications, completed Chinese translations of
 descriptions, and added Korean translations</item>

diff --git a/P5/ReleaseNotes/readme-1.3.xml b/P5/ReleaseNotes/readme-1.3.xml
@@ -18,8 +18,7 @@
       </sourceDesc>
     </fileDesc>
     <revisionDesc>
-      <change who="http://users.ox.ac.uk/~lou"
-	      when="2009-02-01"/>
+      <change who="http://users.ox.ac.uk/~lou" when="2009-02-01"/>
     </revisionDesc>
   </teiHeader>
   <text>

diff --git a/P5/ReleaseNotes/readme-1.4.xml b/P5/ReleaseNotes/readme-1.4.xml
@@ -18,8 +18,7 @@
       </sourceDesc>
     </fileDesc>
     <revisionDesc>
-      <change who="http://users.ox.ac.uk/~lou"
-	      when="2009-06-20"/>
+      <change who="http://users.ox.ac.uk/~lou" when="2009-06-20"/>
     </revisionDesc>
   </teiHeader>
   <text>

diff --git a/P5/ReleaseNotes/readme-1.5.xml b/P5/ReleaseNotes/readme-1.5.xml
@@ -85,6 +85,3 @@ class so that it can appear at either end of a <gi>div</gi>
     </body>
   </text>
 </TEI>
-
-
-
diff --git a/P5/ReleaseNotes/readme-1.6.xml b/P5/ReleaseNotes/readme-1.6.xml
@@ -101,6 +101,3 @@ model.respLike (2881416) </item>
     </body>
   </text>
 </TEI>
-
-
-
diff --git a/P5/ReleaseNotes/readme-1.7.xml b/P5/ReleaseNotes/readme-1.7.xml
@@ -86,6 +86,3 @@ elements which can appear within choice (2834505)</item>
 </p>    </body>
   </text>
 </TEI>
-
-
-
diff --git a/P5/ReleaseNotes/readme-1.9.xml b/P5/ReleaseNotes/readme-1.9.xml
@@ -43,11 +43,11 @@
 	in the process had allowed some invalid ones through).</item>
 
 	<item>All elements have been changed to make them explicit members of 
-	the <ident>att.global</ident> attribute class, rather than having this
+	the <name type="class">att.global</name> attribute class, rather than having this
 	done by special-case processing during the build
 	procedure. This means that any ODD which defines elements in
 	the TEI namespace will have to explicitly add
-	<ident>att.global</ident> to them.</item>
+	<name type="class">att.global</name> to them.</item>
 
 	<item>The Guidelines are now available in ePub and Kindle formats.</item>
       </list>
@@ -64,29 +64,25 @@
 	<row>
 	  <cell>2011-02</cell>
 	  <cell>Add @valid to egXML</cell>
-	  <cell><ptr
-	  target="https://sourceforge.net/tracker/?func=detail&amp;aid=3156049&amp;group_id=106328&amp;atid=644065"/>
+	  <cell><ptr target="https://sourceforge.net/tracker/?func=detail&amp;aid=3156049&amp;group_id=106328&amp;atid=644065"/>
 	  </cell>
 	</row>
 	<row>
 	  <cell>2011-02</cell>
 	  <cell>Make all elements explicit members of
 	  att.global</cell>
-	  <cell><ptr
-	  target="https://sourceforge.net/tracker/?func=detail&amp;aid=2994685&amp;group_id=106328&amp;atid=644065"/>
+	  <cell><ptr target="https://sourceforge.net/tracker/?func=detail&amp;aid=2994685&amp;group_id=106328&amp;atid=644065"/>
 	  </cell>
 	</row>
 	<row>
 	  <cell>2011-02</cell>
 	  <cell>make <gi>collection</gi> typeable</cell>
-	  <cell><ptr
-	  target="https://sourceforge.net/tracker/?func=detail&amp;atid=644065&amp;aid=3114917&amp;group_id=106328"/></cell>
+	  <cell><ptr target="https://sourceforge.net/tracker/?func=detail&amp;atid=644065&amp;aid=3114917&amp;group_id=106328"/></cell>
 	</row>
 	<row>
 	  <cell>2011-02</cell>
 	  <cell>allow <gi>date</gi> as child of <gi>analytic</gi></cell>
-	  <cell><ptr
-	  target="http://sourceforge.net/tracker/?func=detail&amp;aid=3168838&amp;group_id=106328&amp;atid=644065"/></cell>
+	  <cell><ptr target="http://sourceforge.net/tracker/?func=detail&amp;aid=3168838&amp;group_id=106328&amp;atid=644065"/></cell>
 	</row>
 	</table>
     </body>

diff --git a/P5/ReleaseNotes/readme-2.0.1.xml b/P5/ReleaseNotes/readme-2.0.1.xml
@@ -39,8 +39,7 @@ for this release:
       <list type="ordered">
 	<item>Several new elements have been introduced to facilitate
 	a more "document-focussed" (as opposed to "text-focussed") way
-	of working, following extensive work within the <ref
-	target="http://wiki.tei-c.org/index.php/Genetic_Editions">TEI
+	of working, following extensive work within the <ref target="http://wiki.tei-c.org/index.php/Genetic_Editions">TEI
 	Special Interest Group on Genetic Editing</ref> and
 	elsewhere. A new <gi>sourceDoc</gi> element can now be used to
 	organize digital images of a source document in much the same
@@ -60,12 +59,11 @@ for this release:
 (moving to a dual license model of CC-BY and BSD2 for most TEI
 outputs), and made more evident; the source code tree was
 tidied up, with all unused items being moved out; some old annoyances
-— notably the meaningless distinction between "mwa" and "opt" as
-properties of attributes — were
+&#x2014; notably the meaningless distinction between "mwa" and "opt" as
+properties of attributes &#x2014; were
 removed </item>
 
-<item>Following extensive work by the <ref
-target="wiki.tei-c.org/index.php/SIG:Music">Special Interest Group in
+<item>Following extensive work by the <ref target="https://wiki.tei-c.org/index.php/SIG:Music">Special Interest Group in
 Music</ref>, a new <gi>notatedMusic</gi> element was added to support
 representation of musical notation within texts in a way compatible
 with the existing Music Encoding Initiative and MusicXML standards. </item>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,6 +85,3 @@ class so that it can appear at either end of a <gi>div</gi>
		</body>
		</text>
		</TEI>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -101,6 +101,3 @@ model.respLike (2881416) </item>
		</body>
		</text>
		</TEI>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -86,6 +86,3 @@ elements which can appear within choice (2834505)</item>
		</p> </body>
		</text>
		</TEI>