Merge in latest from dev (P5/Source/Specs/att.namespaceable.xml merge…

…d by hand)
TEIC · Sep 8, 2023 · e14d3e9 · e14d3e9
2 parents 9209630 + 99e6502
commit e14d3e9
Show file tree

Hide file tree

Showing 121 changed files with 1,673 additions and 8,877 deletions.
diff --git a/.github/workflows/generate-spec-lists.yml b/.github/workflows/generate-spec-lists.yml
@@ -10,9 +10,14 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v2
-      - uses: ./.github/actions/generate-spec-lists
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Checkout TEI Repository
+        uses: actions/checkout@v3
+
+      - name: Generate JSON Spec list        
+        uses: ./.github/actions/generate-spec-lists
+
+      - name: Auto-commit Spec list  
+        uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_user_name: ${{ github.actor }}
           commit_message: Re-generated spec lists.

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,6 +25,11 @@ jobs:
           repository: TEIC/Stylesheets
           ref: dev
           path: Stylesheets
+
+      # Update permissions in GITHUB_WORKSPACE (e.g. /__w/TEI/TEI)
+      # to resolve "dubious permissions" in git (see TEI/TEIC#2399)  
+      - name: Fix Git permissions
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Run tests from the Test directory
         run: |

diff --git a/Documents/pureODD/chainingTuto/driver.tei b/Documents/pureODD/chainingTuto/driver.tei
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<TEI xmlns="http://www.tei-c.org/ns/1.0"
-    xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="metadata.xml"/>
-  <xi:include href="transcription.xml"/>
-</TEI>
+<TEI xmlns="http://www.tei-c.org/ns/1.0"  xmlns:xi="http://www.w3.org/2001/XInclude">
+    <xi:include href="metadata.xml"/>
+    <xi:include href="transcription.xml"/>
+</TEI>
+ 
diff --git a/Documents/pureODD/chainingTuto/justMetadata.xml b/Documents/pureODD/chainingTuto/justMetadata.xml
@@ -16,24 +16,25 @@
       </fileDesc>
       <revisionDesc>
          <change when="2017-12-28">First draft</change>
-        </revisionDesc>
+      </revisionDesc>
    </teiHeader>
    <text>
-
       <body>
-
-<div type="schemaSpec">
-            <head>The metadata ODD specification</head>
-   <p>This schema specification supplies the metadata elements we will need in our project
-              .</p>
-     <schemaSpec ident="justMetadata" start="teiHeader" source="motherODD.compiled">
-        <moduleRef key="tei"/>
-        <moduleRef key="header" include="teiHeader fileDesc titleStmt publicationStmt sourceDesc profileDesc"/>
-        <moduleRef key="namesdates" include="listPerson listPlace person place persName placeName"/>
-        <moduleRef key="corpus" include="particDesc settingDesc"/>      
-        <elementRef key="title"/>
-        <elementRef key="p"/>
-   </schemaSpec>
+         <div type="schemaSpec">
+            <head>Métadonnées du projet</head>
+            <p>Cette specification fournit les elements de métadata utilisés par notre projet</p>
+
+            <schemaSpec ident="justMetadata" start="teiHeader" source="motherODD_compiled.xml">
+               <moduleRef key="tei"/>
+               <moduleRef key="header"
+                  include="teiHeader fileDesc titleStmt publicationStmt 
+                  sourceDesc profileDesc xenoData"/>
+               <moduleRef key="namesdates"
+                  include="listPerson listPlace person place persName placeName"/>
+               <moduleRef key="corpus" include="particDesc settingDesc"/>
+               <elementRef key="title"/>
+               <elementRef key="p"/>
+            </schemaSpec>
          </div>
       </body>
    </text>

diff --git a/Documents/pureODD/chainingTuto/metadata.xml b/Documents/pureODD/chainingTuto/metadata.xml
@@ -10,7 +10,11 @@
         <sourceDesc>
             <p>Part of TEI Chaining tutorial</p>
         </sourceDesc>
+     <xenoData xmlns:dc="http://dublincore.org/documents/dcmi-namespace/">
+      <dc:author>Jules Verne</dc:author>
+     </xenoData> 
     </fileDesc>
