Merge branch 'develop' into main

Edirom · Sep 10, 2021 · 1da7dd3 · 1da7dd3
2 parents 2d45571 + 53dc0e0
commit 1da7dd3
Show file tree

Hide file tree

Showing 56 changed files with 11,288 additions and 7,287 deletions.
diff --git a/build.properties b/build.properties
@@ -11,7 +11,7 @@ compiledODD.dir=compiled-ODD
 stylesheets.dir=/Users/pstadler/repos/Stylesheets
 
 # Path to local TEI p5subset.xml (get the latest release from http://sourceforge.net/projects/tei/files/TEI-P5-all/)
-tei.source=/Users/pstadler/static/tei-4.1.0/xml/tei/odd/p5subset.xml
+tei.source=/Users/pstadler/static/tei-4.3.0/xml/tei/odd/p5subset.xml
 
 # Path to local MEI mei-source.xml (get the latest release from https://github.com/music-encoding/music-encoding/releases)
 mei.source=/Users/pstadler/static/music-encoding-4.0.1/source/mei-source.xml
diff --git a/compiled-ODD/guidelines-de-wegaBiblio.compiled.xml b/compiled-ODD/guidelines-de-wegaBiblio.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaDiaries.compiled.xml b/compiled-ODD/guidelines-de-wegaDiaries.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaDocuments.compiled.xml b/compiled-ODD/guidelines-de-wegaDocuments.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaLetters.compiled.xml b/compiled-ODD/guidelines-de-wegaLetters.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaNews.compiled.xml b/compiled-ODD/guidelines-de-wegaNews.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaOrgs.compiled.xml b/compiled-ODD/guidelines-de-wegaOrgs.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaPersons.compiled.xml b/compiled-ODD/guidelines-de-wegaPersons.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaPlaces.compiled.xml b/compiled-ODD/guidelines-de-wegaPlaces.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaThematicCommentaries.compiled.xml b/compiled-ODD/guidelines-de-wegaThematicCommentaries.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaVar.compiled.xml b/compiled-ODD/guidelines-de-wegaVar.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaWritings.compiled.xml b/compiled-ODD/guidelines-de-wegaWritings.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wega_all.compiled.xml b/compiled-ODD/guidelines-de-wega_all.compiled.xml
diff --git a/schema/de/wegaBiblio.isosch b/schema/de/wegaBiblio.isosch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
    <title>ISO Schematron rules</title>
-   <!-- This file generated 2020-12-17T13:21:52Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2021-09-01T07:26:02Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -38,7 +38,7 @@
     </pattern>
    <pattern id="schematron-constraint-wegaBiblio-att.datable-calendar-calendar-5">
           <rule context="tei:*[@calendar]">
-            <assert test="string-length(.) gt 0"> @calendar indicates the system or calendar to
+            <assert test="string-length(.) gt 0"> @calendar indicates one or more systems or calendars to
               which the date represented by the content of this element belongs, but this
               <name/> element has no textual content.</assert>
           </rule>
@@ -57,10 +57,10 @@
    </pattern>
    <pattern id="schematron-constraint-wegaBiblio-p-abstractModel-structure-l-8">
       <rule context="tei:p">
-         <report test="ancestor::tei:l[not(.//tei:note//tei:p[. = current()])]">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab.
-      </report>
-      </rule>
+                    <report test="(ancestor::tei:l or ancestor::tei:lg)                          and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText or parent::tei:footNote)">
+                        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
+                    </report>
+                </rule>
    </pattern>
    <pattern id="schematron-constraint-wegaBiblio-rs-rs-typeNkey-9">
                     <rule context="tei:rs[@type='person'][@key]">

diff --git a/schema/de/wegaBiblio.rng b/schema/de/wegaBiblio.rng
diff --git a/schema/de/wegaDiaries.isosch b/schema/de/wegaDiaries.isosch
diff --git a/schema/de/wegaDiaries.rng b/schema/de/wegaDiaries.rng
diff --git a/schema/de/wegaDocuments.isosch b/schema/de/wegaDocuments.isosch
diff --git a/schema/de/wegaDocuments.rng b/schema/de/wegaDocuments.rng
diff --git a/schema/de/wegaLetters.isosch b/schema/de/wegaLetters.isosch
diff --git a/schema/de/wegaLetters.rng b/schema/de/wegaLetters.rng
diff --git a/schema/de/wegaNews.isosch b/schema/de/wegaNews.isosch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
    <title>ISO Schematron rules</title>
