merge in latest from dev

sydb · sydb · commit d07a6cff1d2d · 2025-05-29T11:17:54.000-04:00
diff --git a/Documents/Object/object.doc.html b/Documents/Object/object.doc.html
@@ -6581,8 +6581,8 @@ <h2>Schema object: Elements</h2><div><h3 class="oddSpec" id="TEI">&lt;TEI&gt;</h
       
       <tr><td colspan="2">
         <div id="index.xml-egXML-d32e52400" class="pre egXML_valid">He likes to be punctual. I said <span class="element">&lt;q&gt;</span><br/> <span class="element">&lt;time when-iso="<span class="attributevalue">12</span>"&gt;</span>around noon<span class="element">&lt;/time&gt;</span><br/><span class="element">&lt;/q&gt;</span>, and he showed up at <span class="element">&lt;time when-iso="<span class="attributevalue">12:00:00</span>"&gt;</span>12 O'clock<span class="element">&lt;/time&gt;</span> on the dot.</div>
-        <p>The second occurence of <a class="gi" href="#time">time</a> could have been encoded with the <span class="att">when</span> attribute, as <span class="val">12:00:00</span> is a valid
-                    time with respect to the W3C <span class="titlem">XML Schema Part 2: Datatypes</span> specification. The first occurence could not.</p>
+        <p>The second occurrence of <a class="gi" href="#time">time</a> could have been encoded with the <span class="att">when</span> attribute, as <span class="val">12:00:00</span> is a valid
+                    time with respect to the W3C <span class="titlem">XML Schema Part 2: Datatypes</span> specification. The first occurrence could not.</p>
       </td></tr>
       <tr><td class="wovenodd-col1"><span class="label" xml:lang="en">Note</span></td><td class="wovenodd-col2"><!-- -->
         <div class="p">The value of the <span class="att">when-iso</span> attribute should be the normalized representation of the date, time, or combined date
diff --git a/Documents/notatedMusic/tei_notatedmusic.doc.html b/Documents/notatedMusic/tei_notatedmusic.doc.html
@@ -1627,8 +1627,8 @@ <h2>Schema tei_notatedmusic: Model classes</h2><div><h3 class="oddSpec" id="mode
       
       <tr><td colspan="2">
         <div id="index.xml-egXML-d28e75807" class="pre egXML_valid">He likes to be punctual. I said <span class="element">&lt;q&gt;</span><br/> <span class="element">&lt;time when-iso="<span class="attributevalue">12</span>"&gt;</span>around noon<span class="element">&lt;/time&gt;</span><br/><span class="element">&lt;/q&gt;</span>, and he showed up at <span class="element">&lt;time when-iso="<span class="attributevalue">12:00:00</span>"&gt;</span>12 O'clock<span class="element">&lt;/time&gt;</span> on the dot.</div>
-        <p>The second occurence of <a class="gi" href="#time">time</a> could have been encoded with the <span class="att">when</span> attribute, as <span class="val">12:00:00</span> is a valid
-                    time with respect to the W3C <span class="titlem">XML Schema Part 2: Datatypes</span> specification. The first occurence could not.</p>
+        <p>The second occurrence of <a class="gi" href="#time">time</a> could have been encoded with the <span class="att">when</span> attribute, as <span class="val">12:00:00</span> is a valid
+                    time with respect to the W3C <span class="titlem">XML Schema Part 2: Datatypes</span> specification. The first occurrence could not.</p>
       </td></tr>
       <tr><td class="wovenodd-col1"><span class="label" xml:lang="en">Note</span></td><td class="wovenodd-col2"><!-- -->
         <div class="p">The value of the <span class="att">when-iso</span> attribute should be the normalized representation of the date, time, or combined date
@@ -5672,7 +5672,7 @@ <h2>Schema tei_notatedmusic: Model classes</h2><div><h3 class="oddSpec" id="mode
     adjacency attributes can be used, but the resulting encoding would
     be highly redundant.</div>
     <div class="p">Zero, one, or two children <a class="gi" href="#label">label</a> elements may be