+    <xenoData xmlns:dc="dublineCore"><dc:wibble/></xenoData>
     <profileDesc>
         <particDesc>
             <listPerson>
@@ -28,4 +32,5 @@
             </listPlace>
         </settingDesc>
     </profileDesc>
+
 </teiHeader>
diff --git a/Documents/pureODD/chainingTuto/motherODD.compiled b/Documents/pureODD/chainingTuto/motherODD.compiled
diff --git a/Documents/pureODD/chainingTuto/motherODD.xml b/Documents/pureODD/chainingTuto/motherODD.xml
@@ -15,6 +15,7 @@
          </sourceDesc>
       </fileDesc>
       <revisionDesc>
+         <change when="2021-09-01">Second draft: add teiCorpus, xenoData Tours</change>
          <change when="2017-12-28">First draft</change>
         </revisionDesc>
    </teiHeader>
@@ -24,11 +25,10 @@
 
 <div type="schemaSpec">
             <head>The Mother ODD specification</head>
-            <p>This schema specification supplies all the elements we will need in our project,
-               both for transcription and for metadata.</p>
-     <schemaSpec ident="mother" start="TEI">
+            <p>Cette  spécification fournit tous les éléments nécessaires à un projet de transcription, et pour transcrire les documents, et pour les décrire.</p>
+     <schemaSpec ident="mother" start="TEI teiCorpus" docLang="fr">
         <moduleRef key="tei"/>
-        <moduleRef key="header" include="teiHeader fileDesc titleStmt publicationStmt sourceDesc profileDesc"/>
+        <moduleRef key="header" include="teiCorpus teiHeader fileDesc titleStmt publicationStmt sourceDesc profileDesc xenoData"/>
         <moduleRef key="core" include="pb p hi name title"/>
         <moduleRef key="textstructure" include="TEI body div text name"/>
         <moduleRef key="namesdates" include="listPerson listPlace person place persName placeName"/>

diff --git a/Documents/pureODD/howtoGenerate-fr.xml b/Documents/pureODD/howtoGenerate-fr.xml
@@ -376,90 +376,6 @@
                particulièrement utiles dans le processus de définition d’un schéma utile pour un
                ensemble de documents TEI. </p>
          </div>
-         <div>
-            <head>Paramètres configurables pour la feuille de style oddbyexample</head>
-            <p>Ceux-ci ne fonctionnent pas toujours... voir <ptr
-                  target="https://github.com/TEIC/Stylesheets/issues/212"/></p>
-            <table>
-               <row role="label">
-                  <cell>Paramètre</cell>
-                  <cell>Fonction</cell>
-                  <cell>Valeur par défaut</cell>
-               </row>
-               <row>
-                  <cell>corpus</cell>
-                  <cell>chemin vers le répetoire contenant les fichiers d’entrée</cell>
-                  <cell>./</cell>
-               </row>
-               <row>
-                  <cell>schema</cell>
-                  <cell>nom du schéma à générer</cell>
-                  <cell>oddbyexample</cell>
-               </row>
-               <row>
-                  <cell>corpusList</cell>
-                  <cell>traiter seulement ces fichiers d’entrées</cell>
-                  <cell>(no constraint)</cell>
-               </row>
-               <row>
-                  <cell>prefix</cell>
-                  <cell>traiter seulement les fichiers dont le nom débute par</cell>
-                  <cell>(no constraint)</cell>
-               </row>
-               <row>
-                  <cell>suffix</cell>
-                  <cell>traiter seulement les fichiers avec l’extension</cell>
-                  <cell>xml</cell>
-               </row>
-               <row>
-                  <cell>defaultSource</cell>
-                  <cell>chemin pour faire référence à aux déclarations TEI</cell>
-                  <cell>http://www.tei-c.org/Vault/P5/current/xml/tei/odd/p5subset.xml</cell>
-               </row>
-               <row>
-                  <cell>keepGlobals</cell>
-                  <cell>énumérer tous les attributs globaux</cell>
-                  <cell>false</cell>
-               </row>
-               <row>
-                  <cell>attributeList</cell>
-                  <cell>attributs spécifiques dont les valeurs doivent être énumérées</cell>
-                  <cell>(none)</cell>
-               </row>
-               <row>
-                  <cell>enumerateRend</cell>
-                  <cell>énumérer les valeurs utilisées pour le <att>rend</att></cell>
-                  <cell>false</cell>
-               </row>
-               <row>
-                  <cell>enumerateType</cell>
-                  <cell>énumérer les valeurs utilisées pour <att>type</att></cell>
-                  <cell>false</cell>
-               </row>
-               <row>
-                  <cell>includeHeader</cell>
-                  <cell>énumérer les attributs des éléments dans les headers TEI</cell>
-                  <cell>true</cell>
-               </row>
-               <row>
-                  <cell>processNonTEI</cell>
-                  <cell>énumérer les éléments non-TEI</cell>
-                  <cell>false</cell>
-               </row>
-               <!--     <row><cell>method</cell><cell>should generated moduleRefs use @include or @except</cell><cell>include</cell></row>
-     -->
-               <row>
-                  <cell>debug</cell>
-                  <cell>indiquer les informations de bugs</cell>
-                  <cell>false</cell>
-               </row>
-               <row>
-                  <cell>verbose</cell>
-                  <cell>produire des messages en mode verbose</cell>
-                  <cell>false</cell>
-               </row>
-            </table>
-         </div>
-      </body>
+    </body>
    </text>
 </TEI>
