Merge branch 'develop'

Edirom · Dec 22, 2017 · d721ad9 · d721ad9
2 parents 4cb6c3a + 7c19910
commit d721ad9
Show file tree

Hide file tree

Showing 73 changed files with 36,519 additions and 15,630 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-3.1.0/xml/tei/odd/p5subset.xml
+tei.source=/Users/pstadler/static/tei-3.2.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
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
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
diff --git a/schema/de/wegaNews.rng b/schema/de/wegaNews.rng
diff --git a/schema/de/wegaOrgs.isosch b/schema/de/wegaOrgs.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 2017-05-07T19:04:25Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2017-11-15T18:49:55Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -22,34 +22,34 @@
                                 <assert test="id(substring(@hand,2)) or starts-with(@hand, 'wega:')">There must be an element with the xml:id = "<value-of select="substring(@hand,2)"/>" which is the target of this @hand.</assert>
                             </rule>
                         </pattern>
-   <pattern id="isoschematron-constraint-wegaOrgs-att.datable.w3c-att-datable-w3c-when-2">
+   <pattern id="schematron-constraint-wegaOrgs-att.datable.w3c-att-datable-w3c-when-2">
       <rule context="tei:*[@when]">
         <report test="@notBefore|@notAfter|@from|@to" role="nonfatal">The @when attribute cannot be used with any other att.datable.w3c attributes.</report>
       </rule>
     </pattern>
-   <pattern id="isoschematron-constraint-wegaOrgs-att.datable.w3c-att-datable-w3c-from-3">
+   <pattern id="schematron-constraint-wegaOrgs-att.datable.w3c-att-datable-w3c-from-3">
       <rule context="tei:*[@from]">
         <report test="@notBefore" role="nonfatal">The @from and @notBefore attributes cannot be used together.</report>
       </rule>
     </pattern>
-   <pattern id="isoschematron-constraint-wegaOrgs-att.datable.w3c-att-datable-w3c-to-4">
+   <pattern id="schematron-constraint-wegaOrgs-att.datable.w3c-att-datable-w3c-to-4">
       <rule context="tei:*[@to]">
         <report test="@notAfter" role="nonfatal">The @to and @notAfter attributes cannot be used together.</report>
       </rule>
     </pattern>
-   <pattern id="isoschematron-constraint-wegaOrgs-att.datable-calendar-calendar-5">
+   <pattern id="schematron-constraint-wegaOrgs-att.datable-calendar-calendar-5">
           <rule context="tei:*[@calendar]">
             <assert test="string-length(.) gt 0">
 @calendar indicates the system or calendar to which the date represented by the content of this element
 belongs, but this <name/> element has no textual content.</assert>
           </rule>
         </pattern>
-   <pattern id="isoschematron-constraint-wegaOrgs-att.typed-subtypeTyped-6">
+   <pattern id="schematron-constraint-wegaOrgs-att.typed-subtypeTyped-6">
       <rule context="tei:*[@subtype]">
         <assert test="@type">The <name/> element should not be categorized in detail with @subtype unless also categorized in general with @type</assert>
       </rule>
     </pattern>
-   <pattern id="isoschematron-constraint-wegaOrgs-att.spanning-spanTo-spanTo-2-7">
+   <pattern id="schematron-constraint-wegaOrgs-att.spanning-spanTo-spanTo-2-7">
           <rule context="tei:*[@spanTo]">
             <assert test="id(substring(@spanTo,2)) and following::*[@xml:id=substring(current()/@spanTo,2)]">
 The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the current element <name/>
@@ -63,7 +63,7 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                     </report>
                 </rule>
    </pattern>
-   <pattern id="isoschematron-constraint-wegaOrgs-p-abstractModel-structure-l-9">
+   <pattern id="schematron-constraint-wegaOrgs-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.
@@ -72,7 +72,7 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
    </pattern>
    <pattern id="schematron-constraint-wegaOrgs-rs-rs-typeNkey-10">
                     <rule context="tei:rs[@type][@key]">
-                        <assert test="                             (matches(@key, '^A00[0-9A-F]{4}$') and @type='person') or                             (matches(@key, '^A02\d{4}$') and @type='work') or                             (matches(@key, '^A03\d{4}$') and @type='writing') or                             (matches(@key, '^A04\d{4}$') and @type='letter') or                             (matches(@key, '^A06\d{4}$') and @type='diaryDay') or                             (matches(@key, '^(A00[0-9A-F]{4}\s)*A00[0-9A-F]{4}$') and @type='persons') or                             (matches(@key, '^(A02\d{4}\s)*A02\d{4}$') and @type='works') or                             (matches(@key, '^(A03\d{4}\s)*A03\d{4}$') and @type='writings') or                             (matches(@key, '^(A04\d{4}\s)*A04\d{4}$') and @type='letters') or                             (matches(@key, '^(A05\d{4}\s)*A05\d{4}$') and @type='news') or                             (matches(@key, '^(A06\d{4}\s)*A06\d{4}$') and @type='diaryDays') or                             (matches(@key, '^A08\d{4}$') and @type='org') or                             (matches(@key, '^(A08\d{4}\s)*A08\d{4}$') and @type='orgs') or                             (matches(@key, '^(A11\d{4}\s)*A11\d{4}$') and @type='biblio') or                             (matches(@key, '^A10\d{4}$') and @type='document') or                             (matches(@key, '^(A10\d{4}\s)*A10\d{4}$') and @type='documents')">Type mismatch: The value for @type must be in accordance with the given ID in @key</assert>
+                        <assert test="                             (matches(@key, '^A00[0-9A-F]{4}$') and @type='person') or                             (matches(@key, '^A02\d{4}$') and @type='work') or                             (matches(@key, '^A03\d{4}$') and @type='writing') or                             (matches(@key, '^A04\d{4}$') and @type='letter') or                             (matches(@key, '^A06\d{4}$') and @type='diaryDay') or                             (matches(@key, '^(A00[0-9A-F]{4}\s)*A00[0-9A-F]{4}$') and @type='persons') or                             (matches(@key, '^(A02\d{4}\s)*A02\d{4}$') and @type='works') or                             (matches(@key, '^(A03\d{4}\s)*A03\d{4}$') and @type='writings') or                             (matches(@key, '^(A04\d{4}\s)*A04\d{4}$') and @type='letters') or                             (matches(@key, '^(A05\d{4}\s)*A05\d{4}$') and @type='news') or                             (matches(@key, '^(A06\d{4}\s)*A06\d{4}$') and @type='diaryDays') or                             (matches(@key, '^A08\d{4}$') and @type='org') or                             (matches(@key, '^(A08\d{4}\s)*A08\d{4}$') and @type='orgs') or                             (matches(@key, '^A13\d{4}$') and @type='place') or                             (matches(@key, '^(A13\d{4}\s)*A13\d{4}$') and @type='places') or                             (matches(@key, '^(A11\d{4}\s)*A11\d{4}$') and @type='biblio') or                             (matches(@key, '^A10\d{4}$') and @type='document') or                             (matches(@key, '^(A10\d{4}\s)*A10\d{4}$') and @type='documents')">Type mismatch: The value for @type must be in accordance with the given ID in @key</assert>
                     </rule>
                 </pattern>
    <pattern id="schematron-constraint-wegaOrgs-date-dateHeuristics1-11">