-    present. The first occurence of <a class="gi" href="#label">label</a> provides a label
+    present. The first occurrence of <a class="gi" href="#label">label</a> provides a label
     for the arc; the second provides a second label for the arc, and
     should be used if a transducer is being encoded.</div>
   </td></tr></table></div><div><h3 class="oddSpec" id="argument">&lt;argument&gt;</h3><table class="wovenodd"><tr><td colspan="2" class="wovenodd-col2"><span class="label">&lt;argument&gt; </span>A formal list or prose description of the topics addressed by
@@ -7087,7 +7087,7 @@ <h2>Schema tei_notatedmusic: Model classes</h2><div><h3 class="oddSpec" id="mode
     giving the cause. See further sections ?? and
  ??.</div>
   </td></tr></table></div><div><h3 class="oddSpec" id="datatype">&lt;datatype&gt;</h3><table class="wovenodd"><tr><td colspan="2" class="wovenodd-col2"><span class="label">&lt;datatype&gt; </span>specifies the declared value for an attribute, by referring to
-  any datatype defined by the chosen schema language. «#DTYPES» <a class="link_ptr" href="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDATT"><span>http://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDATT</span></a></td></tr><tr><td class="wovenodd-col1"><span class="label" xml:lang="en">Module</span></td><td class="wovenodd-col2">tagdocs</td></tr><tr><td class="wovenodd-col1"><span class="label" xml:lang="en">In addition to global attributes</span></td><td class="wovenodd-col2">In addition to global attributes<table class="attList"><tr><td class="odd_label">minOccurs</td><td class="odd_value">(minimum number of occurences) indicates the minimum number of times this datatype may
+  any datatype defined by the chosen schema language. «#DTYPES» <a class="link_ptr" href="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDATT"><span>http://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDATT</span></a></td></tr><tr><td class="wovenodd-col1"><span class="label" xml:lang="en">Module</span></td><td class="wovenodd-col2">tagdocs</td></tr><tr><td class="wovenodd-col1"><span class="label" xml:lang="en">In addition to global attributes</span></td><td class="wovenodd-col2">In addition to global attributes<table class="attList"><tr><td class="odd_label">minOccurs</td><td class="odd_value">(minimum number of occurrences) indicates the minimum number of times this datatype may
       occur in the specification of the attribute being defined<table class="attDef"><tr><td class="odd_label"><span class="label" xml:lang="en">Status</span> </td><td class="odd_value"><span xml:lang="en">Optional</span></td></tr>
       
       
@@ -7105,7 +7105,7 @@ <h2>Schema tei_notatedmusic: Model classes</h2><div><h3 class="oddSpec" id="mode
       <tr><td class="odd_label"><span xml:lang="en" class="label">Datatype</span> </td><td class="odd_value"><code class="eg">
 <a class="link_odd" href="#data.count">data.count</a></code></td></tr>
       
-    </table></td></tr><tr><td class="odd_label">maxOccurs</td><td class="odd_value">(maximum number of occurences) indicates the maximum number of times this datatype may
+    </table></td></tr><tr><td class="odd_label">maxOccurs</td><td class="odd_value">(maximum number of occurrences) indicates the maximum number of times this datatype may
       occur in the specification of the attribute being defined<table class="attDef"><tr><td class="odd_label"><span class="label" xml:lang="en">Status</span> </td><td class="odd_value"><span xml:lang="en">Optional</span></td></tr>
       
       
@@ -11525,7 +11525,7 @@ <h2>Schema tei_notatedmusic: Model classes</h2><div><h3 class="oddSpec" id="mode
     <div id="index.xml-egXML-d28e77241" class="pre egXML_valid"><span class="element">&lt;node<br/>  xml:id="<span class="attributevalue">t6</span>"<br/>  type="<span class="attributevalue">final</span>"<br/>  inDegree="<span class="attributevalue">2</span>"<br/>  outDegree="<span class="attributevalue">0</span>"&gt;</span><br/> <span class="element">&lt;label&gt;</span>6<span class="element">&lt;/label&gt;</span><br/><span class="element">&lt;/node&gt;</span></div>
   </td></tr><tr><td class="wovenodd-col1"><span class="label" xml:lang="en">Note</span></td><td class="wovenodd-col2"><!-- -->
     <div class="p">Zero, one, or two children <a class="gi" href="#label">label</a> elements may be