diff --git a/P5/Exemplars/tei_its.odd b/P5/Exemplars/tei_its.odd
@@ -69,12 +69,14 @@
       <moduleRef key="textstructure"/>
       <moduleRef url="https://www.tei-c.org/release/xml/tei/Exemplars/its.rng">
       	<content>
-	  <rng:define name="tei_model.teiHeaderPart" combine="choice">
-	    <rng:ref name="its_rules"/>
-	  </rng:define>
-	  <rng:define name="tei_model.inter" combine="choice">
-	    <rng:ref name="its_span"/>
-	  </rng:define>
+	  <rng:div>
+	    <rng:define name="tei_model.teiHeaderPart" combine="choice">
+	      <rng:ref name="its_rules"/>
+	    </rng:define>
+	    <rng:define name="tei_model.inter" combine="choice">
+	      <rng:ref name="its_span"/>
+	    </rng:define>
+	  </rng:div>
 	</content>
       </moduleRef>
       <classSpec ident="att.global" type="atts" mode="change">

diff --git a/P5/Makefile b/P5/Makefile
@@ -78,10 +78,7 @@ html-web.stamp:  check.stamp p5.xml  Utilities/guidelines.xsl.model
 	@# remove vestiges of previous run
 	rm -rf Guidelines-web
 	@# generate XSL stylesheet by modifying paths in our model stylesheet
-	perl -p -e \
-		"s+http://www.tei-c.org/release/xml/tei/stylesheet+${XSL}+; \
-		 s+/usr/share/xml/tei/stylesheet+${XSL}+;" \
-		Utilities/guidelines.xsl.model > Utilities/guidelines.xsl
+	java -jar Utilities/lib/${SAXONJAR} -s:Utilities/guidelines.xsl.model -xsl:Utilities/guidelines_model_2_executable.xslt -o:Utilities/guidelines.xsl XSL="${XSL}"
 	@# for each language, create a subdirectory and pre-populate it with CSS, source, and web navigation stuff
 	for i in $(ALLLANGUAGES) ;do \
 		mkdir -p Guidelines-web/$$i/html; \
@@ -142,10 +139,7 @@ fonttest:
 pdf-init: check.stamp p5.xml Utilities/guidelines-latex.xsl
 	@echo check if XeLaTeX exist
 	@command -v xelatex || exit 1
-	perl -p -e \
-		"s+http://www.tei-c.org/release/xml/tei/stylesheet+${XSL}+; \
-		 s+/usr/share/xml/tei/stylesheet+${XSL}+;" \
-		Utilities/guidelines-latex.xsl > Utilities/guidelines.xsl
+	java -jar Utilities/lib/${SAXONJAR} -s:Utilities/guidelines-latex.xsl -xsl:Utilities/guidelines_model_2_executable.xslt -o:Utilities/guidelines.xsl XSL="${XSL}"
 	@echo BUILD: build Lite version of Guidelines, then LaTeX version of Guidelines from Lite, then run to PDF using XeLaTeX
 	@echo Make sure you have Junicode and Noto CJK fonts installed
 	${ANT} -lib Utilities/lib/${SAXONJAR} -f antbuilder.xml -DXSL=${XSL} -DXELATEX=${XELATEX} pdfonce