-   <!-- This file generated 2020-12-17T13:21:55Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2021-09-01T07:26:06Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -45,7 +45,7 @@
     </pattern>
    <pattern id="schematron-constraint-wegaNews-att.datable-calendar-calendar-6">
           <rule context="tei:*[@calendar]">
-            <assert test="string-length(.) gt 0"> @calendar indicates the system or calendar to
+            <assert test="string-length(.) gt 0"> @calendar indicates one or more systems or calendars to
               which the date represented by the content of this element belongs, but this
               <name/> element has no textual content.</assert>
           </rule>
@@ -64,10 +64,10 @@
    </pattern>
    <pattern id="schematron-constraint-wegaNews-p-abstractModel-structure-l-9">
       <rule context="tei:p">
-         <report test="ancestor::tei:l[not(.//tei:note//tei:p[. = current()])]">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab.
-      </report>
-      </rule>
+                    <report test="(ancestor::tei:l or ancestor::tei:lg)                          and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText or parent::tei:footNote)">
+                        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
+                    </report>
+                </rule>
    </pattern>
    <pattern id="schematron-constraint-wegaNews-rs-rs-typeNkey-10">
                     <rule context="tei:rs[@type='person'][@key]">
@@ -231,35 +231,40 @@
                     </rule>
                 </pattern>
    <pattern id="schematron-constraint-wegaNews-graphic-graphic-url-check-28">
+                    <rule context="tei:graphic[@url]">
+                        <assert test="matches(@url, '^[-_A-Za-z0-9\.]+$') or starts-with(@url, 'http') or starts-with(@url, 'wega:')">Found invalid (non-ASCII) characters for an internal URL in @url</assert>
+                    </rule>
+                </pattern>
+   <pattern id="schematron-constraint-wegaNews-graphic-url-or-sameAs-29">
       <rule context="tei:graphic">
-                    <assert test="matches(@url, '^[-_A-Za-z0-9\.]+$') or starts-with(@url, 'http') or starts-with(@url, 'wega:')">Found invalid (non-ASCII) characters for an internal URL in @url</assert>
+                    <assert test="(@url or @sameAs) and (count(@url|@sameAs) eq 1)">Exactly one @url or @sameAs attribute is mandatory</assert>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-author-sameAs-sameAs-reference-29">
+   <pattern id="schematron-constraint-wegaNews-author-sameAs-sameAs-reference-30">
                             <rule context="tei:author[@sameAs]">
                                 <assert test="id(substring(@sameAs,2)) or starts-with(@sameAs, 'wega:')">There must be an element with the xml:id = "<value-of select="substring(@sameAs,2)"/>" which is the target of this @sameAs.</assert>
                             </rule>
                         </pattern>
-   <pattern id="schematron-constraint-wegaNews-title-duplicate-title-30">
+   <pattern id="schematron-constraint-wegaNews-title-duplicate-title-31">
                     <rule context="tei:title[following-sibling::tei:title]">
                         <let name="level" value="@level"/>
                         <let name="type" value="string(@type)"/> 
                         <let name="lang" value="string(@xml:lang)"/>
                         <report test="following-sibling::tei:title[@level = $level][string(@xml:lang) = $lang][string(@type) = $type]">Following title without differing @type or xml:lang attribute</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaNews-title-punctuation-mark-31">
+   <pattern id="schematron-constraint-wegaNews-title-punctuation-mark-32">
       <rule context="tei:title">
                     <report test="matches(normalize-space(self::tei:title), '[\.,;]$') and not(matches(normalize-space(self::tei:title), '((\p{Lu})|(\setc)|(\sal)|([\s\.]a)|(\sBl)|(\sAufl))\.$'))">Found a non-valid punctuation mark at the end of <name/> 
          </report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-title-report-leading-zeros-32">
+   <pattern id="schematron-constraint-wegaNews-title-report-leading-zeros-33">
       <rule context="tei:title">
                     <report test="matches(., '\s0\d+\.')">please do not prefix numbers with a zero</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-title-report-quotation-marks-33">
+   <pattern id="schematron-constraint-wegaNews-title-report-quotation-marks-34">
       <rule context="tei:title">
                     <report test="matches(., '&#34;“„')">please replace literal quotation marks with q-tags</report>
                 </rule>
@@ -268,46 +273,46 @@
 
 
 
-    <pattern id="schematron-constraint-wegaNews-div-abstractModel-structure-l-36">
+    <pattern id="schematron-constraint-wegaNews-div-abstractModel-structure-l-37">
       <rule context="tei:div">