-    present. The first occurence of <a class="gi" href="#label">label</a> provides a label
+    present. The first occurrence of <a class="gi" href="#label">label</a> provides a label
     for the arc; the second provides a second label for the arc, and
     should be used if a transducer is being encoded whose actions are
     associated with nodes rather than with arcs.</div>
diff --git a/Documents/notatedMusic/tei_notatedmusic.rng b/Documents/notatedMusic/tei_notatedmusic.rng
@@ -18010,14 +18010,14 @@ avoid potential nameclashes. </a:documentation>
       </zeroOrMore>
       <optional>
         <attribute xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" name="minOccurs" a:defaultValue="1">
-          <a:documentation>(minimum number of occurences) indicates the minimum number of times this datatype may
+          <a:documentation>(minimum number of occurrences) indicates the minimum number of times this datatype may
       occur in the specification of the attribute being defined</a:documentation>
           <ref name="data.count"/>
         </attribute>
       </optional>
       <optional>
         <attribute xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" name="maxOccurs" a:defaultValue="1">
-          <a:documentation>(maximum number of occurences) indicates the maximum number of times this datatype may
+          <a:documentation>(maximum number of occurrences) indicates the maximum number of times this datatype may
       occur in the specification of the attribute being defined</a:documentation>
           <choice>
             <ref name="data.count"/>
diff --git a/I18N/examples-fr/original.en b/I18N/examples-fr/original.en
@@ -5646,11 +5646,11 @@ ten in the morning on Thu 18 May</date>
 punctual. I said <q><time when-iso="12">around noon</time></q>,
 and he showed up at <time when-iso="12:00:00">12 O'clock</time>
 on the dot.</egXML>
-        <p>The second occurence of <gi>time</gi> could have been
+        <p>The second occurrence of <gi>time</gi> could have been
 	encoded with the <att>when</att> attribute, as
 	<val>12:00:00</val> is a valid time with respect to the W3C
 	<title>XML Schema Part 2: Datatypes</title> specification. The
-	first occurence could not.</p>
+	first occurrence could not.</p>
       </exemplum>
       </attDef>
     </attList>
diff --git a/I18N/p5examples.rng b/I18N/p5examples.rng
@@ -31826,14 +31826,14 @@ element, as a series of attDef elements.</a:documentation>
       <ref name="att.global.facs.attribute.facs"/>
       <optional>
         <attribute name="minOccurs" a:defaultValue="1">
-          <a:documentation>(minimum number of occurences) indicates the minimum number of times this datatype may
+          <a:documentation>(minimum number of occurrences) indicates the minimum number of times this datatype may
       occur in the specification of the attribute being defined</a:documentation>
           <data type="nonNegativeInteger"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="maxOccurs" a:defaultValue="1">
-          <a:documentation>(maximum number of occurences) indicates the maximum number of times this datatype may
+          <a:documentation>(maximum number of occurrences) indicates the maximum number of times this datatype may
       occur in the specification of the attribute being defined</a:documentation>
           <choice>
             <data type="nonNegativeInteger"/>
diff --git a/P5/ReleaseNotes/readme-2.1.0.xml b/P5/ReleaseNotes/readme-2.1.0.xml
@@ -102,7 +102,7 @@ att.datcat:
 
 	adjust model to allow multiple graphic in table properly with page breaks. http://purl.org/tei/fr/3305016
 
-	allow <trailer> to have type/subtype attributes, per Council meeting 2012-04-16 (noted that trailer is repeatable, so distinguishing between occurences with @type is desirable)
+	allow <trailer> to have type/subtype attributes, per Council meeting 2012-04-16 (noted that trailer is repeatable, so distinguishing between occurrences with @type is desirable)
 
 	permit multiple heads at start of a spGrp for consistency with div etc.
 