diff --git a/P5/ReleaseNotes/readme-0.3.1.xml b/P5/ReleaseNotes/readme-0.3.1.xml
@@ -12,7 +12,7 @@
        </editionStmt>
        <publicationStmt>
             <authority>The Text Encoding Initiative</authority>
-	 <p>TEI Web</p>      
+	 <distributor>TEI Web</distributor>      
        </publicationStmt>
        <sourceDesc>
 	 <p>No source</p>

diff --git a/P5/ReleaseNotes/readme-0.6.xml b/P5/ReleaseNotes/readme-0.6.xml
@@ -8,7 +8,7 @@
       </titleStmt>
       <editionStmt>
 	<edition>
-	  <date value="2007-03-12">12 March 2007</date>
+	  <date when="2007-03-12">12 March 2007</date>
 	</edition>
       </editionStmt>
       <publicationStmt>
@@ -19,9 +19,9 @@
       </sourceDesc>
     </fileDesc>
     <revisionDesc>
-      <change who="#sbauman.emt" date="2007-03-12">Added a few items;
+      <change who="#sbauman.emt" when="2007-03-12">Added a few items;
       inserted some phrase-level encoding</change>
-      <change who="#lburnard.ond" date="2007-03-12">created</change>
+      <change who="#lburnard.ond" when="2007-03-12">created</change>
     </revisionDesc>
   </teiHeader>
   <text>

diff --git a/P5/ReleaseNotes/readme-1.0.1.xml b/P5/ReleaseNotes/readme-1.0.1.xml
@@ -7,7 +7,7 @@
       </titleStmt>
       <editionStmt>
 	<edition>
-	  <date value="2008-02-03">3 February 2008</date>
+	  <date when="2008-02-03">3 February 2008</date>
 	</edition>
       </editionStmt>
       <publicationStmt>

diff --git a/P5/ReleaseNotes/readme-1.0.xml b/P5/ReleaseNotes/readme-1.0.xml
@@ -7,7 +7,7 @@
       </titleStmt>
       <editionStmt>
 	<edition>
-	  <date value="2007-11-02">2 November 2007</date>
+	  <date when="2007-11-02">2 November 2007</date>
 	</edition>
       </editionStmt>
       <publicationStmt>

diff --git a/P5/ReleaseNotes/readme-1.1.xml b/P5/ReleaseNotes/readme-1.1.xml
@@ -8,7 +8,7 @@
       </titleStmt>
       <editionStmt>
 	<edition>
-	  <date value="2008-07-">7 July 2008</date>
+	  <date when="2008-07-07">7 July 2008</date>
 	</edition>
       </editionStmt>
       <publicationStmt>
@@ -20,7 +20,7 @@
     </fileDesc>
     <revisionDesc>
       <change who="http://users.ox.ac.uk/~lou"
-	      date="2007-07-28">created retrospectively from svn ChangeLog</change>
+	      when="2007-07-28">created retrospectively from svn ChangeLog</change>
     </revisionDesc>
   </teiHeader>
   <text>

diff --git a/P5/ReleaseNotes/readme-1.9.xml b/P5/ReleaseNotes/readme-1.9.xml
@@ -53,7 +53,7 @@
       </list>
       </p>
 
-      <p>
+
 	<p>The table below lists other changes which affect generated schemas.</p>
 	<table rend="rules">
 	  <row role="label">
@@ -79,17 +79,16 @@
 	<row>
 	  <cell>2011-02</cell>
 	  <cell>make <gi>collection</gi> typeable</cell>
-	  <cell><ptt
+	  <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><ptt
+	  <cell><ptr
 	  target="http://sourceforge.net/tracker/?func=detail&amp;aid=3168838&amp;group_id=106328&amp;atid=644065"/></cell>
 	</row>
 	</table>
-      </p>
     </body>
   </text>
 </TEI>