@@ -115,18 +115,18 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                 </report>
              </rule>
    </pattern>
-   <pattern id="isoschematron-constraint-wegaOrgs-ptr-ptrAtts-18">
+   <pattern id="schematron-constraint-wegaOrgs-ptr-ptrAtts-18">
       <rule context="tei:ptr">
          <report test="@target and @cRef">Only one of the
 attributes @target and @cRef may be supplied on <name/>.</report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-wegaOrgs-ref-prev-next-correspContext-19">
       <rule context="tei:ref">
-                    <report test="@type=('previous', 'next') and not(parent::tei:correspContext)">previous and next are only used within the correspContext element.</report>
+                    <report test="@type=('previousLetterFromAddressee', 'nextLetterFromAddressee') and not(parent::tei:correspContext)">'previousLetterFromAddressee' and 'nextLetterFromAddressee' are only used within the correspContext element.</report>
                 </rule>
    </pattern>
-   <pattern id="isoschematron-constraint-wegaOrgs-ref-refAtts-20">
+   <pattern id="schematron-constraint-wegaOrgs-ref-refAtts-20">
       <rule context="tei:ref">
          <report test="@target and @cRef">Only one of the
 	attributes @target' and @cRef' may be supplied on <name/>
@@ -138,7 +138,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     <report test="./tei:label and not(@type='gloss')">Labels are only allowed in lists of type='gloss'</report>
                 </rule>
    </pattern>
-   <pattern id="isoschematron-constraint-wegaOrgs-list-gloss-list-must-have-labels-22">
+   <pattern id="schematron-constraint-wegaOrgs-list-gloss-list-must-have-labels-22">
       <rule context="tei:list[@type='gloss']">
 	        <assert test="tei:label">The content of a "gloss" list should include a sequence of one or more pairs of a label element followed by an item element</assert>
       </rule>
@@ -155,7 +155,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                 </pattern>
    <pattern id="schematron-constraint-wegaOrgs-note-notesStmt-notes-25">
                     <rule context="tei:note[parent::tei:notesStmt]">
-                        <assert test="@type=('editorial', 'summary', 'thematicCom', 'part', 'incipit')">Within the notesStmt only 'editorial', 'summary', 'part' or 'thematicCom' are allowed for @type on note.</assert>
+                        <assert test="@type=('editorial', 'summary', 'thematicCom', 'incipit')">Within the notesStmt only 'editorial', 'summary', or 'thematicCom' are allowed for @type on note.</assert>
                     </rule>
                 </pattern>
    <pattern id="schematron-constraint-wegaOrgs-author-sameAs-sameAs-reference-26">
@@ -177,7 +177,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          </report>
                 </rule>
    </pattern>
-   <pattern id="isoschematron-constraint-wegaOrgs-l-abstractModel-structure-l-29">
+   <pattern id="schematron-constraint-wegaOrgs-l-abstractModel-structure-l-29">
       <rule context="tei:l">
          <report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">
         Abstract model violation: Lines may not contain lines or lg elements.
@@ -224,24 +224,30 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     <report test="./@subtype = ('sender', 'addressee') and not(./@type = 'correspondence')">if @subtype contains 'sender' or 'addressee' @type has to be 'correspondence'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaOrgs-whitespaceOnlyContent-38">
-                <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=('part', 'thematicCom'))] | tei:placeName | tei:title | tei:seg | tei:item[not(@* or *)]">
+   <pattern id="schematron-constraint-wegaOrgs-styleguide-document-node-content-38">
+                <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-wegaOrgs-whitespaceOnlyContent-39">
+                <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-wegaOrgs-elementStartsWithWhitespace-39">
+   <pattern id="schematron-constraint-wegaOrgs-elementStartsWithWhitespace-40">
                 <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-wegaOrgs-untrimmedAttributeValues-40">
+   <pattern id="schematron-constraint-wegaOrgs-untrimmedAttributeValues-41">
                 <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-wegaOrgs-att.wega.rend-underline-n-41">
+   <pattern id="schematron-constraint-wegaOrgs-att.wega.rend-underline-n-42">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>