-         <report test="ancestor::tei:l">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div.
+         <report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
+        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-div-abstractModel-structure-p-37">
+   <pattern id="schematron-constraint-wegaNews-div-abstractModel-structure-p-38">
       <rule context="tei:div">
-         <report test="ancestor::tei:p or ancestor::tei:ab and not(ancestor::tei:floatingText)">
-        Abstract model violation: p and ab may not contain higher-level structural elements such as div.
+         <report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
+        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-orgName-parent-org-38">
+   <pattern id="schematron-constraint-wegaNews-orgName-parent-org-39">
                     <rule context="tei:orgName[parent::tei:org]">
                         <report test="@key or not(@type)">It is required to give the type ('alt' or 'reg') of the name while @key is forbiden here.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaNews-orgName-parent-org-reg-39">
+   <pattern id="schematron-constraint-wegaNews-orgName-parent-org-reg-40">
                     <rule context="tei:orgName[parent::tei:org and not(preceding::tei:orgName)]">
                         <assert test="@type='reg'">There must exactly be one name with @type='reg'.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaNews-orgName-parent-org-reg-40">
+   <pattern id="schematron-constraint-wegaNews-orgName-parent-org-reg-41">
                     <rule context="tei:orgName[parent::tei:org and preceding::tei:orgName]">
                         <report test="@type='reg'">Only the first name can be of @type='reg'. Following names are supposed to be alternative names, @type='alt'.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaNews-orgName-parent-not-org-41">
+   <pattern id="schematron-constraint-wegaNews-orgName-parent-not-org-42">
                     <rule context="tei:orgName[not(parent::tei:org)]">
                         <report test="@type">No @type attribute allowed here.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaNews-table-collapsible-head-42">
+   <pattern id="schematron-constraint-wegaNews-table-collapsible-head-43">
       <rule context="tei:table">
                     <report test="@rend='collapsible' and not(tei:head)">For the collapsible feature to work a head must be given for the <name/>.</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-row-number-of-cells-43">
+   <pattern id="schematron-constraint-wegaNews-row-number-of-cells-44">
                     <rule context="tei:row[preceding-sibling::tei:row]">
                         <let name="thisNode" value="."/>
 
@@ -328,51 +333,51 @@
                         <assert test="$thisRowCellCount + $precedingCellsWithRowspanCount = $precedingRowCellCount">The total ammount of cells should be equal for every row in a table. This row ammounts to <value-of select="$thisRowCellCount + $precedingCellsWithRowspanCount"/> cells (possibly affected by some preceding rowspans, i.e. cell/@rows) instead of <value-of select="$precedingRowCellCount"/> for the preceding row.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaNews-cell-cell-rows-44">
+   <pattern id="schematron-constraint-wegaNews-cell-cell-rows-45">
                     <rule context="tei:cell[@rows]">
                         <report test="(count(parent::tei:row/following-sibling::tei:row) + 1) lt number(@rows)">There are less following rows than indicated in the @rows attribute.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaNews-styleguide-document-node-content-45">
+   <pattern id="schematron-constraint-wegaNews-styleguide-document-node-content-46">
                 <rule context="document-node()">
                     <report test="count(processing-instruction()) ne 2">WeGA styleguide error: there should exactly be two processing instructions before the root element</report>
                     <report test="comment()">WeGA styleguide error: there should be no comments outside the root element</report>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaNews-whitespaceOnlyContent-46">
+   <pattern id="schematron-constraint-wegaNews-whitespaceOnlyContent-47">
                 <rule context="tei:surname | tei:forename | tei:persName | tei:author[not(@sameAs)] | tei:occupation | tei:settlement | tei:country | tei:region | tei:rs | tei:workName | tei:characterName | tei:hi[not(.//tei:gap)] | tei:head | tei:note[not(@type=('thematicCom'))] | tei:placeName | tei:title | tei:seg | tei:item[not(@* or *)]">
                     <report test="normalize-space(.) = ''">
             <name/> has whitespace only content</report>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaNews-elementStartsWithWhitespace-47">
+   <pattern id="schematron-constraint-wegaNews-elementStartsWithWhitespace-48">
                 <rule context="tei:surname | tei:forename | tei:persName[not(@type)] | tei:author | tei:occupation | tei:settlement | tei:country | tei:region | tei:rs | tei:workName | tei:characterName | tei:hi | tei:placeName[not(parent::tei:address or parent::tei:birth or parent::tei:death)]">
                     <report test="matches(.,'^\s') and (node()[1] = text()[1])">whitespace at the beginning of element <name/>
          </report>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaNews-untrimmedAttributeValues-48">
