Merge branch 'develop' into main

Edirom · Sep 20, 2020 · 6a4dee9 · 6a4dee9
2 parents b2a6f93 + b3b95c0
commit 6a4dee9
Show file tree

Hide file tree

Showing 67 changed files with 28,167 additions and 36,295 deletions.
diff --git a/build.properties b/build.properties
@@ -3,15 +3,15 @@
 # Instead, copy it to local.build.properties and edit that.
 #
 
-# working directory for temporary files.
-# Can be wiped with 'ant clean' 
+# output directory for compiled (processed) ODDs
+# which can serve as independent source
 compiledODD.dir=compiled-ODD
 
 # Path to local installation of the TEI stylesheets (https://github.com/TEIC/Stylesheets)
 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-3.6.0/xml/tei/odd/p5subset.xml
+tei.source=/Users/pstadler/static/tei-4.1.0/xml/tei/odd/p5subset.xml
 
-# Path to local MEI driver.xml (get the latest release from https://code.google.com/p/music-encoding/downloads/list)
-mei.source=/Users/pstadler/static/MEI2013_v2.1.1/source/driver.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-wegaWorks.compiled.xml b/compiled-ODD/guidelines-de-wegaWorks.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 2019-09-09T10:58:45Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2020-09-14T10:02:28Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -183,100 +183,115 @@
                         <assert test="@type='thematicCom' and @target">You need to provide thematic commentary targets (Only @type='thematicCom' and @target go together!).</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-note-notesStmt-notes-19">
+   <pattern id="schematron-constraint-wegaBiblio-note-thematicCom-must-be-empty-19">
+                    <rule context="tei:note[@type='thematicCom' or @target]">
+                        <report test="normalize-space() ne''">Thematic commentaries must not contain any text.</report>
+                    </rule>
+                </pattern>
+   <pattern id="schematron-constraint-wegaBiblio-note-notesStmt-notes-20">
                     <rule context="tei:note[parent::tei:notesStmt]">
                         <assert test="@type=('editorial', 'summary', 'thematicCom', 'incipit', 'textConst')">Within the notesStmt only 'editorial', 'summary', 'textConst', or 'thematicCom' are allowed for @type on note.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-note-text-notes-20">
+   <pattern id="schematron-constraint-wegaBiblio-note-text-notes-21">
                     <rule context="tei:note[not(parent::tei:notesStmt)]">
                         <report test="@type=('editorial', 'summary', 'incipit')">The note types 'editorial', 'summary', or 'thematicCom' are not allowed within the text section but only in the notesStmt.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-note-structured-content-notes-21">
+   <pattern id="schematron-constraint-wegaBiblio-note-structured-content-notes-22">
                     <rule context="tei:note[parent::tei:notesStmt][tei:p|tei:list|tei:table]">
                         <report test="text()[matches(., '\w')] or *[not(self::tei:p or self::tei:list or self::tei:table)]">There must be no mixed content when a tei:p, tei:list, or tei:table is present.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-analytic-analyticTitle-22">
+   <pattern id="schematron-constraint-wegaBiblio-analytic-analyticTitle-23">
       <rule context="tei:analytic">
                     <report test="tei:title/@level and not(tei:title/@level='a')">a title within analytic must have a @level='a'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-monogr-monogrTitle-23">
+   <pattern id="schematron-constraint-wegaBiblio-monogr-monogrTitle-24">
       <rule context="tei:monogr">
                     <report test="tei:title/@level and not(tei:title/@level=('j','m','u'))">a title within monogr must have a @level='j|m'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-series-seriesTitle-24">
+   <pattern id="schematron-constraint-wegaBiblio-series-seriesTitle-25">
       <rule context="tei:series">
                     <report test="tei:title/@level and not(tei:title/@level='s')">a title within series must have a @level='s'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-author-sameAs-sameAs-reference-25">
+   <pattern id="schematron-constraint-wegaBiblio-author-sameAs-sameAs-reference-26">
                             <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-wegaBiblio-title-duplicate-title-26">
+   <pattern id="schematron-constraint-wegaBiblio-title-duplicate-title-27">
                     <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-wegaBiblio-title-punctuation-mark-27">
+   <pattern id="schematron-constraint-wegaBiblio-title-punctuation-mark-28">
       <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-wegaBiblio-imprint-duplicate-biblScope-type-28">
+   <pattern id="schematron-constraint-wegaBiblio-title-report-leading-zeros-29">
+      <rule context="tei:title">
+                    <report test="matches(., '\s0\d+\.')">please do not prefix numbers with a zero</report>
+                </rule>
+   </pattern>
+   <pattern id="schematron-constraint-wegaBiblio-title-report-quotation-marks-30">
+      <rule context="tei:title">
+                    <report test="matches(., '&#34;“„')">please replace literal quotation marks with q-tags</report>
+                </rule>
+   </pattern>
+   <pattern id="schematron-constraint-wegaBiblio-imprint-duplicate-biblScope-type-31">
       <rule context="tei:imprint">
                     <report test="count(distinct-values(tei:biblScope/@type)) ne count(tei:biblScope/@type)">duplicate value for biblScope</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-styleguide-document-node-content-29">
+   <pattern id="schematron-constraint-wegaBiblio-styleguide-document-node-content-32">
                 <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-wegaBiblio-whitespaceOnlyContent-30">
+   <pattern id="schematron-constraint-wegaBiblio-whitespaceOnlyContent-33">
                 <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-wegaBiblio-elementStartsWithWhitespace-31">
+   <pattern id="schematron-constraint-wegaBiblio-elementStartsWithWhitespace-34">
                 <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-wegaBiblio-untrimmedAttributeValues-32">
+   <pattern id="schematron-constraint-wegaBiblio-untrimmedAttributeValues-35">
                 <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-wegaBiblio-wegaTargets-33">
+   <pattern id="schematron-constraint-wegaBiblio-wegaTargets-36">
                 <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-wegaBiblio-emojiCheck-34">
+   <pattern id="schematron-constraint-wegaBiblio-emojiCheck-37">
                 <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-wegaBiblio-sourceMustResolve-35">
+   <pattern id="schematron-constraint-wegaBiblio-sourceMustResolve-38">
                 <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-wegaBiblio-att.wega.rend-underline-n-36">
+   <pattern id="schematron-constraint-wegaBiblio-att.wega.rend-underline-n-39">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>