diff --git a/P5/Source/Specs/arc.xml b/P5/Source/Specs/arc.xml
@@ -76,7 +76,7 @@
     adjacency attributes can be used, but the resulting encoding would
     be highly redundant.</p>
     <p>Zero, one, or two children <gi>label</gi> elements may be
-    present. The first occurence of <gi>label</gi> provides a label
+    present. The first occurrence of <gi>label</gi> provides a label
     for the arc; the second provides a second label for the arc, and
     should be used if a transducer is being encoded.</p>
   </remarks>
diff --git a/P5/Source/Specs/att.datable.iso.xml b/P5/Source/Specs/att.datable.iso.xml
@@ -65,8 +65,8 @@
       </exemplum>
       <exemplum xml:lang="en">
         <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="DATABLEISO-egXML-tb" source="#UND">He likes to be punctual. I said <q><time when-iso="12">around noon</time></q>, and he showed up at <time when-iso="12:00:00">12 O'clock</time> on the dot.</egXML>
-        <p>The second occurence of <gi>time</gi> could have been encoded with the <att>when</att> attribute, as <val>12:00:00</val> is a valid
-          time with respect to the W3C <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref> specification. The first occurence could not.</p>
+        <p>The second occurrence of <gi>time</gi> could have been encoded with the <att>when</att> attribute, as <val>12:00:00</val> is a valid
+          time with respect to the W3C <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref> specification. The first occurrence could not.</p>
       </exemplum>
     </attDef>
     <!--     <attList>org="group">-->
diff --git a/P5/Source/Specs/att.repeatable.xml b/P5/Source/Specs/att.repeatable.xml
@@ -26,7 +26,7 @@
   </constraintSpec>
   <attList>
     <attDef ident="minOccurs">
-      <gloss versionDate="2013-11-21" xml:lang="en">minimum number of occurences</gloss>
+      <gloss versionDate="2013-11-21" xml:lang="en">minimum number of occurrences</gloss>
       <gloss versionDate="2007-12-20" xml:lang="ko">빈도의 최소 수</gloss>
       <gloss versionDate="2007-05-02" xml:lang="zh-TW">出現次數最小值</gloss>
       <gloss versionDate="2007-06-12" xml:lang="fr">nombre minimum d'occurrences</gloss>
@@ -44,7 +44,7 @@
       <defaultVal>1</defaultVal>
     </attDef>
     <attDef ident="maxOccurs">
-      <gloss versionDate="2007-12-20" xml:lang="en">maximum number of occurences</gloss>
+      <gloss versionDate="2007-12-20" xml:lang="en">maximum number of occurrences</gloss>
       <gloss versionDate="2007-12-20" xml:lang="ko">빈도의 최대 수</gloss>
       <gloss versionDate="2007-05-02" xml:lang="zh-TW">出現次數最大值</gloss>
       <gloss versionDate="2007-06-12" xml:lang="fr">nombre maximum d'occurrences.</gloss>
diff --git a/P5/Source/Specs/dimensions.xml b/P5/Source/Specs/dimensions.xml
@@ -27,7 +27,7 @@
     <!-- It would be simpler to use just
          "( count(tei:width), count(tei:height), count(tei:depth) ) > 1",
          but then we would not be able to tell the user which element
-         had too many occurences. -->
+         had too many occurrences. -->
     <constraint>
       <sch:rule context="tei:dimensions">
         <sch:report test="count(tei:width) gt 1">
diff --git a/P5/Source/Specs/msDesc.xml b/P5/Source/Specs/msDesc.xml
@@ -53,7 +53,7 @@
         <!-- Note: This rule applies to <msContents>, <physDesc>,
              <history>, and <additional> wherever they occur. Luckily
              they are only allowed in places where they are