+   <pattern id="schematron-constraint-wegaNews-untrimmedAttributeValues-49">
                 <rule context="*">
                     <report test="some $i in @* satisfies string-length(normalize-unicode(normalize-space(replace($i, ' | | | ', ' ')))) ne string-length($i)">There is some whitespace here at the beginning or end of some attribute value.</report>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaNews-wegaTargets-49">
+   <pattern id="schematron-constraint-wegaNews-wegaTargets-50">
                 <rule context="*[starts-with(@target, 'wega:')]">
                     <assert test="matches(@target, '^wega:A[0-9A-F]{6}(#.+)?(\s+wega:A[0-9A-F]{6}(#.+)?)*$')">"wega"-prefixed URIs must follow the pattern "wega:A002068" (i.e. without any file extension)</assert>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaNews-emojiCheck-50">
+   <pattern id="schematron-constraint-wegaNews-emojiCheck-51">
                 <rule context="*[some $i in text() satisfies normalize-space($i) ne '']">
                     <report test="matches(., '[⌚-⌛]|[⏩-⏬]|[⏰]|[⏳]|[◽-◾]|[☔-☕]|[♈-♓]|[♿]|[⚓]|[⚡]|[⚪-⚫]|[⚽-⚾]|[⛄-⛅]|[⛎]|[⛔]|[⛪]|[⛲-⛳]|[⛵]|[⛺]|[⛽]|[✅]|[✊-✋]|[✨]|[❌]|[❎]|[❓-❕]|[❗]|[➕-➗]|[➰]|[➿]|[⬛-⬜]|[⭐]|[⭕]|[🀄]|[🃏]|[🆎]|[🆑-🆚]|[🇦-🇿]|[🈁]|[🈚]|[🈯]|[🈲-🈶]|[🈸-🈺]|[🉐-🉑]|[🌀-🌠]|[🌭-🌯]|[🌰-🌵]|[🌷-🍼]|[🍾-🍿]|[🎀-🎓]|[🎠-🏄]|[🏅]|[🏆-🏊]|[🏏-🏓]|[🏠-🏰]|[🏴]|[🏸-🏿]|[🐀-🐾]|[👀]|[👂-📷]|[📸]|[📹-📼]|[📿]|[🔀-🔽]|[🕋-🕎]|[🕐-🕧]|[🕺]|[🖕-🖖]|[🖤]|[🗻-🗿]|[😀]|[😁-😐]|[😑]|[😒-😔]|[😕]|[😖]|[😗]|[😘]|[😙]|[😚]|[😛]|[😜-😞]|[😟]|[😠-😥]|[😦-😧]|[😨-😫]|[😬]|[😭]|[😮-😯]|[😰-😳]|[😴]|[😵-🙀]|[🙁-🙂]|[🙃-🙄]|[🙅-🙏]|[🚀-🛅]|[🛌]|[🛐]|[🛑-🛒]|[🛕]|[🛫-🛬]|[🛴-🛶]|[🛷-🛸]|[🛹]|[🛺]|[🟠-🟫]|[🤍-🤏]|[🤐-🤘]|[🤙-🤞]|[🤟]|[🤠-🤧]|[🤨-🤯]|[🤰]|[🤱-🤲]|[🤳-🤺]|[🤼-🤾]|[🤿]|[🥀-🥅]|[🥇-🥋]|[🥌]|[🥍-🥏]|[🥐-🥞]|[🥟-🥫]|[🥬-🥰]|[🥱]|[🥳-🥶]|[🥺]|[🥻]|[🥼-🥿]|[🦀-🦄]|[🦅-🦑]|[🦒-🦗]|[🦘-🦢]|[🦥-🦪]|[🦮-🦯]|[🦰-🦹]|[🦺-🦿]|[🧀]|[🧁-🧂]|[🧃-🧊]|[🧍-🧏]|[🧐-🧦]|[🧧-🧿]|[🩰-🩳]|[🩸-🩺]|[🪀-🪂]|[🪐-🪕]')">Text contains characters with Emoji presentation as default.</report>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaNews-sourceMustResolve-51">
+   <pattern id="schematron-constraint-wegaNews-sourceMustResolve-52">
                 <rule context="*[starts-with(@source, '#')]">
                     <let name="source" value="@source"/>
                     <assert test="id(substring($source,2))">Unable to locate the reference provided by the @source attribute.</assert>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaNews-att.wega.rend-underline-n-52">
+   <pattern id="schematron-constraint-wegaNews-att.wega.rend-underline-n-53">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>