-             constrained to 0 or 1 occurence. If that changes someday,
+             constrained to 0 or 1 occurrence. If that changes someday,
              this constraint may will likely need to be updated,
              too. -->
         <!-- Also worth noting that
@@ -62,7 +62,7 @@
              concrete rules in the individual <elementSpec>s; and
              b) I did not test for the existence of "../*[name(.) eq
              $gi][2]" because then an error would be generated for
-             each of the multiple occurences of $gi. -->
+             each of the multiple occurrences of $gi. -->
         <sch:let name="gi" value="name(.)"/>
         <sch:report test="preceding-sibling::*[ name(.) eq $gi ]
                           and
diff --git a/P5/Source/Specs/node.xml b/P5/Source/Specs/node.xml
@@ -298,7 +298,7 @@ versa if the graph is directed.</p>
   </exemplum>
   <remarks versionDate="2007-03-02" xml:lang="en">
     <p>Zero, one, or two children <gi>label</gi> elements may be
-    present. The first occurence of <gi>label</gi> provides a label
+    present. The first occurrence of <gi>label</gi> provides a label
     for the arc; the second provides a second label for the arc, and
     should be used if a transducer is being encoded whose actions are
     associated with nodes rather than with arcs.</p>
diff --git a/P5/Test/detest.xml b/P5/Test/detest.xml
@@ -180,7 +180,7 @@
       </div>
       <div type="test">
         <p>
-          Testing multiple occurences of a datatype in a single
+          Testing multiple occurrences of a datatype in a single
           attribute value. The following should be valid:
           <distinct type="valid" o01="0" o02="0" o0i="0" o11="0" o12="1" o1i="1" o22="1 2" o2i="1 2">minimum</distinct>
           <distinct type="valid" o01="1" o02="1" o0i="1" o11="1" o12="1 2" o1i="1 2" o22="1 2" o2i="1 2 3">min +1 unless ≤, in which case max</distinct> 
diff --git a/P5/Test/testerrmav.odd b/P5/Test/testerrmav.odd
@@ -43,7 +43,7 @@
         <moduleRef key="tei"/>
         <moduleRef key="header"/>
         <moduleRef key="textstructure"/>
-	<!-- remove most elements, modify a few to test occurences -->
+	<!-- remove most elements, modify a few to test occurrences -->
         <elementSpec ident="abbr" mode="change" module="core">
 	  <desc>TEST <att>minOccurs</att> of <val>3</val> on a ref in content</desc>
 	  <content>
@@ -64,7 +64,7 @@
 	  </content>
 	</elementSpec>
         <elementSpec ident="altIdent" mode="change" module="core">
-	  <desc>TEST various content occurence values &#x2014; on alternations in sequence</desc>
+	  <desc>TEST various content occurrence values &#x2014; on alternations in sequence</desc>
 	  <content>
 	    <sequence>
 	      <alternate>
@@ -119,7 +119,7 @@
 	  </content>	      
 	</elementSpec>
         <elementSpec ident="analytic" mode="change" module="core">
-	  <desc>TEST various content occurence values &#x2014; on sequences in alternation</desc>
+	  <desc>TEST various content occurrence values &#x2014; on sequences in alternation</desc>
 	  <content>
 	    <alternate>
 	      <sequence>
@@ -174,7 +174,7 @@
 	  </content>	      
 	</elementSpec>
         <elementSpec ident="bibl" mode="change" module="core">
-	  <desc>TEST occurence ranges of a reference to a class or macro</desc>
+	  <desc>TEST occurrence ranges of a reference to a class or macro</desc>
 	  <content>
 	    <alternate>
 	      <sequence>
diff --git a/P5/Test/testerrmav.xml b/P5/Test/testerrmav.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <div type="test" xmlns="http://www.tei-c.org/ns/1.0">
-  <p>Testing multiple occurences of a datatype in a single attribute
+  <p>Testing multiple occurrences of a datatype in a single attribute
     value. All of the following should be invalid in some
     perfect world, but only those with type=invalid
     should be invalid here. Those with type=invalid-escapee
