diff --git a/compiled-ODD/guidelines-de-wegaBiblio.compiled.xml b/compiled-ODD/guidelines-de-wegaBiblio.compiled.xml
index 134bc0b6..15cea9ca 100644
--- a/compiled-ODD/guidelines-de-wegaBiblio.compiled.xml
+++ b/compiled-ODD/guidelines-de-wegaBiblio.compiled.xml
@@ -4418,17 +4418,22 @@ resource, either within the current document or elsewhere.</desc>
   </exemplum><listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</ref>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.5.1. Referring Strings</ref>
-  </listRef></elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics1">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>larger</emph> value than its corresponding <att>notAfter</att> (for dates AC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>größeren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten n.Chr.)</desc>
+  </listRef></elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
+                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> date value than its corresponding <att>notAfter</att></desc>
+                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Datumswert als sein entsprechendes <att>notAfter</att></desc>
                 <constraint>
-                    <sch:report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-                </constraint>
-            </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> value than its corresponding <att>notAfter</att> (for dates BC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten v.Chr.)</desc>
-                <constraint>
-                    <sch:report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
                 </constraint>
             </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics3">
                 <desc versionDate="2013-11-11" xml:lang="en">checks for the cooccurence of date and duration attributes</desc>
diff --git a/compiled-ODD/guidelines-de-wegaDiaries.compiled.xml b/compiled-ODD/guidelines-de-wegaDiaries.compiled.xml
index fd657b0b..72f2ee82 100644
--- a/compiled-ODD/guidelines-de-wegaDiaries.compiled.xml
+++ b/compiled-ODD/guidelines-de-wegaDiaries.compiled.xml
@@ -6125,17 +6125,22 @@ concerned, as further discussed in section <ref target="http://www.tei-c.org/rel
   </exemplum><listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONANU">3.5.3. Numbers and
 Measures</ref>
-  </listRef></elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics1">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>larger</emph> value than its corresponding <att>notAfter</att> (for dates AC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>größeren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten n.Chr.)</desc>
+  </listRef></elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
+                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> date value than its corresponding <att>notAfter</att></desc>
+                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Datumswert als sein entsprechendes <att>notAfter</att></desc>
                 <constraint>
-                    <sch:report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-                </constraint>
-            </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> value than its corresponding <att>notAfter</att> (for dates BC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten v.Chr.)</desc>
-                <constraint>
-                    <sch:report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
                 </constraint>
             </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics3">
                 <desc versionDate="2013-11-11" xml:lang="en">checks for the cooccurence of date and duration attributes</desc>
diff --git a/compiled-ODD/guidelines-de-wegaDocuments.compiled.xml b/compiled-ODD/guidelines-de-wegaDocuments.compiled.xml
index fee692be..a8ba80d4 100644
--- a/compiled-ODD/guidelines-de-wegaDocuments.compiled.xml
+++ b/compiled-ODD/guidelines-de-wegaDocuments.compiled.xml
@@ -6835,17 +6835,22 @@ TOURS</addrLine>
   <listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAD">3.5.2. Addresses</ref>
   </listRef>
-</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="model.publicationStmtPart.detail"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics1">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>larger</emph> value than its corresponding <att>notAfter</att> (for dates AC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>größeren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten n.Chr.)</desc>
+</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="model.publicationStmtPart.detail"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
+                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> date value than its corresponding <att>notAfter</att></desc>
+                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Datumswert als sein entsprechendes <att>notAfter</att></desc>
                 <constraint>
-                    <sch:report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-                </constraint>
-            </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> value than its corresponding <att>notAfter</att> (for dates BC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten v.Chr.)</desc>
-                <constraint>
-                    <sch:report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
                 </constraint>
             </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics3">
                 <desc versionDate="2013-11-11" xml:lang="en">checks for the cooccurence of date and duration attributes</desc>
diff --git a/compiled-ODD/guidelines-de-wegaLetters.compiled.xml b/compiled-ODD/guidelines-de-wegaLetters.compiled.xml
index dbcb20da..ed488c54 100644
--- a/compiled-ODD/guidelines-de-wegaLetters.compiled.xml
+++ b/compiled-ODD/guidelines-de-wegaLetters.compiled.xml
@@ -7464,17 +7464,22 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONANU">3.5.3. Numbers and
 Measures</ref>
   </listRef>
-</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="model.publicationStmtPart.detail"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics1">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>larger</emph> value than its corresponding <att>notAfter</att> (for dates AC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>größeren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten n.Chr.)</desc>
+</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="model.publicationStmtPart.detail"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
+                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> date value than its corresponding <att>notAfter</att></desc>
+                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Datumswert als sein entsprechendes <att>notAfter</att></desc>
                 <constraint>
-                    <sch:report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-                </constraint>
-            </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> value than its corresponding <att>notAfter</att> (for dates BC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten v.Chr.)</desc>
-                <constraint>
-                    <sch:report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
                 </constraint>
             </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics3">
                 <desc versionDate="2013-11-11" xml:lang="en">checks for the cooccurence of date and duration attributes</desc>
diff --git a/compiled-ODD/guidelines-de-wegaNews.compiled.xml b/compiled-ODD/guidelines-de-wegaNews.compiled.xml
index d377b560..5f87f1ae 100644
--- a/compiled-ODD/guidelines-de-wegaNews.compiled.xml
+++ b/compiled-ODD/guidelines-de-wegaNews.compiled.xml
@@ -5180,17 +5180,22 @@ en-tête et un texte, constitue un document TEI.</desc>
   </exemplum><listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</ref>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.5.1. Referring Strings</ref>
-  </listRef></elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics1">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>larger</emph> value than its corresponding <att>notAfter</att> (for dates AC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>größeren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten n.Chr.)</desc>
+  </listRef></elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
+                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> date value than its corresponding <att>notAfter</att></desc>
+                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Datumswert als sein entsprechendes <att>notAfter</att></desc>
                 <constraint>
-                    <sch:report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-                </constraint>
-            </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> value than its corresponding <att>notAfter</att> (for dates BC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten v.Chr.)</desc>
-                <constraint>
-                    <sch:report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
                 </constraint>
             </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics3">
                 <desc versionDate="2013-11-11" xml:lang="en">checks for the cooccurence of date and duration attributes</desc>
diff --git a/compiled-ODD/guidelines-de-wegaOrgs.compiled.xml b/compiled-ODD/guidelines-de-wegaOrgs.compiled.xml
index 15ec5ba4..3ac8d9b2 100644
--- a/compiled-ODD/guidelines-de-wegaOrgs.compiled.xml
+++ b/compiled-ODD/guidelines-de-wegaOrgs.compiled.xml
@@ -3418,7 +3418,7 @@ expliquer d'autres parties d'un document.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">raggruppa gli elementi che nominano o indicano una
     persona, un luogo (costruito dall'uomo o geografico), o un'organizzazione</desc>
   <classes>
-    
+    <memberOf key="model.addrPart"/>
     <memberOf key="model.pPart.data"/>
     
   </classes>
@@ -3464,6 +3464,21 @@ expliquer d'autres parties d'un document.</desc>
   <listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBI">3.11. Bibliographic Citations and References</ref>
   </listRef>
+</classSpec><classSpec module="tei" xml:id="ADDRPART" type="model" ident="model.addrPart">
+  <desc versionDate="2007-10-02" xml:lang="en">groups elements such as names or postal codes which may appear as part of a
+    postal address.</desc>
+  <desc versionDate="2007-12-20" xml:lang="ko">우편 주소의 부분으로 나타날 수 있는 이름 또는 우편 번호와 같은 요소를 모아 놓는다.</desc>
+  <desc versionDate="2007-05-02" xml:lang="zh-TW">可能出現於郵寄地址部份的元素，如名稱或郵遞區號。</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">郵便情報としてある名前や郵便番号等の要素をまとめる．</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">regroupe des éléments comme des noms ou des codes postaux
+    qui peuvent apparaître dans une adresse postale</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">agrupa los elementos que constituyen una dirección postal
+    o de cualquier otro tipo.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">raggruppa elementi che costituiscono un indirizzo postale
+    o altro tipo di indirizzo</desc>
+  <listRef>
+    <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAD">3.5.2. Addresses</ref>
+  </listRef>
 </classSpec><classSpec module="tei" xml:id="DATA" type="model" ident="model.pPart.data">
   <desc versionDate="2005-10-10" xml:lang="en">groups phrase-level elements containing names, dates, numbers, measures, and similar data.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">이름, 날짜, 수, 측정, 그리고 유사 데이터를 포함하는 구-층위 요소를 모아 놓는다.</desc>
@@ -4618,7 +4633,39 @@ defined in <ptr target="#XSLT2"/>
   </alternate>
   </content>
   
-</dataSpec><macroSpec module="tei" type="dt" ident="data.count" validUntil="2018-10-01">
+</dataSpec><macroSpec module="tei" type="dt" ident="data.certainty" validUntil="2018-10-01">
+  <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressing a degree of certainty.</desc>
+  <desc versionDate="2007-12-20" xml:lang="ko">확실성 정도를 표현하는 속성 값의 범위를 정의한다.</desc>
+  <desc versionDate="2007-05-02" xml:lang="zh-TW">定義表示正確度的屬性值範圍</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">確信度を示す属性値の程度を示す．</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">Définit la gamme des valeurs d'attribut exprimant un
+    degré de certitude</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos que exprimen un
+    grado de certeza.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi che esprimono
+    un grado di certezza</desc>
+  <content>
+    <rng:choice>
+      <rng:value>high</rng:value>
+      <rng:value>medium</rng:value>
+      <rng:value>low</rng:value>
+      <rng:value>unknown</rng:value>
+    </rng:choice>
+  </content>
+  <remarks versionDate="2011-02-26" xml:lang="en">
+    <p>Certainty may be expressed by one of the predefined symbolic values <val>high</val>,
+        <val>medium</val>, or <val>low</val>. The value
+	<val>unknown</val> should be used in cases where the encoder
+	does not wish to assert an opinion about the matter. For more precise indication, <ident type="datatype">data.probability</ident> may be used instead or in addition.</p>
+  </remarks>
+  <remarks xml:lang="ja" versionDate="2008-04-05">
+    <p> 確信度は，<val>high</val>, <val>medium</val>, <val>low</val>のうち の1つが選択される．より詳細に示したい場合には， <ident type="datatype">data.probability</ident>を単独または追加と して使用することができる． </p>
+  </remarks>
+  <remarks versionDate="2009-05-25" xml:lang="fr">
+    <p>Le degré de certitude peut être exprimé par l'une des valeurs symboliques prédéfinies
+        <val>high</val>, <val>medium</val>, ou <val>low</val>. Pour une indication précise, <ident type="datatype">data.probability</ident> peut être utilisé en remplacement ou en complément.</p>
+  </remarks>
+</macroSpec><macroSpec module="tei" type="dt" ident="data.count" validUntil="2018-10-01">
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used for a non-negative
 integer value used as a count.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">계산으로 사용된 음이 아닌 정수 값의 속성 값 범위를 정의한다.</desc>
@@ -5373,7 +5420,41 @@ one initial.</desc>
   </exemplum><listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</ref>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.5.1. Referring Strings</ref>
-  </listRef></elementSpec><elementSpec rend="change" module="core" ident="address"><gloss versionDate="2016-11-24" xml:lang="de">Adresse</gloss><desc rend="replace" versionDate="2013-11-11" xml:lang="en">contains a postal address, for example of a publisher, an organization, or an individual.</desc><desc rend="replace" versionDate="2013-11-11" xml:lang="de">enthält eine postalische Adresse, beispielsweise die eines Verlages, einer Organisation oder eines Einzelnen.</desc><classes><memberOf key="model.addressLike"/></classes><content><oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="addrLine"/></oneOrMore></content><attList/><exemplum xml:lang="en">
+  </listRef></elementSpec><elementSpec module="core" ident="address">
+  <gloss versionDate="2016-11-24" xml:lang="de">Adresse</gloss>
+  <desc versionDate="2007-02-15" xml:lang="en">contains a postal address, for example of a publisher, an organization, or an
+    individual.</desc>
+  <desc versionDate="2007-12-20" xml:lang="ko">예를 들어, 출판사, 기관, 개인의 우편 주소를 포함한다.</desc>
+  <desc versionDate="2007-05-02" xml:lang="zh-TW">包含出版者、機構、或是個人的郵寄地址或其他地址。</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">郵便配達情報を示す．例えば，出版者，組織，個人の住所など．</desc>
+  <desc versionDate="2009-01-06" xml:lang="fr">contient une adresse postale ou d'un autre type, par exemple l'adresse d'un
+    éditeur, d'un organisme ou d'une personne.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">contiene una dirección postal, por ejemplo de un editor, una institución,
+    etc.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">contiene un indirizzo (postale), ad esempio di un editore, di un'organizzazione, di
+    un individuo.</desc>
+  <desc versionDate="2016-11-24" xml:lang="de">enthält eine Postadresse, z. B. eines Verlegers, einer Organisation oder einer Einzelperson.</desc>
+  <classes>
+    <memberOf key="att.global"/>
+    <memberOf key="model.addressLike"/>
+    
+  </classes>
+  <content>
+    <sequence>
+      
+        <classRef key="model.global" minOccurs="0" maxOccurs="unbounded"/>
+      
+      <sequence minOccurs="1" maxOccurs="unbounded">
+        
+          <classRef key="model.addrPart"/>
+        
+        
+          <classRef key="model.global" minOccurs="0" maxOccurs="unbounded"/>
+        
+      </sequence>
+    </sequence>
+  </content>
+  <exemplum xml:lang="en">
     <p>Using just the elements defined by the core module, an address could be represented as follows:</p>
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <address>
@@ -5383,7 +5464,8 @@ one initial.</desc>
         <name>Italy</name>
       </address>
     </egXML>
-  </exemplum><exemplum xml:lang="en">
+  </exemplum>
+  <exemplum xml:lang="en">
     <p>When a schema includes the names and dates module more specific elements such as country or settlement would be preferable over generic <gi>name</gi>:</p>
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <address>
@@ -5393,7 +5475,8 @@ one initial.</desc>
         <country>Italy</country>
       </address>
     </egXML>
-  </exemplum><exemplum versionDate="2008-04-06" xml:lang="fr">
+  </exemplum>
+  <exemplum versionDate="2008-04-06" xml:lang="fr">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <address>
         <addrLine>Centre d'Études Supérieures de la Renaissance</addrLine>
@@ -5403,7 +5486,8 @@ TOURS</addrLine>
         <addrLine>France</addrLine>
       </address>
     </egXML>
-  </exemplum><exemplum xml:lang="zh-TW">
+  </exemplum>
+  <exemplum xml:lang="zh-TW">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <address>
         <street>邯郸路220号</street>
@@ -5412,7 +5496,8 @@ TOURS</addrLine>
         <name n="I">中華人民共和國</name>
       </address>
     </egXML>
-  </exemplum><exemplum xml:lang="zh-TW">
+  </exemplum>
+  <exemplum xml:lang="zh-TW">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <address>
         <addrLine>沙田</addrLine>
@@ -5421,7 +5506,8 @@ TOURS</addrLine>
         <addrLine>中華人民共和國</addrLine>
       </address>
     </egXML>
-  </exemplum><exemplum xml:lang="en">
+  </exemplum>
+  <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <address>
         <addrLine>Computing Center, MC 135</addrLine>
@@ -5430,7 +5516,8 @@ TOURS</addrLine>
         <addrLine>USA</addrLine>
       </address>
     </egXML>
-  </exemplum><exemplum xml:lang="mul">
+  </exemplum>
+  <exemplum xml:lang="mul">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <address>
            <country key="FR"/>
@@ -5441,25 +5528,31 @@ TOURS</addrLine>
              <street><num>30</num>, Cours de Verdun</street>
          </address>
     </egXML>
-  </exemplum><remarks versionDate="2007-12-16" xml:lang="en">
+  </exemplum>
+  <remarks versionDate="2007-12-16" xml:lang="en">
     <p rend="dataDesc">This element should be used for postal addresses only. Within it, the generic element <gi>addrLine</gi> may
       be used as an alternative to any of the more specialized elements available from the <ident type="class">model.addrPart</ident> class, such as <gi>street</gi>, <gi>postCode</gi> etc.</p>
-  </remarks><remarks xml:lang="fr" versionDate="2007-06-12">
+  </remarks>
+  <remarks xml:lang="fr" versionDate="2007-06-12">
     <p rend="dataDesc">Cet élément ne doit être utilisé que pour donner une adresse postale. A l'intérieur de cet élément,
       l'élément générique <gi>addrLine</gi> peut être utilisé comme élément alternatif aux éléments plus spécialisés de la classe
         <ident type="class">model.addrPart</ident> class, tels que <gi>street</gi>, <gi>postCode</gi> etc.</p>
-  </remarks><remarks xml:lang="ja" versionDate="2008-04-05">
+  </remarks>
+  <remarks xml:lang="ja" versionDate="2008-04-05">
     <p rend="dataDesc"> 当該要素は，郵便配達情報にのみ使用されるべきである． 子要素として要素<gi>addrLine</gi>は，クラスmodel.addrPartにある要
       素の代わりとして，例えば，要素<gi>street</gi>や要素 <gi>postcode</gi>として使用することができる． </p>
-  </remarks><remarks xml:lang="de" versionDate="2016-11-24">
+  </remarks>
+  <remarks xml:lang="de" versionDate="2016-11-24">
     <p rend="dataDesc">Dieses Element sollte ausschließlich für postalische Addressen verwendet werden. Innerhalb des Elements 
           kann das generische <gi>addrLine</gi>-Element als Alternative zu den spezielleren Elementen aus der 
           <ident type="class">model.addrPart</ident>-Klasse, wie <gi>street</gi> (Straße), <gi>postCode</gi> (Postleitzahl), etc. verwendet werden.</p>
-  </remarks><listRef>
+  </remarks>
+  <listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAD">3.5.2. Addresses</ref>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD24">2.2.4. Publication, Distribution, Licensing, etc.</ref>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.11.2.4. Imprint, Size of a Document, and Reprint Information</ref>
-  </listRef></elementSpec><elementSpec rend="change" module="core" ident="addrLine"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">address line</gloss><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">Adresszeile</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains one line of a postal address.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält eine postalische Adresse.</desc><classes/><content><macroRef key="macro.phraseSeq"/></content><attList><attDef ident="n" usage="opt">
+  </listRef>
+</elementSpec><elementSpec rend="change" module="core" ident="addrLine"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">address line</gloss><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">Adresszeile</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains one line of a postal address.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält eine postalische Adresse.</desc><classes><memberOf key="model.addrPart"/></classes><content><macroRef key="macro.phraseSeq"/></content><attList><attDef ident="n" usage="opt">
                     <gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" versionDate="2013-11-11" xml:lang="en">number</gloss>
                     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" versionDate="2013-11-11" xml:lang="en">gives a number (or other label) for an element, which is not necessarily unique within the document.</desc>
                     <gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" versionDate="2013-11-11" xml:lang="en">Nummer</gloss>
@@ -5562,7 +5655,7 @@ TOURS</addrLine>
   <desc versionDate="2007-01-21" xml:lang="it">indirizzo postale completo, incluso il nome o il numero che identifica l'edificio, così come il nome della strada dove è situato.</desc>
   <classes>
     <memberOf key="att.global"/>
-    
+    <memberOf key="model.addrPart"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -5639,7 +5732,7 @@ TOURS</addrLine>
         nell'indirizzo postale per semplificare l'ordine e la distribuzione della posta.</desc>
   <classes>
     <memberOf key="att.global"/>
-    
+    <memberOf key="model.addrPart"/>
   </classes>
   <content>
     <textNode/>
@@ -5688,17 +5781,22 @@ TOURS</addrLine>
   <listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAD">3.5.2. Addresses</ref>
   </listRef>
-</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics1">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>larger</emph> value than its corresponding <att>notAfter</att> (for dates AC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>größeren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten n.Chr.)</desc>
-                <constraint>
-                    <sch:report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-                </constraint>
-            </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> value than its corresponding <att>notAfter</att> (for dates BC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten v.Chr.)</desc>
+</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
+                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> date value than its corresponding <att>notAfter</att></desc>
+                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Datumswert als sein entsprechendes <att>notAfter</att></desc>
                 <constraint>
-                    <sch:report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
                 </constraint>
             </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics3">
                 <desc versionDate="2013-11-11" xml:lang="en">checks for the cooccurence of date and duration attributes</desc>
@@ -8321,20 +8419,74 @@ means of a <gi>glyph</gi> or <gi>char</gi> element referenced here as <code>#sym
     </egXML>
   </exemplum><listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</ref>
-  </listRef></elementSpec><elementSpec rend="change" module="namesdates" ident="event"><gloss versionDate="2008-12-09" xml:lang="fr">évènement</gloss><desc rend="replace" versionDate="2015-08-26" xml:lang="en">contains data relating to any kind of significant event associated with a an organization or corporate body.</desc><desc rend="replace" versionDate="2015-05-22" xml:lang="de">enthält Informationen über 'events' (z.B. Gründung, Einstellung der Tätigkeit) einer Organisation oder Körperschaft.</desc><classes><memberOf key="att.datable"/></classes><content><ref xmlns="http://relaxng.org/ns/structure/1.0" name="label"/><ref xmlns="http://relaxng.org/ns/structure/1.0" name="desc"/></content><constraintSpec scheme="schematron" ident="org-events">
+  </listRef></elementSpec><elementSpec rend="change" module="namesdates" ident="event"><gloss versionDate="2008-12-09" xml:lang="fr">évènement</gloss><desc rend="replace" versionDate="2015-08-26" xml:lang="en">contains data relating to any kind of significant event associated with a an organization or corporate body.</desc><desc rend="replace" versionDate="2015-05-22" xml:lang="de">enthält Informationen über 'events' (z.B. Gründung, Einstellung der Tätigkeit) einer Organisation oder Körperschaft.</desc><classes/><content><sequence minOccurs="1" maxOccurs="1"><elementRef key="label"/><elementRef key="desc"/></sequence></content><constraintSpec scheme="schematron" ident="org-events">
             <constraint>
                 <sch:assert test="tei:label=('Beginn der Tätigkeit', 'Einstellung der Tätigkeit')">label for event should be 'Beginn der Tätigkeit' or 'Einstellung der Tätigkeit'.</sch:assert>
             </constraint>
-        </constraintSpec><attList><attDef ident="where" usage="opt">
-      <desc versionDate="2007-06-11" xml:lang="en">indicates the location of an event by pointing to a <gi>place</gi> element</desc>
-      <desc versionDate="2007-12-20" xml:lang="ko"><gi>place</gi> 요소를 지시함으로써 사건의 위치를 나타낸다.</desc>
-      <desc versionDate="2008-04-06" xml:lang="es">indica la localización de un acontecimiento señalando un elemento <gi>lugar</gi>
-         </desc>
-      <desc versionDate="2008-12-09" xml:lang="fr">indique la localisation d'un évènement en pointant vers un élément <gi>place</gi>
-         </desc>
-      <desc versionDate="2007-11-06" xml:lang="it">indica la posizione di un evento facendo riferimento a un elemento place</desc>
-      <datatype><dataRef key="teidata.pointer"/></datatype>
-    </attDef></attList><exemplum xml:lang="en">
+        </constraintSpec><attList><attDef ident="where" mode="delete"/></attList><exemplum xml:lang="en">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples">
+      <person>
+        <event type="mat" when="1972-10-12">
+          <label>matriculation</label>
+        </event>
+        <event type="grad" when="1975-06-23">
+          <label>graduation</label>
+        </event>
+      </person>
+    </egXML>
+  </exemplum><exemplum versionDate="2008-04-06" xml:lang="fr">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples">
+      <person>
+        <event type="mat" when="1972-10-12">
+          <label>inscription</label>
+        </event>
+        <event type="grad" when="1975-06-23">
+          <label>diplômé</label>
+        </event>
+      </person>
+    </egXML>
+  </exemplum><exemplum xml:lang="zh-TW">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples">
+      <person>
+        <event type="mat" when="1972-10-12">
+          <label>入學</label>
+        </event>
+        <event type="grad" when="1975-06-23">
+          <label>畢業</label>
+        </event>
+      </person>
+    </egXML>
+  </exemplum><listRef>
+    <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">13.3.1. Basic Principles</ref>
+  </listRef><gloss rend="replace" versionDate="2013-11-11" xml:lang="en">event</gloss><gloss rend="replace" versionDate="2013-11-11" xml:lang="en">Ereignis</gloss><desc rend="replace" versionDate="2013-11-11" xml:lang="en">contains data relating to any kind of significant event associated with a person, place, or organization.</desc><desc rend="replace" versionDate="2013-11-11" xml:lang="en">enthält Daten, die zu irgendeinem signifkanten Ereignis, das mit eienr Person, einem Ort oder eine Organisation assoziiert werden kann, zugeordnet werden.</desc><classes><memberOf key="att.datable.w3c"/></classes><content><ref xmlns="http://relaxng.org/ns/structure/1.0" name="head"/><choice xmlns="http://relaxng.org/ns/structure/1.0"><ref name="p"/><ref name="list"/></choice><rng:interleave>
+                <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="p"/></zeroOrMore>
+                <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="list"/></zeroOrMore>
+            </rng:interleave></content><attList><attDef ident="type" usage="opt">
+                <desc versionDate="2013-11-11" xml:lang="en">characterizes the element in some sense, using any convenient classification scheme or typology.</desc>
+                <desc versionDate="2013-11-11" xml:lang="de">charakterisiert das Element in einem gewissen Sinne, wobei irgendeine zweckmäßige Systematik oder Typologie angwendet wird.</desc>
+                <valList type="closed">
+                    <valItem ident="studentOf">
+                        <desc versionDate="2013-11-11" xml:lang="en">student.</desc>
+                        <desc versionDate="2013-11-11" xml:lang="de">Schüler.</desc>
+                    </valItem>
+                    <valItem ident="profOf">
+                        <desc versionDate="2013-11-11" xml:lang="en">prof.</desc>
+                        <desc versionDate="2013-11-11" xml:lang="de">Prof.</desc>
+                    </valItem>
+                </valList>
+            </attDef><attDef ident="status" usage="opt">
+                <desc versionDate="2013-11-11" xml:lang="en">describes the status of a document either currently or, when associated with a dated element, at the time indicated.</desc>
+                <desc versionDate="2013-11-11" xml:lang="de">beschreibt entweder den aktuellen Status eines Dokuments oder den Zeitpunkt zu dem ein veraltetes Element zugeordnet wurde.</desc>
+                <valList type="closed">
+                    <valItem ident="restricted"/></valList>
+            </attDef><attDef ident="cert" usage="opt">
+                <gloss versionDate="2013-11-11" xml:lang="en">certainty</gloss>
+                <desc versionDate="2013-11-11" xml:lang="en">signifies the degree of certainty associated with the intervention or interpretation.</desc>
+                <gloss versionDate="2013-11-11" xml:lang="de">Sicherheit</gloss>
+                <desc versionDate="2013-11-11" xml:lang="de">besagt den Grad der Sicherheit, mit der die Intervention oder Interpretation verbunden ist.</desc>
+                <datatype>
+                    <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.certainty"/></datatype>
+            </attDef><attDef ident="where" mode="delete"/></attList><exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <person>
         <event type="mat" when="1972-10-12">
diff --git a/compiled-ODD/guidelines-de-wegaPersons.compiled.xml b/compiled-ODD/guidelines-de-wegaPersons.compiled.xml
index b2782cfb..8c79b8e7 100644
--- a/compiled-ODD/guidelines-de-wegaPersons.compiled.xml
+++ b/compiled-ODD/guidelines-de-wegaPersons.compiled.xml
@@ -5258,17 +5258,22 @@ TOURS</addrLine>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAD">3.5.2. Addresses</ref>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD24">2.2.4. Publication, Distribution, Licensing, etc.</ref>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.11.2.4. Imprint, Size of a Document, and Reprint Information</ref>
-  </listRef></elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics1">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>larger</emph> value than its corresponding <att>notAfter</att> (for dates AC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>größeren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten n.Chr.)</desc>
+  </listRef></elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
+                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> date value than its corresponding <att>notAfter</att></desc>
+                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Datumswert als sein entsprechendes <att>notAfter</att></desc>
                 <constraint>
-                    <sch:report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-                </constraint>
-            </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> value than its corresponding <att>notAfter</att> (for dates BC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten v.Chr.)</desc>
-                <constraint>
-                    <sch:report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
                 </constraint>
             </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics3">
                 <desc versionDate="2013-11-11" xml:lang="en">checks for the cooccurence of date and duration attributes</desc>
diff --git a/compiled-ODD/guidelines-de-wegaThematicCommentaries.compiled.xml b/compiled-ODD/guidelines-de-wegaThematicCommentaries.compiled.xml
index 80c69ddb..a861e44a 100644
--- a/compiled-ODD/guidelines-de-wegaThematicCommentaries.compiled.xml
+++ b/compiled-ODD/guidelines-de-wegaThematicCommentaries.compiled.xml
@@ -6702,17 +6702,22 @@ TOURS</addrLine>
   <listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAD">3.5.2. Addresses</ref>
   </listRef>
-</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics1">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>larger</emph> value than its corresponding <att>notAfter</att> (for dates AC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>größeren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten n.Chr.)</desc>
+</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
+                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> date value than its corresponding <att>notAfter</att></desc>
+                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Datumswert als sein entsprechendes <att>notAfter</att></desc>
                 <constraint>
-                    <sch:report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-                </constraint>
-            </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> value than its corresponding <att>notAfter</att> (for dates BC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten v.Chr.)</desc>
-                <constraint>
-                    <sch:report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
                 </constraint>
             </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics3">
                 <desc versionDate="2013-11-11" xml:lang="en">checks for the cooccurence of date and duration attributes</desc>
diff --git a/compiled-ODD/guidelines-de-wegaVar.compiled.xml b/compiled-ODD/guidelines-de-wegaVar.compiled.xml
index b7cdb87b..bc925974 100644
--- a/compiled-ODD/guidelines-de-wegaVar.compiled.xml
+++ b/compiled-ODD/guidelines-de-wegaVar.compiled.xml
@@ -7354,17 +7354,22 @@ TOURS</addrLine>
   <listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAD">3.5.2. Addresses</ref>
   </listRef>
-</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics1">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>larger</emph> value than its corresponding <att>notAfter</att> (for dates AC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>größeren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten n.Chr.)</desc>
+</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
+                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> date value than its corresponding <att>notAfter</att></desc>
+                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Datumswert als sein entsprechendes <att>notAfter</att></desc>
                 <constraint>
-                    <sch:report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-                </constraint>
-            </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> value than its corresponding <att>notAfter</att> (for dates BC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten v.Chr.)</desc>
-                <constraint>
-                    <sch:report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
                 </constraint>
             </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics3">
                 <desc versionDate="2013-11-11" xml:lang="en">checks for the cooccurence of date and duration attributes</desc>
diff --git a/compiled-ODD/guidelines-de-wegaWritings.compiled.xml b/compiled-ODD/guidelines-de-wegaWritings.compiled.xml
index 7491245a..42e1b653 100644
--- a/compiled-ODD/guidelines-de-wegaWritings.compiled.xml
+++ b/compiled-ODD/guidelines-de-wegaWritings.compiled.xml
@@ -6845,17 +6845,22 @@ TOURS</addrLine>
   <listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAD">3.5.2. Addresses</ref>
   </listRef>
-</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="model.publicationStmtPart.detail"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics1">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>larger</emph> value than its corresponding <att>notAfter</att> (for dates AC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>größeren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten n.Chr.)</desc>
+</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="model.publicationStmtPart.detail"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
+                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> date value than its corresponding <att>notAfter</att></desc>
+                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Datumswert als sein entsprechendes <att>notAfter</att></desc>
                 <constraint>
-                    <sch:report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-                </constraint>
-            </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> value than its corresponding <att>notAfter</att> (for dates BC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten v.Chr.)</desc>
-                <constraint>
-                    <sch:report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
                 </constraint>
             </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics3">
                 <desc versionDate="2013-11-11" xml:lang="en">checks for the cooccurence of date and duration attributes</desc>
diff --git a/compiled-ODD/guidelines-de-wega_all.compiled.xml b/compiled-ODD/guidelines-de-wega_all.compiled.xml
index 72f13085..c343b534 100644
--- a/compiled-ODD/guidelines-de-wega_all.compiled.xml
+++ b/compiled-ODD/guidelines-de-wega_all.compiled.xml
@@ -8771,17 +8771,22 @@ Measures</ref>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONANU">3.5.3. Numbers and
 Measures</ref>
   </listRef>
-</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="model.publicationStmtPart.detail"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics1">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>larger</emph> value than its corresponding <att>notAfter</att> (for dates AC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>größeren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten n.Chr.)</desc>
+</elementSpec><elementSpec rend="change" module="core" ident="date"><gloss versionDate="2009-01-06" xml:lang="fr">date</gloss><gloss versionDate="2016-11-25" xml:lang="de">Datum</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="en">contains a date in any format.</desc><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" rend="replace" versionDate="2013-11-11" xml:lang="de">enthält ein Datum in einem beliebigen Format.</desc><classes><memberOf key="att.global.responsibility"/><memberOf key="model.dateLike"/><memberOf key="model.publicationStmtPart.detail"/><memberOf key="att.datable"/></classes><content><alternate minOccurs="0" maxOccurs="unbounded"><textNode/><classRef key="model.gLike"/><classRef key="model.phrase"/><classRef key="model.global"/></alternate></content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
+                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> date value than its corresponding <att>notAfter</att></desc>
+                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Datumswert als sein entsprechendes <att>notAfter</att></desc>
                 <constraint>
-                    <sch:report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-                </constraint>
-            </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics2">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> value than its corresponding <att>notAfter</att> (for dates BC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten v.Chr.)</desc>
-                <constraint>
-                    <sch:report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
                 </constraint>
             </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" scheme="schematron" ident="dateHeuristics3">
                 <desc versionDate="2013-11-11" xml:lang="en">checks for the cooccurence of date and duration attributes</desc>
diff --git a/schema/de/wegaBiblio.isosch b/schema/de/wegaBiblio.isosch
index d9d94cfb..06e1c228 100644
--- 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 2017-11-15T18:49:47Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2017-12-21T19:30:24Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -68,79 +68,83 @@ belongs, but this <name/> element has no textual content.</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-wegaBiblio-date-dateHeuristics1-10">
-      <rule context="tei:date">
-                    <report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-date-dateHeuristics2-11">
-      <rule context="tei:date">
-                    <report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-date-dateHeuristics3-12">
+   <pattern id="schematron-constraint-wegaBiblio-date-dateHeuristics2-10">
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                </pattern>
+   <pattern id="schematron-constraint-wegaBiblio-date-dateHeuristics3-11">
       <rule context="tei:date">
                     <report test="(@from or @to) and (@when or @notAfter or @notBefore)">cooccurence of date and duration attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-date-dateHeuristics4-13">
+   <pattern id="schematron-constraint-wegaBiblio-date-dateHeuristics4-12">
       <rule context="tei:date">
                     <report test="@when and (@notAfter or @notBefore)">cooccurence of exact and uncertain date attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-date-dateHeuristics5-14">
+   <pattern id="schematron-constraint-wegaBiblio-date-dateHeuristics5-13">
       <rule context="tei:date">
                     <assert test="@when or @notBefore or @notAfter or @from or @to or @cert='unknown' or matches(., '0000|o\.J\.|unknown') or ancestor::tei:text">tei:date benötigt ein Attribut @when, @notBefore o.ä.</assert>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-ref-prev-next-correspContext-15">
+   <pattern id="schematron-constraint-wegaBiblio-ref-prev-next-correspContext-14">
       <rule context="tei:ref">
                     <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="schematron-constraint-wegaBiblio-ref-refAtts-16">
+   <pattern id="schematron-constraint-wegaBiblio-ref-refAtts-15">
       <rule context="tei:ref">
          <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-wegaBiblio-note-note-in-text-17">
+   <pattern id="schematron-constraint-wegaBiblio-note-note-in-text-16">
                     <rule context="tei:note[not(parent::tei:org or parent::tei:person or parent::tei:notesStmt or parent::tei:biblStruct or parent::tei:imprint)]">
                         <assert test="@type and @resp and @xml:id">It is required to provide @type and @resp and @xml:id on note.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaBiblio-note-thematicCom-target-18">
+   <pattern id="schematron-constraint-wegaBiblio-note-thematicCom-target-17">
                     <rule context="tei:note[@type='thematicCom' or @target]">
                         <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-notesStmt-notes-18">
                     <rule context="tei:note[parent::tei:notesStmt]">
                         <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-wegaBiblio-analytic-analyticTitle-20">
+   <pattern id="schematron-constraint-wegaBiblio-analytic-analyticTitle-19">
       <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-21">
+   <pattern id="schematron-constraint-wegaBiblio-monogr-monogrTitle-20">
       <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-22">
+   <pattern id="schematron-constraint-wegaBiblio-series-seriesTitle-21">
       <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-23">
+   <pattern id="schematron-constraint-wegaBiblio-author-sameAs-sameAs-reference-22">
                             <rule context="tei:*[@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-24">
+   <pattern id="schematron-constraint-wegaBiblio-title-duplicate-title-23">
                     <rule context="tei:title[following-sibling::tei:title]">
                         <let name="level" value="@level"/>
                         <let name="type" value="string(@type)"/> 
@@ -148,41 +152,41 @@ belongs, but this <name/> element has no textual content.</assert>
                         <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-25">
+   <pattern id="schematron-constraint-wegaBiblio-title-punctuation-mark-24">
       <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-26">
+   <pattern id="schematron-constraint-wegaBiblio-imprint-duplicate-biblScope-type-25">
       <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-27">
+   <pattern id="schematron-constraint-wegaBiblio-styleguide-document-node-content-26">
                 <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-28">
+   <pattern id="schematron-constraint-wegaBiblio-whitespaceOnlyContent-27">
                 <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-29">
+   <pattern id="schematron-constraint-wegaBiblio-elementStartsWithWhitespace-28">
                 <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-30">
+   <pattern id="schematron-constraint-wegaBiblio-untrimmedAttributeValues-29">
                 <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-att.wega.rend-underline-n-31">
+   <pattern id="schematron-constraint-wegaBiblio-att.wega.rend-underline-n-30">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>
diff --git a/schema/de/wegaBiblio.rng b/schema/de/wegaBiblio.rng
index 027b12d7..99b2323e 100644
--- a/schema/de/wegaBiblio.rng
+++ b/schema/de/wegaBiblio.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-08T08:24:34Z. .
+Schema generated from ODD source 2017-12-21T19:30:24Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -1124,31 +1124,55 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-date-dateHeuristics1-constraint-report-6">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaBiblio-date-dateHeuristics2-constraint-rule-8">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-date-dateHeuristics2-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaBiblio-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaBiblio-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaBiblio-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-date-dateHeuristics3-constraint-report-8">
+                  id="wegaBiblio-date-dateHeuristics3-constraint-report-10">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1160,7 +1184,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-date-dateHeuristics4-constraint-report-9">
+                  id="wegaBiblio-date-dateHeuristics4-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1221,7 +1245,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Quellenangabe) definiert eine Quellenangabe an einer anderen Stelle, die womöglich durch zusätzlichen Text oder Kommentare modifizert wurde. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-ref-prev-next-correspContext-constraint-report-10">
+                  id="wegaBiblio-ref-prev-next-correspContext-constraint-report-12">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1233,7 +1257,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-ref-refAtts-constraint-report-11">
+                  id="wegaBiblio-ref-refAtts-constraint-report-13">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -1270,7 +1294,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Anmerkung) enthält eine Notiz oder eine Anmerkung/Annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-note-note-in-text-constraint-rule-8">
+                  id="wegaBiblio-note-note-in-text-constraint-rule-12">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1282,7 +1306,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-note-thematicCom-target-constraint-rule-9">
+                  id="wegaBiblio-note-thematicCom-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1294,7 +1318,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-note-notesStmt-notes-constraint-rule-10">
+                  id="wegaBiblio-note-notesStmt-notes-constraint-rule-14">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1363,7 +1387,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-analytic-analyticTitle-constraint-report-12">
+                  id="wegaBiblio-analytic-analyticTitle-constraint-report-14">
             <rule context="tei:analytic">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1448,7 +1472,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-monogr-monogrTitle-constraint-report-13">
+                  id="wegaBiblio-monogr-monogrTitle-constraint-report-15">
             <rule context="tei:monogr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1479,7 +1503,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-series-seriesTitle-constraint-report-14">
+                  id="wegaBiblio-series-seriesTitle-constraint-report-16">
             <rule context="tei:series">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1524,7 +1548,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-author-sameAs-sameAs-reference-constraint-rule-11">
+                  id="wegaBiblio-author-sameAs-sameAs-reference-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1581,7 +1605,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Titel) enthält einen Titel für jede Art von Arbeit. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-title-duplicate-title-constraint-rule-12">
+                  id="wegaBiblio-title-duplicate-title-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1596,7 +1620,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-title-punctuation-mark-constraint-report-16">
+                  id="wegaBiblio-title-punctuation-mark-constraint-report-18">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1663,7 +1687,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </optional>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-imprint-duplicate-biblScope-type-constraint-report-17">
+                  id="wegaBiblio-imprint-duplicate-biblScope-type-constraint-report-19">
             <rule context="tei:imprint">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1899,7 +1923,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaBiblio-att.wega.rend-underline-n-constraint-rule-17">
+            id="wegaBiblio-att.wega.rend-underline-n-constraint-rule-21">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1916,7 +1940,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaBiblio-styleguide-document-node-content-constraint-rule-13">
+            id="wegaBiblio-styleguide-document-node-content-constraint-rule-17">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1929,7 +1953,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaBiblio-whitespaceOnlyContent-constraint-rule-14">
+            id="wegaBiblio-whitespaceOnlyContent-constraint-rule-18">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1942,7 +1966,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaBiblio-elementStartsWithWhitespace-constraint-rule-15">
+            id="wegaBiblio-elementStartsWithWhitespace-constraint-rule-19">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1955,7 +1979,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaBiblio-untrimmedAttributeValues-constraint-rule-16">
+            id="wegaBiblio-untrimmedAttributeValues-constraint-rule-20">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/de/wegaDiaries.isosch b/schema/de/wegaDiaries.isosch
index 982ec74b..61ad327c 100644
--- a/schema/de/wegaDiaries.isosch
+++ b/schema/de/wegaDiaries.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-12-15T16:35:47Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2017-12-21T19:30:24Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -80,32 +80,36 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                         <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-wegaDiaries-date-dateHeuristics1-12">
-      <rule context="tei:date">
-                    <report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-date-dateHeuristics2-13">
-      <rule context="tei:date">
-                    <report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-date-dateHeuristics3-14">
+   <pattern id="schematron-constraint-wegaDiaries-date-dateHeuristics2-12">
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                </pattern>
+   <pattern id="schematron-constraint-wegaDiaries-date-dateHeuristics3-13">
       <rule context="tei:date">
                     <report test="(@from or @to) and (@when or @notAfter or @notBefore)">cooccurence of date and duration attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-date-dateHeuristics4-15">
+   <pattern id="schematron-constraint-wegaDiaries-date-dateHeuristics4-14">
       <rule context="tei:date">
                     <report test="@when and (@notAfter or @notBefore)">cooccurence of exact and uncertain date attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-date-dateHeuristics5-16">
+   <pattern id="schematron-constraint-wegaDiaries-date-dateHeuristics5-15">
       <rule context="tei:date">
                     <assert test="@when or @notBefore or @notAfter or @from or @to or @cert='unknown' or matches(., '0000|o\.J\.|unknown') or ancestor::tei:text">tei:date benötigt ein Attribut @when, @notBefore o.ä.</assert>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-ptr-ptr-target-17">
+   <pattern id="schematron-constraint-wegaDiaries-ptr-ptr-target-16">
                  <rule context="tei:ptr[not(starts-with(@target, 'http'))]">
                     <assert test="following::tei:note[@xml:id=substring(current()/@target,2)]">
                        The note element indicated by @target (<value-of select="@target"/>) must follow the current element <name/>. 
@@ -113,52 +117,52 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                     </assert>
                  </rule>
              </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-ptr-duplicate-ptr-18">
+   <pattern id="schematron-constraint-wegaDiaries-ptr-duplicate-ptr-17">
       <rule context="tei:ptr">
                 <report test="following::tei:ptr[@target=current()/@target]">
                    There must be only one pointer with the @target (<value-of select="@target"/>)
                 </report>
              </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-ptr-ptrAtts-19">
+   <pattern id="schematron-constraint-wegaDiaries-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-wegaDiaries-ref-prev-next-correspContext-20">
+   <pattern id="schematron-constraint-wegaDiaries-ref-prev-next-correspContext-19">
       <rule context="tei:ref">
                     <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="schematron-constraint-wegaDiaries-ref-refAtts-21">
+   <pattern id="schematron-constraint-wegaDiaries-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/>
          </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-note-note-in-text-22">
+   <pattern id="schematron-constraint-wegaDiaries-note-note-in-text-21">
                     <rule context="tei:note[not(parent::tei:org or parent::tei:person or parent::tei:notesStmt or parent::tei:biblStruct or parent::tei:imprint)]">
                         <assert test="@type and @resp and @xml:id">It is required to provide @type and @resp and @xml:id on note.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-note-thematicCom-target-23">
+   <pattern id="schematron-constraint-wegaDiaries-note-thematicCom-target-22">
                     <rule context="tei:note[@type='thematicCom' or @target]">
                         <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-wegaDiaries-note-notesStmt-notes-24">
+   <pattern id="schematron-constraint-wegaDiaries-note-notesStmt-notes-23">
                     <rule context="tei:note[parent::tei:notesStmt]">
                         <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-wegaDiaries-pb-facs-facs-reference-25">
+   <pattern id="schematron-constraint-wegaDiaries-pb-facs-facs-reference-24">
                             <rule context="tei:*[@facs]">
                                 <assert test="id(substring(@facs,2)) or starts-with(@facs, 'wega:')">There must be an element with the xml:id = "<value-of select="substring(@facs,2)"/>" which is the target of this @facs.</assert>
                             </rule>
                         </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-title-duplicate-title-26">
+   <pattern id="schematron-constraint-wegaDiaries-title-duplicate-title-25">
                     <rule context="tei:title[following-sibling::tei:title]">
                         <let name="level" value="@level"/>
                         <let name="type" value="string(@type)"/> 
@@ -166,98 +170,98 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                         <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-wegaDiaries-title-punctuation-mark-27">
+   <pattern id="schematron-constraint-wegaDiaries-title-punctuation-mark-26">
       <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-wegaDiaries-orgName-parent-org-28">
+   <pattern id="schematron-constraint-wegaDiaries-orgName-parent-org-27">
                     <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-wegaDiaries-orgName-parent-org-reg-29">
+   <pattern id="schematron-constraint-wegaDiaries-orgName-parent-org-reg-28">
                     <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-wegaDiaries-orgName-parent-org-reg-30">
+   <pattern id="schematron-constraint-wegaDiaries-orgName-parent-org-reg-29">
                     <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-wegaDiaries-orgName-parent-not-org-31">
+   <pattern id="schematron-constraint-wegaDiaries-orgName-parent-not-org-30">
                     <rule context="tei:orgName[not(parent::tei:org)]">
                         <report test="@type">No @type attribute allowed here.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-addSpan-spanTo-32">
+   <pattern id="schematron-constraint-wegaDiaries-addSpan-spanTo-31">
       <rule context="tei:addSpan">
          <assert test="@spanTo">The @spanTo attribute of <name/> is required.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-addSpan-spanTo-spanTo-7-34">
+   <pattern id="schematron-constraint-wegaDiaries-addSpan-spanTo-spanTo-7-33">
                             <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/>
                                 </assert>
                             </rule>
                         </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-subst-substContents1-35">
+   <pattern id="schematron-constraint-wegaDiaries-subst-substContents1-34">
       <rule context="tei:subst">
          <assert test="child::tei:add and child::tei:del">
             <name/> must have at least one child add and at least one child del</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-ab-abstractModel-structure-p-36">
+   <pattern id="schematron-constraint-wegaDiaries-ab-abstractModel-structure-p-35">
       <rule context="tei:ab">
          <report test="not(ancestor::floatingText) and (ancestor::tei:p or ancestor::tei:ab)          and not(parent::tei:exemplum         |parent::tei:item         |parent::tei:note         |parent::tei:q         |parent::tei:quote         |parent::tei:remarks         |parent::tei:said         |parent::tei:sp         |parent::tei:stage         |parent::tei:cell         |parent::tei:figure)">
         Abstract model violation: ab may not contain paragraphs or other ab elements.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-ab-abstractModel-structure-l-37">
+   <pattern id="schematron-constraint-wegaDiaries-ab-abstractModel-structure-l-36">
       <rule context="tei:ab">
          <report test="ancestor::tei:l or ancestor::tei:lg">
         Abstract model violation: Lines may not contain higher-level divisions such as p or ab.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-seg-activeOrPassivePerformance-38">
+   <pattern id="schematron-constraint-wegaDiaries-seg-activeOrPassivePerformance-37">
       <rule context="tei:seg">
                     <report test="./@subtype = ('active', 'passive') and not(./@type = 'performance')">if @subtype contains 'active' or 'passive' @type has to be 'performance'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDiaries-seg-AddresseeOrSenderCorrespondence-39">
+   <pattern id="schematron-constraint-wegaDiaries-seg-AddresseeOrSenderCorrespondence-38">
       <rule context="tei:seg">
                     <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-wegaDiaries-styleguide-document-node-content-40">
+   <pattern id="schematron-constraint-wegaDiaries-styleguide-document-node-content-39">
                 <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-wegaDiaries-whitespaceOnlyContent-41">
+   <pattern id="schematron-constraint-wegaDiaries-whitespaceOnlyContent-40">
                 <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-wegaDiaries-elementStartsWithWhitespace-42">
+   <pattern id="schematron-constraint-wegaDiaries-elementStartsWithWhitespace-41">
                 <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-wegaDiaries-untrimmedAttributeValues-43">
+   <pattern id="schematron-constraint-wegaDiaries-untrimmedAttributeValues-42">
                 <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-wegaDiaries-att.wega.rend-underline-n-44">
+   <pattern id="schematron-constraint-wegaDiaries-att.wega.rend-underline-n-43">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>
diff --git a/schema/de/wegaDiaries.rng b/schema/de/wegaDiaries.rng
index e4fdf7d9..1bf496d8 100644
--- a/schema/de/wegaDiaries.rng
+++ b/schema/de/wegaDiaries.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-15T16:35:47Z. .
+Schema generated from ODD source 2017-12-21T19:30:24Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -1967,31 +1967,55 @@ Measures]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-date-dateHeuristics1-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaDiaries-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-date-dateHeuristics2-constraint-report-8">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaDiaries-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaDiaries-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaDiaries-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-date-dateHeuristics3-constraint-report-9">
+                  id="wegaDiaries-date-dateHeuristics3-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2003,7 +2027,7 @@ Measures]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-date-dateHeuristics4-constraint-report-10">
+                  id="wegaDiaries-date-dateHeuristics4-constraint-report-12">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2078,7 +2102,7 @@ Measures]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) wird benutzt um auf ein folgendes note zu zeigen und somit den Beginn des zu kommentierenden Bereichs zu markieren. Alternativ kann das Element ein Platzhalter für eine externe URL (präfigiert mit 'http') sein. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ptr-ptr-target-constraint-rule-9">
+                  id="wegaDiaries-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2093,7 +2117,7 @@ Measures]</a:documentation>
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ptr-duplicate-ptr-constraint-report-11">
+                  id="wegaDiaries-ptr-duplicate-ptr-constraint-report-13">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2107,7 +2131,7 @@ Measures]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ptr-ptrAtts-constraint-report-12">
+                  id="wegaDiaries-ptr-ptrAtts-constraint-report-14">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2133,7 +2157,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Quellenangabe) definiert eine Quellenangabe an einer anderen Stelle, die womöglich durch zusätzlichen Text oder Kommentare modifizert wurde. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ref-prev-next-correspContext-constraint-report-13">
+                  id="wegaDiaries-ref-prev-next-correspContext-constraint-report-15">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2145,7 +2169,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ref-refAtts-constraint-report-14">
+                  id="wegaDiaries-ref-refAtts-constraint-report-16">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2182,7 +2206,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Anmerkung) enthält eine Notiz oder eine Anmerkung/Annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-note-note-in-text-constraint-rule-10">
+                  id="wegaDiaries-note-note-in-text-constraint-rule-14">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2194,7 +2218,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-note-thematicCom-target-constraint-rule-11">
+                  id="wegaDiaries-note-thematicCom-target-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2206,7 +2230,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-note-notesStmt-notes-constraint-rule-12">
+                  id="wegaDiaries-note-notesStmt-notes-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2288,7 +2312,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-pb-facs-facs-reference-constraint-rule-13">
+                  id="wegaDiaries-pb-facs-facs-reference-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2333,7 +2357,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Titel) enthält einen Titel für jede Art von Arbeit. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-title-duplicate-title-constraint-rule-14">
+                  id="wegaDiaries-title-duplicate-title-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2348,7 +2372,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-title-punctuation-mark-constraint-report-16">
+                  id="wegaDiaries-title-punctuation-mark-constraint-report-18">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2412,7 +2436,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-orgName-parent-org-constraint-rule-15">
+                  id="wegaDiaries-orgName-parent-org-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2424,7 +2448,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-orgName-parent-org-reg-constraint-rule-16">
+                  id="wegaDiaries-orgName-parent-org-reg-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2436,7 +2460,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-orgName-parent-org-reg-constraint-rule-17">
+                  id="wegaDiaries-orgName-parent-org-reg-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2448,7 +2472,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-orgName-parent-not-org-constraint-rule-18">
+                  id="wegaDiaries-orgName-parent-not-org-constraint-rule-22">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2653,7 +2677,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             <data type="anyURI"/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-addSpan-hand-hand-reference-constraint-rule-19">
+                  id="wegaDiaries-addSpan-hand-hand-reference-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2669,7 +2693,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             <data type="anyURI"/>
          </attribute> 
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-addSpan-spanTo-spanTo-7-constraint-rule-20">
+                  id="wegaDiaries-addSpan-spanTo-spanTo-7-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2797,7 +2821,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unbenannter Bereich) enthält jede beliebige Komponentenebene einer Texteinheit, eingesetzt als einen unbenannten Bereich für eine Phrase oder ein analoges Element, aber ohne die semantische Bedeutung eines Absatzes. [16.3. Blocks, Segments, and Anchors]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ab-abstractModel-structure-p-constraint-report-20">
+                  id="wegaDiaries-ab-abstractModel-structure-p-constraint-report-22">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2807,7 +2831,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ab-abstractModel-structure-l-constraint-report-21">
+                  id="wegaDiaries-ab-abstractModel-structure-l-constraint-report-23">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2850,7 +2874,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(beliebiges Segment) steht für eine beliebige Segmentierung des Textes unterhalb des ‘chunk’ Levels. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-seg-activeOrPassivePerformance-constraint-report-22">
+                  id="wegaDiaries-seg-activeOrPassivePerformance-constraint-report-24">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2862,7 +2886,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-seg-AddresseeOrSenderCorrespondence-constraint-report-23">
+                  id="wegaDiaries-seg-AddresseeOrSenderCorrespondence-constraint-report-25">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3096,7 +3120,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDiaries-att.wega.rend-underline-n-constraint-rule-25">
+            id="wegaDiaries-att.wega.rend-underline-n-constraint-rule-29">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3113,7 +3137,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDiaries-styleguide-document-node-content-constraint-rule-21">
+            id="wegaDiaries-styleguide-document-node-content-constraint-rule-25">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3126,7 +3150,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDiaries-whitespaceOnlyContent-constraint-rule-22">
+            id="wegaDiaries-whitespaceOnlyContent-constraint-rule-26">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3139,7 +3163,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDiaries-elementStartsWithWhitespace-constraint-rule-23">
+            id="wegaDiaries-elementStartsWithWhitespace-constraint-rule-27">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3152,7 +3176,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDiaries-untrimmedAttributeValues-constraint-rule-24">
+            id="wegaDiaries-untrimmedAttributeValues-constraint-rule-28">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/de/wegaDocuments.isosch b/schema/de/wegaDocuments.isosch
index dd6b3426..6a07168b 100644
--- a/schema/de/wegaDocuments.isosch
+++ b/schema/de/wegaDocuments.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-11-15T18:49:51Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2017-12-21T19:30:25Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -81,32 +81,36 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                         <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-wegaDocuments-date-dateHeuristics1-12">
-      <rule context="tei:date">
-                    <report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-date-dateHeuristics2-13">
-      <rule context="tei:date">
-                    <report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-date-dateHeuristics3-14">
+   <pattern id="schematron-constraint-wegaDocuments-date-dateHeuristics2-12">
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                </pattern>
+   <pattern id="schematron-constraint-wegaDocuments-date-dateHeuristics3-13">
       <rule context="tei:date">
                     <report test="(@from or @to) and (@when or @notAfter or @notBefore)">cooccurence of date and duration attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-date-dateHeuristics4-15">
+   <pattern id="schematron-constraint-wegaDocuments-date-dateHeuristics4-14">
       <rule context="tei:date">
                     <report test="@when and (@notAfter or @notBefore)">cooccurence of exact and uncertain date attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-date-dateHeuristics5-16">
+   <pattern id="schematron-constraint-wegaDocuments-date-dateHeuristics5-15">
       <rule context="tei:date">
                     <assert test="@when or @notBefore or @notAfter or @from or @to or @cert='unknown' or matches(., '0000|o\.J\.|unknown') or ancestor::tei:text">tei:date benötigt ein Attribut @when, @notBefore o.ä.</assert>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-ptr-ptr-target-17">
+   <pattern id="schematron-constraint-wegaDocuments-ptr-ptr-target-16">
                  <rule context="tei:ptr[not(starts-with(@target, 'http'))]">
                     <assert test="following::tei:note[@xml:id=substring(current()/@target,2)]">
                        The note element indicated by @target (<value-of select="@target"/>) must follow the current element <name/>. 
@@ -114,82 +118,82 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                     </assert>
                  </rule>
              </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-ptr-duplicate-ptr-18">
+   <pattern id="schematron-constraint-wegaDocuments-ptr-duplicate-ptr-17">
       <rule context="tei:ptr">
                 <report test="following::tei:ptr[@target=current()/@target]">
                    There must be only one pointer with the @target (<value-of select="@target"/>)
                 </report>
              </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-ptr-ptrAtts-19">
+   <pattern id="schematron-constraint-wegaDocuments-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-wegaDocuments-ref-prev-next-correspContext-20">
+   <pattern id="schematron-constraint-wegaDocuments-ref-prev-next-correspContext-19">
       <rule context="tei:ref">
                     <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="schematron-constraint-wegaDocuments-ref-refAtts-21">
+   <pattern id="schematron-constraint-wegaDocuments-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/>
          </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-list-gloss-list-22">
+   <pattern id="schematron-constraint-wegaDocuments-list-gloss-list-21">
       <rule context="tei:list">
                     <report test="./tei:label and not(@type='gloss')">Labels are only allowed in lists of type='gloss'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-list-gloss-list-must-have-labels-23">
+   <pattern id="schematron-constraint-wegaDocuments-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>
     </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-note-note-in-text-24">
+   <pattern id="schematron-constraint-wegaDocuments-note-note-in-text-23">
                     <rule context="tei:note[not(parent::tei:org or parent::tei:person or parent::tei:notesStmt or parent::tei:biblStruct or parent::tei:imprint)]">
                         <assert test="@type and @resp and @xml:id">It is required to provide @type and @resp and @xml:id on note.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-note-thematicCom-target-25">
+   <pattern id="schematron-constraint-wegaDocuments-note-thematicCom-target-24">
                     <rule context="tei:note[@type='thematicCom' or @target]">
                         <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-wegaDocuments-note-notesStmt-notes-26">
+   <pattern id="schematron-constraint-wegaDocuments-note-notesStmt-notes-25">
                     <rule context="tei:note[parent::tei:notesStmt]">
                         <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-wegaDocuments-graphic-graphic-url-check-27">
+   <pattern id="schematron-constraint-wegaDocuments-graphic-graphic-url-check-26">
       <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>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-pb-facs-facs-reference-28">
+   <pattern id="schematron-constraint-wegaDocuments-pb-facs-facs-reference-27">
                             <rule context="tei:*[@facs]">
                                 <assert test="id(substring(@facs,2)) or starts-with(@facs, 'wega:')">There must be an element with the xml:id = "<value-of select="substring(@facs,2)"/>" which is the target of this @facs.</assert>
                             </rule>
                         </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-analytic-analyticTitle-29">
+   <pattern id="schematron-constraint-wegaDocuments-analytic-analyticTitle-28">
       <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-wegaDocuments-monogr-monogrTitle-30">
+   <pattern id="schematron-constraint-wegaDocuments-monogr-monogrTitle-29">
       <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-wegaDocuments-author-sameAs-sameAs-reference-31">
+   <pattern id="schematron-constraint-wegaDocuments-author-sameAs-sameAs-reference-30">
                             <rule context="tei:*[@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-wegaDocuments-title-duplicate-title-32">
+   <pattern id="schematron-constraint-wegaDocuments-title-duplicate-title-31">
                     <rule context="tei:title[following-sibling::tei:title]">
                         <let name="level" value="@level"/>
                         <let name="type" value="string(@type)"/> 
@@ -197,28 +201,28 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                         <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-wegaDocuments-title-punctuation-mark-33">
+   <pattern id="schematron-constraint-wegaDocuments-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-wegaDocuments-imprint-duplicate-biblScope-type-34">
+   <pattern id="schematron-constraint-wegaDocuments-imprint-duplicate-biblScope-type-33">
       <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-wegaDocuments-relatedItem-relatedItem-type-within-notesStmt-35">
+   <pattern id="schematron-constraint-wegaDocuments-relatedItem-relatedItem-type-within-notesStmt-34">
       <rule context="tei:relatedItem">
                     <report test="@type and not(parent::tei:notesStmt)">The @type attribute on <name/> must only be used within the notesStmt.</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-relatedItem-relatedItem-target-within-notesStmt-36">
+   <pattern id="schematron-constraint-wegaDocuments-relatedItem-relatedItem-target-within-notesStmt-35">
                     <rule context="tei:relatedItem[parent::tei:notesStmt]">
                         <assert test="@target and @type">Within the notesStmt you must supply both the @target and the @type attribute on <name/>.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-relatedItem-targetorcontent1-37">
+   <pattern id="schematron-constraint-wegaDocuments-relatedItem-targetorcontent1-36">
       <rule context="tei:relatedItem">
          <report test="@target and count( child::* ) &gt; 0">
 If the @target attribute on <name/> is used, the
@@ -227,33 +231,33 @@ relatedItem element must be empty</report>
         or a child element to indicate the related bibliographic item</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-l-abstractModel-structure-l-38">
+   <pattern id="schematron-constraint-wegaDocuments-l-abstractModel-structure-l-37">
       <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.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-lg-atleast1oflggapl-39">
+   <pattern id="schematron-constraint-wegaDocuments-lg-atleast1oflggapl-38">
       <rule context="tei:lg">
          <assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
         must contain at least one child l, lg or gap element.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-lg-abstractModel-structure-l-40">
+   <pattern id="schematron-constraint-wegaDocuments-lg-abstractModel-structure-l-39">
       <rule context="tei:lg">
          <report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
         Abstract model violation: Lines may not contain line groups.
       </report>
       </rule>
    </pattern>
-   <pattern id="isoschematron-constraint-wegaDocuments-teiHeader-seriesTitle-41">
+   <pattern id="isoschematron-constraint-wegaDocuments-teiHeader-seriesTitle-40">
                 <rule context="tei:fileDesc/tei:titleStmt/tei:title[@level='s']">
                     <assert test=".='WeGA, Dokumente, Digitale Edition'">The series title must be 
                         "WeGA, Dokumente, Digitale Edition".</assert>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-notesStmt-count-notes-42">
+   <pattern id="schematron-constraint-wegaDocuments-notesStmt-count-notes-41">
       <rule context="tei:notesStmt">
                     <report test="count(tei:note/@type) ne count(distinct-values(tei:note/concat(@type, @xml:lang, @n)))">Only one summary, incipit, editorial and thematicCom are allowed within notesStmt.</report>
                 </rule>
@@ -262,46 +266,46 @@ relatedItem element must be empty</report>
       
     
       
-    <pattern id="schematron-constraint-wegaDocuments-div-abstractModel-structure-l-45">
+    <pattern id="schematron-constraint-wegaDocuments-div-abstractModel-structure-l-44">
       <rule context="tei:div">
          <report test="ancestor::tei:l">
         Abstract model violation: Lines may not contain higher-level structural elements such as div.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-div-abstractModel-structure-p-46">
+   <pattern id="schematron-constraint-wegaDocuments-div-abstractModel-structure-p-45">
       <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>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-orgName-parent-org-47">
+   <pattern id="schematron-constraint-wegaDocuments-orgName-parent-org-46">
                     <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-wegaDocuments-orgName-parent-org-reg-48">
+   <pattern id="schematron-constraint-wegaDocuments-orgName-parent-org-reg-47">
                     <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-wegaDocuments-orgName-parent-org-reg-49">
+   <pattern id="schematron-constraint-wegaDocuments-orgName-parent-org-reg-48">
                     <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-wegaDocuments-orgName-parent-not-org-50">
+   <pattern id="schematron-constraint-wegaDocuments-orgName-parent-not-org-49">
                     <rule context="tei:orgName[not(parent::tei:org)]">
                         <report test="@type">No @type attribute allowed here.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-table-collapsible-head-51">
+   <pattern id="schematron-constraint-wegaDocuments-table-collapsible-head-50">
       <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-wegaDocuments-row-number-of-cells-52">
+   <pattern id="schematron-constraint-wegaDocuments-row-number-of-cells-51">
                     <rule context="tei:row[preceding-sibling::tei:row]">
                         <let name="thisNode" value="."/>
                         
@@ -322,74 +326,74 @@ relatedItem element must be empty</report>
                         <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-wegaDocuments-cell-cell-rows-53">
+   <pattern id="schematron-constraint-wegaDocuments-cell-cell-rows-52">
                     <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-wegaDocuments-addSpan-spanTo-54">
+   <pattern id="schematron-constraint-wegaDocuments-addSpan-spanTo-53">
       <rule context="tei:addSpan">
          <assert test="@spanTo">The @spanTo attribute of <name/> is required.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-addSpan-spanTo-spanTo-7-56">
+   <pattern id="schematron-constraint-wegaDocuments-addSpan-spanTo-spanTo-7-55">
                             <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/>
                                 </assert>
                             </rule>
                         </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-subst-substContents1-57">
+   <pattern id="schematron-constraint-wegaDocuments-subst-substContents1-56">
       <rule context="tei:subst">
          <assert test="child::tei:add and child::tei:del">
             <name/> must have at least one child add and at least one child del</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-msIdentifier-msId_minimal-58">
+   <pattern id="schematron-constraint-wegaDocuments-msIdentifier-msId_minimal-57">
       <rule context="tei:msIdentifier">
          <report test="not(parent::tei:msPart) and       (local-name(*[1])='idno' or       local-name(*[1])='altIdentifier' or       normalize-space(.)='')">An msIdentifier must contain either a repository or location of some type, or a manuscript name</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-seg-activeOrPassivePerformance-59">
+   <pattern id="schematron-constraint-wegaDocuments-seg-activeOrPassivePerformance-58">
       <rule context="tei:seg">
                     <report test="./@subtype = ('active', 'passive') and not(./@type = 'performance')">if @subtype contains 'active' or 'passive' @type has to be 'performance'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-seg-AddresseeOrSenderCorrespondence-60">
+   <pattern id="schematron-constraint-wegaDocuments-seg-AddresseeOrSenderCorrespondence-59">
       <rule context="tei:seg">
                     <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-wegaDocuments-att.witnessed-att-wit-61">
+   <pattern id="schematron-constraint-wegaDocuments-att.witnessed-att-wit-60">
                     <rule context="tei:*[@wit]">
                         <let name="wit" value="@wit"/>
                         <assert test="preceding::tei:witness[@xml:id = substring($wit, 2)]">The @wit-attribute must point at some witness element</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaDocuments-styleguide-document-node-content-62">
+   <pattern id="schematron-constraint-wegaDocuments-styleguide-document-node-content-61">
                 <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-wegaDocuments-whitespaceOnlyContent-63">
+   <pattern id="schematron-constraint-wegaDocuments-whitespaceOnlyContent-62">
                 <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-wegaDocuments-elementStartsWithWhitespace-64">
+   <pattern id="schematron-constraint-wegaDocuments-elementStartsWithWhitespace-63">
                 <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-wegaDocuments-untrimmedAttributeValues-65">
+   <pattern id="schematron-constraint-wegaDocuments-untrimmedAttributeValues-64">
                 <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-wegaDocuments-att.wega.rend-underline-n-66">
+   <pattern id="schematron-constraint-wegaDocuments-att.wega.rend-underline-n-65">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>
diff --git a/schema/de/wegaDocuments.rng b/schema/de/wegaDocuments.rng
index 7d1b9d13..ead40595 100644
--- a/schema/de/wegaDocuments.rng
+++ b/schema/de/wegaDocuments.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-08T08:24:39Z. .
+Schema generated from ODD source 2017-12-21T19:30:25Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -2600,31 +2600,55 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-date-dateHeuristics1-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaDocuments-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-date-dateHeuristics2-constraint-report-8">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaDocuments-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaDocuments-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaDocuments-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-date-dateHeuristics3-constraint-report-9">
+                  id="wegaDocuments-date-dateHeuristics3-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2636,7 +2660,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-date-dateHeuristics4-constraint-report-10">
+                  id="wegaDocuments-date-dateHeuristics4-constraint-report-12">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2711,7 +2735,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) wird benutzt um auf ein folgendes note zu zeigen und somit den Beginn des zu kommentierenden Bereichs zu markieren. Alternativ kann das Element ein Platzhalter für eine externe URL (präfigiert mit 'http') sein. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-ptr-ptr-target-constraint-rule-9">
+                  id="wegaDocuments-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2726,7 +2750,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-ptr-duplicate-ptr-constraint-report-11">
+                  id="wegaDocuments-ptr-duplicate-ptr-constraint-report-13">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2740,7 +2764,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-ptr-ptrAtts-constraint-report-12">
+                  id="wegaDocuments-ptr-ptrAtts-constraint-report-14">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2766,7 +2790,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Quellenangabe) definiert eine Quellenangabe an einer anderen Stelle, die womöglich durch zusätzlichen Text oder Kommentare modifizert wurde. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-ref-prev-next-correspContext-constraint-report-13">
+                  id="wegaDocuments-ref-prev-next-correspContext-constraint-report-15">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2778,7 +2802,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-ref-refAtts-constraint-report-14">
+                  id="wegaDocuments-ref-refAtts-constraint-report-16">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2832,7 +2856,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-list-gloss-list-constraint-report-15">
+                  id="wegaDocuments-list-gloss-list-constraint-report-17">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2844,7 +2868,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-list-gloss-list-must-have-labels-constraint-rule-10">
+                  id="wegaDocuments-list-gloss-list-must-have-labels-constraint-rule-14">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2933,7 +2957,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Anmerkung) enthält eine Notiz oder eine Anmerkung/Annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-note-note-in-text-constraint-rule-11">
+                  id="wegaDocuments-note-note-in-text-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2945,7 +2969,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-note-thematicCom-target-constraint-rule-12">
+                  id="wegaDocuments-note-thematicCom-target-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2957,7 +2981,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-note-notesStmt-notes-constraint-rule-13">
+                  id="wegaDocuments-note-notesStmt-notes-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3066,7 +3090,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-pb-facs-facs-reference-constraint-rule-14">
+                  id="wegaDocuments-pb-facs-facs-reference-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3140,7 +3164,7 @@ Elements]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-analytic-analyticTitle-constraint-report-16">
+                  id="wegaDocuments-analytic-analyticTitle-constraint-report-18">
             <rule context="tei:analytic">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3233,7 +3257,7 @@ Elements]</a:documentation>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-monogr-monogrTitle-constraint-report-17">
+                  id="wegaDocuments-monogr-monogrTitle-constraint-report-19">
             <rule context="tei:monogr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3278,7 +3302,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-author-sameAs-sameAs-reference-constraint-rule-15">
+                  id="wegaDocuments-author-sameAs-sameAs-reference-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3384,7 +3408,7 @@ Elements]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Titel) enthält einen Titel für jede Art von Arbeit. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-title-duplicate-title-constraint-rule-16">
+                  id="wegaDocuments-title-duplicate-title-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3399,7 +3423,7 @@ Elements]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-title-punctuation-mark-constraint-report-19">
+                  id="wegaDocuments-title-punctuation-mark-constraint-report-21">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3466,7 +3490,7 @@ Elements]</a:documentation>
             </optional>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-imprint-duplicate-biblScope-type-constraint-report-20">
+                  id="wegaDocuments-imprint-duplicate-biblScope-type-constraint-report-22">
             <rule context="tei:imprint">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3601,7 +3625,7 @@ Elements]</a:documentation>
             </choice>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-relatedItem-relatedItem-type-within-notesStmt-constraint-report-21">
+                  id="wegaDocuments-relatedItem-relatedItem-type-within-notesStmt-constraint-report-23">
             <rule context="tei:relatedItem">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3613,7 +3637,7 @@ Elements]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-17">
+                  id="wegaDocuments-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3625,7 +3649,7 @@ Elements]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-relatedItem-targetorcontent1-constraint-report-22">
+                  id="wegaDocuments-relatedItem-targetorcontent1-constraint-report-24">
             <rule context="tei:relatedItem">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -3682,7 +3706,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-l-abstractModel-structure-l-constraint-report-23">
+                  id="wegaDocuments-l-abstractModel-structure-l-constraint-report-25">
             <rule context="tei:l">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3741,7 +3765,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-lg-abstractModel-structure-l-constraint-report-24">
+                  id="wegaDocuments-lg-abstractModel-structure-l-constraint-report-26">
             <rule context="tei:lg">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3764,7 +3788,7 @@ relatedItem element must be empty</sch:report>
             <ref name="revisionDesc"/>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-teiHeader-seriesTitle-constraint-rule-18">
+                  id="wegaDocuments-teiHeader-seriesTitle-constraint-rule-22">
             <sch:rule xmlns:xi="http://www.w3.org/2001/XInclude"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
@@ -3969,7 +3993,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-notesStmt-count-notes-constraint-report-25">
+                  id="wegaDocuments-notesStmt-count-notes-constraint-report-27">
             <rule context="tei:notesStmt">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4383,7 +4407,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-div-abstractModel-structure-l-constraint-report-26">
+                  id="wegaDocuments-div-abstractModel-structure-l-constraint-report-28">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4393,7 +4417,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-div-abstractModel-structure-p-constraint-report-27">
+                  id="wegaDocuments-div-abstractModel-structure-p-constraint-report-29">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4562,7 +4586,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-orgName-parent-org-constraint-rule-19">
+                  id="wegaDocuments-orgName-parent-org-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4574,7 +4598,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-orgName-parent-org-reg-constraint-rule-20">
+                  id="wegaDocuments-orgName-parent-org-reg-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4586,7 +4610,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-orgName-parent-org-reg-constraint-rule-21">
+                  id="wegaDocuments-orgName-parent-org-reg-constraint-rule-25">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4598,7 +4622,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-orgName-parent-not-org-constraint-rule-22">
+                  id="wegaDocuments-orgName-parent-not-org-constraint-rule-26">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4744,7 +4768,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-table-collapsible-head-constraint-report-31">
+                  id="wegaDocuments-table-collapsible-head-constraint-report-33">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4778,7 +4802,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-row-number-of-cells-constraint-rule-23">
+                  id="wegaDocuments-row-number-of-cells-constraint-rule-27">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4815,7 +4839,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Tabellenzelle) enthält eine Zelle einer Tabelle. [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-cell-cell-rows-constraint-rule-24">
+                  id="wegaDocuments-cell-cell-rows-constraint-rule-28">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4981,7 +5005,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             <data type="anyURI"/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-addSpan-hand-hand-reference-constraint-rule-25">
+                  id="wegaDocuments-addSpan-hand-hand-reference-constraint-rule-29">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4997,7 +5021,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             <data type="anyURI"/>
          </attribute> 
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-addSpan-spanTo-spanTo-7-constraint-rule-26">
+                  id="wegaDocuments-addSpan-spanTo-spanTo-7-constraint-rule-30">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5145,7 +5169,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-msIdentifier-msId_minimal-constraint-report-33">
+                  id="wegaDocuments-msIdentifier-msId_minimal-constraint-report-35">
             <rule context="tei:msIdentifier">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5274,7 +5298,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(beliebiges Segment) steht für eine beliebige Segmentierung des Textes unterhalb des ‘chunk’ Levels. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-seg-activeOrPassivePerformance-constraint-report-34">
+                  id="wegaDocuments-seg-activeOrPassivePerformance-constraint-report-36">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5286,7 +5310,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-seg-AddresseeOrSenderCorrespondence-constraint-report-35">
+                  id="wegaDocuments-seg-AddresseeOrSenderCorrespondence-constraint-report-37">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5445,7 +5469,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDocuments-att.witnessed-att-wit-constraint-rule-27">
+            id="wegaDocuments-att.witnessed-att-wit-constraint-rule-31">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5663,7 +5687,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDocuments-att.wega.rend-underline-n-constraint-rule-32">
+            id="wegaDocuments-att.wega.rend-underline-n-constraint-rule-36">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5680,7 +5704,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDocuments-styleguide-document-node-content-constraint-rule-28">
+            id="wegaDocuments-styleguide-document-node-content-constraint-rule-32">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5693,7 +5717,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDocuments-whitespaceOnlyContent-constraint-rule-29">
+            id="wegaDocuments-whitespaceOnlyContent-constraint-rule-33">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5706,7 +5730,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDocuments-elementStartsWithWhitespace-constraint-rule-30">
+            id="wegaDocuments-elementStartsWithWhitespace-constraint-rule-34">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5719,7 +5743,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDocuments-untrimmedAttributeValues-constraint-rule-31">
+            id="wegaDocuments-untrimmedAttributeValues-constraint-rule-35">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/de/wegaLetters.isosch b/schema/de/wegaLetters.isosch
index 57bcb9e9..0b6fa609 100644
--- a/schema/de/wegaLetters.isosch
+++ b/schema/de/wegaLetters.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-11-15T18:49:53Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2017-12-21T19:30:26Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -86,32 +86,36 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                 <report test="ancestor::tei:opener">Putting <name/> in the opener is most probably an error and should be put in a separate div of type=address</report>
             </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-date-dateHeuristics1-13">
-      <rule context="tei:date">
-                    <report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaLetters-date-dateHeuristics2-14">
-      <rule context="tei:date">
-                    <report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaLetters-date-dateHeuristics3-15">
+   <pattern id="schematron-constraint-wegaLetters-date-dateHeuristics2-13">
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                </pattern>
+   <pattern id="schematron-constraint-wegaLetters-date-dateHeuristics3-14">
       <rule context="tei:date">
                     <report test="(@from or @to) and (@when or @notAfter or @notBefore)">cooccurence of date and duration attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-date-dateHeuristics4-16">
+   <pattern id="schematron-constraint-wegaLetters-date-dateHeuristics4-15">
       <rule context="tei:date">
                     <report test="@when and (@notAfter or @notBefore)">cooccurence of exact and uncertain date attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-date-dateHeuristics5-17">
+   <pattern id="schematron-constraint-wegaLetters-date-dateHeuristics5-16">
       <rule context="tei:date">
                     <assert test="@when or @notBefore or @notAfter or @from or @to or @cert='unknown' or matches(., '0000|o\.J\.|unknown') or ancestor::tei:text">tei:date benötigt ein Attribut @when, @notBefore o.ä.</assert>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-ptr-ptr-target-18">
+   <pattern id="schematron-constraint-wegaLetters-ptr-ptr-target-17">
                  <rule context="tei:ptr[not(starts-with(@target, 'http'))]">
                     <assert test="following::tei:note[@xml:id=substring(current()/@target,2)]">
                        The note element indicated by @target (<value-of select="@target"/>) must follow the current element <name/>. 
@@ -119,87 +123,87 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                     </assert>
                  </rule>
              </pattern>
-   <pattern id="schematron-constraint-wegaLetters-ptr-duplicate-ptr-19">
+   <pattern id="schematron-constraint-wegaLetters-ptr-duplicate-ptr-18">
       <rule context="tei:ptr">
                 <report test="following::tei:ptr[@target=current()/@target]">
                    There must be only one pointer with the @target (<value-of select="@target"/>)
                 </report>
              </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-ptr-ptrAtts-20">
+   <pattern id="schematron-constraint-wegaLetters-ptr-ptrAtts-19">
       <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-wegaLetters-ref-prev-next-correspContext-21">
+   <pattern id="schematron-constraint-wegaLetters-ref-prev-next-correspContext-20">
       <rule context="tei:ref">
                     <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="schematron-constraint-wegaLetters-ref-refAtts-22">
+   <pattern id="schematron-constraint-wegaLetters-ref-refAtts-21">
       <rule context="tei:ref">
          <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-wegaLetters-list-gloss-list-23">
+   <pattern id="schematron-constraint-wegaLetters-list-gloss-list-22">
       <rule context="tei:list">
                     <report test="./tei:label and not(@type='gloss')">Labels are only allowed in lists of type='gloss'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-list-gloss-list-must-have-labels-24">
+   <pattern id="schematron-constraint-wegaLetters-list-gloss-list-must-have-labels-23">
       <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>
     </pattern>
-   <pattern id="schematron-constraint-wegaLetters-note-note-in-text-25">
+   <pattern id="schematron-constraint-wegaLetters-note-note-in-text-24">
                     <rule context="tei:note[not(parent::tei:org or parent::tei:person or parent::tei:notesStmt or parent::tei:biblStruct or parent::tei:imprint)]">
                         <assert test="@type and @resp and @xml:id">It is required to provide @type and @resp and @xml:id on note.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaLetters-note-thematicCom-target-26">
+   <pattern id="schematron-constraint-wegaLetters-note-thematicCom-target-25">
                     <rule context="tei:note[@type='thematicCom' or @target]">
                         <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-wegaLetters-note-notesStmt-notes-27">
+   <pattern id="schematron-constraint-wegaLetters-note-notesStmt-notes-26">
                     <rule context="tei:note[parent::tei:notesStmt]">
                         <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-wegaLetters-graphic-graphic-url-check-28">
+   <pattern id="schematron-constraint-wegaLetters-graphic-graphic-url-check-27">
       <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>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-pb-facs-facs-reference-29">
+   <pattern id="schematron-constraint-wegaLetters-pb-facs-facs-reference-28">
                             <rule context="tei:*[@facs]">
                                 <assert test="id(substring(@facs,2)) or starts-with(@facs, 'wega:')">There must be an element with the xml:id = "<value-of select="substring(@facs,2)"/>" which is the target of this @facs.</assert>
                             </rule>
                         </pattern>
-   <pattern id="schematron-constraint-wegaLetters-analytic-analyticTitle-30">
+   <pattern id="schematron-constraint-wegaLetters-analytic-analyticTitle-29">
       <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-wegaLetters-monogr-monogrTitle-31">
+   <pattern id="schematron-constraint-wegaLetters-monogr-monogrTitle-30">
       <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-wegaLetters-series-seriesTitle-32">
+   <pattern id="schematron-constraint-wegaLetters-series-seriesTitle-31">
       <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-wegaLetters-author-sameAs-sameAs-reference-33">
+   <pattern id="schematron-constraint-wegaLetters-author-sameAs-sameAs-reference-32">
                             <rule context="tei:*[@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-wegaLetters-title-duplicate-title-34">
+   <pattern id="schematron-constraint-wegaLetters-title-duplicate-title-33">
                     <rule context="tei:title[following-sibling::tei:title]">
                         <let name="level" value="@level"/>
                         <let name="type" value="string(@type)"/> 
@@ -207,28 +211,28 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                         <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-wegaLetters-title-punctuation-mark-35">
+   <pattern id="schematron-constraint-wegaLetters-title-punctuation-mark-34">
       <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-wegaLetters-imprint-duplicate-biblScope-type-36">
+   <pattern id="schematron-constraint-wegaLetters-imprint-duplicate-biblScope-type-35">
       <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-wegaLetters-relatedItem-relatedItem-type-within-notesStmt-37">
+   <pattern id="schematron-constraint-wegaLetters-relatedItem-relatedItem-type-within-notesStmt-36">
       <rule context="tei:relatedItem">
                     <report test="@type and not(parent::tei:notesStmt)">The @type attribute on <name/> must only be used within the notesStmt.</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-relatedItem-relatedItem-target-within-notesStmt-38">
+   <pattern id="schematron-constraint-wegaLetters-relatedItem-relatedItem-target-within-notesStmt-37">
                     <rule context="tei:relatedItem[parent::tei:notesStmt]">
                         <assert test="@target and @type">Within the notesStmt you must supply both the @target and the @type attribute on <name/>.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaLetters-relatedItem-targetorcontent1-39">
+   <pattern id="schematron-constraint-wegaLetters-relatedItem-targetorcontent1-38">
       <rule context="tei:relatedItem">
          <report test="@target and count( child::* ) &gt; 0">
 If the @target attribute on <name/> is used, the
@@ -237,33 +241,33 @@ relatedItem element must be empty</report>
         or a child element to indicate the related bibliographic item</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-l-abstractModel-structure-l-40">
+   <pattern id="schematron-constraint-wegaLetters-l-abstractModel-structure-l-39">
       <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.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-lg-atleast1oflggapl-41">
+   <pattern id="schematron-constraint-wegaLetters-lg-atleast1oflggapl-40">
       <rule context="tei:lg">
          <assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
         must contain at least one child l, lg or gap element.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-lg-abstractModel-structure-l-42">
+   <pattern id="schematron-constraint-wegaLetters-lg-abstractModel-structure-l-41">
       <rule context="tei:lg">
          <report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
         Abstract model violation: Lines may not contain line groups.
       </report>
       </rule>
    </pattern>
-   <pattern id="isoschematron-constraint-wegaLetters-teiHeader-seriesTitle-43">
+   <pattern id="isoschematron-constraint-wegaLetters-teiHeader-seriesTitle-42">
                 <rule context="tei:fileDesc/tei:titleStmt/tei:title[@level='s']">
                     <assert test=".=('WeGA, Briefe, Digitale Edition', 'WeGA, Albumblätter, Digitale Edition')">The series title must be either 
                         "WeGA, Briefe, Digitale Edition", or "WeGA, Albumblätter, Digitale Edition".</assert>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaLetters-notesStmt-count-notes-44">
+   <pattern id="schematron-constraint-wegaLetters-notesStmt-count-notes-43">
       <rule context="tei:notesStmt">
                     <report test="count(tei:note/@type) ne count(distinct-values(tei:note/concat(@type, @xml:lang, @n)))">Only one summary, incipit, editorial and thematicCom are allowed within notesStmt.</report>
                 </rule>
@@ -272,46 +276,46 @@ relatedItem element must be empty</report>
       
     
       
-    <pattern id="schematron-constraint-wegaLetters-div-abstractModel-structure-l-47">
+    <pattern id="schematron-constraint-wegaLetters-div-abstractModel-structure-l-46">
       <rule context="tei:div">
          <report test="ancestor::tei:l">
         Abstract model violation: Lines may not contain higher-level structural elements such as div.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-div-abstractModel-structure-p-48">
+   <pattern id="schematron-constraint-wegaLetters-div-abstractModel-structure-p-47">
       <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>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-orgName-parent-org-49">
+   <pattern id="schematron-constraint-wegaLetters-orgName-parent-org-48">
                     <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-wegaLetters-orgName-parent-org-reg-50">
+   <pattern id="schematron-constraint-wegaLetters-orgName-parent-org-reg-49">
                     <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-wegaLetters-orgName-parent-org-reg-51">
+   <pattern id="schematron-constraint-wegaLetters-orgName-parent-org-reg-50">
                     <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-wegaLetters-orgName-parent-not-org-52">
+   <pattern id="schematron-constraint-wegaLetters-orgName-parent-not-org-51">
                     <rule context="tei:orgName[not(parent::tei:org)]">
                         <report test="@type">No @type attribute allowed here.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaLetters-table-collapsible-head-53">
+   <pattern id="schematron-constraint-wegaLetters-table-collapsible-head-52">
       <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-wegaLetters-row-number-of-cells-54">
+   <pattern id="schematron-constraint-wegaLetters-row-number-of-cells-53">
                     <rule context="tei:row[preceding-sibling::tei:row]">
                         <let name="thisNode" value="."/>
                         
@@ -332,80 +336,80 @@ relatedItem element must be empty</report>
                         <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-wegaLetters-cell-cell-rows-55">
+   <pattern id="schematron-constraint-wegaLetters-cell-cell-rows-54">
                     <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-wegaLetters-addSpan-spanTo-56">
+   <pattern id="schematron-constraint-wegaLetters-addSpan-spanTo-55">
       <rule context="tei:addSpan">
          <assert test="@spanTo">The @spanTo attribute of <name/> is required.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-addSpan-spanTo-spanTo-7-58">
+   <pattern id="schematron-constraint-wegaLetters-addSpan-spanTo-spanTo-7-57">
                             <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/>
                                 </assert>
                             </rule>
                         </pattern>
-   <pattern id="schematron-constraint-wegaLetters-subst-substContents1-59">
+   <pattern id="schematron-constraint-wegaLetters-subst-substContents1-58">
       <rule context="tei:subst">
          <assert test="child::tei:add and child::tei:del">
             <name/> must have at least one child add and at least one child del</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-msIdentifier-msId_minimal-60">
+   <pattern id="schematron-constraint-wegaLetters-msIdentifier-msId_minimal-59">
       <rule context="tei:msIdentifier">
          <report test="not(parent::tei:msPart) and       (local-name(*[1])='idno' or       local-name(*[1])='altIdentifier' or       normalize-space(.)='')">An msIdentifier must contain either a repository or location of some type, or a manuscript name</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-seg-activeOrPassivePerformance-61">
+   <pattern id="schematron-constraint-wegaLetters-seg-activeOrPassivePerformance-60">
       <rule context="tei:seg">
                     <report test="./@subtype = ('active', 'passive') and not(./@type = 'performance')">if @subtype contains 'active' or 'passive' @type has to be 'performance'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaLetters-seg-AddresseeOrSenderCorrespondence-62">
+   <pattern id="schematron-constraint-wegaLetters-seg-AddresseeOrSenderCorrespondence-61">
       <rule context="tei:seg">
                     <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-wegaLetters-att.witnessed-att-wit-63">
+   <pattern id="schematron-constraint-wegaLetters-att.witnessed-att-wit-62">
                     <rule context="tei:*[@wit]">
                         <let name="wit" value="@wit"/>
                         <assert test="preceding::tei:witness[@xml:id = substring($wit, 2)]">The @wit-attribute must point at some witness element</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaLetters-styleguide-document-node-content-64">
+   <pattern id="schematron-constraint-wegaLetters-styleguide-document-node-content-63">
                 <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-wegaLetters-whitespaceOnlyContent-65">
+   <pattern id="schematron-constraint-wegaLetters-whitespaceOnlyContent-64">
                 <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-wegaLetters-elementStartsWithWhitespace-66">
+   <pattern id="schematron-constraint-wegaLetters-elementStartsWithWhitespace-65">
                 <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-wegaLetters-untrimmedAttributeValues-67">
+   <pattern id="schematron-constraint-wegaLetters-untrimmedAttributeValues-66">
                 <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-wegaLetters-styleguide-document-node-content-68">
+   <pattern id="schematron-constraint-wegaLetters-styleguide-document-node-content-67">
                 <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-wegaLetters-att.wega.rend-underline-n-69">
+   <pattern id="schematron-constraint-wegaLetters-att.wega.rend-underline-n-68">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>
diff --git a/schema/de/wegaLetters.rng b/schema/de/wegaLetters.rng
index 66ac4ae2..7aadc175 100644
--- a/schema/de/wegaLetters.rng
+++ b/schema/de/wegaLetters.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-08T08:24:42Z. .
+Schema generated from ODD source 2017-12-21T19:30:26Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -2858,31 +2858,55 @@ Empfohlene Werte sind: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a:do
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-date-dateHeuristics1-constraint-report-8">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaLetters-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-date-dateHeuristics2-constraint-report-9">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaLetters-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-date-dateHeuristics3-constraint-report-10">
+                  id="wegaLetters-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaLetters-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaLetters-date-dateHeuristics3-constraint-report-12">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2894,7 +2918,7 @@ Empfohlene Werte sind: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a:do
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-date-dateHeuristics4-constraint-report-11">
+                  id="wegaLetters-date-dateHeuristics4-constraint-report-13">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2969,7 +2993,7 @@ Empfohlene Werte sind: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a:do
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) wird benutzt um auf ein folgendes note zu zeigen und somit den Beginn des zu kommentierenden Bereichs zu markieren. Alternativ kann das Element ein Platzhalter für eine externe URL (präfigiert mit 'http') sein. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-ptr-ptr-target-constraint-rule-9">
+                  id="wegaLetters-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2984,7 +3008,7 @@ Empfohlene Werte sind: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a:do
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-ptr-duplicate-ptr-constraint-report-12">
+                  id="wegaLetters-ptr-duplicate-ptr-constraint-report-14">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2998,7 +3022,7 @@ Empfohlene Werte sind: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a:do
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-ptr-ptrAtts-constraint-report-13">
+                  id="wegaLetters-ptr-ptrAtts-constraint-report-15">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3024,7 +3048,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Quellenangabe) definiert eine Quellenangabe an einer anderen Stelle, die womöglich durch zusätzlichen Text oder Kommentare modifizert wurde. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-ref-prev-next-correspContext-constraint-report-14">
+                  id="wegaLetters-ref-prev-next-correspContext-constraint-report-16">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3036,7 +3060,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-ref-refAtts-constraint-report-15">
+                  id="wegaLetters-ref-refAtts-constraint-report-17">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3090,7 +3114,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-list-gloss-list-constraint-report-16">
+                  id="wegaLetters-list-gloss-list-constraint-report-18">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3102,7 +3126,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-list-gloss-list-must-have-labels-constraint-rule-10">
+                  id="wegaLetters-list-gloss-list-must-have-labels-constraint-rule-14">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3206,7 +3230,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Anmerkung) enthält eine Notiz oder eine Anmerkung/Annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-note-note-in-text-constraint-rule-11">
+                  id="wegaLetters-note-note-in-text-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3218,7 +3242,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-note-thematicCom-target-constraint-rule-12">
+                  id="wegaLetters-note-thematicCom-target-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3230,7 +3254,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-note-notesStmt-notes-constraint-rule-13">
+                  id="wegaLetters-note-notesStmt-notes-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3352,7 +3376,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-pb-facs-facs-reference-constraint-rule-14">
+                  id="wegaLetters-pb-facs-facs-reference-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3408,7 +3432,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-analytic-analyticTitle-constraint-report-17">
+                  id="wegaLetters-analytic-analyticTitle-constraint-report-19">
             <rule context="tei:analytic">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3501,7 +3525,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-monogr-monogrTitle-constraint-report-18">
+                  id="wegaLetters-monogr-monogrTitle-constraint-report-20">
             <rule context="tei:monogr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3534,7 +3558,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-series-seriesTitle-constraint-report-19">
+                  id="wegaLetters-series-seriesTitle-constraint-report-21">
             <rule context="tei:series">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3579,7 +3603,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-author-sameAs-sameAs-reference-constraint-rule-15">
+                  id="wegaLetters-author-sameAs-sameAs-reference-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3685,7 +3709,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Titel) enthält einen Titel für jede Art von Arbeit. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-title-duplicate-title-constraint-rule-16">
+                  id="wegaLetters-title-duplicate-title-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3700,7 +3724,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-title-punctuation-mark-constraint-report-21">
+                  id="wegaLetters-title-punctuation-mark-constraint-report-23">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3767,7 +3791,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </optional>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-imprint-duplicate-biblScope-type-constraint-report-22">
+                  id="wegaLetters-imprint-duplicate-biblScope-type-constraint-report-24">
             <rule context="tei:imprint">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3904,7 +3928,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </choice>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-relatedItem-relatedItem-type-within-notesStmt-constraint-report-23">
+                  id="wegaLetters-relatedItem-relatedItem-type-within-notesStmt-constraint-report-25">
             <rule context="tei:relatedItem">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3916,7 +3940,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-17">
+                  id="wegaLetters-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3928,7 +3952,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-relatedItem-targetorcontent1-constraint-report-24">
+                  id="wegaLetters-relatedItem-targetorcontent1-constraint-report-26">
             <rule context="tei:relatedItem">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -3985,7 +4009,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-l-abstractModel-structure-l-constraint-report-25">
+                  id="wegaLetters-l-abstractModel-structure-l-constraint-report-27">
             <rule context="tei:l">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4044,7 +4068,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-lg-abstractModel-structure-l-constraint-report-26">
+                  id="wegaLetters-lg-abstractModel-structure-l-constraint-report-28">
             <rule context="tei:lg">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4067,7 +4091,7 @@ relatedItem element must be empty</sch:report>
             <ref name="revisionDesc"/>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-teiHeader-seriesTitle-constraint-rule-18">
+                  id="wegaLetters-teiHeader-seriesTitle-constraint-rule-22">
             <sch:rule xmlns:xi="http://www.w3.org/2001/XInclude"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
@@ -4267,7 +4291,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-notesStmt-count-notes-constraint-report-27">
+                  id="wegaLetters-notesStmt-count-notes-constraint-report-29">
             <rule context="tei:notesStmt">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4773,7 +4797,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-div-abstractModel-structure-l-constraint-report-28">
+                  id="wegaLetters-div-abstractModel-structure-l-constraint-report-30">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4783,7 +4807,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-div-abstractModel-structure-p-constraint-report-29">
+                  id="wegaLetters-div-abstractModel-structure-p-constraint-report-31">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5020,7 +5044,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-orgName-parent-org-constraint-rule-19">
+                  id="wegaLetters-orgName-parent-org-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5032,7 +5056,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-orgName-parent-org-reg-constraint-rule-20">
+                  id="wegaLetters-orgName-parent-org-reg-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5044,7 +5068,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-orgName-parent-org-reg-constraint-rule-21">
+                  id="wegaLetters-orgName-parent-org-reg-constraint-rule-25">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5056,7 +5080,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-orgName-parent-not-org-constraint-rule-22">
+                  id="wegaLetters-orgName-parent-not-org-constraint-rule-26">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5202,7 +5226,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-table-collapsible-head-constraint-report-33">
+                  id="wegaLetters-table-collapsible-head-constraint-report-35">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5236,7 +5260,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-row-number-of-cells-constraint-rule-23">
+                  id="wegaLetters-row-number-of-cells-constraint-rule-27">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5273,7 +5297,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Tabellenzelle) enthält eine Zelle einer Tabelle. [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-cell-cell-rows-constraint-rule-24">
+                  id="wegaLetters-cell-cell-rows-constraint-rule-28">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5439,7 +5463,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
             <data type="anyURI"/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-addSpan-hand-hand-reference-constraint-rule-25">
+                  id="wegaLetters-addSpan-hand-hand-reference-constraint-rule-29">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5455,7 +5479,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
             <data type="anyURI"/>
          </attribute> 
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-addSpan-spanTo-spanTo-7-constraint-rule-26">
+                  id="wegaLetters-addSpan-spanTo-spanTo-7-constraint-rule-30">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5664,7 +5688,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-msIdentifier-msId_minimal-constraint-report-35">
+                  id="wegaLetters-msIdentifier-msId_minimal-constraint-report-37">
             <rule context="tei:msIdentifier">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5858,7 +5882,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(beliebiges Segment) steht für eine beliebige Segmentierung des Textes unterhalb des ‘chunk’ Levels. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-seg-activeOrPassivePerformance-constraint-report-36">
+                  id="wegaLetters-seg-activeOrPassivePerformance-constraint-report-38">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5870,7 +5894,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-seg-AddresseeOrSenderCorrespondence-constraint-report-37">
+                  id="wegaLetters-seg-AddresseeOrSenderCorrespondence-constraint-report-39">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -6029,7 +6053,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-att.witnessed-att-wit-constraint-rule-27">
+            id="wegaLetters-att.witnessed-att-wit-constraint-rule-31">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6255,7 +6279,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-att.wega.rend-underline-n-constraint-rule-33">
+            id="wegaLetters-att.wega.rend-underline-n-constraint-rule-37">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6272,7 +6296,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-styleguide-document-node-content-constraint-rule-28">
+            id="wegaLetters-styleguide-document-node-content-constraint-rule-32">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6285,7 +6309,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-whitespaceOnlyContent-constraint-rule-29">
+            id="wegaLetters-whitespaceOnlyContent-constraint-rule-33">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6298,7 +6322,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-elementStartsWithWhitespace-constraint-rule-30">
+            id="wegaLetters-elementStartsWithWhitespace-constraint-rule-34">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6311,7 +6335,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-untrimmedAttributeValues-constraint-rule-31">
+            id="wegaLetters-untrimmedAttributeValues-constraint-rule-35">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6323,7 +6347,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
                 </sch:rule>
    </pattern>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-styleguide-document-node-content-constraint-rule-32">
+            id="wegaLetters-styleguide-document-node-content-constraint-rule-36">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/de/wegaNews.isosch b/schema/de/wegaNews.isosch
index ab381738..e648ea62 100644
--- 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 2017-11-15T18:49:54Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2017-12-21T19:30:27Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -76,79 +76,83 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                         <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-wegaNews-date-dateHeuristics1-11">
-      <rule context="tei:date">
-                    <report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaNews-date-dateHeuristics2-12">
-      <rule context="tei:date">
-                    <report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaNews-date-dateHeuristics3-13">
+   <pattern id="schematron-constraint-wegaNews-date-dateHeuristics2-11">
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                </pattern>
+   <pattern id="schematron-constraint-wegaNews-date-dateHeuristics3-12">
       <rule context="tei:date">
                     <report test="(@from or @to) and (@when or @notAfter or @notBefore)">cooccurence of date and duration attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-date-dateHeuristics4-14">
+   <pattern id="schematron-constraint-wegaNews-date-dateHeuristics4-13">
       <rule context="tei:date">
                     <report test="@when and (@notAfter or @notBefore)">cooccurence of exact and uncertain date attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-date-dateHeuristics5-15">
+   <pattern id="schematron-constraint-wegaNews-date-dateHeuristics5-14">
       <rule context="tei:date">
                     <assert test="@when or @notBefore or @notAfter or @from or @to or @cert='unknown' or matches(., '0000|o\.J\.|unknown') or ancestor::tei:text">tei:date benötigt ein Attribut @when, @notBefore o.ä.</assert>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-ref-prev-next-correspContext-16">
+   <pattern id="schematron-constraint-wegaNews-ref-prev-next-correspContext-15">
       <rule context="tei:ref">
                     <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="schematron-constraint-wegaNews-ref-refAtts-17">
+   <pattern id="schematron-constraint-wegaNews-ref-refAtts-16">
       <rule context="tei:ref">
          <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-wegaNews-list-gloss-list-18">
+   <pattern id="schematron-constraint-wegaNews-list-gloss-list-17">
       <rule context="tei:list">
                     <report test="./tei:label and not(@type='gloss')">Labels are only allowed in lists of type='gloss'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-list-gloss-list-must-have-labels-19">
+   <pattern id="schematron-constraint-wegaNews-list-gloss-list-must-have-labels-18">
       <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>
     </pattern>
-   <pattern id="schematron-constraint-wegaNews-note-note-in-text-20">
+   <pattern id="schematron-constraint-wegaNews-note-note-in-text-19">
                     <rule context="tei:note[not(parent::tei:org or parent::tei:person or parent::tei:notesStmt or parent::tei:biblStruct or parent::tei:imprint)]">
                         <assert test="@type and @resp and @xml:id">It is required to provide @type and @resp and @xml:id on note.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaNews-note-thematicCom-target-21">
+   <pattern id="schematron-constraint-wegaNews-note-thematicCom-target-20">
                     <rule context="tei:note[@type='thematicCom' or @target]">
                         <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-wegaNews-note-notesStmt-notes-22">
+   <pattern id="schematron-constraint-wegaNews-note-notesStmt-notes-21">
                     <rule context="tei:note[parent::tei:notesStmt]">
                         <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-wegaNews-graphic-graphic-url-check-23">
+   <pattern id="schematron-constraint-wegaNews-graphic-graphic-url-check-22">
       <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>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-author-sameAs-sameAs-reference-24">
+   <pattern id="schematron-constraint-wegaNews-author-sameAs-sameAs-reference-23">
                             <rule context="tei:*[@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-25">
+   <pattern id="schematron-constraint-wegaNews-title-duplicate-title-24">
                     <rule context="tei:title[following-sibling::tei:title]">
                         <let name="level" value="@level"/>
                         <let name="type" value="string(@type)"/> 
@@ -156,7 +160,7 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                         <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-26">
+   <pattern id="schematron-constraint-wegaNews-title-punctuation-mark-25">
       <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>
@@ -166,46 +170,46 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
       
     
       
-    <pattern id="schematron-constraint-wegaNews-div-abstractModel-structure-l-29">
+    <pattern id="schematron-constraint-wegaNews-div-abstractModel-structure-l-28">
       <rule context="tei:div">
          <report test="ancestor::tei:l">
         Abstract model violation: Lines may not contain higher-level structural elements such as div.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-div-abstractModel-structure-p-30">
+   <pattern id="schematron-constraint-wegaNews-div-abstractModel-structure-p-29">
       <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>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaNews-orgName-parent-org-31">
+   <pattern id="schematron-constraint-wegaNews-orgName-parent-org-30">
                     <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-32">
+   <pattern id="schematron-constraint-wegaNews-orgName-parent-org-reg-31">
                     <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-33">
+   <pattern id="schematron-constraint-wegaNews-orgName-parent-org-reg-32">
                     <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-34">
+   <pattern id="schematron-constraint-wegaNews-orgName-parent-not-org-33">
                     <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-35">
+   <pattern id="schematron-constraint-wegaNews-table-collapsible-head-34">
       <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-36">
+   <pattern id="schematron-constraint-wegaNews-row-number-of-cells-35">
                     <rule context="tei:row[preceding-sibling::tei:row]">
                         <let name="thisNode" value="."/>
                         
@@ -226,35 +230,35 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                         <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-37">
+   <pattern id="schematron-constraint-wegaNews-cell-cell-rows-36">
                     <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-38">
+   <pattern id="schematron-constraint-wegaNews-styleguide-document-node-content-37">
                 <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-39">
+   <pattern id="schematron-constraint-wegaNews-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=('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-40">
+   <pattern id="schematron-constraint-wegaNews-elementStartsWithWhitespace-39">
                 <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-41">
+   <pattern id="schematron-constraint-wegaNews-untrimmedAttributeValues-40">
                 <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-att.wega.rend-underline-n-42">
+   <pattern id="schematron-constraint-wegaNews-att.wega.rend-underline-n-41">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>
diff --git a/schema/de/wegaNews.rng b/schema/de/wegaNews.rng
index 6b461f59..d7bf2989 100644
--- a/schema/de/wegaNews.rng
+++ b/schema/de/wegaNews.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-11-15T18:49:54Z. .
+Schema generated from ODD source 2017-12-21T19:30:26Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -1751,31 +1751,55 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-date-dateHeuristics1-constraint-report-6">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaNews-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-date-dateHeuristics2-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaNews-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaNews-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaNews-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-date-dateHeuristics3-constraint-report-8">
+                  id="wegaNews-date-dateHeuristics3-constraint-report-10">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1787,7 +1811,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-date-dateHeuristics4-constraint-report-9">
+                  id="wegaNews-date-dateHeuristics4-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1848,7 +1872,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Quellenangabe) definiert eine Quellenangabe an einer anderen Stelle, die womöglich durch zusätzlichen Text oder Kommentare modifizert wurde. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-ref-prev-next-correspContext-constraint-report-10">
+                  id="wegaNews-ref-prev-next-correspContext-constraint-report-12">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1860,7 +1884,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-ref-refAtts-constraint-report-11">
+                  id="wegaNews-ref-refAtts-constraint-report-13">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -1914,7 +1938,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-list-gloss-list-constraint-report-12">
+                  id="wegaNews-list-gloss-list-constraint-report-14">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1926,7 +1950,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-list-gloss-list-must-have-labels-constraint-rule-9">
+                  id="wegaNews-list-gloss-list-must-have-labels-constraint-rule-13">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2004,7 +2028,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Anmerkung) enthält eine Notiz oder eine Anmerkung/Annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-note-note-in-text-constraint-rule-10">
+                  id="wegaNews-note-note-in-text-constraint-rule-14">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2016,7 +2040,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-note-thematicCom-target-constraint-rule-11">
+                  id="wegaNews-note-thematicCom-target-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2028,7 +2052,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-note-notesStmt-notes-constraint-rule-12">
+                  id="wegaNews-note-notesStmt-notes-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2159,7 +2183,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-author-sameAs-sameAs-reference-constraint-rule-13">
+                  id="wegaNews-author-sameAs-sameAs-reference-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2190,7 +2214,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Titel) enthält einen Titel für jede Art von Arbeit. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-title-duplicate-title-constraint-rule-14">
+                  id="wegaNews-title-duplicate-title-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2205,7 +2229,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-title-punctuation-mark-constraint-report-14">
+                  id="wegaNews-title-punctuation-mark-constraint-report-16">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2522,7 +2546,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-div-abstractModel-structure-l-constraint-report-15">
+                  id="wegaNews-div-abstractModel-structure-l-constraint-report-17">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2532,7 +2556,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-div-abstractModel-structure-p-constraint-report-16">
+                  id="wegaNews-div-abstractModel-structure-p-constraint-report-18">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2572,7 +2596,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-orgName-parent-org-constraint-rule-15">
+                  id="wegaNews-orgName-parent-org-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2584,7 +2608,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-orgName-parent-org-reg-constraint-rule-16">
+                  id="wegaNews-orgName-parent-org-reg-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2596,7 +2620,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-orgName-parent-org-reg-constraint-rule-17">
+                  id="wegaNews-orgName-parent-org-reg-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2608,7 +2632,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-orgName-parent-not-org-constraint-rule-18">
+                  id="wegaNews-orgName-parent-not-org-constraint-rule-22">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2724,7 +2748,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-table-collapsible-head-constraint-report-20">
+                  id="wegaNews-table-collapsible-head-constraint-report-22">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2758,7 +2782,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-row-number-of-cells-constraint-rule-19">
+                  id="wegaNews-row-number-of-cells-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2795,7 +2819,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Tabellenzelle) enthält eine Zelle einer Tabelle. [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-cell-cell-rows-constraint-rule-20">
+                  id="wegaNews-cell-cell-rows-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2926,7 +2950,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaNews-att.wega.rend-underline-n-constraint-rule-25">
+            id="wegaNews-att.wega.rend-underline-n-constraint-rule-29">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2943,7 +2967,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaNews-styleguide-document-node-content-constraint-rule-21">
+            id="wegaNews-styleguide-document-node-content-constraint-rule-25">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2956,7 +2980,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaNews-whitespaceOnlyContent-constraint-rule-22">
+            id="wegaNews-whitespaceOnlyContent-constraint-rule-26">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2969,7 +2993,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaNews-elementStartsWithWhitespace-constraint-rule-23">
+            id="wegaNews-elementStartsWithWhitespace-constraint-rule-27">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2982,7 +3006,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaNews-untrimmedAttributeValues-constraint-rule-24">
+            id="wegaNews-untrimmedAttributeValues-constraint-rule-28">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/de/wegaPersons.isosch b/schema/de/wegaPersons.isosch
index 88a75448..9f7043a7 100644
--- a/schema/de/wegaPersons.isosch
+++ b/schema/de/wegaPersons.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-12-15T21:47:13Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2017-12-21T19:30:27Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -68,89 +68,93 @@ belongs, but this <name/> element has no textual content.</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-wegaPersons-date-dateHeuristics1-10">
-      <rule context="tei:date">
-                    <report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaPersons-date-dateHeuristics2-11">
-      <rule context="tei:date">
-                    <report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaPersons-date-dateHeuristics3-12">
+   <pattern id="schematron-constraint-wegaPersons-date-dateHeuristics2-10">
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                </pattern>
+   <pattern id="schematron-constraint-wegaPersons-date-dateHeuristics3-11">
       <rule context="tei:date">
                     <report test="(@from or @to) and (@when or @notAfter or @notBefore)">cooccurence of date and duration attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaPersons-date-dateHeuristics4-13">
+   <pattern id="schematron-constraint-wegaPersons-date-dateHeuristics4-12">
       <rule context="tei:date">
                     <report test="@when and (@notAfter or @notBefore)">cooccurence of exact and uncertain date attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaPersons-date-dateHeuristics5-14">
+   <pattern id="schematron-constraint-wegaPersons-date-dateHeuristics5-13">
       <rule context="tei:date">
                     <assert test="@when or @notBefore or @notAfter or @from or @to or @cert='unknown' or matches(., '0000|o\.J\.|unknown') or ancestor::tei:text">tei:date benötigt ein Attribut @when, @notBefore o.ä.</assert>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaPersons-ref-prev-next-correspContext-15">
+   <pattern id="schematron-constraint-wegaPersons-ref-prev-next-correspContext-14">
       <rule context="tei:ref">
                     <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="schematron-constraint-wegaPersons-ref-refAtts-16">
+   <pattern id="schematron-constraint-wegaPersons-ref-refAtts-15">
       <rule context="tei:ref">
          <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-wegaPersons-list-gloss-list-17">
+   <pattern id="schematron-constraint-wegaPersons-list-gloss-list-16">
       <rule context="tei:list">
                     <report test="./tei:label and not(@type='gloss')">Labels are only allowed in lists of type='gloss'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaPersons-list-gloss-list-must-have-labels-18">
+   <pattern id="schematron-constraint-wegaPersons-list-gloss-list-must-have-labels-17">
       <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>
     </pattern>
-   <pattern id="schematron-constraint-wegaPersons-note-note-in-text-19">
+   <pattern id="schematron-constraint-wegaPersons-note-note-in-text-18">
                     <rule context="tei:note[not(parent::tei:org or parent::tei:person or parent::tei:notesStmt or parent::tei:biblStruct or parent::tei:imprint)]">
                         <assert test="@type and @resp and @xml:id">It is required to provide @type and @resp and @xml:id on note.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaPersons-note-thematicCom-target-20">
+   <pattern id="schematron-constraint-wegaPersons-note-thematicCom-target-19">
                     <rule context="tei:note[@type='thematicCom' or @target]">
                         <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-wegaPersons-note-notesStmt-notes-21">
+   <pattern id="schematron-constraint-wegaPersons-note-notesStmt-notes-20">
                     <rule context="tei:note[parent::tei:notesStmt]">
                         <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-wegaPersons-orgName-parent-org-22">
+   <pattern id="schematron-constraint-wegaPersons-orgName-parent-org-21">
                     <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-wegaPersons-orgName-parent-org-reg-23">
+   <pattern id="schematron-constraint-wegaPersons-orgName-parent-org-reg-22">
                     <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-wegaPersons-orgName-parent-org-reg-24">
+   <pattern id="schematron-constraint-wegaPersons-orgName-parent-org-reg-23">
                     <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-wegaPersons-orgName-parent-not-org-25">
+   <pattern id="schematron-constraint-wegaPersons-orgName-parent-not-org-24">
                     <rule context="tei:orgName[not(parent::tei:org)]">
                         <report test="@type">No @type attribute allowed here.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaPersons-person-personHeuristics1-26">
+   <pattern id="schematron-constraint-wegaPersons-person-personHeuristics1-25">
       <rule context="tei:person">
                 
                 
@@ -159,7 +163,7 @@ belongs, but this <name/> element has no textual content.</assert>
                 
             </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaPersons-person-personHeuristics2-27">
+   <pattern id="schematron-constraint-wegaPersons-person-personHeuristics2-26">
       <rule context="tei:person">
                 
                 
@@ -168,51 +172,51 @@ belongs, but this <name/> element has no textual content.</assert>
                 
             </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaPersons-person-enforceWhitespace-28">
+   <pattern id="schematron-constraint-wegaPersons-person-enforceWhitespace-27">
                 <rule context="tei:persName[@type][./*]">
                     <assert test="every $x in ./*[following-sibling::*] satisfies $x[following-sibling::node()[1] instance of text()]">Child elements of persName should be separated with whitespace.</assert>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaPersons-person-bioSummary-mixed-content-29">
+   <pattern id="schematron-constraint-wegaPersons-person-bioSummary-mixed-content-28">
                 <rule context="tei:note[@type='bioSummary'][tei:list]">
                     <report test="text()[matches(., '\S')]">When utilizing tei:list as structural unit you should wrap other text in tei:p.</report>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaPersons-residence-residence-no-mixed-content-30">
+   <pattern id="schematron-constraint-wegaPersons-residence-residence-no-mixed-content-29">
       <rule context="tei:residence">
                 <report test="tei:*/tei:*">No further markup allowed within <name/>
          </report>
             </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaPersons-styleguide-document-node-content-31">
+   <pattern id="schematron-constraint-wegaPersons-styleguide-document-node-content-30">
                 <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-wegaPersons-whitespaceOnlyContent-32">
+   <pattern id="schematron-constraint-wegaPersons-whitespaceOnlyContent-31">
                 <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-wegaPersons-elementStartsWithWhitespace-33">
+   <pattern id="schematron-constraint-wegaPersons-elementStartsWithWhitespace-32">
                 <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-wegaPersons-untrimmedAttributeValues-34">
+   <pattern id="schematron-constraint-wegaPersons-untrimmedAttributeValues-33">
                 <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-wegaPersons-att.wega.rend-underline-n-35">
+   <pattern id="schematron-constraint-wegaPersons-att.wega.rend-underline-n-34">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaPersons-macro.birthDeathContent-uncertainPlacenames-36">
+   <pattern id="schematron-constraint-wegaPersons-macro.birthDeathContent-uncertainPlacenames-35">
                 <rule context="tei:birth | tei:death">
                     <report test="count(distinct-values((tei:placeName | tei:settlement | tei:region | tei:country)/local-name())) gt 1">Multiple encodings of places will be regarded as alternatives. If it's really one place, please wrap in a placeName</report>
                 </rule>
diff --git a/schema/de/wegaPersons.rng b/schema/de/wegaPersons.rng
index 1810a12a..f8c202d0 100644
--- a/schema/de/wegaPersons.rng
+++ b/schema/de/wegaPersons.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-15T21:47:13Z. .
+Schema generated from ODD source 2017-12-21T19:30:27Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -192,7 +192,7 @@ TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
       </zeroOrMore>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaPersons-macro.birthDeathContent-uncertainPlacenames-constraint-rule-23">
+            id="wegaPersons-macro.birthDeathContent-uncertainPlacenames-constraint-rule-27">
       <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                 xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -1722,31 +1722,55 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-date-dateHeuristics1-constraint-report-6">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaPersons-date-dateHeuristics2-constraint-rule-8">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-date-dateHeuristics2-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaPersons-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaPersons-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaPersons-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-date-dateHeuristics3-constraint-report-8">
+                  id="wegaPersons-date-dateHeuristics3-constraint-report-10">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1758,7 +1782,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-date-dateHeuristics4-constraint-report-9">
+                  id="wegaPersons-date-dateHeuristics4-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1819,7 +1843,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Quellenangabe) definiert eine Quellenangabe an einer anderen Stelle, die womöglich durch zusätzlichen Text oder Kommentare modifizert wurde. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-ref-prev-next-correspContext-constraint-report-10">
+                  id="wegaPersons-ref-prev-next-correspContext-constraint-report-12">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1831,7 +1855,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-ref-refAtts-constraint-report-11">
+                  id="wegaPersons-ref-refAtts-constraint-report-13">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -1884,7 +1908,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-list-gloss-list-constraint-report-12">
+                  id="wegaPersons-list-gloss-list-constraint-report-14">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1896,7 +1920,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-list-gloss-list-must-have-labels-constraint-rule-8">
+                  id="wegaPersons-list-gloss-list-must-have-labels-constraint-rule-12">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -1965,7 +1989,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Anmerkung) enthält eine Notiz oder eine Anmerkung/Annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-note-note-in-text-constraint-rule-9">
+                  id="wegaPersons-note-note-in-text-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1977,7 +2001,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-note-thematicCom-target-constraint-rule-10">
+                  id="wegaPersons-note-thematicCom-target-constraint-rule-14">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1989,7 +2013,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-note-notesStmt-notes-constraint-rule-11">
+                  id="wegaPersons-note-notesStmt-notes-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2159,7 +2183,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-orgName-parent-org-constraint-rule-12">
+                  id="wegaPersons-orgName-parent-org-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2171,7 +2195,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-orgName-parent-org-reg-constraint-rule-13">
+                  id="wegaPersons-orgName-parent-org-reg-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2183,7 +2207,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-orgName-parent-org-reg-constraint-rule-14">
+                  id="wegaPersons-orgName-parent-org-reg-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2195,7 +2219,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-orgName-parent-not-org-constraint-rule-15">
+                  id="wegaPersons-orgName-parent-not-org-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2721,7 +2745,7 @@ Beispielwerte sind etwa: 1] primary; 2] other; 3] paid; 4] unpaid</a:documentati
             </group>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-person-personHeuristics1-constraint-report-16">
+                  id="wegaPersons-person-personHeuristics1-constraint-report-18">
             <rule context="tei:person">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -2730,7 +2754,7 @@ Beispielwerte sind etwa: 1] primary; 2] other; 3] paid; 4] unpaid</a:documentati
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-person-personHeuristics2-constraint-report-17">
+                  id="wegaPersons-person-personHeuristics2-constraint-report-19">
             <rule context="tei:person">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -2739,7 +2763,7 @@ Beispielwerte sind etwa: 1] primary; 2] other; 3] paid; 4] unpaid</a:documentati
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-person-enforceWhitespace-constraint-rule-16">
+                  id="wegaPersons-person-enforceWhitespace-constraint-rule-20">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2748,7 +2772,7 @@ Beispielwerte sind etwa: 1] primary; 2] other; 3] paid; 4] unpaid</a:documentati
                 </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-person-bioSummary-mixed-content-constraint-rule-17">
+                  id="wegaPersons-person-bioSummary-mixed-content-constraint-rule-21">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2798,7 +2822,7 @@ Beispielwerte sind etwa: 1] primary; 2] other; 3] paid; 4] unpaid</a:documentati
             <ref name="country"/>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-residence-residence-no-mixed-content-constraint-report-19">
+                  id="wegaPersons-residence-residence-no-mixed-content-constraint-report-21">
             <rule context="tei:residence">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -2937,7 +2961,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaPersons-att.wega.rend-underline-n-constraint-rule-22">
+            id="wegaPersons-att.wega.rend-underline-n-constraint-rule-26">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2954,7 +2978,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaPersons-styleguide-document-node-content-constraint-rule-18">
+            id="wegaPersons-styleguide-document-node-content-constraint-rule-22">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2967,7 +2991,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaPersons-whitespaceOnlyContent-constraint-rule-19">
+            id="wegaPersons-whitespaceOnlyContent-constraint-rule-23">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2980,7 +3004,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaPersons-elementStartsWithWhitespace-constraint-rule-20">
+            id="wegaPersons-elementStartsWithWhitespace-constraint-rule-24">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2993,7 +3017,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaPersons-untrimmedAttributeValues-constraint-rule-21">
+            id="wegaPersons-untrimmedAttributeValues-constraint-rule-25">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/de/wegaPlaces.isosch b/schema/de/wegaPlaces.isosch
index badcc74c..7ec1d02d 100644
--- a/schema/de/wegaPlaces.isosch
+++ b/schema/de/wegaPlaces.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-11-15T18:49:57Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2017-12-21T19:30:28Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
diff --git a/schema/de/wegaPlaces.rng b/schema/de/wegaPlaces.rng
index 97b0c047..468320e4 100644
--- a/schema/de/wegaPlaces.rng
+++ b/schema/de/wegaPlaces.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-11-15T18:49:57Z. .
+Schema generated from ODD source 2017-12-21T19:30:28Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
diff --git a/schema/de/wegaThematicCommentaries.isosch b/schema/de/wegaThematicCommentaries.isosch
index b71a0c6b..500b170a 100644
--- a/schema/de/wegaThematicCommentaries.isosch
+++ b/schema/de/wegaThematicCommentaries.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-11-15T18:49:58Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2017-12-21T19:30:28Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -76,32 +76,36 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                         <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-wegaThematicCommentaries-date-dateHeuristics1-11">
-      <rule context="tei:date">
-                    <report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-date-dateHeuristics2-12">
-      <rule context="tei:date">
-                    <report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-date-dateHeuristics3-13">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-date-dateHeuristics2-11">
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                </pattern>
+   <pattern id="schematron-constraint-wegaThematicCommentaries-date-dateHeuristics3-12">
       <rule context="tei:date">
                     <report test="(@from or @to) and (@when or @notAfter or @notBefore)">cooccurence of date and duration attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-date-dateHeuristics4-14">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-date-dateHeuristics4-13">
       <rule context="tei:date">
                     <report test="@when and (@notAfter or @notBefore)">cooccurence of exact and uncertain date attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-date-dateHeuristics5-15">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-date-dateHeuristics5-14">
       <rule context="tei:date">
                     <assert test="@when or @notBefore or @notAfter or @from or @to or @cert='unknown' or matches(., '0000|o\.J\.|unknown') or ancestor::tei:text">tei:date benötigt ein Attribut @when, @notBefore o.ä.</assert>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-ptr-ptr-target-16">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-ptr-ptr-target-15">
                  <rule context="tei:ptr[not(starts-with(@target, 'http'))]">
                     <assert test="following::tei:note[@xml:id=substring(current()/@target,2)]">
                        The note element indicated by @target (<value-of select="@target"/>) must follow the current element <name/>. 
@@ -109,67 +113,67 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                     </assert>
                  </rule>
              </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-ptr-duplicate-ptr-17">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-ptr-duplicate-ptr-16">
       <rule context="tei:ptr">
                 <report test="following::tei:ptr[@target=current()/@target]">
                    There must be only one pointer with the @target (<value-of select="@target"/>)
                 </report>
              </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-ptr-ptrAtts-18">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-ptr-ptrAtts-17">
       <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-wegaThematicCommentaries-ref-prev-next-correspContext-19">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-ref-prev-next-correspContext-18">
       <rule context="tei:ref">
                     <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="schematron-constraint-wegaThematicCommentaries-ref-refAtts-20">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-ref-refAtts-19">
       <rule context="tei:ref">
          <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-wegaThematicCommentaries-list-gloss-list-21">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-list-gloss-list-20">
       <rule context="tei:list">
                     <report test="./tei:label and not(@type='gloss')">Labels are only allowed in lists of type='gloss'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-list-gloss-list-must-have-labels-22">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-list-gloss-list-must-have-labels-21">
       <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>
     </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-note-note-in-text-23">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-note-note-in-text-22">
                     <rule context="tei:note[not(parent::tei:org or parent::tei:person or parent::tei:notesStmt or parent::tei:biblStruct or parent::tei:imprint)]">
                         <assert test="@type and @resp and @xml:id">It is required to provide @type and @resp and @xml:id on note.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-note-thematicCom-target-24">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-note-thematicCom-target-23">
                     <rule context="tei:note[@type='thematicCom' or @target]">
                         <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-wegaThematicCommentaries-note-notesStmt-notes-25">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-note-notesStmt-notes-24">
                     <rule context="tei:note[parent::tei:notesStmt]">
                         <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-wegaThematicCommentaries-graphic-graphic-url-check-26">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-graphic-graphic-url-check-25">
       <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>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-author-sameAs-sameAs-reference-27">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-author-sameAs-sameAs-reference-26">
                             <rule context="tei:*[@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-wegaThematicCommentaries-title-duplicate-title-28">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-title-duplicate-title-27">
                     <rule context="tei:title[following-sibling::tei:title]">
                         <let name="level" value="@level"/>
                         <let name="type" value="string(@type)"/> 
@@ -177,24 +181,24 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                         <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-wegaThematicCommentaries-title-punctuation-mark-29">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-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="isoschematron-constraint-wegaThematicCommentaries-teiHeader-seriesTitle-30">
+   <pattern id="isoschematron-constraint-wegaThematicCommentaries-teiHeader-seriesTitle-29">
                 <rule context="tei:fileDesc/tei:titleStmt/tei:title[@level='s']">
                     <assert test=".='WeGA, Themenkommentare, Digitale Edition'">The series title must be 
                         "WeGA, Themenkommentare, Digitale Edition".</assert>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-notesStmt-count-notes-31">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-notesStmt-count-notes-30">
       <rule context="tei:notesStmt">
                     <report test="count(tei:note/@type) ne count(distinct-values(tei:note/concat(@type, @xml:lang, @n)))">Only one summary, incipit, editorial and thematicCom are allowed within notesStmt.</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-quotation-quotationContents-32">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-quotation-quotationContents-31">
       <rule context="tei:quotation">
          <report test="not(@marks) and not (tei:p)">
 On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
@@ -204,46 +208,46 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
       
     
       
-    <pattern id="schematron-constraint-wegaThematicCommentaries-div-abstractModel-structure-l-35">
+    <pattern id="schematron-constraint-wegaThematicCommentaries-div-abstractModel-structure-l-34">
       <rule context="tei:div">
          <report test="ancestor::tei:l">
         Abstract model violation: Lines may not contain higher-level structural elements such as div.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-div-abstractModel-structure-p-36">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-div-abstractModel-structure-p-35">
       <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>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-orgName-parent-org-37">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-orgName-parent-org-36">
                     <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-wegaThematicCommentaries-orgName-parent-org-reg-38">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-orgName-parent-org-reg-37">
                     <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-wegaThematicCommentaries-orgName-parent-org-reg-39">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-orgName-parent-org-reg-38">
                     <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-wegaThematicCommentaries-orgName-parent-not-org-40">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-orgName-parent-not-org-39">
                     <rule context="tei:orgName[not(parent::tei:org)]">
                         <report test="@type">No @type attribute allowed here.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-table-collapsible-head-41">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-table-collapsible-head-40">
       <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-wegaThematicCommentaries-row-number-of-cells-42">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-row-number-of-cells-41">
                     <rule context="tei:row[preceding-sibling::tei:row]">
                         <let name="thisNode" value="."/>
                         
@@ -264,59 +268,59 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                         <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-wegaThematicCommentaries-cell-cell-rows-43">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-cell-cell-rows-42">
                     <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-wegaThematicCommentaries-ab-abstractModel-structure-p-44">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-ab-abstractModel-structure-p-43">
       <rule context="tei:ab">
          <report test="not(ancestor::floatingText) and (ancestor::tei:p or ancestor::tei:ab)          and not(parent::tei:exemplum         |parent::tei:item         |parent::tei:note         |parent::tei:q         |parent::tei:quote         |parent::tei:remarks         |parent::tei:said         |parent::tei:sp         |parent::tei:stage         |parent::tei:cell         |parent::tei:figure)">
         Abstract model violation: ab may not contain paragraphs or other ab elements.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-ab-abstractModel-structure-l-45">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-ab-abstractModel-structure-l-44">
       <rule context="tei:ab">
          <report test="ancestor::tei:l or ancestor::tei:lg">
         Abstract model violation: Lines may not contain higher-level divisions such as p or ab.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-seg-activeOrPassivePerformance-46">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-seg-activeOrPassivePerformance-45">
       <rule context="tei:seg">
                     <report test="./@subtype = ('active', 'passive') and not(./@type = 'performance')">if @subtype contains 'active' or 'passive' @type has to be 'performance'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-seg-AddresseeOrSenderCorrespondence-47">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-seg-AddresseeOrSenderCorrespondence-46">
       <rule context="tei:seg">
                     <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-wegaThematicCommentaries-styleguide-document-node-content-48">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-styleguide-document-node-content-47">
                 <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-wegaThematicCommentaries-att.wega.rend-underline-n-49">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-att.wega.rend-underline-n-48">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaThematicCommentaries-whitespaceOnlyContent-50">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-whitespaceOnlyContent-49">
                 <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-wegaThematicCommentaries-elementStartsWithWhitespace-51">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-elementStartsWithWhitespace-50">
                 <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-wegaThematicCommentaries-untrimmedAttributeValues-52">
+   <pattern id="schematron-constraint-wegaThematicCommentaries-untrimmedAttributeValues-51">
                 <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>
diff --git a/schema/de/wegaThematicCommentaries.rng b/schema/de/wegaThematicCommentaries.rng
index 4e86418f..144bf85a 100644
--- a/schema/de/wegaThematicCommentaries.rng
+++ b/schema/de/wegaThematicCommentaries.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-11-15T18:49:58Z. .
+Schema generated from ODD source 2017-12-21T19:30:28Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -2499,31 +2499,55 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-date-dateHeuristics1-constraint-report-6">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaThematicCommentaries-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-date-dateHeuristics2-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaThematicCommentaries-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaThematicCommentaries-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaThematicCommentaries-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-date-dateHeuristics3-constraint-report-8">
+                  id="wegaThematicCommentaries-date-dateHeuristics3-constraint-report-10">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2535,7 +2559,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-date-dateHeuristics4-constraint-report-9">
+                  id="wegaThematicCommentaries-date-dateHeuristics4-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2610,7 +2634,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) wird benutzt um auf ein folgendes note zu zeigen und somit den Beginn des zu kommentierenden Bereichs zu markieren. Alternativ kann das Element ein Platzhalter für eine externe URL (präfigiert mit 'http') sein. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ptr-ptr-target-constraint-rule-9">
+                  id="wegaThematicCommentaries-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2625,7 +2649,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ptr-duplicate-ptr-constraint-report-10">
+                  id="wegaThematicCommentaries-ptr-duplicate-ptr-constraint-report-12">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2639,7 +2663,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ptr-ptrAtts-constraint-report-11">
+                  id="wegaThematicCommentaries-ptr-ptrAtts-constraint-report-13">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2665,7 +2689,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Quellenangabe) definiert eine Quellenangabe an einer anderen Stelle, die womöglich durch zusätzlichen Text oder Kommentare modifizert wurde. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ref-prev-next-correspContext-constraint-report-12">
+                  id="wegaThematicCommentaries-ref-prev-next-correspContext-constraint-report-14">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2677,7 +2701,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ref-refAtts-constraint-report-13">
+                  id="wegaThematicCommentaries-ref-refAtts-constraint-report-15">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2731,7 +2755,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-list-gloss-list-constraint-report-14">
+                  id="wegaThematicCommentaries-list-gloss-list-constraint-report-16">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2743,7 +2767,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-list-gloss-list-must-have-labels-constraint-rule-10">
+                  id="wegaThematicCommentaries-list-gloss-list-must-have-labels-constraint-rule-14">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2821,7 +2845,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Anmerkung) enthält eine Notiz oder eine Anmerkung/Annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-note-note-in-text-constraint-rule-11">
+                  id="wegaThematicCommentaries-note-note-in-text-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2833,7 +2857,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-note-thematicCom-target-constraint-rule-12">
+                  id="wegaThematicCommentaries-note-thematicCom-target-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2845,7 +2869,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-note-notesStmt-notes-constraint-rule-13">
+                  id="wegaThematicCommentaries-note-notesStmt-notes-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2978,7 +3002,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-author-sameAs-sameAs-reference-constraint-rule-14">
+                  id="wegaThematicCommentaries-author-sameAs-sameAs-reference-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3084,7 +3108,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Titel) enthält einen Titel für jede Art von Arbeit. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-title-duplicate-title-constraint-rule-15">
+                  id="wegaThematicCommentaries-title-duplicate-title-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3099,7 +3123,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-title-punctuation-mark-constraint-report-16">
+                  id="wegaThematicCommentaries-title-punctuation-mark-constraint-report-18">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3278,7 +3302,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             <ref name="revisionDesc"/>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-teiHeader-seriesTitle-constraint-rule-16">
+                  id="wegaThematicCommentaries-teiHeader-seriesTitle-constraint-rule-20">
             <sch:rule xmlns:xi="http://www.w3.org/2001/XInclude"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
@@ -3484,7 +3508,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-notesStmt-count-notes-constraint-report-17">
+                  id="wegaThematicCommentaries-notesStmt-count-notes-constraint-report-19">
             <rule context="tei:notesStmt">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3543,7 +3567,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             <ref name="model.pLike"/>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-quotation-quotationContents-constraint-report-18">
+                  id="wegaThematicCommentaries-quotation-quotationContents-constraint-report-20">
             <rule context="tei:quotation">
                <report xmlns:xi="http://www.w3.org/2001/XInclude"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -3805,7 +3829,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-div-abstractModel-structure-l-constraint-report-19">
+                  id="wegaThematicCommentaries-div-abstractModel-structure-l-constraint-report-21">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3815,7 +3839,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-div-abstractModel-structure-p-constraint-report-20">
+                  id="wegaThematicCommentaries-div-abstractModel-structure-p-constraint-report-22">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3961,7 +3985,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-orgName-parent-org-constraint-rule-17">
+                  id="wegaThematicCommentaries-orgName-parent-org-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3973,7 +3997,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-orgName-parent-org-reg-constraint-rule-18">
+                  id="wegaThematicCommentaries-orgName-parent-org-reg-constraint-rule-22">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3985,7 +4009,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-orgName-parent-org-reg-constraint-rule-19">
+                  id="wegaThematicCommentaries-orgName-parent-org-reg-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3997,7 +4021,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-orgName-parent-not-org-constraint-rule-20">
+                  id="wegaThematicCommentaries-orgName-parent-not-org-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4151,7 +4175,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-table-collapsible-head-constraint-report-24">
+                  id="wegaThematicCommentaries-table-collapsible-head-constraint-report-26">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4185,7 +4209,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-row-number-of-cells-constraint-rule-21">
+                  id="wegaThematicCommentaries-row-number-of-cells-constraint-rule-25">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4222,7 +4246,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Tabellenzelle) enthält eine Zelle einer Tabelle. [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-cell-cell-rows-constraint-rule-22">
+                  id="wegaThematicCommentaries-cell-cell-rows-constraint-rule-26">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4347,7 +4371,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any arbitrary component-level unit of text, acting as an anonymous container for phrase or inter level elements analogous to, but without the semantic baggage of, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ab-abstractModel-structure-p-constraint-report-26">
+                  id="wegaThematicCommentaries-ab-abstractModel-structure-p-constraint-report-28">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4357,7 +4381,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ab-abstractModel-structure-l-constraint-report-27">
+                  id="wegaThematicCommentaries-ab-abstractModel-structure-l-constraint-report-29">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4390,7 +4414,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(beliebiges Segment) steht für eine beliebige Segmentierung des Textes unterhalb des ‘chunk’ Levels. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-seg-activeOrPassivePerformance-constraint-report-28">
+                  id="wegaThematicCommentaries-seg-activeOrPassivePerformance-constraint-report-30">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4402,7 +4426,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-seg-AddresseeOrSenderCorrespondence-constraint-report-29">
+                  id="wegaThematicCommentaries-seg-AddresseeOrSenderCorrespondence-constraint-report-31">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4580,7 +4604,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaThematicCommentaries-att.wega.rend-underline-n-constraint-rule-24">
+            id="wegaThematicCommentaries-att.wega.rend-underline-n-constraint-rule-28">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4636,7 +4660,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaThematicCommentaries-styleguide-document-node-content-constraint-rule-23">
+            id="wegaThematicCommentaries-styleguide-document-node-content-constraint-rule-27">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4649,7 +4673,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaThematicCommentaries-whitespaceOnlyContent-constraint-rule-25">
+            id="wegaThematicCommentaries-whitespaceOnlyContent-constraint-rule-29">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4662,7 +4686,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaThematicCommentaries-elementStartsWithWhitespace-constraint-rule-26">
+            id="wegaThematicCommentaries-elementStartsWithWhitespace-constraint-rule-30">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4675,7 +4699,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaThematicCommentaries-untrimmedAttributeValues-constraint-rule-27">
+            id="wegaThematicCommentaries-untrimmedAttributeValues-constraint-rule-31">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/de/wegaVar.isosch b/schema/de/wegaVar.isosch
index 56e87bbd..69fed570 100644
--- a/schema/de/wegaVar.isosch
+++ b/schema/de/wegaVar.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-11-15T18:50:00Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2017-12-21T19:30:29Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -77,32 +77,36 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                         <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-wegaVar-date-dateHeuristics1-11">
-      <rule context="tei:date">
-                    <report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaVar-date-dateHeuristics2-12">
-      <rule context="tei:date">
-                    <report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaVar-date-dateHeuristics3-13">
+   <pattern id="schematron-constraint-wegaVar-date-dateHeuristics2-11">
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                </pattern>
+   <pattern id="schematron-constraint-wegaVar-date-dateHeuristics3-12">
       <rule context="tei:date">
                     <report test="(@from or @to) and (@when or @notAfter or @notBefore)">cooccurence of date and duration attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaVar-date-dateHeuristics4-14">
+   <pattern id="schematron-constraint-wegaVar-date-dateHeuristics4-13">
       <rule context="tei:date">
                     <report test="@when and (@notAfter or @notBefore)">cooccurence of exact and uncertain date attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaVar-date-dateHeuristics5-15">
+   <pattern id="schematron-constraint-wegaVar-date-dateHeuristics5-14">
       <rule context="tei:date">
                     <assert test="@when or @notBefore or @notAfter or @from or @to or @cert='unknown' or matches(., '0000|o\.J\.|unknown') or ancestor::tei:text">tei:date benötigt ein Attribut @when, @notBefore o.ä.</assert>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaVar-ptr-ptr-target-16">
+   <pattern id="schematron-constraint-wegaVar-ptr-ptr-target-15">
                  <rule context="tei:ptr[not(starts-with(@target, 'http'))]">
                     <assert test="following::tei:note[@xml:id=substring(current()/@target,2)]">
                        The note element indicated by @target (<value-of select="@target"/>) must follow the current element <name/>. 
@@ -110,67 +114,67 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                     </assert>
                  </rule>
              </pattern>
-   <pattern id="schematron-constraint-wegaVar-ptr-duplicate-ptr-17">
+   <pattern id="schematron-constraint-wegaVar-ptr-duplicate-ptr-16">
       <rule context="tei:ptr">
                 <report test="following::tei:ptr[@target=current()/@target]">
                    There must be only one pointer with the @target (<value-of select="@target"/>)
                 </report>
              </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaVar-ptr-ptrAtts-18">
+   <pattern id="schematron-constraint-wegaVar-ptr-ptrAtts-17">
       <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-wegaVar-ref-prev-next-correspContext-19">
+   <pattern id="schematron-constraint-wegaVar-ref-prev-next-correspContext-18">
       <rule context="tei:ref">
                     <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="schematron-constraint-wegaVar-ref-refAtts-20">
+   <pattern id="schematron-constraint-wegaVar-ref-refAtts-19">
       <rule context="tei:ref">
          <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-wegaVar-list-gloss-list-21">
+   <pattern id="schematron-constraint-wegaVar-list-gloss-list-20">
       <rule context="tei:list">
                     <report test="./tei:label and not(@type='gloss')">Labels are only allowed in lists of type='gloss'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaVar-list-gloss-list-must-have-labels-22">
+   <pattern id="schematron-constraint-wegaVar-list-gloss-list-must-have-labels-21">
       <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>
     </pattern>
-   <pattern id="schematron-constraint-wegaVar-note-note-in-text-23">
+   <pattern id="schematron-constraint-wegaVar-note-note-in-text-22">
                     <rule context="tei:note[not(parent::tei:org or parent::tei:person or parent::tei:notesStmt or parent::tei:biblStruct or parent::tei:imprint)]">
                         <assert test="@type and @resp and @xml:id">It is required to provide @type and @resp and @xml:id on note.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaVar-note-thematicCom-target-24">
+   <pattern id="schematron-constraint-wegaVar-note-thematicCom-target-23">
                     <rule context="tei:note[@type='thematicCom' or @target]">
                         <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-wegaVar-note-notesStmt-notes-25">
+   <pattern id="schematron-constraint-wegaVar-note-notesStmt-notes-24">
                     <rule context="tei:note[parent::tei:notesStmt]">
                         <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-wegaVar-graphic-graphic-url-check-26">
+   <pattern id="schematron-constraint-wegaVar-graphic-graphic-url-check-25">
       <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>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaVar-author-sameAs-sameAs-reference-27">
+   <pattern id="schematron-constraint-wegaVar-author-sameAs-sameAs-reference-26">
                             <rule context="tei:*[@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-wegaVar-title-duplicate-title-28">
+   <pattern id="schematron-constraint-wegaVar-title-duplicate-title-27">
                     <rule context="tei:title[following-sibling::tei:title]">
                         <let name="level" value="@level"/>
                         <let name="type" value="string(@type)"/> 
@@ -178,18 +182,18 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                         <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-wegaVar-title-punctuation-mark-29">
+   <pattern id="schematron-constraint-wegaVar-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-wegaVar-notesStmt-count-notes-30">
+   <pattern id="schematron-constraint-wegaVar-notesStmt-count-notes-29">
       <rule context="tei:notesStmt">
                     <report test="count(tei:note/@type) ne count(distinct-values(tei:note/concat(@type, @xml:lang, @n)))">Only one summary, incipit, editorial and thematicCom are allowed within notesStmt.</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaVar-quotation-quotationContents-31">
+   <pattern id="schematron-constraint-wegaVar-quotation-quotationContents-30">
       <rule context="tei:quotation">
          <report test="not(@marks) and not (tei:p)">
 On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
@@ -199,46 +203,46 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
       
     
       
-    <pattern id="schematron-constraint-wegaVar-div-abstractModel-structure-l-34">
+    <pattern id="schematron-constraint-wegaVar-div-abstractModel-structure-l-33">
       <rule context="tei:div">
          <report test="ancestor::tei:l">
         Abstract model violation: Lines may not contain higher-level structural elements such as div.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaVar-div-abstractModel-structure-p-35">
+   <pattern id="schematron-constraint-wegaVar-div-abstractModel-structure-p-34">
       <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>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaVar-orgName-parent-org-36">
+   <pattern id="schematron-constraint-wegaVar-orgName-parent-org-35">
                     <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-wegaVar-orgName-parent-org-reg-37">
+   <pattern id="schematron-constraint-wegaVar-orgName-parent-org-reg-36">
                     <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-wegaVar-orgName-parent-org-reg-38">
+   <pattern id="schematron-constraint-wegaVar-orgName-parent-org-reg-37">
                     <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-wegaVar-orgName-parent-not-org-39">
+   <pattern id="schematron-constraint-wegaVar-orgName-parent-not-org-38">
                     <rule context="tei:orgName[not(parent::tei:org)]">
                         <report test="@type">No @type attribute allowed here.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaVar-table-collapsible-head-40">
+   <pattern id="schematron-constraint-wegaVar-table-collapsible-head-39">
       <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-wegaVar-row-number-of-cells-41">
+   <pattern id="schematron-constraint-wegaVar-row-number-of-cells-40">
                     <rule context="tei:row[preceding-sibling::tei:row]">
                         <let name="thisNode" value="."/>
                         
@@ -259,42 +263,42 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                         <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-wegaVar-cell-cell-rows-42">
+   <pattern id="schematron-constraint-wegaVar-cell-cell-rows-41">
                     <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-wegaVar-ab-abstractModel-structure-p-43">
+   <pattern id="schematron-constraint-wegaVar-ab-abstractModel-structure-p-42">
       <rule context="tei:ab">
          <report test="not(ancestor::floatingText) and (ancestor::tei:p or ancestor::tei:ab)          and not(parent::tei:exemplum         |parent::tei:item         |parent::tei:note         |parent::tei:q         |parent::tei:quote         |parent::tei:remarks         |parent::tei:said         |parent::tei:sp         |parent::tei:stage         |parent::tei:cell         |parent::tei:figure)">
         Abstract model violation: ab may not contain paragraphs or other ab elements.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaVar-ab-abstractModel-structure-l-44">
+   <pattern id="schematron-constraint-wegaVar-ab-abstractModel-structure-l-43">
       <rule context="tei:ab">
          <report test="ancestor::tei:l or ancestor::tei:lg">
         Abstract model violation: Lines may not contain higher-level divisions such as p or ab.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaVar-seg-activeOrPassivePerformance-45">
+   <pattern id="schematron-constraint-wegaVar-seg-activeOrPassivePerformance-44">
       <rule context="tei:seg">
                     <report test="./@subtype = ('active', 'passive') and not(./@type = 'performance')">if @subtype contains 'active' or 'passive' @type has to be 'performance'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaVar-seg-AddresseeOrSenderCorrespondence-46">
+   <pattern id="schematron-constraint-wegaVar-seg-AddresseeOrSenderCorrespondence-45">
       <rule context="tei:seg">
                     <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-wegaVar-styleguide-document-node-content-47">
+   <pattern id="schematron-constraint-wegaVar-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-wegaVar-att.wega.rend-underline-n-48">
+   <pattern id="schematron-constraint-wegaVar-att.wega.rend-underline-n-47">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>
diff --git a/schema/de/wegaVar.rng b/schema/de/wegaVar.rng
index 1fa4af3b..4396a893 100644
--- a/schema/de/wegaVar.rng
+++ b/schema/de/wegaVar.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-11-15T18:49:59Z. .
+Schema generated from ODD source 2017-12-21T19:30:29Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -2713,31 +2713,55 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-date-dateHeuristics1-constraint-report-6">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaVar-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-date-dateHeuristics2-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaVar-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaVar-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaVar-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-date-dateHeuristics3-constraint-report-8">
+                  id="wegaVar-date-dateHeuristics3-constraint-report-10">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2749,7 +2773,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-date-dateHeuristics4-constraint-report-9">
+                  id="wegaVar-date-dateHeuristics4-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2837,7 +2861,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) wird benutzt um auf ein folgendes note zu zeigen und somit den Beginn des zu kommentierenden Bereichs zu markieren. Alternativ kann das Element ein Platzhalter für eine externe URL (präfigiert mit 'http') sein. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ptr-ptr-target-constraint-rule-9">
+                  id="wegaVar-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2852,7 +2876,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ptr-duplicate-ptr-constraint-report-10">
+                  id="wegaVar-ptr-duplicate-ptr-constraint-report-12">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2866,7 +2890,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ptr-ptrAtts-constraint-report-11">
+                  id="wegaVar-ptr-ptrAtts-constraint-report-13">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2892,7 +2916,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Quellenangabe) definiert eine Quellenangabe an einer anderen Stelle, die womöglich durch zusätzlichen Text oder Kommentare modifizert wurde. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ref-prev-next-correspContext-constraint-report-12">
+                  id="wegaVar-ref-prev-next-correspContext-constraint-report-14">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2904,7 +2928,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ref-refAtts-constraint-report-13">
+                  id="wegaVar-ref-refAtts-constraint-report-15">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2958,7 +2982,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-list-gloss-list-constraint-report-14">
+                  id="wegaVar-list-gloss-list-constraint-report-16">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2970,7 +2994,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-list-gloss-list-must-have-labels-constraint-rule-10">
+                  id="wegaVar-list-gloss-list-must-have-labels-constraint-rule-14">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3049,7 +3073,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Anmerkung) enthält eine Notiz oder eine Anmerkung/Annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-note-note-in-text-constraint-rule-11">
+                  id="wegaVar-note-note-in-text-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3061,7 +3085,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-note-thematicCom-target-constraint-rule-12">
+                  id="wegaVar-note-thematicCom-target-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3073,7 +3097,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-note-notesStmt-notes-constraint-rule-13">
+                  id="wegaVar-note-notesStmt-notes-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3217,7 +3241,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-author-sameAs-sameAs-reference-constraint-rule-14">
+                  id="wegaVar-author-sameAs-sameAs-reference-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3323,7 +3347,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Titel) enthält einen Titel für jede Art von Arbeit. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-title-duplicate-title-constraint-rule-15">
+                  id="wegaVar-title-duplicate-title-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3338,7 +3362,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-title-punctuation-mark-constraint-report-16">
+                  id="wegaVar-title-punctuation-mark-constraint-report-18">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3721,7 +3745,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-notesStmt-count-notes-constraint-report-17">
+                  id="wegaVar-notesStmt-count-notes-constraint-report-19">
             <rule context="tei:notesStmt">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3793,7 +3817,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             <ref name="model.pLike"/>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-quotation-quotationContents-constraint-report-18">
+                  id="wegaVar-quotation-quotationContents-constraint-report-20">
             <rule context="tei:quotation">
                <report xmlns:xi="http://www.w3.org/2001/XInclude"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -4048,7 +4072,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-div-abstractModel-structure-l-constraint-report-19">
+                  id="wegaVar-div-abstractModel-structure-l-constraint-report-21">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4058,7 +4082,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-div-abstractModel-structure-p-constraint-report-20">
+                  id="wegaVar-div-abstractModel-structure-p-constraint-report-22">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4410,7 +4434,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-orgName-parent-org-constraint-rule-16">
+                  id="wegaVar-orgName-parent-org-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4422,7 +4446,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-orgName-parent-org-reg-constraint-rule-17">
+                  id="wegaVar-orgName-parent-org-reg-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4434,7 +4458,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-orgName-parent-org-reg-constraint-rule-18">
+                  id="wegaVar-orgName-parent-org-reg-constraint-rule-22">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4446,7 +4470,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-orgName-parent-not-org-constraint-rule-19">
+                  id="wegaVar-orgName-parent-not-org-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4600,7 +4624,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-table-collapsible-head-constraint-report-24">
+                  id="wegaVar-table-collapsible-head-constraint-report-26">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4634,7 +4658,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-row-number-of-cells-constraint-rule-20">
+                  id="wegaVar-row-number-of-cells-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4671,7 +4695,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Tabellenzelle) enthält eine Zelle einer Tabelle. [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-cell-cell-rows-constraint-rule-21">
+                  id="wegaVar-cell-cell-rows-constraint-rule-25">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4890,7 +4914,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any arbitrary component-level unit of text, acting as an anonymous container for phrase or inter level elements analogous to, but without the semantic baggage of, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ab-abstractModel-structure-p-constraint-report-26">
+                  id="wegaVar-ab-abstractModel-structure-p-constraint-report-28">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4900,7 +4924,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ab-abstractModel-structure-l-constraint-report-27">
+                  id="wegaVar-ab-abstractModel-structure-l-constraint-report-29">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4933,7 +4957,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(beliebiges Segment) steht für eine beliebige Segmentierung des Textes unterhalb des ‘chunk’ Levels. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-seg-activeOrPassivePerformance-constraint-report-28">
+                  id="wegaVar-seg-activeOrPassivePerformance-constraint-report-30">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4945,7 +4969,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-seg-AddresseeOrSenderCorrespondence-constraint-report-29">
+                  id="wegaVar-seg-AddresseeOrSenderCorrespondence-constraint-report-31">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5123,7 +5147,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaVar-att.wega.rend-underline-n-constraint-rule-23">
+            id="wegaVar-att.wega.rend-underline-n-constraint-rule-27">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5179,7 +5203,7 @@ Beispielwerte sind etwa: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaVar-styleguide-document-node-content-constraint-rule-22">
+            id="wegaVar-styleguide-document-node-content-constraint-rule-26">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/de/wegaWritings.isosch b/schema/de/wegaWritings.isosch
index 2c3f37e6..47028fc0 100644
--- a/schema/de/wegaWritings.isosch
+++ b/schema/de/wegaWritings.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-11-15T18:50:02Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2017-12-21T19:30:30Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -81,32 +81,36 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                         <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-wegaWritings-date-dateHeuristics1-12">
-      <rule context="tei:date">
-                    <report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaWritings-date-dateHeuristics2-13">
-      <rule context="tei:date">
-                    <report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wegaWritings-date-dateHeuristics3-14">
+   <pattern id="schematron-constraint-wegaWritings-date-dateHeuristics2-12">
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                </pattern>
+   <pattern id="schematron-constraint-wegaWritings-date-dateHeuristics3-13">
       <rule context="tei:date">
                     <report test="(@from or @to) and (@when or @notAfter or @notBefore)">cooccurence of date and duration attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-date-dateHeuristics4-15">
+   <pattern id="schematron-constraint-wegaWritings-date-dateHeuristics4-14">
       <rule context="tei:date">
                     <report test="@when and (@notAfter or @notBefore)">cooccurence of exact and uncertain date attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-date-dateHeuristics5-16">
+   <pattern id="schematron-constraint-wegaWritings-date-dateHeuristics5-15">
       <rule context="tei:date">
                     <assert test="@when or @notBefore or @notAfter or @from or @to or @cert='unknown' or matches(., '0000|o\.J\.|unknown') or ancestor::tei:text">tei:date benötigt ein Attribut @when, @notBefore o.ä.</assert>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-ptr-ptr-target-17">
+   <pattern id="schematron-constraint-wegaWritings-ptr-ptr-target-16">
                  <rule context="tei:ptr[not(starts-with(@target, 'http'))]">
                     <assert test="following::tei:note[@xml:id=substring(current()/@target,2)]">
                        The note element indicated by @target (<value-of select="@target"/>) must follow the current element <name/>. 
@@ -114,82 +118,82 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                     </assert>
                  </rule>
              </pattern>
-   <pattern id="schematron-constraint-wegaWritings-ptr-duplicate-ptr-18">
+   <pattern id="schematron-constraint-wegaWritings-ptr-duplicate-ptr-17">
       <rule context="tei:ptr">
                 <report test="following::tei:ptr[@target=current()/@target]">
                    There must be only one pointer with the @target (<value-of select="@target"/>)
                 </report>
              </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-ptr-ptrAtts-19">
+   <pattern id="schematron-constraint-wegaWritings-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-wegaWritings-ref-prev-next-correspContext-20">
+   <pattern id="schematron-constraint-wegaWritings-ref-prev-next-correspContext-19">
       <rule context="tei:ref">
                     <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="schematron-constraint-wegaWritings-ref-refAtts-21">
+   <pattern id="schematron-constraint-wegaWritings-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/>
          </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-list-gloss-list-22">
+   <pattern id="schematron-constraint-wegaWritings-list-gloss-list-21">
       <rule context="tei:list">
                     <report test="./tei:label and not(@type='gloss')">Labels are only allowed in lists of type='gloss'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-list-gloss-list-must-have-labels-23">
+   <pattern id="schematron-constraint-wegaWritings-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>
     </pattern>
-   <pattern id="schematron-constraint-wegaWritings-note-note-in-text-24">
+   <pattern id="schematron-constraint-wegaWritings-note-note-in-text-23">
                     <rule context="tei:note[not(parent::tei:org or parent::tei:person or parent::tei:notesStmt or parent::tei:biblStruct or parent::tei:imprint)]">
                         <assert test="@type and @resp and @xml:id">It is required to provide @type and @resp and @xml:id on note.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaWritings-note-thematicCom-target-25">
+   <pattern id="schematron-constraint-wegaWritings-note-thematicCom-target-24">
                     <rule context="tei:note[@type='thematicCom' or @target]">
                         <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-wegaWritings-note-notesStmt-notes-26">
+   <pattern id="schematron-constraint-wegaWritings-note-notesStmt-notes-25">
                     <rule context="tei:note[parent::tei:notesStmt]">
                         <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-wegaWritings-graphic-graphic-url-check-27">
+   <pattern id="schematron-constraint-wegaWritings-graphic-graphic-url-check-26">
       <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>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-pb-facs-facs-reference-28">
+   <pattern id="schematron-constraint-wegaWritings-pb-facs-facs-reference-27">
                             <rule context="tei:*[@facs]">
                                 <assert test="id(substring(@facs,2)) or starts-with(@facs, 'wega:')">There must be an element with the xml:id = "<value-of select="substring(@facs,2)"/>" which is the target of this @facs.</assert>
                             </rule>
                         </pattern>
-   <pattern id="schematron-constraint-wegaWritings-analytic-analyticTitle-29">
+   <pattern id="schematron-constraint-wegaWritings-analytic-analyticTitle-28">
       <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-wegaWritings-monogr-monogrTitle-30">
+   <pattern id="schematron-constraint-wegaWritings-monogr-monogrTitle-29">
       <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-wegaWritings-author-sameAs-sameAs-reference-31">
+   <pattern id="schematron-constraint-wegaWritings-author-sameAs-sameAs-reference-30">
                             <rule context="tei:*[@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-wegaWritings-title-duplicate-title-32">
+   <pattern id="schematron-constraint-wegaWritings-title-duplicate-title-31">
                     <rule context="tei:title[following-sibling::tei:title]">
                         <let name="level" value="@level"/>
                         <let name="type" value="string(@type)"/> 
@@ -197,28 +201,28 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                         <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-wegaWritings-title-punctuation-mark-33">
+   <pattern id="schematron-constraint-wegaWritings-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-wegaWritings-imprint-duplicate-biblScope-type-34">
+   <pattern id="schematron-constraint-wegaWritings-imprint-duplicate-biblScope-type-33">
       <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-wegaWritings-relatedItem-relatedItem-type-within-notesStmt-35">
+   <pattern id="schematron-constraint-wegaWritings-relatedItem-relatedItem-type-within-notesStmt-34">
       <rule context="tei:relatedItem">
                     <report test="@type and not(parent::tei:notesStmt)">The @type attribute on <name/> must only be used within the notesStmt.</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-relatedItem-relatedItem-target-within-notesStmt-36">
+   <pattern id="schematron-constraint-wegaWritings-relatedItem-relatedItem-target-within-notesStmt-35">
                     <rule context="tei:relatedItem[parent::tei:notesStmt]">
                         <assert test="@target and @type">Within the notesStmt you must supply both the @target and the @type attribute on <name/>.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaWritings-relatedItem-targetorcontent1-37">
+   <pattern id="schematron-constraint-wegaWritings-relatedItem-targetorcontent1-36">
       <rule context="tei:relatedItem">
          <report test="@target and count( child::* ) &gt; 0">
 If the @target attribute on <name/> is used, the
@@ -227,33 +231,33 @@ relatedItem element must be empty</report>
         or a child element to indicate the related bibliographic item</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-l-abstractModel-structure-l-38">
+   <pattern id="schematron-constraint-wegaWritings-l-abstractModel-structure-l-37">
       <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.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-lg-atleast1oflggapl-39">
+   <pattern id="schematron-constraint-wegaWritings-lg-atleast1oflggapl-38">
       <rule context="tei:lg">
          <assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
         must contain at least one child l, lg or gap element.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-lg-abstractModel-structure-l-40">
+   <pattern id="schematron-constraint-wegaWritings-lg-abstractModel-structure-l-39">
       <rule context="tei:lg">
          <report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
         Abstract model violation: Lines may not contain line groups.
       </report>
       </rule>
    </pattern>
-   <pattern id="isoschematron-constraint-wegaWritings-teiHeader-seriesTitle-41">
+   <pattern id="isoschematron-constraint-wegaWritings-teiHeader-seriesTitle-40">
                 <rule context="tei:fileDesc/tei:titleStmt/tei:title[@level='s']">
                     <assert test=".='WeGA, Rezeptionsdokumente, Digitale Edition'">The series title must be 
                         "WeGA, Rezeptionsdokumente, Digitale Edition".</assert>
                 </rule>
             </pattern>
-   <pattern id="schematron-constraint-wegaWritings-notesStmt-count-notes-42">
+   <pattern id="schematron-constraint-wegaWritings-notesStmt-count-notes-41">
       <rule context="tei:notesStmt">
                     <report test="count(tei:note/@type) ne count(distinct-values(tei:note/concat(@type, @xml:lang, @n)))">Only one summary, incipit, editorial and thematicCom are allowed within notesStmt.</report>
                 </rule>
@@ -262,46 +266,46 @@ relatedItem element must be empty</report>
       
     
       
-    <pattern id="schematron-constraint-wegaWritings-div-abstractModel-structure-l-45">
+    <pattern id="schematron-constraint-wegaWritings-div-abstractModel-structure-l-44">
       <rule context="tei:div">
          <report test="ancestor::tei:l">
         Abstract model violation: Lines may not contain higher-level structural elements such as div.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-div-abstractModel-structure-p-46">
+   <pattern id="schematron-constraint-wegaWritings-div-abstractModel-structure-p-45">
       <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>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-orgName-parent-org-47">
+   <pattern id="schematron-constraint-wegaWritings-orgName-parent-org-46">
                     <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-wegaWritings-orgName-parent-org-reg-48">
+   <pattern id="schematron-constraint-wegaWritings-orgName-parent-org-reg-47">
                     <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-wegaWritings-orgName-parent-org-reg-49">
+   <pattern id="schematron-constraint-wegaWritings-orgName-parent-org-reg-48">
                     <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-wegaWritings-orgName-parent-not-org-50">
+   <pattern id="schematron-constraint-wegaWritings-orgName-parent-not-org-49">
                     <rule context="tei:orgName[not(parent::tei:org)]">
                         <report test="@type">No @type attribute allowed here.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaWritings-table-collapsible-head-51">
+   <pattern id="schematron-constraint-wegaWritings-table-collapsible-head-50">
       <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-wegaWritings-row-number-of-cells-52">
+   <pattern id="schematron-constraint-wegaWritings-row-number-of-cells-51">
                     <rule context="tei:row[preceding-sibling::tei:row]">
                         <let name="thisNode" value="."/>
                         
@@ -322,80 +326,80 @@ relatedItem element must be empty</report>
                         <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-wegaWritings-cell-cell-rows-53">
+   <pattern id="schematron-constraint-wegaWritings-cell-cell-rows-52">
                     <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-wegaWritings-addSpan-spanTo-54">
+   <pattern id="schematron-constraint-wegaWritings-addSpan-spanTo-53">
       <rule context="tei:addSpan">
          <assert test="@spanTo">The @spanTo attribute of <name/> is required.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-addSpan-spanTo-spanTo-7-56">
+   <pattern id="schematron-constraint-wegaWritings-addSpan-spanTo-spanTo-7-55">
                             <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/>
                                 </assert>
                             </rule>
                         </pattern>
-   <pattern id="schematron-constraint-wegaWritings-subst-substContents1-57">
+   <pattern id="schematron-constraint-wegaWritings-subst-substContents1-56">
       <rule context="tei:subst">
          <assert test="child::tei:add and child::tei:del">
             <name/> must have at least one child add and at least one child del</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-msIdentifier-msId_minimal-58">
+   <pattern id="schematron-constraint-wegaWritings-msIdentifier-msId_minimal-57">
       <rule context="tei:msIdentifier">
          <report test="not(parent::tei:msPart) and       (local-name(*[1])='idno' or       local-name(*[1])='altIdentifier' or       normalize-space(.)='')">An msIdentifier must contain either a repository or location of some type, or a manuscript name</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-seg-activeOrPassivePerformance-59">
+   <pattern id="schematron-constraint-wegaWritings-seg-activeOrPassivePerformance-58">
       <rule context="tei:seg">
                     <report test="./@subtype = ('active', 'passive') and not(./@type = 'performance')">if @subtype contains 'active' or 'passive' @type has to be 'performance'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wegaWritings-seg-AddresseeOrSenderCorrespondence-60">
+   <pattern id="schematron-constraint-wegaWritings-seg-AddresseeOrSenderCorrespondence-59">
       <rule context="tei:seg">
                     <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-wegaWritings-att.witnessed-att-wit-61">
+   <pattern id="schematron-constraint-wegaWritings-att.witnessed-att-wit-60">
                     <rule context="tei:*[@wit]">
                         <let name="wit" value="@wit"/>
                         <assert test="preceding::tei:witness[@xml:id = substring($wit, 2)]">The @wit-attribute must point at some witness element</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wegaWritings-whitespaceOnlyContent-62">
+   <pattern id="schematron-constraint-wegaWritings-whitespaceOnlyContent-61">
                 <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-wegaWritings-elementStartsWithWhitespace-63">
+   <pattern id="schematron-constraint-wegaWritings-elementStartsWithWhitespace-62">
                 <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-wegaWritings-untrimmedAttributeValues-64">
+   <pattern id="schematron-constraint-wegaWritings-untrimmedAttributeValues-63">
                 <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-wegaWritings-styleguide-document-node-content-65">
+   <pattern id="schematron-constraint-wegaWritings-styleguide-document-node-content-64">
                 <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-wegaWritings-styleguide-document-node-content-66">
+   <pattern id="schematron-constraint-wegaWritings-styleguide-document-node-content-65">
                 <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-wegaWritings-att.wega.rend-underline-n-67">
+   <pattern id="schematron-constraint-wegaWritings-att.wega.rend-underline-n-66">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>
diff --git a/schema/de/wegaWritings.rng b/schema/de/wegaWritings.rng
index 6c0b4119..9842bd58 100644
--- a/schema/de/wegaWritings.rng
+++ b/schema/de/wegaWritings.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-08T08:24:58Z. .
+Schema generated from ODD source 2017-12-21T19:30:30Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -2609,31 +2609,55 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-date-dateHeuristics1-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaWritings-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-date-dateHeuristics2-constraint-report-8">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaWritings-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaWritings-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaWritings-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-date-dateHeuristics3-constraint-report-9">
+                  id="wegaWritings-date-dateHeuristics3-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2645,7 +2669,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-date-dateHeuristics4-constraint-report-10">
+                  id="wegaWritings-date-dateHeuristics4-constraint-report-12">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2720,7 +2744,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) wird benutzt um auf ein folgendes note zu zeigen und somit den Beginn des zu kommentierenden Bereichs zu markieren. Alternativ kann das Element ein Platzhalter für eine externe URL (präfigiert mit 'http') sein. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-ptr-ptr-target-constraint-rule-9">
+                  id="wegaWritings-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2735,7 +2759,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-ptr-duplicate-ptr-constraint-report-11">
+                  id="wegaWritings-ptr-duplicate-ptr-constraint-report-13">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2749,7 +2773,7 @@ Empfohlene Werte sind: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] foreig
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-ptr-ptrAtts-constraint-report-12">
+                  id="wegaWritings-ptr-ptrAtts-constraint-report-14">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2775,7 +2799,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Quellenangabe) definiert eine Quellenangabe an einer anderen Stelle, die womöglich durch zusätzlichen Text oder Kommentare modifizert wurde. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-ref-prev-next-correspContext-constraint-report-13">
+                  id="wegaWritings-ref-prev-next-correspContext-constraint-report-15">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2787,7 +2811,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-ref-refAtts-constraint-report-14">
+                  id="wegaWritings-ref-refAtts-constraint-report-16">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2841,7 +2865,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-list-gloss-list-constraint-report-15">
+                  id="wegaWritings-list-gloss-list-constraint-report-17">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2853,7 +2877,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-list-gloss-list-must-have-labels-constraint-rule-10">
+                  id="wegaWritings-list-gloss-list-must-have-labels-constraint-rule-14">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2942,7 +2966,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Anmerkung) enthält eine Notiz oder eine Anmerkung/Annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-note-note-in-text-constraint-rule-11">
+                  id="wegaWritings-note-note-in-text-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2954,7 +2978,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-note-thematicCom-target-constraint-rule-12">
+                  id="wegaWritings-note-thematicCom-target-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2966,7 +2990,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-note-notesStmt-notes-constraint-rule-13">
+                  id="wegaWritings-note-notesStmt-notes-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3075,7 +3099,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-pb-facs-facs-reference-constraint-rule-14">
+                  id="wegaWritings-pb-facs-facs-reference-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3149,7 +3173,7 @@ Elements]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-analytic-analyticTitle-constraint-report-16">
+                  id="wegaWritings-analytic-analyticTitle-constraint-report-18">
             <rule context="tei:analytic">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3242,7 +3266,7 @@ Elements]</a:documentation>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-monogr-monogrTitle-constraint-report-17">
+                  id="wegaWritings-monogr-monogrTitle-constraint-report-19">
             <rule context="tei:monogr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3287,7 +3311,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-author-sameAs-sameAs-reference-constraint-rule-15">
+                  id="wegaWritings-author-sameAs-sameAs-reference-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3393,7 +3417,7 @@ Elements]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Titel) enthält einen Titel für jede Art von Arbeit. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-title-duplicate-title-constraint-rule-16">
+                  id="wegaWritings-title-duplicate-title-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3408,7 +3432,7 @@ Elements]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-title-punctuation-mark-constraint-report-19">
+                  id="wegaWritings-title-punctuation-mark-constraint-report-21">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3475,7 +3499,7 @@ Elements]</a:documentation>
             </optional>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-imprint-duplicate-biblScope-type-constraint-report-20">
+                  id="wegaWritings-imprint-duplicate-biblScope-type-constraint-report-22">
             <rule context="tei:imprint">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3610,7 +3634,7 @@ Elements]</a:documentation>
             </choice>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-relatedItem-relatedItem-type-within-notesStmt-constraint-report-21">
+                  id="wegaWritings-relatedItem-relatedItem-type-within-notesStmt-constraint-report-23">
             <rule context="tei:relatedItem">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3622,7 +3646,7 @@ Elements]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-17">
+                  id="wegaWritings-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3634,7 +3658,7 @@ Elements]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-relatedItem-targetorcontent1-constraint-report-22">
+                  id="wegaWritings-relatedItem-targetorcontent1-constraint-report-24">
             <rule context="tei:relatedItem">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -3691,7 +3715,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-l-abstractModel-structure-l-constraint-report-23">
+                  id="wegaWritings-l-abstractModel-structure-l-constraint-report-25">
             <rule context="tei:l">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3750,7 +3774,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-lg-abstractModel-structure-l-constraint-report-24">
+                  id="wegaWritings-lg-abstractModel-structure-l-constraint-report-26">
             <rule context="tei:lg">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3773,7 +3797,7 @@ relatedItem element must be empty</sch:report>
             <ref name="revisionDesc"/>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-teiHeader-seriesTitle-constraint-rule-18">
+                  id="wegaWritings-teiHeader-seriesTitle-constraint-rule-22">
             <sch:rule xmlns:xi="http://www.w3.org/2001/XInclude"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
@@ -3972,7 +3996,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-notesStmt-count-notes-constraint-report-25">
+                  id="wegaWritings-notesStmt-count-notes-constraint-report-27">
             <rule context="tei:notesStmt">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4380,7 +4404,7 @@ relatedItem element must be empty</sch:report>
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-div-abstractModel-structure-l-constraint-report-26">
+                  id="wegaWritings-div-abstractModel-structure-l-constraint-report-28">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4390,7 +4414,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-div-abstractModel-structure-p-constraint-report-27">
+                  id="wegaWritings-div-abstractModel-structure-p-constraint-report-29">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4577,7 +4601,7 @@ relatedItem element must be empty</sch:report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-orgName-parent-org-constraint-rule-19">
+                  id="wegaWritings-orgName-parent-org-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4589,7 +4613,7 @@ relatedItem element must be empty</sch:report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-orgName-parent-org-reg-constraint-rule-20">
+                  id="wegaWritings-orgName-parent-org-reg-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4601,7 +4625,7 @@ relatedItem element must be empty</sch:report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-orgName-parent-org-reg-constraint-rule-21">
+                  id="wegaWritings-orgName-parent-org-reg-constraint-rule-25">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4613,7 +4637,7 @@ relatedItem element must be empty</sch:report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-orgName-parent-not-org-constraint-rule-22">
+                  id="wegaWritings-orgName-parent-not-org-constraint-rule-26">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4759,7 +4783,7 @@ relatedItem element must be empty</sch:report>
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-table-collapsible-head-constraint-report-31">
+                  id="wegaWritings-table-collapsible-head-constraint-report-33">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4793,7 +4817,7 @@ relatedItem element must be empty</sch:report>
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-row-number-of-cells-constraint-rule-23">
+                  id="wegaWritings-row-number-of-cells-constraint-rule-27">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4830,7 +4854,7 @@ relatedItem element must be empty</sch:report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Tabellenzelle) enthält eine Zelle einer Tabelle. [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-cell-cell-rows-constraint-rule-24">
+                  id="wegaWritings-cell-cell-rows-constraint-rule-28">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4996,7 +5020,7 @@ relatedItem element must be empty</sch:report>
             <data type="anyURI"/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-addSpan-hand-hand-reference-constraint-rule-25">
+                  id="wegaWritings-addSpan-hand-hand-reference-constraint-rule-29">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5012,7 +5036,7 @@ relatedItem element must be empty</sch:report>
             <data type="anyURI"/>
          </attribute> 
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-addSpan-spanTo-spanTo-7-constraint-rule-26">
+                  id="wegaWritings-addSpan-spanTo-spanTo-7-constraint-rule-30">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5160,7 +5184,7 @@ relatedItem element must be empty</sch:report>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-msIdentifier-msId_minimal-constraint-report-33">
+                  id="wegaWritings-msIdentifier-msId_minimal-constraint-report-35">
             <rule context="tei:msIdentifier">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5278,7 +5302,7 @@ relatedItem element must be empty</sch:report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(beliebiges Segment) steht für eine beliebige Segmentierung des Textes unterhalb des ‘chunk’ Levels. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-seg-activeOrPassivePerformance-constraint-report-34">
+                  id="wegaWritings-seg-activeOrPassivePerformance-constraint-report-36">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5290,7 +5314,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-seg-AddresseeOrSenderCorrespondence-constraint-report-35">
+                  id="wegaWritings-seg-AddresseeOrSenderCorrespondence-constraint-report-37">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5449,7 +5473,7 @@ relatedItem element must be empty</sch:report>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-att.witnessed-att-wit-constraint-rule-27">
+            id="wegaWritings-att.witnessed-att-wit-constraint-rule-31">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5667,7 +5691,7 @@ relatedItem element must be empty</sch:report>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-att.wega.rend-underline-n-constraint-rule-33">
+            id="wegaWritings-att.wega.rend-underline-n-constraint-rule-37">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5684,7 +5708,7 @@ relatedItem element must be empty</sch:report>
       </choice>
    </start>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-whitespaceOnlyContent-constraint-rule-28">
+            id="wegaWritings-whitespaceOnlyContent-constraint-rule-32">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5697,7 +5721,7 @@ relatedItem element must be empty</sch:report>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-elementStartsWithWhitespace-constraint-rule-29">
+            id="wegaWritings-elementStartsWithWhitespace-constraint-rule-33">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5710,7 +5734,7 @@ relatedItem element must be empty</sch:report>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-untrimmedAttributeValues-constraint-rule-30">
+            id="wegaWritings-untrimmedAttributeValues-constraint-rule-34">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5722,7 +5746,7 @@ relatedItem element must be empty</sch:report>
                 </sch:rule>
    </pattern>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-styleguide-document-node-content-constraint-rule-31">
+            id="wegaWritings-styleguide-document-node-content-constraint-rule-35">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5735,7 +5759,7 @@ relatedItem element must be empty</sch:report>
                 </sch:rule>
    </pattern>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-styleguide-document-node-content-constraint-rule-32">
+            id="wegaWritings-styleguide-document-node-content-constraint-rule-36">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/de/wega_all.isosch b/schema/de/wega_all.isosch
index 85597917..0dcebf18 100644
--- a/schema/de/wega_all.isosch
+++ b/schema/de/wega_all.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-11-15T18:50:01Z by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2017-12-21T19:30:30Z by 'extract-isosch.xsl'. -->
 
    <!-- ********************* -->
    <!-- namespaces, declared: -->
@@ -82,32 +82,36 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                         <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-wega_all-date-dateHeuristics1-12">
-      <rule context="tei:date">
-                    <report test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wega_all-date-dateHeuristics2-13">
-      <rule context="tei:date">
-                    <report test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</report>
-                </rule>
-   </pattern>
-   <pattern id="schematron-constraint-wega_all-date-dateHeuristics3-14">
+   <pattern id="schematron-constraint-wega_all-date-dateHeuristics2-12">
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                    <rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</report>
+                    </rule>
+                </pattern>
+   <pattern id="schematron-constraint-wega_all-date-dateHeuristics3-13">
       <rule context="tei:date">
                     <report test="(@from or @to) and (@when or @notAfter or @notBefore)">cooccurence of date and duration attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-date-dateHeuristics4-15">
+   <pattern id="schematron-constraint-wega_all-date-dateHeuristics4-14">
       <rule context="tei:date">
                     <report test="@when and (@notAfter or @notBefore)">cooccurence of exact and uncertain date attributes</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-date-dateHeuristics5-16">
+   <pattern id="schematron-constraint-wega_all-date-dateHeuristics5-15">
       <rule context="tei:date">
                     <assert test="@when or @notBefore or @notAfter or @from or @to or @cert='unknown' or matches(., '0000|o\.J\.|unknown') or ancestor::tei:text">tei:date benötigt ein Attribut @when, @notBefore o.ä.</assert>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-ptr-ptr-target-17">
+   <pattern id="schematron-constraint-wega_all-ptr-ptr-target-16">
                  <rule context="tei:ptr[not(starts-with(@target, 'http'))]">
                     <assert test="following::tei:note[@xml:id=substring(current()/@target,2)]">
                        The note element indicated by @target (<value-of select="@target"/>) must follow the current element <name/>. 
@@ -115,87 +119,87 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
                     </assert>
                  </rule>
              </pattern>
-   <pattern id="schematron-constraint-wega_all-ptr-duplicate-ptr-18">
+   <pattern id="schematron-constraint-wega_all-ptr-duplicate-ptr-17">
       <rule context="tei:ptr">
                 <report test="following::tei:ptr[@target=current()/@target]">
                    There must be only one pointer with the @target (<value-of select="@target"/>)
                 </report>
              </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-ptr-ptrAtts-19">
+   <pattern id="schematron-constraint-wega_all-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-wega_all-ref-prev-next-correspContext-20">
+   <pattern id="schematron-constraint-wega_all-ref-prev-next-correspContext-19">
       <rule context="tei:ref">
                     <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="schematron-constraint-wega_all-ref-refAtts-21">
+   <pattern id="schematron-constraint-wega_all-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/>
          </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-list-gloss-list-22">
+   <pattern id="schematron-constraint-wega_all-list-gloss-list-21">
       <rule context="tei:list">
                     <report test="./tei:label and not(@type='gloss')">Labels are only allowed in lists of type='gloss'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-list-gloss-list-must-have-labels-23">
+   <pattern id="schematron-constraint-wega_all-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>
     </pattern>
-   <pattern id="schematron-constraint-wega_all-note-note-in-text-24">
+   <pattern id="schematron-constraint-wega_all-note-note-in-text-23">
                     <rule context="tei:note[not(parent::tei:org or parent::tei:person or parent::tei:notesStmt or parent::tei:biblStruct or parent::tei:imprint)]">
                         <assert test="@type and @resp and @xml:id">It is required to provide @type and @resp and @xml:id on note.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wega_all-note-thematicCom-target-25">
+   <pattern id="schematron-constraint-wega_all-note-thematicCom-target-24">
                     <rule context="tei:note[@type='thematicCom' or @target]">
                         <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-wega_all-note-notesStmt-notes-26">
+   <pattern id="schematron-constraint-wega_all-note-notesStmt-notes-25">
                     <rule context="tei:note[parent::tei:notesStmt]">
                         <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-wega_all-graphic-graphic-url-check-27">
+   <pattern id="schematron-constraint-wega_all-graphic-graphic-url-check-26">
       <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>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-pb-facs-facs-reference-28">
+   <pattern id="schematron-constraint-wega_all-pb-facs-facs-reference-27">
                             <rule context="tei:*[@facs]">
                                 <assert test="id(substring(@facs,2)) or starts-with(@facs, 'wega:')">There must be an element with the xml:id = "<value-of select="substring(@facs,2)"/>" which is the target of this @facs.</assert>
                             </rule>
                         </pattern>
-   <pattern id="schematron-constraint-wega_all-analytic-analyticTitle-29">
+   <pattern id="schematron-constraint-wega_all-analytic-analyticTitle-28">
       <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-wega_all-monogr-monogrTitle-30">
+   <pattern id="schematron-constraint-wega_all-monogr-monogrTitle-29">
       <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-wega_all-series-seriesTitle-31">
+   <pattern id="schematron-constraint-wega_all-series-seriesTitle-30">
       <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-wega_all-author-sameAs-sameAs-reference-32">
+   <pattern id="schematron-constraint-wega_all-author-sameAs-sameAs-reference-31">
                             <rule context="tei:*[@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-wega_all-title-duplicate-title-33">
+   <pattern id="schematron-constraint-wega_all-title-duplicate-title-32">
                     <rule context="tei:title[following-sibling::tei:title]">
                         <let name="level" value="@level"/>
                         <let name="type" value="string(@type)"/> 
@@ -203,28 +207,28 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                         <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-wega_all-title-punctuation-mark-34">
+   <pattern id="schematron-constraint-wega_all-title-punctuation-mark-33">
       <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-wega_all-imprint-duplicate-biblScope-type-35">
+   <pattern id="schematron-constraint-wega_all-imprint-duplicate-biblScope-type-34">
       <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-wega_all-relatedItem-relatedItem-type-within-notesStmt-36">
+   <pattern id="schematron-constraint-wega_all-relatedItem-relatedItem-type-within-notesStmt-35">
       <rule context="tei:relatedItem">
                     <report test="@type and not(parent::tei:notesStmt)">The @type attribute on <name/> must only be used within the notesStmt.</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-relatedItem-relatedItem-target-within-notesStmt-37">
+   <pattern id="schematron-constraint-wega_all-relatedItem-relatedItem-target-within-notesStmt-36">
                     <rule context="tei:relatedItem[parent::tei:notesStmt]">
                         <assert test="@target and @type">Within the notesStmt you must supply both the @target and the @type attribute on <name/>.</assert>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wega_all-relatedItem-targetorcontent1-38">
+   <pattern id="schematron-constraint-wega_all-relatedItem-targetorcontent1-37">
       <rule context="tei:relatedItem">
          <report test="@target and count( child::* ) &gt; 0">
 If the @target attribute on <name/> is used, the
@@ -233,32 +237,32 @@ relatedItem element must be empty</report>
         or a child element to indicate the related bibliographic item</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-l-abstractModel-structure-l-39">
+   <pattern id="schematron-constraint-wega_all-l-abstractModel-structure-l-38">
       <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.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-lg-atleast1oflggapl-40">
+   <pattern id="schematron-constraint-wega_all-lg-atleast1oflggapl-39">
       <rule context="tei:lg">
          <assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
         must contain at least one child l, lg or gap element.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-lg-abstractModel-structure-l-41">
+   <pattern id="schematron-constraint-wega_all-lg-abstractModel-structure-l-40">
       <rule context="tei:lg">
          <report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
         Abstract model violation: Lines may not contain line groups.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-table-collapsible-head-42">
+   <pattern id="schematron-constraint-wega_all-table-collapsible-head-41">
       <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-wega_all-row-number-of-cells-43">
+   <pattern id="schematron-constraint-wega_all-row-number-of-cells-42">
                     <rule context="tei:row[preceding-sibling::tei:row]">
                         <let name="thisNode" value="."/>
                         
@@ -279,72 +283,72 @@ relatedItem element must be empty</report>
                         <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-wega_all-cell-cell-rows-44">
+   <pattern id="schematron-constraint-wega_all-cell-cell-rows-43">
                     <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-wega_all-notesStmt-count-notes-45">
+   <pattern id="schematron-constraint-wega_all-notesStmt-count-notes-44">
       <rule context="tei:notesStmt">
                     <report test="count(tei:note/@type) ne count(distinct-values(tei:note/concat(@type, @xml:lang, @n)))">Only one summary, incipit, editorial and thematicCom are allowed within notesStmt.</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-quotation-quotationContents-46">
+   <pattern id="schematron-constraint-wega_all-quotation-quotationContents-45">
       <rule context="tei:quotation">
          <report test="not(@marks) and not (tei:p)">
 On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-ab-abstractModel-structure-p-47">
+   <pattern id="schematron-constraint-wega_all-ab-abstractModel-structure-p-46">
       <rule context="tei:ab">
          <report test="not(ancestor::floatingText) and (ancestor::tei:p or ancestor::tei:ab)          and not(parent::tei:exemplum         |parent::tei:item         |parent::tei:note         |parent::tei:q         |parent::tei:quote         |parent::tei:remarks         |parent::tei:said         |parent::tei:sp         |parent::tei:stage         |parent::tei:cell         |parent::tei:figure)">
         Abstract model violation: ab may not contain paragraphs or other ab elements.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-ab-abstractModel-structure-l-48">
+   <pattern id="schematron-constraint-wega_all-ab-abstractModel-structure-l-47">
       <rule context="tei:ab">
          <report test="ancestor::tei:l or ancestor::tei:lg">
         Abstract model violation: Lines may not contain higher-level divisions such as p or ab.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-seg-activeOrPassivePerformance-49">
+   <pattern id="schematron-constraint-wega_all-seg-activeOrPassivePerformance-48">
       <rule context="tei:seg">
                     <report test="./@subtype = ('active', 'passive') and not(./@type = 'performance')">if @subtype contains 'active' or 'passive' @type has to be 'performance'</report>
                 </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-seg-AddresseeOrSenderCorrespondence-50">
+   <pattern id="schematron-constraint-wega_all-seg-AddresseeOrSenderCorrespondence-49">
       <rule context="tei:seg">
                     <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-wega_all-msIdentifier-msId_minimal-51">
+   <pattern id="schematron-constraint-wega_all-msIdentifier-msId_minimal-50">
       <rule context="tei:msIdentifier">
          <report test="not(parent::tei:msPart) and       (local-name(*[1])='idno' or       local-name(*[1])='altIdentifier' or       normalize-space(.)='')">An msIdentifier must contain either a repository or location of some type, or a manuscript name</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-orgName-parent-org-52">
+   <pattern id="schematron-constraint-wega_all-orgName-parent-org-51">
                     <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-wega_all-orgName-parent-org-reg-53">
+   <pattern id="schematron-constraint-wega_all-orgName-parent-org-reg-52">
                     <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-wega_all-orgName-parent-org-reg-54">
+   <pattern id="schematron-constraint-wega_all-orgName-parent-org-reg-53">
                     <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-wega_all-orgName-parent-not-org-55">
+   <pattern id="schematron-constraint-wega_all-orgName-parent-not-org-54">
                     <rule context="tei:orgName[not(parent::tei:org)]">
                         <report test="@type">No @type attribute allowed here.</report>
                     </rule>
                 </pattern>
-   <pattern id="schematron-constraint-wega_all-att.witnessed-att-wit-56">
+   <pattern id="schematron-constraint-wega_all-att.witnessed-att-wit-55">
                     <rule context="tei:*[@wit]">
                         <let name="wit" value="@wit"/>
                         <assert test="preceding::tei:witness[@xml:id = substring($wit, 2)]">The @wit-attribute must point at some witness element</assert>
@@ -354,62 +358,62 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
       
     
       
-    <pattern id="schematron-constraint-wega_all-div-abstractModel-structure-l-59">
+    <pattern id="schematron-constraint-wega_all-div-abstractModel-structure-l-58">
       <rule context="tei:div">
          <report test="ancestor::tei:l">
         Abstract model violation: Lines may not contain higher-level structural elements such as div.
       </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-div-abstractModel-structure-p-60">
+   <pattern id="schematron-constraint-wega_all-div-abstractModel-structure-p-59">
       <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>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-addSpan-spanTo-61">
+   <pattern id="schematron-constraint-wega_all-addSpan-spanTo-60">
       <rule context="tei:addSpan">
          <assert test="@spanTo">The @spanTo attribute of <name/> is required.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-addSpan-spanTo-spanTo-7-63">
+   <pattern id="schematron-constraint-wega_all-addSpan-spanTo-spanTo-7-62">
                             <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/>
                                 </assert>
                             </rule>
                         </pattern>
-   <pattern id="schematron-constraint-wega_all-subst-substContents1-64">
+   <pattern id="schematron-constraint-wega_all-subst-substContents1-63">
       <rule context="tei:subst">
          <assert test="child::tei:add and child::tei:del">
             <name/> must have at least one child add and at least one child del</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-wega_all-styleguide-document-node-content-65">
+   <pattern id="schematron-constraint-wega_all-styleguide-document-node-content-64">
                 <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-wega_all-whitespaceOnlyContent-66">
+   <pattern id="schematron-constraint-wega_all-whitespaceOnlyContent-65">
                 <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-wega_all-elementStartsWithWhitespace-67">
+   <pattern id="schematron-constraint-wega_all-elementStartsWithWhitespace-66">
                 <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-wega_all-untrimmedAttributeValues-68">
+   <pattern id="schematron-constraint-wega_all-untrimmedAttributeValues-67">
                 <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-wega_all-att.wega.rend-underline-n-69">
+   <pattern id="schematron-constraint-wega_all-att.wega.rend-underline-n-68">
                     <rule context="*:hi[@n] | *:rend[@n]">
                         <report test="@rend ne 'underline'">The @n-attribute is only supported in combination with @rend='underline'</report>
                     </rule>
diff --git a/schema/de/wega_all.rng b/schema/de/wega_all.rng
index a369084a..46aa54de 100644
--- a/schema/de/wega_all.rng
+++ b/schema/de/wega_all.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-08T08:24:54Z. .
+Schema generated from ODD source 2017-12-21T19:30:30Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -3325,31 +3325,55 @@ Measures]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-date-dateHeuristics1-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wega_all-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-date-dateHeuristics2-constraint-report-8">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wega_all-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wega_all-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wega_all-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-date-dateHeuristics3-constraint-report-9">
+                  id="wega_all-date-dateHeuristics3-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3361,7 +3385,7 @@ Measures]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-date-dateHeuristics4-constraint-report-10">
+                  id="wega_all-date-dateHeuristics4-constraint-report-12">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3436,7 +3460,7 @@ Measures]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) wird benutzt um auf ein folgendes note zu zeigen und somit den Beginn des zu kommentierenden Bereichs zu markieren. Alternativ kann das Element ein Platzhalter für eine externe URL (präfigiert mit 'http') sein. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ptr-ptr-target-constraint-rule-9">
+                  id="wega_all-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3451,7 +3475,7 @@ Measures]</a:documentation>
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ptr-duplicate-ptr-constraint-report-11">
+                  id="wega_all-ptr-duplicate-ptr-constraint-report-13">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3465,7 +3489,7 @@ Measures]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ptr-ptrAtts-constraint-report-12">
+                  id="wega_all-ptr-ptrAtts-constraint-report-14">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3491,7 +3515,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Quellenangabe) definiert eine Quellenangabe an einer anderen Stelle, die womöglich durch zusätzlichen Text oder Kommentare modifizert wurde. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ref-prev-next-correspContext-constraint-report-13">
+                  id="wega_all-ref-prev-next-correspContext-constraint-report-15">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3503,7 +3527,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ref-refAtts-constraint-report-14">
+                  id="wega_all-ref-refAtts-constraint-report-16">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3557,7 +3581,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-list-gloss-list-constraint-report-15">
+                  id="wega_all-list-gloss-list-constraint-report-17">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3569,7 +3593,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-list-gloss-list-must-have-labels-constraint-rule-10">
+                  id="wega_all-list-gloss-list-must-have-labels-constraint-rule-14">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3648,7 +3672,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Anmerkung) enthält eine Notiz oder eine Anmerkung/Annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-note-note-in-text-constraint-rule-11">
+                  id="wega_all-note-note-in-text-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3660,7 +3684,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-note-thematicCom-target-constraint-rule-12">
+                  id="wega_all-note-thematicCom-target-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3672,7 +3696,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-note-notesStmt-notes-constraint-rule-13">
+                  id="wega_all-note-notesStmt-notes-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3794,7 +3818,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-pb-facs-facs-reference-constraint-rule-14">
+                  id="wega_all-pb-facs-facs-reference-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3869,7 +3893,7 @@ Elements]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-analytic-analyticTitle-constraint-report-16">
+                  id="wega_all-analytic-analyticTitle-constraint-report-18">
             <rule context="tei:analytic">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3969,7 +3993,7 @@ Elements]</a:documentation>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-monogr-monogrTitle-constraint-report-17">
+                  id="wega_all-monogr-monogrTitle-constraint-report-19">
             <rule context="tei:monogr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4003,7 +4027,7 @@ Elements]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-series-seriesTitle-constraint-report-18">
+                  id="wega_all-series-seriesTitle-constraint-report-20">
             <rule context="tei:series">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4048,7 +4072,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-author-sameAs-sameAs-reference-constraint-rule-15">
+                  id="wega_all-author-sameAs-sameAs-reference-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4154,7 +4178,7 @@ Elements]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Titel) enthält einen Titel für jede Art von Arbeit. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-title-duplicate-title-constraint-rule-16">
+                  id="wega_all-title-duplicate-title-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4169,7 +4193,7 @@ Elements]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-title-punctuation-mark-constraint-report-20">
+                  id="wega_all-title-punctuation-mark-constraint-report-22">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4236,7 +4260,7 @@ Elements]</a:documentation>
             </optional>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-imprint-duplicate-biblScope-type-constraint-report-21">
+                  id="wega_all-imprint-duplicate-biblScope-type-constraint-report-23">
             <rule context="tei:imprint">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4376,7 +4400,7 @@ Elements]</a:documentation>
             </choice>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-relatedItem-relatedItem-type-within-notesStmt-constraint-report-22">
+                  id="wega_all-relatedItem-relatedItem-type-within-notesStmt-constraint-report-24">
             <rule context="tei:relatedItem">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4388,7 +4412,7 @@ Elements]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-17">
+                  id="wega_all-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4400,7 +4424,7 @@ Elements]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-relatedItem-targetorcontent1-constraint-report-23">
+                  id="wega_all-relatedItem-targetorcontent1-constraint-report-25">
             <rule context="tei:relatedItem">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -4457,7 +4481,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-l-abstractModel-structure-l-constraint-report-24">
+                  id="wega_all-l-abstractModel-structure-l-constraint-report-26">
             <rule context="tei:l">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4516,7 +4540,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-lg-abstractModel-structure-l-constraint-report-25">
+                  id="wega_all-lg-abstractModel-structure-l-constraint-report-27">
             <rule context="tei:lg">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4593,7 +4617,7 @@ relatedItem element must be empty</sch:report>
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-table-collapsible-head-constraint-report-26">
+                  id="wega_all-table-collapsible-head-constraint-report-28">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4627,7 +4651,7 @@ relatedItem element must be empty</sch:report>
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-row-number-of-cells-constraint-rule-18">
+                  id="wega_all-row-number-of-cells-constraint-rule-22">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4664,7 +4688,7 @@ relatedItem element must be empty</sch:report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Tabellenzelle) enthält eine Zelle einer Tabelle. [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-cell-cell-rows-constraint-rule-19">
+                  id="wega_all-cell-cell-rows-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5004,7 +5028,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-notesStmt-count-notes-constraint-report-28">
+                  id="wega_all-notesStmt-count-notes-constraint-report-30">
             <rule context="tei:notesStmt">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5078,7 +5102,7 @@ Empfohlene Werte sind: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OC
             <ref name="model.pLike"/>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-quotation-quotationContents-constraint-report-29">
+                  id="wega_all-quotation-quotationContents-constraint-report-31">
             <rule context="tei:quotation">
                <report xmlns:xi="http://www.w3.org/2001/XInclude"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -5372,7 +5396,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any arbitrary component-level unit of text, acting as an anonymous container for phrase or inter level elements analogous to, but without the semantic baggage of, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ab-abstractModel-structure-p-constraint-report-30">
+                  id="wega_all-ab-abstractModel-structure-p-constraint-report-32">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5382,7 +5406,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ab-abstractModel-structure-l-constraint-report-31">
+                  id="wega_all-ab-abstractModel-structure-l-constraint-report-33">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5415,7 +5439,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(beliebiges Segment) steht für eine beliebige Segmentierung des Textes unterhalb des ‘chunk’ Levels. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-seg-activeOrPassivePerformance-constraint-report-32">
+                  id="wega_all-seg-activeOrPassivePerformance-constraint-report-34">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5427,7 +5451,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-seg-AddresseeOrSenderCorrespondence-constraint-report-33">
+                  id="wega_all-seg-AddresseeOrSenderCorrespondence-constraint-report-35">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5637,7 +5661,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-msIdentifier-msId_minimal-constraint-report-34">
+                  id="wega_all-msIdentifier-msId_minimal-constraint-report-36">
             <rule context="tei:msIdentifier">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5884,7 +5908,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-orgName-parent-org-constraint-rule-20">
+                  id="wega_all-orgName-parent-org-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5896,7 +5920,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-orgName-parent-org-reg-constraint-rule-21">
+                  id="wega_all-orgName-parent-org-reg-constraint-rule-25">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5908,7 +5932,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-orgName-parent-org-reg-constraint-rule-22">
+                  id="wega_all-orgName-parent-org-reg-constraint-rule-26">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5920,7 +5944,7 @@ Empfohlene Werte sind: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] f
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-orgName-parent-not-org-constraint-rule-23">
+                  id="wega_all-orgName-parent-not-org-constraint-rule-27">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6654,7 +6678,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wega_all-att.witnessed-att-wit-constraint-rule-24">
+            id="wega_all-att.witnessed-att-wit-constraint-rule-28">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7121,7 +7145,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-div-abstractModel-structure-l-constraint-report-38">
+                  id="wega_all-div-abstractModel-structure-l-constraint-report-40">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -7131,7 +7155,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-div-abstractModel-structure-p-constraint-report-39">
+                  id="wega_all-div-abstractModel-structure-p-constraint-report-41">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -7454,7 +7478,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
             <data type="anyURI"/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-addSpan-hand-hand-reference-constraint-rule-25">
+                  id="wega_all-addSpan-hand-hand-reference-constraint-rule-29">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7470,7 +7494,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
             <data type="anyURI"/>
          </attribute> 
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-addSpan-spanTo-spanTo-7-constraint-rule-26">
+                  id="wega_all-addSpan-spanTo-spanTo-7-constraint-rule-30">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7679,7 +7703,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wega_all-att.wega.rend-underline-n-constraint-rule-31">
+            id="wega_all-att.wega.rend-underline-n-constraint-rule-35">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7699,7 +7723,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wega_all-styleguide-document-node-content-constraint-rule-27">
+            id="wega_all-styleguide-document-node-content-constraint-rule-31">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7712,7 +7736,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wega_all-whitespaceOnlyContent-constraint-rule-28">
+            id="wega_all-whitespaceOnlyContent-constraint-rule-32">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7725,7 +7749,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wega_all-elementStartsWithWhitespace-constraint-rule-29">
+            id="wega_all-elementStartsWithWhitespace-constraint-rule-33">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7738,7 +7762,7 @@ Beispielwerte sind etwa: 1] explicit; 2] implicit</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wega_all-untrimmedAttributeValues-constraint-rule-30">
+            id="wega_all-untrimmedAttributeValues-constraint-rule-34">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/en/wegaBiblio.rng b/schema/en/wegaBiblio.rng
index 39f06898..48af616a 100644
--- a/schema/en/wegaBiblio.rng
+++ b/schema/en/wegaBiblio.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-08T08:25:09Z. .
+Schema generated from ODD source 2017-12-21T19:30:32Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -1124,31 +1124,55 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-date-dateHeuristics1-constraint-report-6">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaBiblio-date-dateHeuristics2-constraint-rule-8">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-date-dateHeuristics2-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaBiblio-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaBiblio-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaBiblio-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-date-dateHeuristics3-constraint-report-8">
+                  id="wegaBiblio-date-dateHeuristics3-constraint-report-10">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1160,7 +1184,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-date-dateHeuristics4-constraint-report-9">
+                  id="wegaBiblio-date-dateHeuristics4-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1221,7 +1245,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-ref-prev-next-correspContext-constraint-report-10">
+                  id="wegaBiblio-ref-prev-next-correspContext-constraint-report-12">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1233,7 +1257,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-ref-refAtts-constraint-report-11">
+                  id="wegaBiblio-ref-refAtts-constraint-report-13">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -1270,7 +1294,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a note or annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-note-note-in-text-constraint-rule-8">
+                  id="wegaBiblio-note-note-in-text-constraint-rule-12">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1282,7 +1306,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-note-thematicCom-target-constraint-rule-9">
+                  id="wegaBiblio-note-thematicCom-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1294,7 +1318,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-note-notesStmt-notes-constraint-rule-10">
+                  id="wegaBiblio-note-notesStmt-notes-constraint-rule-14">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1363,7 +1387,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-analytic-analyticTitle-constraint-report-12">
+                  id="wegaBiblio-analytic-analyticTitle-constraint-report-14">
             <rule context="tei:analytic">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1448,7 +1472,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-monogr-monogrTitle-constraint-report-13">
+                  id="wegaBiblio-monogr-monogrTitle-constraint-report-15">
             <rule context="tei:monogr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1479,7 +1503,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-series-seriesTitle-constraint-report-14">
+                  id="wegaBiblio-series-seriesTitle-constraint-report-16">
             <rule context="tei:series">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1524,7 +1548,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-author-sameAs-sameAs-reference-constraint-rule-11">
+                  id="wegaBiblio-author-sameAs-sameAs-reference-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1581,7 +1605,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a title for any kind of work. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-title-duplicate-title-constraint-rule-12">
+                  id="wegaBiblio-title-duplicate-title-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1596,7 +1620,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-title-punctuation-mark-constraint-report-16">
+                  id="wegaBiblio-title-punctuation-mark-constraint-report-18">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1663,7 +1687,7 @@ belongs, but this <sch:name/> element has no textual content.</sch:assert>
             </optional>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaBiblio-imprint-duplicate-biblScope-type-constraint-report-17">
+                  id="wegaBiblio-imprint-duplicate-biblScope-type-constraint-report-19">
             <rule context="tei:imprint">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1899,7 +1923,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaBiblio-att.wega.rend-underline-n-constraint-rule-17">
+            id="wegaBiblio-att.wega.rend-underline-n-constraint-rule-21">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1916,7 +1940,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaBiblio-styleguide-document-node-content-constraint-rule-13">
+            id="wegaBiblio-styleguide-document-node-content-constraint-rule-17">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1929,7 +1953,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaBiblio-whitespaceOnlyContent-constraint-rule-14">
+            id="wegaBiblio-whitespaceOnlyContent-constraint-rule-18">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1942,7 +1966,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaBiblio-elementStartsWithWhitespace-constraint-rule-15">
+            id="wegaBiblio-elementStartsWithWhitespace-constraint-rule-19">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1955,7 +1979,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaBiblio-untrimmedAttributeValues-constraint-rule-16">
+            id="wegaBiblio-untrimmedAttributeValues-constraint-rule-20">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/en/wegaDiaries.rng b/schema/en/wegaDiaries.rng
index 113c2877..ec962396 100644
--- a/schema/en/wegaDiaries.rng
+++ b/schema/en/wegaDiaries.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-15T16:35:50Z. .
+Schema generated from ODD source 2017-12-21T19:30:33Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -1967,31 +1967,55 @@ Measures]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-date-dateHeuristics1-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaDiaries-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-date-dateHeuristics2-constraint-report-8">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaDiaries-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaDiaries-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaDiaries-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-date-dateHeuristics3-constraint-report-9">
+                  id="wegaDiaries-date-dateHeuristics3-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2003,7 +2027,7 @@ Measures]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-date-dateHeuristics4-constraint-report-10">
+                  id="wegaDiaries-date-dateHeuristics4-constraint-report-12">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2078,7 +2102,7 @@ Measures]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) is used to point at a following note thus marking the beginning of the to be annotated section. Alternatively, the element can be a placeholder for an external URL (prefixed with 'http'). [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ptr-ptr-target-constraint-rule-9">
+                  id="wegaDiaries-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2093,7 +2117,7 @@ Measures]</a:documentation>
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ptr-duplicate-ptr-constraint-report-11">
+                  id="wegaDiaries-ptr-duplicate-ptr-constraint-report-13">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2107,7 +2131,7 @@ Measures]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ptr-ptrAtts-constraint-report-12">
+                  id="wegaDiaries-ptr-ptrAtts-constraint-report-14">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2133,7 +2157,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ref-prev-next-correspContext-constraint-report-13">
+                  id="wegaDiaries-ref-prev-next-correspContext-constraint-report-15">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2145,7 +2169,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ref-refAtts-constraint-report-14">
+                  id="wegaDiaries-ref-refAtts-constraint-report-16">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2182,7 +2206,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a note or annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-note-note-in-text-constraint-rule-10">
+                  id="wegaDiaries-note-note-in-text-constraint-rule-14">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2194,7 +2218,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-note-thematicCom-target-constraint-rule-11">
+                  id="wegaDiaries-note-thematicCom-target-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2206,7 +2230,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-note-notesStmt-notes-constraint-rule-12">
+                  id="wegaDiaries-note-notesStmt-notes-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2288,7 +2312,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-pb-facs-facs-reference-constraint-rule-13">
+                  id="wegaDiaries-pb-facs-facs-reference-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2333,7 +2357,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a title for any kind of work. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-title-duplicate-title-constraint-rule-14">
+                  id="wegaDiaries-title-duplicate-title-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2348,7 +2372,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-title-punctuation-mark-constraint-report-16">
+                  id="wegaDiaries-title-punctuation-mark-constraint-report-18">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2412,7 +2436,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-orgName-parent-org-constraint-rule-15">
+                  id="wegaDiaries-orgName-parent-org-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2424,7 +2448,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-orgName-parent-org-reg-constraint-rule-16">
+                  id="wegaDiaries-orgName-parent-org-reg-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2436,7 +2460,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-orgName-parent-org-reg-constraint-rule-17">
+                  id="wegaDiaries-orgName-parent-org-reg-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2448,7 +2472,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-orgName-parent-not-org-constraint-rule-18">
+                  id="wegaDiaries-orgName-parent-not-org-constraint-rule-22">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2653,7 +2677,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             <data type="anyURI"/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-addSpan-hand-hand-reference-constraint-rule-19">
+                  id="wegaDiaries-addSpan-hand-hand-reference-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2669,7 +2693,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             <data type="anyURI"/>
          </attribute> 
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-addSpan-spanTo-spanTo-7-constraint-rule-20">
+                  id="wegaDiaries-addSpan-spanTo-spanTo-7-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2797,7 +2821,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any arbitrary component-level unit of text, acting as an anonymous container for phrase or inter level elements analogous to, but without the semantic baggage of, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ab-abstractModel-structure-p-constraint-report-20">
+                  id="wegaDiaries-ab-abstractModel-structure-p-constraint-report-22">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2807,7 +2831,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-ab-abstractModel-structure-l-constraint-report-21">
+                  id="wegaDiaries-ab-abstractModel-structure-l-constraint-report-23">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2850,7 +2874,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arbitrary segment) represents any segmentation of text below the ‘chunk’ level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-seg-activeOrPassivePerformance-constraint-report-22">
+                  id="wegaDiaries-seg-activeOrPassivePerformance-constraint-report-24">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2862,7 +2886,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDiaries-seg-AddresseeOrSenderCorrespondence-constraint-report-23">
+                  id="wegaDiaries-seg-AddresseeOrSenderCorrespondence-constraint-report-25">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3096,7 +3120,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDiaries-att.wega.rend-underline-n-constraint-rule-25">
+            id="wegaDiaries-att.wega.rend-underline-n-constraint-rule-29">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3113,7 +3137,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDiaries-styleguide-document-node-content-constraint-rule-21">
+            id="wegaDiaries-styleguide-document-node-content-constraint-rule-25">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3126,7 +3150,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDiaries-whitespaceOnlyContent-constraint-rule-22">
+            id="wegaDiaries-whitespaceOnlyContent-constraint-rule-26">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3139,7 +3163,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDiaries-elementStartsWithWhitespace-constraint-rule-23">
+            id="wegaDiaries-elementStartsWithWhitespace-constraint-rule-27">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3152,7 +3176,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDiaries-untrimmedAttributeValues-constraint-rule-24">
+            id="wegaDiaries-untrimmedAttributeValues-constraint-rule-28">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/en/wegaDocuments.rng b/schema/en/wegaDocuments.rng
index a6afa362..f84d4bb4 100644
--- a/schema/en/wegaDocuments.rng
+++ b/schema/en/wegaDocuments.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-08T08:25:14Z. .
+Schema generated from ODD source 2017-12-21T19:30:34Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -2600,31 +2600,55 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-date-dateHeuristics1-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaDocuments-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-date-dateHeuristics2-constraint-report-8">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaDocuments-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaDocuments-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaDocuments-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-date-dateHeuristics3-constraint-report-9">
+                  id="wegaDocuments-date-dateHeuristics3-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2636,7 +2660,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-date-dateHeuristics4-constraint-report-10">
+                  id="wegaDocuments-date-dateHeuristics4-constraint-report-12">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2711,7 +2735,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) is used to point at a following note thus marking the beginning of the to be annotated section. Alternatively, the element can be a placeholder for an external URL (prefixed with 'http'). [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-ptr-ptr-target-constraint-rule-9">
+                  id="wegaDocuments-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2726,7 +2750,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-ptr-duplicate-ptr-constraint-report-11">
+                  id="wegaDocuments-ptr-duplicate-ptr-constraint-report-13">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2740,7 +2764,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-ptr-ptrAtts-constraint-report-12">
+                  id="wegaDocuments-ptr-ptrAtts-constraint-report-14">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2766,7 +2790,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-ref-prev-next-correspContext-constraint-report-13">
+                  id="wegaDocuments-ref-prev-next-correspContext-constraint-report-15">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2778,7 +2802,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-ref-refAtts-constraint-report-14">
+                  id="wegaDocuments-ref-refAtts-constraint-report-16">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2832,7 +2856,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-list-gloss-list-constraint-report-15">
+                  id="wegaDocuments-list-gloss-list-constraint-report-17">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2844,7 +2868,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-list-gloss-list-must-have-labels-constraint-rule-10">
+                  id="wegaDocuments-list-gloss-list-must-have-labels-constraint-rule-14">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2933,7 +2957,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a note or annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-note-note-in-text-constraint-rule-11">
+                  id="wegaDocuments-note-note-in-text-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2945,7 +2969,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-note-thematicCom-target-constraint-rule-12">
+                  id="wegaDocuments-note-thematicCom-target-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2957,7 +2981,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-note-notesStmt-notes-constraint-rule-13">
+                  id="wegaDocuments-note-notesStmt-notes-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3066,7 +3090,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-pb-facs-facs-reference-constraint-rule-14">
+                  id="wegaDocuments-pb-facs-facs-reference-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3140,7 +3164,7 @@ Elements]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-analytic-analyticTitle-constraint-report-16">
+                  id="wegaDocuments-analytic-analyticTitle-constraint-report-18">
             <rule context="tei:analytic">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3233,7 +3257,7 @@ Elements]</a:documentation>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-monogr-monogrTitle-constraint-report-17">
+                  id="wegaDocuments-monogr-monogrTitle-constraint-report-19">
             <rule context="tei:monogr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3278,7 +3302,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-author-sameAs-sameAs-reference-constraint-rule-15">
+                  id="wegaDocuments-author-sameAs-sameAs-reference-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3384,7 +3408,7 @@ Elements]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a title for any kind of work. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-title-duplicate-title-constraint-rule-16">
+                  id="wegaDocuments-title-duplicate-title-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3399,7 +3423,7 @@ Elements]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-title-punctuation-mark-constraint-report-19">
+                  id="wegaDocuments-title-punctuation-mark-constraint-report-21">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3466,7 +3490,7 @@ Elements]</a:documentation>
             </optional>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-imprint-duplicate-biblScope-type-constraint-report-20">
+                  id="wegaDocuments-imprint-duplicate-biblScope-type-constraint-report-22">
             <rule context="tei:imprint">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3601,7 +3625,7 @@ Elements]</a:documentation>
             </choice>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-relatedItem-relatedItem-type-within-notesStmt-constraint-report-21">
+                  id="wegaDocuments-relatedItem-relatedItem-type-within-notesStmt-constraint-report-23">
             <rule context="tei:relatedItem">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3613,7 +3637,7 @@ Elements]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-17">
+                  id="wegaDocuments-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3625,7 +3649,7 @@ Elements]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-relatedItem-targetorcontent1-constraint-report-22">
+                  id="wegaDocuments-relatedItem-targetorcontent1-constraint-report-24">
             <rule context="tei:relatedItem">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -3682,7 +3706,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-l-abstractModel-structure-l-constraint-report-23">
+                  id="wegaDocuments-l-abstractModel-structure-l-constraint-report-25">
             <rule context="tei:l">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3741,7 +3765,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-lg-abstractModel-structure-l-constraint-report-24">
+                  id="wegaDocuments-lg-abstractModel-structure-l-constraint-report-26">
             <rule context="tei:lg">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3764,7 +3788,7 @@ relatedItem element must be empty</sch:report>
             <ref name="revisionDesc"/>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-teiHeader-seriesTitle-constraint-rule-18">
+                  id="wegaDocuments-teiHeader-seriesTitle-constraint-rule-22">
             <sch:rule xmlns:xi="http://www.w3.org/2001/XInclude"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
@@ -3969,7 +3993,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-notesStmt-count-notes-constraint-report-25">
+                  id="wegaDocuments-notesStmt-count-notes-constraint-report-27">
             <rule context="tei:notesStmt">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4383,7 +4407,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-div-abstractModel-structure-l-constraint-report-26">
+                  id="wegaDocuments-div-abstractModel-structure-l-constraint-report-28">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4393,7 +4417,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-div-abstractModel-structure-p-constraint-report-27">
+                  id="wegaDocuments-div-abstractModel-structure-p-constraint-report-29">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4562,7 +4586,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-orgName-parent-org-constraint-rule-19">
+                  id="wegaDocuments-orgName-parent-org-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4574,7 +4598,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-orgName-parent-org-reg-constraint-rule-20">
+                  id="wegaDocuments-orgName-parent-org-reg-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4586,7 +4610,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-orgName-parent-org-reg-constraint-rule-21">
+                  id="wegaDocuments-orgName-parent-org-reg-constraint-rule-25">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4598,7 +4622,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-orgName-parent-not-org-constraint-rule-22">
+                  id="wegaDocuments-orgName-parent-not-org-constraint-rule-26">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4744,7 +4768,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-table-collapsible-head-constraint-report-31">
+                  id="wegaDocuments-table-collapsible-head-constraint-report-33">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4778,7 +4802,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-row-number-of-cells-constraint-rule-23">
+                  id="wegaDocuments-row-number-of-cells-constraint-rule-27">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4815,7 +4839,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains one cell of a table [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-cell-cell-rows-constraint-rule-24">
+                  id="wegaDocuments-cell-cell-rows-constraint-rule-28">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4981,7 +5005,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             <data type="anyURI"/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-addSpan-hand-hand-reference-constraint-rule-25">
+                  id="wegaDocuments-addSpan-hand-hand-reference-constraint-rule-29">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4997,7 +5021,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             <data type="anyURI"/>
          </attribute> 
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-addSpan-spanTo-spanTo-7-constraint-rule-26">
+                  id="wegaDocuments-addSpan-spanTo-spanTo-7-constraint-rule-30">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5145,7 +5169,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-msIdentifier-msId_minimal-constraint-report-33">
+                  id="wegaDocuments-msIdentifier-msId_minimal-constraint-report-35">
             <rule context="tei:msIdentifier">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5274,7 +5298,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arbitrary segment) represents any segmentation of text below the ‘chunk’ level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-seg-activeOrPassivePerformance-constraint-report-34">
+                  id="wegaDocuments-seg-activeOrPassivePerformance-constraint-report-36">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5286,7 +5310,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaDocuments-seg-AddresseeOrSenderCorrespondence-constraint-report-35">
+                  id="wegaDocuments-seg-AddresseeOrSenderCorrespondence-constraint-report-37">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5445,7 +5469,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDocuments-att.witnessed-att-wit-constraint-rule-27">
+            id="wegaDocuments-att.witnessed-att-wit-constraint-rule-31">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5663,7 +5687,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDocuments-att.wega.rend-underline-n-constraint-rule-32">
+            id="wegaDocuments-att.wega.rend-underline-n-constraint-rule-36">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5680,7 +5704,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDocuments-styleguide-document-node-content-constraint-rule-28">
+            id="wegaDocuments-styleguide-document-node-content-constraint-rule-32">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5693,7 +5717,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDocuments-whitespaceOnlyContent-constraint-rule-29">
+            id="wegaDocuments-whitespaceOnlyContent-constraint-rule-33">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5706,7 +5730,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDocuments-elementStartsWithWhitespace-constraint-rule-30">
+            id="wegaDocuments-elementStartsWithWhitespace-constraint-rule-34">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5719,7 +5743,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaDocuments-untrimmedAttributeValues-constraint-rule-31">
+            id="wegaDocuments-untrimmedAttributeValues-constraint-rule-35">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/en/wegaLetters.rng b/schema/en/wegaLetters.rng
index 4eedab32..efe0cdbf 100644
--- a/schema/en/wegaLetters.rng
+++ b/schema/en/wegaLetters.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-08T08:25:17Z. .
+Schema generated from ODD source 2017-12-21T19:30:35Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -2858,31 +2858,55 @@ Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-date-dateHeuristics1-constraint-report-8">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaLetters-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-date-dateHeuristics2-constraint-report-9">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaLetters-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-date-dateHeuristics3-constraint-report-10">
+                  id="wegaLetters-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaLetters-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaLetters-date-dateHeuristics3-constraint-report-12">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2894,7 +2918,7 @@ Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-date-dateHeuristics4-constraint-report-11">
+                  id="wegaLetters-date-dateHeuristics4-constraint-report-13">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2969,7 +2993,7 @@ Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) is used to point at a following note thus marking the beginning of the to be annotated section. Alternatively, the element can be a placeholder for an external URL (prefixed with 'http'). [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-ptr-ptr-target-constraint-rule-9">
+                  id="wegaLetters-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2984,7 +3008,7 @@ Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-ptr-duplicate-ptr-constraint-report-12">
+                  id="wegaLetters-ptr-duplicate-ptr-constraint-report-14">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2998,7 +3022,7 @@ Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-ptr-ptrAtts-constraint-report-13">
+                  id="wegaLetters-ptr-ptrAtts-constraint-report-15">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3024,7 +3048,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-ref-prev-next-correspContext-constraint-report-14">
+                  id="wegaLetters-ref-prev-next-correspContext-constraint-report-16">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3036,7 +3060,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-ref-refAtts-constraint-report-15">
+                  id="wegaLetters-ref-refAtts-constraint-report-17">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3090,7 +3114,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-list-gloss-list-constraint-report-16">
+                  id="wegaLetters-list-gloss-list-constraint-report-18">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3102,7 +3126,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-list-gloss-list-must-have-labels-constraint-rule-10">
+                  id="wegaLetters-list-gloss-list-must-have-labels-constraint-rule-14">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3206,7 +3230,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a note or annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-note-note-in-text-constraint-rule-11">
+                  id="wegaLetters-note-note-in-text-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3218,7 +3242,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-note-thematicCom-target-constraint-rule-12">
+                  id="wegaLetters-note-thematicCom-target-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3230,7 +3254,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-note-notesStmt-notes-constraint-rule-13">
+                  id="wegaLetters-note-notesStmt-notes-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3352,7 +3376,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-pb-facs-facs-reference-constraint-rule-14">
+                  id="wegaLetters-pb-facs-facs-reference-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3408,7 +3432,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-analytic-analyticTitle-constraint-report-17">
+                  id="wegaLetters-analytic-analyticTitle-constraint-report-19">
             <rule context="tei:analytic">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3501,7 +3525,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-monogr-monogrTitle-constraint-report-18">
+                  id="wegaLetters-monogr-monogrTitle-constraint-report-20">
             <rule context="tei:monogr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3534,7 +3558,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-series-seriesTitle-constraint-report-19">
+                  id="wegaLetters-series-seriesTitle-constraint-report-21">
             <rule context="tei:series">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3579,7 +3603,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-author-sameAs-sameAs-reference-constraint-rule-15">
+                  id="wegaLetters-author-sameAs-sameAs-reference-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3685,7 +3709,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a title for any kind of work. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-title-duplicate-title-constraint-rule-16">
+                  id="wegaLetters-title-duplicate-title-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3700,7 +3724,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-title-punctuation-mark-constraint-report-21">
+                  id="wegaLetters-title-punctuation-mark-constraint-report-23">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3767,7 +3791,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </optional>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-imprint-duplicate-biblScope-type-constraint-report-22">
+                  id="wegaLetters-imprint-duplicate-biblScope-type-constraint-report-24">
             <rule context="tei:imprint">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3904,7 +3928,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </choice>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-relatedItem-relatedItem-type-within-notesStmt-constraint-report-23">
+                  id="wegaLetters-relatedItem-relatedItem-type-within-notesStmt-constraint-report-25">
             <rule context="tei:relatedItem">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3916,7 +3940,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-17">
+                  id="wegaLetters-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3928,7 +3952,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-relatedItem-targetorcontent1-constraint-report-24">
+                  id="wegaLetters-relatedItem-targetorcontent1-constraint-report-26">
             <rule context="tei:relatedItem">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -3985,7 +4009,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-l-abstractModel-structure-l-constraint-report-25">
+                  id="wegaLetters-l-abstractModel-structure-l-constraint-report-27">
             <rule context="tei:l">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4044,7 +4068,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-lg-abstractModel-structure-l-constraint-report-26">
+                  id="wegaLetters-lg-abstractModel-structure-l-constraint-report-28">
             <rule context="tei:lg">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4067,7 +4091,7 @@ relatedItem element must be empty</sch:report>
             <ref name="revisionDesc"/>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-teiHeader-seriesTitle-constraint-rule-18">
+                  id="wegaLetters-teiHeader-seriesTitle-constraint-rule-22">
             <sch:rule xmlns:xi="http://www.w3.org/2001/XInclude"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
@@ -4267,7 +4291,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-notesStmt-count-notes-constraint-report-27">
+                  id="wegaLetters-notesStmt-count-notes-constraint-report-29">
             <rule context="tei:notesStmt">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4773,7 +4797,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-div-abstractModel-structure-l-constraint-report-28">
+                  id="wegaLetters-div-abstractModel-structure-l-constraint-report-30">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4783,7 +4807,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-div-abstractModel-structure-p-constraint-report-29">
+                  id="wegaLetters-div-abstractModel-structure-p-constraint-report-31">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5020,7 +5044,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-orgName-parent-org-constraint-rule-19">
+                  id="wegaLetters-orgName-parent-org-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5032,7 +5056,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-orgName-parent-org-reg-constraint-rule-20">
+                  id="wegaLetters-orgName-parent-org-reg-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5044,7 +5068,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-orgName-parent-org-reg-constraint-rule-21">
+                  id="wegaLetters-orgName-parent-org-reg-constraint-rule-25">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5056,7 +5080,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-orgName-parent-not-org-constraint-rule-22">
+                  id="wegaLetters-orgName-parent-not-org-constraint-rule-26">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5202,7 +5226,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-table-collapsible-head-constraint-report-33">
+                  id="wegaLetters-table-collapsible-head-constraint-report-35">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5236,7 +5260,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-row-number-of-cells-constraint-rule-23">
+                  id="wegaLetters-row-number-of-cells-constraint-rule-27">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5273,7 +5297,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains one cell of a table [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-cell-cell-rows-constraint-rule-24">
+                  id="wegaLetters-cell-cell-rows-constraint-rule-28">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5439,7 +5463,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <data type="anyURI"/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-addSpan-hand-hand-reference-constraint-rule-25">
+                  id="wegaLetters-addSpan-hand-hand-reference-constraint-rule-29">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5455,7 +5479,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <data type="anyURI"/>
          </attribute> 
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-addSpan-spanTo-spanTo-7-constraint-rule-26">
+                  id="wegaLetters-addSpan-spanTo-spanTo-7-constraint-rule-30">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5664,7 +5688,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-msIdentifier-msId_minimal-constraint-report-35">
+                  id="wegaLetters-msIdentifier-msId_minimal-constraint-report-37">
             <rule context="tei:msIdentifier">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5858,7 +5882,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arbitrary segment) represents any segmentation of text below the ‘chunk’ level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-seg-activeOrPassivePerformance-constraint-report-36">
+                  id="wegaLetters-seg-activeOrPassivePerformance-constraint-report-38">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5870,7 +5894,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaLetters-seg-AddresseeOrSenderCorrespondence-constraint-report-37">
+                  id="wegaLetters-seg-AddresseeOrSenderCorrespondence-constraint-report-39">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -6029,7 +6053,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-att.witnessed-att-wit-constraint-rule-27">
+            id="wegaLetters-att.witnessed-att-wit-constraint-rule-31">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6255,7 +6279,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-att.wega.rend-underline-n-constraint-rule-33">
+            id="wegaLetters-att.wega.rend-underline-n-constraint-rule-37">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6272,7 +6296,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-styleguide-document-node-content-constraint-rule-28">
+            id="wegaLetters-styleguide-document-node-content-constraint-rule-32">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6285,7 +6309,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-whitespaceOnlyContent-constraint-rule-29">
+            id="wegaLetters-whitespaceOnlyContent-constraint-rule-33">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6298,7 +6322,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-elementStartsWithWhitespace-constraint-rule-30">
+            id="wegaLetters-elementStartsWithWhitespace-constraint-rule-34">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6311,7 +6335,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-untrimmedAttributeValues-constraint-rule-31">
+            id="wegaLetters-untrimmedAttributeValues-constraint-rule-35">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6323,7 +6347,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                 </sch:rule>
    </pattern>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaLetters-styleguide-document-node-content-constraint-rule-32">
+            id="wegaLetters-styleguide-document-node-content-constraint-rule-36">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/en/wegaNews.rng b/schema/en/wegaNews.rng
index 00828174..6fcbf931 100644
--- a/schema/en/wegaNews.rng
+++ b/schema/en/wegaNews.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-11-15T18:58:20Z. .
+Schema generated from ODD source 2017-12-21T19:30:35Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -1751,31 +1751,55 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-date-dateHeuristics1-constraint-report-6">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaNews-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-date-dateHeuristics2-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaNews-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaNews-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaNews-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-date-dateHeuristics3-constraint-report-8">
+                  id="wegaNews-date-dateHeuristics3-constraint-report-10">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1787,7 +1811,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-date-dateHeuristics4-constraint-report-9">
+                  id="wegaNews-date-dateHeuristics4-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1848,7 +1872,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-ref-prev-next-correspContext-constraint-report-10">
+                  id="wegaNews-ref-prev-next-correspContext-constraint-report-12">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1860,7 +1884,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-ref-refAtts-constraint-report-11">
+                  id="wegaNews-ref-refAtts-constraint-report-13">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -1914,7 +1938,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-list-gloss-list-constraint-report-12">
+                  id="wegaNews-list-gloss-list-constraint-report-14">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1926,7 +1950,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-list-gloss-list-must-have-labels-constraint-rule-9">
+                  id="wegaNews-list-gloss-list-must-have-labels-constraint-rule-13">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2004,7 +2028,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a note or annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-note-note-in-text-constraint-rule-10">
+                  id="wegaNews-note-note-in-text-constraint-rule-14">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2016,7 +2040,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-note-thematicCom-target-constraint-rule-11">
+                  id="wegaNews-note-thematicCom-target-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2028,7 +2052,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-note-notesStmt-notes-constraint-rule-12">
+                  id="wegaNews-note-notesStmt-notes-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2159,7 +2183,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-author-sameAs-sameAs-reference-constraint-rule-13">
+                  id="wegaNews-author-sameAs-sameAs-reference-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2190,7 +2214,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a title for any kind of work. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-title-duplicate-title-constraint-rule-14">
+                  id="wegaNews-title-duplicate-title-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2205,7 +2229,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-title-punctuation-mark-constraint-report-14">
+                  id="wegaNews-title-punctuation-mark-constraint-report-16">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2522,7 +2546,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-div-abstractModel-structure-l-constraint-report-15">
+                  id="wegaNews-div-abstractModel-structure-l-constraint-report-17">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2532,7 +2556,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-div-abstractModel-structure-p-constraint-report-16">
+                  id="wegaNews-div-abstractModel-structure-p-constraint-report-18">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2572,7 +2596,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-orgName-parent-org-constraint-rule-15">
+                  id="wegaNews-orgName-parent-org-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2584,7 +2608,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-orgName-parent-org-reg-constraint-rule-16">
+                  id="wegaNews-orgName-parent-org-reg-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2596,7 +2620,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-orgName-parent-org-reg-constraint-rule-17">
+                  id="wegaNews-orgName-parent-org-reg-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2608,7 +2632,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-orgName-parent-not-org-constraint-rule-18">
+                  id="wegaNews-orgName-parent-not-org-constraint-rule-22">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2724,7 +2748,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-table-collapsible-head-constraint-report-20">
+                  id="wegaNews-table-collapsible-head-constraint-report-22">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2758,7 +2782,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-row-number-of-cells-constraint-rule-19">
+                  id="wegaNews-row-number-of-cells-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2795,7 +2819,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains one cell of a table [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaNews-cell-cell-rows-constraint-rule-20">
+                  id="wegaNews-cell-cell-rows-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2926,7 +2950,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaNews-att.wega.rend-underline-n-constraint-rule-25">
+            id="wegaNews-att.wega.rend-underline-n-constraint-rule-29">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2943,7 +2967,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaNews-styleguide-document-node-content-constraint-rule-21">
+            id="wegaNews-styleguide-document-node-content-constraint-rule-25">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2956,7 +2980,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaNews-whitespaceOnlyContent-constraint-rule-22">
+            id="wegaNews-whitespaceOnlyContent-constraint-rule-26">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2969,7 +2993,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaNews-elementStartsWithWhitespace-constraint-rule-23">
+            id="wegaNews-elementStartsWithWhitespace-constraint-rule-27">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2982,7 +3006,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaNews-untrimmedAttributeValues-constraint-rule-24">
+            id="wegaNews-untrimmedAttributeValues-constraint-rule-28">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/en/wegaPersons.rng b/schema/en/wegaPersons.rng
index 6f333b7a..0400450d 100644
--- a/schema/en/wegaPersons.rng
+++ b/schema/en/wegaPersons.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-15T21:50:09Z. .
+Schema generated from ODD source 2017-12-21T19:30:36Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -192,7 +192,7 @@ TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
       </zeroOrMore>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaPersons-macro.birthDeathContent-uncertainPlacenames-constraint-rule-23">
+            id="wegaPersons-macro.birthDeathContent-uncertainPlacenames-constraint-rule-27">
       <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                 xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -1722,31 +1722,55 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-date-dateHeuristics1-constraint-report-6">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaPersons-date-dateHeuristics2-constraint-rule-8">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-date-dateHeuristics2-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaPersons-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaPersons-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaPersons-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-date-dateHeuristics3-constraint-report-8">
+                  id="wegaPersons-date-dateHeuristics3-constraint-report-10">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1758,7 +1782,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-date-dateHeuristics4-constraint-report-9">
+                  id="wegaPersons-date-dateHeuristics4-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1819,7 +1843,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-ref-prev-next-correspContext-constraint-report-10">
+                  id="wegaPersons-ref-prev-next-correspContext-constraint-report-12">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1831,7 +1855,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-ref-refAtts-constraint-report-11">
+                  id="wegaPersons-ref-refAtts-constraint-report-13">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -1884,7 +1908,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-list-gloss-list-constraint-report-12">
+                  id="wegaPersons-list-gloss-list-constraint-report-14">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -1896,7 +1920,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-list-gloss-list-must-have-labels-constraint-rule-8">
+                  id="wegaPersons-list-gloss-list-must-have-labels-constraint-rule-12">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -1965,7 +1989,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a note or annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-note-note-in-text-constraint-rule-9">
+                  id="wegaPersons-note-note-in-text-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1977,7 +2001,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-note-thematicCom-target-constraint-rule-10">
+                  id="wegaPersons-note-thematicCom-target-constraint-rule-14">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -1989,7 +2013,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-note-notesStmt-notes-constraint-rule-11">
+                  id="wegaPersons-note-notesStmt-notes-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2159,7 +2183,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-orgName-parent-org-constraint-rule-12">
+                  id="wegaPersons-orgName-parent-org-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2171,7 +2195,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-orgName-parent-org-reg-constraint-rule-13">
+                  id="wegaPersons-orgName-parent-org-reg-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2183,7 +2207,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-orgName-parent-org-reg-constraint-rule-14">
+                  id="wegaPersons-orgName-parent-org-reg-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2195,7 +2219,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-orgName-parent-not-org-constraint-rule-15">
+                  id="wegaPersons-orgName-parent-not-org-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2721,7 +2745,7 @@ Sample values include: 1] primary; 2] other; 3] paid; 4] unpaid</a:documentation
             </group>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-person-personHeuristics1-constraint-report-16">
+                  id="wegaPersons-person-personHeuristics1-constraint-report-18">
             <rule context="tei:person">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -2730,7 +2754,7 @@ Sample values include: 1] primary; 2] other; 3] paid; 4] unpaid</a:documentation
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-person-personHeuristics2-constraint-report-17">
+                  id="wegaPersons-person-personHeuristics2-constraint-report-19">
             <rule context="tei:person">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -2739,7 +2763,7 @@ Sample values include: 1] primary; 2] other; 3] paid; 4] unpaid</a:documentation
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-person-enforceWhitespace-constraint-rule-16">
+                  id="wegaPersons-person-enforceWhitespace-constraint-rule-20">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2748,7 +2772,7 @@ Sample values include: 1] primary; 2] other; 3] paid; 4] unpaid</a:documentation
                 </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-person-bioSummary-mixed-content-constraint-rule-17">
+                  id="wegaPersons-person-bioSummary-mixed-content-constraint-rule-21">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2798,7 +2822,7 @@ Sample values include: 1] primary; 2] other; 3] paid; 4] unpaid</a:documentation
             <ref name="country"/>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaPersons-residence-residence-no-mixed-content-constraint-report-19">
+                  id="wegaPersons-residence-residence-no-mixed-content-constraint-report-21">
             <rule context="tei:residence">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -2937,7 +2961,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaPersons-att.wega.rend-underline-n-constraint-rule-22">
+            id="wegaPersons-att.wega.rend-underline-n-constraint-rule-26">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2954,7 +2978,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaPersons-styleguide-document-node-content-constraint-rule-18">
+            id="wegaPersons-styleguide-document-node-content-constraint-rule-22">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2967,7 +2991,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaPersons-whitespaceOnlyContent-constraint-rule-19">
+            id="wegaPersons-whitespaceOnlyContent-constraint-rule-23">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2980,7 +3004,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaPersons-elementStartsWithWhitespace-constraint-rule-20">
+            id="wegaPersons-elementStartsWithWhitespace-constraint-rule-24">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2993,7 +3017,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaPersons-untrimmedAttributeValues-constraint-rule-21">
+            id="wegaPersons-untrimmedAttributeValues-constraint-rule-25">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/en/wegaPlaces.rng b/schema/en/wegaPlaces.rng
index c21410b5..12fecc97 100644
--- a/schema/en/wegaPlaces.rng
+++ b/schema/en/wegaPlaces.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-11-15T18:58:23Z. .
+Schema generated from ODD source 2017-12-21T19:30:37Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
diff --git a/schema/en/wegaThematicCommentaries.rng b/schema/en/wegaThematicCommentaries.rng
index 5587eb45..fbaa7d58 100644
--- a/schema/en/wegaThematicCommentaries.rng
+++ b/schema/en/wegaThematicCommentaries.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-11-15T18:58:24Z. .
+Schema generated from ODD source 2017-12-21T19:30:37Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -2499,31 +2499,55 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-date-dateHeuristics1-constraint-report-6">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaThematicCommentaries-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-date-dateHeuristics2-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaThematicCommentaries-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaThematicCommentaries-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaThematicCommentaries-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-date-dateHeuristics3-constraint-report-8">
+                  id="wegaThematicCommentaries-date-dateHeuristics3-constraint-report-10">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2535,7 +2559,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-date-dateHeuristics4-constraint-report-9">
+                  id="wegaThematicCommentaries-date-dateHeuristics4-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2610,7 +2634,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) is used to point at a following note thus marking the beginning of the to be annotated section. Alternatively, the element can be a placeholder for an external URL (prefixed with 'http'). [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ptr-ptr-target-constraint-rule-9">
+                  id="wegaThematicCommentaries-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2625,7 +2649,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ptr-duplicate-ptr-constraint-report-10">
+                  id="wegaThematicCommentaries-ptr-duplicate-ptr-constraint-report-12">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2639,7 +2663,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ptr-ptrAtts-constraint-report-11">
+                  id="wegaThematicCommentaries-ptr-ptrAtts-constraint-report-13">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2665,7 +2689,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ref-prev-next-correspContext-constraint-report-12">
+                  id="wegaThematicCommentaries-ref-prev-next-correspContext-constraint-report-14">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2677,7 +2701,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ref-refAtts-constraint-report-13">
+                  id="wegaThematicCommentaries-ref-refAtts-constraint-report-15">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2731,7 +2755,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-list-gloss-list-constraint-report-14">
+                  id="wegaThematicCommentaries-list-gloss-list-constraint-report-16">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2743,7 +2767,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-list-gloss-list-must-have-labels-constraint-rule-10">
+                  id="wegaThematicCommentaries-list-gloss-list-must-have-labels-constraint-rule-14">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2821,7 +2845,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a note or annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-note-note-in-text-constraint-rule-11">
+                  id="wegaThematicCommentaries-note-note-in-text-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2833,7 +2857,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-note-thematicCom-target-constraint-rule-12">
+                  id="wegaThematicCommentaries-note-thematicCom-target-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2845,7 +2869,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-note-notesStmt-notes-constraint-rule-13">
+                  id="wegaThematicCommentaries-note-notesStmt-notes-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2978,7 +3002,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-author-sameAs-sameAs-reference-constraint-rule-14">
+                  id="wegaThematicCommentaries-author-sameAs-sameAs-reference-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3084,7 +3108,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a title for any kind of work. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-title-duplicate-title-constraint-rule-15">
+                  id="wegaThematicCommentaries-title-duplicate-title-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3099,7 +3123,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-title-punctuation-mark-constraint-report-16">
+                  id="wegaThematicCommentaries-title-punctuation-mark-constraint-report-18">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3278,7 +3302,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             <ref name="revisionDesc"/>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-teiHeader-seriesTitle-constraint-rule-16">
+                  id="wegaThematicCommentaries-teiHeader-seriesTitle-constraint-rule-20">
             <sch:rule xmlns:xi="http://www.w3.org/2001/XInclude"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
@@ -3484,7 +3508,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-notesStmt-count-notes-constraint-report-17">
+                  id="wegaThematicCommentaries-notesStmt-count-notes-constraint-report-19">
             <rule context="tei:notesStmt">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3543,7 +3567,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             <ref name="model.pLike"/>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-quotation-quotationContents-constraint-report-18">
+                  id="wegaThematicCommentaries-quotation-quotationContents-constraint-report-20">
             <rule context="tei:quotation">
                <report xmlns:xi="http://www.w3.org/2001/XInclude"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -3805,7 +3829,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-div-abstractModel-structure-l-constraint-report-19">
+                  id="wegaThematicCommentaries-div-abstractModel-structure-l-constraint-report-21">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3815,7 +3839,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-div-abstractModel-structure-p-constraint-report-20">
+                  id="wegaThematicCommentaries-div-abstractModel-structure-p-constraint-report-22">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3961,7 +3985,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-orgName-parent-org-constraint-rule-17">
+                  id="wegaThematicCommentaries-orgName-parent-org-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3973,7 +3997,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-orgName-parent-org-reg-constraint-rule-18">
+                  id="wegaThematicCommentaries-orgName-parent-org-reg-constraint-rule-22">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3985,7 +4009,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-orgName-parent-org-reg-constraint-rule-19">
+                  id="wegaThematicCommentaries-orgName-parent-org-reg-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3997,7 +4021,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-orgName-parent-not-org-constraint-rule-20">
+                  id="wegaThematicCommentaries-orgName-parent-not-org-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4151,7 +4175,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-table-collapsible-head-constraint-report-24">
+                  id="wegaThematicCommentaries-table-collapsible-head-constraint-report-26">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4185,7 +4209,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-row-number-of-cells-constraint-rule-21">
+                  id="wegaThematicCommentaries-row-number-of-cells-constraint-rule-25">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4222,7 +4246,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains one cell of a table [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-cell-cell-rows-constraint-rule-22">
+                  id="wegaThematicCommentaries-cell-cell-rows-constraint-rule-26">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4347,7 +4371,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any arbitrary component-level unit of text, acting as an anonymous container for phrase or inter level elements analogous to, but without the semantic baggage of, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ab-abstractModel-structure-p-constraint-report-26">
+                  id="wegaThematicCommentaries-ab-abstractModel-structure-p-constraint-report-28">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4357,7 +4381,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-ab-abstractModel-structure-l-constraint-report-27">
+                  id="wegaThematicCommentaries-ab-abstractModel-structure-l-constraint-report-29">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4390,7 +4414,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arbitrary segment) represents any segmentation of text below the ‘chunk’ level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-seg-activeOrPassivePerformance-constraint-report-28">
+                  id="wegaThematicCommentaries-seg-activeOrPassivePerformance-constraint-report-30">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4402,7 +4426,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaThematicCommentaries-seg-AddresseeOrSenderCorrespondence-constraint-report-29">
+                  id="wegaThematicCommentaries-seg-AddresseeOrSenderCorrespondence-constraint-report-31">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4580,7 +4604,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaThematicCommentaries-att.wega.rend-underline-n-constraint-rule-24">
+            id="wegaThematicCommentaries-att.wega.rend-underline-n-constraint-rule-28">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4636,7 +4660,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaThematicCommentaries-styleguide-document-node-content-constraint-rule-23">
+            id="wegaThematicCommentaries-styleguide-document-node-content-constraint-rule-27">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4649,7 +4673,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaThematicCommentaries-whitespaceOnlyContent-constraint-rule-25">
+            id="wegaThematicCommentaries-whitespaceOnlyContent-constraint-rule-29">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4662,7 +4686,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaThematicCommentaries-elementStartsWithWhitespace-constraint-rule-26">
+            id="wegaThematicCommentaries-elementStartsWithWhitespace-constraint-rule-30">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4675,7 +4699,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaThematicCommentaries-untrimmedAttributeValues-constraint-rule-27">
+            id="wegaThematicCommentaries-untrimmedAttributeValues-constraint-rule-31">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/en/wegaVar.rng b/schema/en/wegaVar.rng
index 770ac445..cc2df33b 100644
--- a/schema/en/wegaVar.rng
+++ b/schema/en/wegaVar.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-11-15T18:58:26Z. .
+Schema generated from ODD source 2017-12-21T19:30:38Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -2713,31 +2713,55 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-date-dateHeuristics1-constraint-report-6">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaVar-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-date-dateHeuristics2-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaVar-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaVar-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaVar-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-date-dateHeuristics3-constraint-report-8">
+                  id="wegaVar-date-dateHeuristics3-constraint-report-10">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2749,7 +2773,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-date-dateHeuristics4-constraint-report-9">
+                  id="wegaVar-date-dateHeuristics4-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2837,7 +2861,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) is used to point at a following note thus marking the beginning of the to be annotated section. Alternatively, the element can be a placeholder for an external URL (prefixed with 'http'). [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ptr-ptr-target-constraint-rule-9">
+                  id="wegaVar-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2852,7 +2876,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ptr-duplicate-ptr-constraint-report-10">
+                  id="wegaVar-ptr-duplicate-ptr-constraint-report-12">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2866,7 +2890,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ptr-ptrAtts-constraint-report-11">
+                  id="wegaVar-ptr-ptrAtts-constraint-report-13">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2892,7 +2916,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ref-prev-next-correspContext-constraint-report-12">
+                  id="wegaVar-ref-prev-next-correspContext-constraint-report-14">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2904,7 +2928,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ref-refAtts-constraint-report-13">
+                  id="wegaVar-ref-refAtts-constraint-report-15">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2958,7 +2982,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-list-gloss-list-constraint-report-14">
+                  id="wegaVar-list-gloss-list-constraint-report-16">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2970,7 +2994,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-list-gloss-list-must-have-labels-constraint-rule-10">
+                  id="wegaVar-list-gloss-list-must-have-labels-constraint-rule-14">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3049,7 +3073,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a note or annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-note-note-in-text-constraint-rule-11">
+                  id="wegaVar-note-note-in-text-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3061,7 +3085,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-note-thematicCom-target-constraint-rule-12">
+                  id="wegaVar-note-thematicCom-target-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3073,7 +3097,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-note-notesStmt-notes-constraint-rule-13">
+                  id="wegaVar-note-notesStmt-notes-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3217,7 +3241,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-author-sameAs-sameAs-reference-constraint-rule-14">
+                  id="wegaVar-author-sameAs-sameAs-reference-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3323,7 +3347,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a title for any kind of work. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-title-duplicate-title-constraint-rule-15">
+                  id="wegaVar-title-duplicate-title-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3338,7 +3362,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-title-punctuation-mark-constraint-report-16">
+                  id="wegaVar-title-punctuation-mark-constraint-report-18">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3721,7 +3745,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-notesStmt-count-notes-constraint-report-17">
+                  id="wegaVar-notesStmt-count-notes-constraint-report-19">
             <rule context="tei:notesStmt">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3793,7 +3817,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             <ref name="model.pLike"/>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-quotation-quotationContents-constraint-report-18">
+                  id="wegaVar-quotation-quotationContents-constraint-report-20">
             <rule context="tei:quotation">
                <report xmlns:xi="http://www.w3.org/2001/XInclude"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -4048,7 +4072,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-div-abstractModel-structure-l-constraint-report-19">
+                  id="wegaVar-div-abstractModel-structure-l-constraint-report-21">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4058,7 +4082,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-div-abstractModel-structure-p-constraint-report-20">
+                  id="wegaVar-div-abstractModel-structure-p-constraint-report-22">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4410,7 +4434,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-orgName-parent-org-constraint-rule-16">
+                  id="wegaVar-orgName-parent-org-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4422,7 +4446,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-orgName-parent-org-reg-constraint-rule-17">
+                  id="wegaVar-orgName-parent-org-reg-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4434,7 +4458,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-orgName-parent-org-reg-constraint-rule-18">
+                  id="wegaVar-orgName-parent-org-reg-constraint-rule-22">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4446,7 +4470,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-orgName-parent-not-org-constraint-rule-19">
+                  id="wegaVar-orgName-parent-not-org-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4600,7 +4624,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-table-collapsible-head-constraint-report-24">
+                  id="wegaVar-table-collapsible-head-constraint-report-26">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4634,7 +4658,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-row-number-of-cells-constraint-rule-20">
+                  id="wegaVar-row-number-of-cells-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4671,7 +4695,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains one cell of a table [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-cell-cell-rows-constraint-rule-21">
+                  id="wegaVar-cell-cell-rows-constraint-rule-25">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4890,7 +4914,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any arbitrary component-level unit of text, acting as an anonymous container for phrase or inter level elements analogous to, but without the semantic baggage of, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ab-abstractModel-structure-p-constraint-report-26">
+                  id="wegaVar-ab-abstractModel-structure-p-constraint-report-28">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4900,7 +4924,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-ab-abstractModel-structure-l-constraint-report-27">
+                  id="wegaVar-ab-abstractModel-structure-l-constraint-report-29">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4933,7 +4957,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arbitrary segment) represents any segmentation of text below the ‘chunk’ level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-seg-activeOrPassivePerformance-constraint-report-28">
+                  id="wegaVar-seg-activeOrPassivePerformance-constraint-report-30">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4945,7 +4969,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaVar-seg-AddresseeOrSenderCorrespondence-constraint-report-29">
+                  id="wegaVar-seg-AddresseeOrSenderCorrespondence-constraint-report-31">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5123,7 +5147,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaVar-att.wega.rend-underline-n-constraint-rule-23">
+            id="wegaVar-att.wega.rend-underline-n-constraint-rule-27">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5179,7 +5203,7 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaVar-styleguide-document-node-content-constraint-rule-22">
+            id="wegaVar-styleguide-document-node-content-constraint-rule-26">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/en/wegaWritings.rng b/schema/en/wegaWritings.rng
index 4ded21b4..c4cc6ac1 100644
--- a/schema/en/wegaWritings.rng
+++ b/schema/en/wegaWritings.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-08T08:25:32Z. .
+Schema generated from ODD source 2017-12-21T19:30:39Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -2609,31 +2609,55 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-date-dateHeuristics1-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wegaWritings-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-date-dateHeuristics2-constraint-report-8">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wegaWritings-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaWritings-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wegaWritings-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-date-dateHeuristics3-constraint-report-9">
+                  id="wegaWritings-date-dateHeuristics3-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2645,7 +2669,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-date-dateHeuristics4-constraint-report-10">
+                  id="wegaWritings-date-dateHeuristics4-constraint-report-12">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2720,7 +2744,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) is used to point at a following note thus marking the beginning of the to be annotated section. Alternatively, the element can be a placeholder for an external URL (prefixed with 'http'). [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-ptr-ptr-target-constraint-rule-9">
+                  id="wegaWritings-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2735,7 +2759,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-ptr-duplicate-ptr-constraint-report-11">
+                  id="wegaWritings-ptr-duplicate-ptr-constraint-report-13">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2749,7 +2773,7 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-ptr-ptrAtts-constraint-report-12">
+                  id="wegaWritings-ptr-ptrAtts-constraint-report-14">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2775,7 +2799,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-ref-prev-next-correspContext-constraint-report-13">
+                  id="wegaWritings-ref-prev-next-correspContext-constraint-report-15">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2787,7 +2811,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-ref-refAtts-constraint-report-14">
+                  id="wegaWritings-ref-refAtts-constraint-report-16">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2841,7 +2865,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-list-gloss-list-constraint-report-15">
+                  id="wegaWritings-list-gloss-list-constraint-report-17">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -2853,7 +2877,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-list-gloss-list-must-have-labels-constraint-rule-10">
+                  id="wegaWritings-list-gloss-list-must-have-labels-constraint-rule-14">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -2942,7 +2966,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a note or annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-note-note-in-text-constraint-rule-11">
+                  id="wegaWritings-note-note-in-text-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2954,7 +2978,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-note-thematicCom-target-constraint-rule-12">
+                  id="wegaWritings-note-thematicCom-target-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -2966,7 +2990,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-note-notesStmt-notes-constraint-rule-13">
+                  id="wegaWritings-note-notesStmt-notes-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3075,7 +3099,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-pb-facs-facs-reference-constraint-rule-14">
+                  id="wegaWritings-pb-facs-facs-reference-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3149,7 +3173,7 @@ Elements]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-analytic-analyticTitle-constraint-report-16">
+                  id="wegaWritings-analytic-analyticTitle-constraint-report-18">
             <rule context="tei:analytic">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3242,7 +3266,7 @@ Elements]</a:documentation>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-monogr-monogrTitle-constraint-report-17">
+                  id="wegaWritings-monogr-monogrTitle-constraint-report-19">
             <rule context="tei:monogr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3287,7 +3311,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-author-sameAs-sameAs-reference-constraint-rule-15">
+                  id="wegaWritings-author-sameAs-sameAs-reference-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3393,7 +3417,7 @@ Elements]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a title for any kind of work. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-title-duplicate-title-constraint-rule-16">
+                  id="wegaWritings-title-duplicate-title-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3408,7 +3432,7 @@ Elements]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-title-punctuation-mark-constraint-report-19">
+                  id="wegaWritings-title-punctuation-mark-constraint-report-21">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3475,7 +3499,7 @@ Elements]</a:documentation>
             </optional>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-imprint-duplicate-biblScope-type-constraint-report-20">
+                  id="wegaWritings-imprint-duplicate-biblScope-type-constraint-report-22">
             <rule context="tei:imprint">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3610,7 +3634,7 @@ Elements]</a:documentation>
             </choice>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-relatedItem-relatedItem-type-within-notesStmt-constraint-report-21">
+                  id="wegaWritings-relatedItem-relatedItem-type-within-notesStmt-constraint-report-23">
             <rule context="tei:relatedItem">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3622,7 +3646,7 @@ Elements]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-17">
+                  id="wegaWritings-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3634,7 +3658,7 @@ Elements]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-relatedItem-targetorcontent1-constraint-report-22">
+                  id="wegaWritings-relatedItem-targetorcontent1-constraint-report-24">
             <rule context="tei:relatedItem">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -3691,7 +3715,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-l-abstractModel-structure-l-constraint-report-23">
+                  id="wegaWritings-l-abstractModel-structure-l-constraint-report-25">
             <rule context="tei:l">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3750,7 +3774,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-lg-abstractModel-structure-l-constraint-report-24">
+                  id="wegaWritings-lg-abstractModel-structure-l-constraint-report-26">
             <rule context="tei:lg">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3773,7 +3797,7 @@ relatedItem element must be empty</sch:report>
             <ref name="revisionDesc"/>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-teiHeader-seriesTitle-constraint-rule-18">
+                  id="wegaWritings-teiHeader-seriesTitle-constraint-rule-22">
             <sch:rule xmlns:xi="http://www.w3.org/2001/XInclude"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
@@ -3972,7 +3996,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-notesStmt-count-notes-constraint-report-25">
+                  id="wegaWritings-notesStmt-count-notes-constraint-report-27">
             <rule context="tei:notesStmt">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4380,7 +4404,7 @@ relatedItem element must be empty</sch:report>
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-div-abstractModel-structure-l-constraint-report-26">
+                  id="wegaWritings-div-abstractModel-structure-l-constraint-report-28">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4390,7 +4414,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-div-abstractModel-structure-p-constraint-report-27">
+                  id="wegaWritings-div-abstractModel-structure-p-constraint-report-29">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4577,7 +4601,7 @@ relatedItem element must be empty</sch:report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-orgName-parent-org-constraint-rule-19">
+                  id="wegaWritings-orgName-parent-org-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4589,7 +4613,7 @@ relatedItem element must be empty</sch:report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-orgName-parent-org-reg-constraint-rule-20">
+                  id="wegaWritings-orgName-parent-org-reg-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4601,7 +4625,7 @@ relatedItem element must be empty</sch:report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-orgName-parent-org-reg-constraint-rule-21">
+                  id="wegaWritings-orgName-parent-org-reg-constraint-rule-25">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4613,7 +4637,7 @@ relatedItem element must be empty</sch:report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-orgName-parent-not-org-constraint-rule-22">
+                  id="wegaWritings-orgName-parent-not-org-constraint-rule-26">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4759,7 +4783,7 @@ relatedItem element must be empty</sch:report>
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-table-collapsible-head-constraint-report-31">
+                  id="wegaWritings-table-collapsible-head-constraint-report-33">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4793,7 +4817,7 @@ relatedItem element must be empty</sch:report>
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-row-number-of-cells-constraint-rule-23">
+                  id="wegaWritings-row-number-of-cells-constraint-rule-27">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4830,7 +4854,7 @@ relatedItem element must be empty</sch:report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains one cell of a table [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-cell-cell-rows-constraint-rule-24">
+                  id="wegaWritings-cell-cell-rows-constraint-rule-28">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4996,7 +5020,7 @@ relatedItem element must be empty</sch:report>
             <data type="anyURI"/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-addSpan-hand-hand-reference-constraint-rule-25">
+                  id="wegaWritings-addSpan-hand-hand-reference-constraint-rule-29">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5012,7 +5036,7 @@ relatedItem element must be empty</sch:report>
             <data type="anyURI"/>
          </attribute> 
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-addSpan-spanTo-spanTo-7-constraint-rule-26">
+                  id="wegaWritings-addSpan-spanTo-spanTo-7-constraint-rule-30">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5160,7 +5184,7 @@ relatedItem element must be empty</sch:report>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-msIdentifier-msId_minimal-constraint-report-33">
+                  id="wegaWritings-msIdentifier-msId_minimal-constraint-report-35">
             <rule context="tei:msIdentifier">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5278,7 +5302,7 @@ relatedItem element must be empty</sch:report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arbitrary segment) represents any segmentation of text below the ‘chunk’ level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-seg-activeOrPassivePerformance-constraint-report-34">
+                  id="wegaWritings-seg-activeOrPassivePerformance-constraint-report-36">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5290,7 +5314,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wegaWritings-seg-AddresseeOrSenderCorrespondence-constraint-report-35">
+                  id="wegaWritings-seg-AddresseeOrSenderCorrespondence-constraint-report-37">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5449,7 +5473,7 @@ relatedItem element must be empty</sch:report>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-att.witnessed-att-wit-constraint-rule-27">
+            id="wegaWritings-att.witnessed-att-wit-constraint-rule-31">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5667,7 +5691,7 @@ relatedItem element must be empty</sch:report>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-att.wega.rend-underline-n-constraint-rule-33">
+            id="wegaWritings-att.wega.rend-underline-n-constraint-rule-37">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5684,7 +5708,7 @@ relatedItem element must be empty</sch:report>
       </choice>
    </start>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-whitespaceOnlyContent-constraint-rule-28">
+            id="wegaWritings-whitespaceOnlyContent-constraint-rule-32">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5697,7 +5721,7 @@ relatedItem element must be empty</sch:report>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-elementStartsWithWhitespace-constraint-rule-29">
+            id="wegaWritings-elementStartsWithWhitespace-constraint-rule-33">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5710,7 +5734,7 @@ relatedItem element must be empty</sch:report>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-untrimmedAttributeValues-constraint-rule-30">
+            id="wegaWritings-untrimmedAttributeValues-constraint-rule-34">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5722,7 +5746,7 @@ relatedItem element must be empty</sch:report>
                 </sch:rule>
    </pattern>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-styleguide-document-node-content-constraint-rule-31">
+            id="wegaWritings-styleguide-document-node-content-constraint-rule-35">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5735,7 +5759,7 @@ relatedItem element must be empty</sch:report>
                 </sch:rule>
    </pattern>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wegaWritings-styleguide-document-node-content-constraint-rule-32">
+            id="wegaWritings-styleguide-document-node-content-constraint-rule-36">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/schema/en/wega_all.rng b/schema/en/wega_all.rng
index 8581a768..7be5b7e2 100644
--- a/schema/en/wega_all.rng
+++ b/schema/en/wega_all.rng
@@ -5,7 +5,7 @@
          xmlns:teix="http://www.tei-c.org/ns/Examples"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2017-12-08T08:25:30Z. .
+Schema generated from ODD source 2017-12-21T19:30:39Z. .
 TEI Edition: Version 3.2.0. Last updated on
 	10th July 2017, revision 0fcf651
 TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.2.0/
@@ -3325,31 +3325,55 @@ Measures]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-date-dateHeuristics1-constraint-report-7">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))">value of notBefore greater than notAfter</sch:report>
-            </rule>
+                  id="wega_all-date-dateHeuristics2-constraint-rule-9">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-date-dateHeuristics2-constraint-report-8">
-            <rule context="tei:date">
-               <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
-                           xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                           xmlns:s="http://www.ascc.net/xml/schematron"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                           test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')">value of notBefore smaller than notAfter</sch:report>
-            </rule>
+                  id="wega_all-date-dateHeuristics2-constraint-rule-10">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wega_all-date-dateHeuristics2-constraint-rule-11">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+         </pattern>
+         <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  id="wega_all-date-dateHeuristics2-constraint-rule-12">
+            <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
+                      xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+                      xmlns:s="http://www.ascc.net/xml/schematron"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                      context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))">the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-date-dateHeuristics3-constraint-report-9">
+                  id="wega_all-date-dateHeuristics3-constraint-report-11">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3361,7 +3385,7 @@ Measures]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-date-dateHeuristics4-constraint-report-10">
+                  id="wega_all-date-dateHeuristics4-constraint-report-12">
             <rule context="tei:date">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3436,7 +3460,7 @@ Measures]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) is used to point at a following note thus marking the beginning of the to be annotated section. Alternatively, the element can be a placeholder for an external URL (prefixed with 'http'). [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ptr-ptr-target-constraint-rule-9">
+                  id="wega_all-ptr-ptr-target-constraint-rule-13">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3451,7 +3475,7 @@ Measures]</a:documentation>
                  </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ptr-duplicate-ptr-constraint-report-11">
+                  id="wega_all-ptr-duplicate-ptr-constraint-report-13">
             <rule context="tei:ptr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3465,7 +3489,7 @@ Measures]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ptr-ptrAtts-constraint-report-12">
+                  id="wega_all-ptr-ptrAtts-constraint-report-14">
             <rule context="tei:ptr">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3491,7 +3515,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.6. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ref-prev-next-correspContext-constraint-report-13">
+                  id="wega_all-ref-prev-next-correspContext-constraint-report-15">
             <rule context="tei:ref">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3503,7 +3527,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ref-refAtts-constraint-report-14">
+                  id="wega_all-ref-refAtts-constraint-report-16">
             <rule context="tei:ref">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3557,7 +3581,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </oneOrMore>
          </choice>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-list-gloss-list-constraint-report-15">
+                  id="wega_all-list-gloss-list-constraint-report-17">
             <rule context="tei:list">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3569,7 +3593,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-list-gloss-list-must-have-labels-constraint-rule-10">
+                  id="wega_all-list-gloss-list-must-have-labels-constraint-rule-14">
             <sch:rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3648,7 +3672,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a note or annotation. [3.8.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.11.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-note-note-in-text-constraint-rule-11">
+                  id="wega_all-note-note-in-text-constraint-rule-15">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3660,7 +3684,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-note-thematicCom-target-constraint-rule-12">
+                  id="wega_all-note-thematicCom-target-constraint-rule-16">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3672,7 +3696,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-note-notesStmt-notes-constraint-rule-13">
+                  id="wega_all-note-notesStmt-notes-constraint-rule-17">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3794,7 +3818,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-pb-facs-facs-reference-constraint-rule-14">
+                  id="wega_all-pb-facs-facs-reference-constraint-rule-18">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -3869,7 +3893,7 @@ Elements]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-analytic-analyticTitle-constraint-report-16">
+                  id="wega_all-analytic-analyticTitle-constraint-report-18">
             <rule context="tei:analytic">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -3969,7 +3993,7 @@ Elements]</a:documentation>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-monogr-monogrTitle-constraint-report-17">
+                  id="wega_all-monogr-monogrTitle-constraint-report-19">
             <rule context="tei:monogr">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4003,7 +4027,7 @@ Elements]</a:documentation>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-series-seriesTitle-constraint-report-18">
+                  id="wega_all-series-seriesTitle-constraint-report-20">
             <rule context="tei:series">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4048,7 +4072,7 @@ Elements]</a:documentation>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-author-sameAs-sameAs-reference-constraint-rule-15">
+                  id="wega_all-author-sameAs-sameAs-reference-constraint-rule-19">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4154,7 +4178,7 @@ Elements]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a title for any kind of work. [3.11.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement 2.2.5. The Series Statement]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-title-duplicate-title-constraint-rule-16">
+                  id="wega_all-title-duplicate-title-constraint-rule-20">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4169,7 +4193,7 @@ Elements]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-title-punctuation-mark-constraint-report-20">
+                  id="wega_all-title-punctuation-mark-constraint-report-22">
             <rule context="tei:title">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4236,7 +4260,7 @@ Elements]</a:documentation>
             </optional>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-imprint-duplicate-biblScope-type-constraint-report-21">
+                  id="wega_all-imprint-duplicate-biblScope-type-constraint-report-23">
             <rule context="tei:imprint">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4376,7 +4400,7 @@ Elements]</a:documentation>
             </choice>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-relatedItem-relatedItem-type-within-notesStmt-constraint-report-22">
+                  id="wega_all-relatedItem-relatedItem-type-within-notesStmt-constraint-report-24">
             <rule context="tei:relatedItem">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4388,7 +4412,7 @@ Elements]</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-17">
+                  id="wega_all-relatedItem-relatedItem-target-within-notesStmt-constraint-rule-21">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4400,7 +4424,7 @@ Elements]</a:documentation>
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-relatedItem-targetorcontent1-constraint-report-23">
+                  id="wega_all-relatedItem-targetorcontent1-constraint-report-25">
             <rule context="tei:relatedItem">
                <sch:report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns="http://www.tei-c.org/ns/1.0"
@@ -4457,7 +4481,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-l-abstractModel-structure-l-constraint-report-24">
+                  id="wega_all-l-abstractModel-structure-l-constraint-report-26">
             <rule context="tei:l">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4516,7 +4540,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-lg-abstractModel-structure-l-constraint-report-25">
+                  id="wega_all-lg-abstractModel-structure-l-constraint-report-27">
             <rule context="tei:lg">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4593,7 +4617,7 @@ relatedItem element must be empty</sch:report>
             <ref name="row"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-table-collapsible-head-constraint-report-26">
+                  id="wega_all-table-collapsible-head-constraint-report-28">
             <rule context="tei:table">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -4627,7 +4651,7 @@ relatedItem element must be empty</sch:report>
             <ref name="cell"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-row-number-of-cells-constraint-rule-18">
+                  id="wega_all-row-number-of-cells-constraint-rule-22">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -4664,7 +4688,7 @@ relatedItem element must be empty</sch:report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains one cell of a table [14.1.1. TEI Tables]</a:documentation>
          <ref name="macro.specialPara"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-cell-cell-rows-constraint-rule-19">
+                  id="wega_all-cell-cell-rows-constraint-rule-23">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5004,7 +5028,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-notesStmt-count-notes-constraint-report-28">
+                  id="wega_all-notesStmt-count-notes-constraint-report-30">
             <rule context="tei:notesStmt">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5078,7 +5102,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             <ref name="model.pLike"/>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-quotation-quotationContents-constraint-report-29">
+                  id="wega_all-quotation-quotationContents-constraint-report-31">
             <rule context="tei:quotation">
                <report xmlns:xi="http://www.w3.org/2001/XInclude"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -5372,7 +5396,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any arbitrary component-level unit of text, acting as an anonymous container for phrase or inter level elements analogous to, but without the semantic baggage of, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ab-abstractModel-structure-p-constraint-report-30">
+                  id="wega_all-ab-abstractModel-structure-p-constraint-report-32">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5382,7 +5406,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-ab-abstractModel-structure-l-constraint-report-31">
+                  id="wega_all-ab-abstractModel-structure-l-constraint-report-33">
             <rule context="tei:ab">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5415,7 +5439,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arbitrary segment) represents any segmentation of text below the ‘chunk’ level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-seg-activeOrPassivePerformance-constraint-report-32">
+                  id="wega_all-seg-activeOrPassivePerformance-constraint-report-34">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5427,7 +5451,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-seg-AddresseeOrSenderCorrespondence-constraint-report-33">
+                  id="wega_all-seg-AddresseeOrSenderCorrespondence-constraint-report-35">
             <rule context="tei:seg">
                <sch:report xmlns:mei="http://www.music-encoding.org/ns/mei"
                            xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
@@ -5637,7 +5661,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-msIdentifier-msId_minimal-constraint-report-34">
+                  id="wega_all-msIdentifier-msId_minimal-constraint-report-36">
             <rule context="tei:msIdentifier">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -5884,7 +5908,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-orgName-parent-org-constraint-rule-20">
+                  id="wega_all-orgName-parent-org-constraint-rule-24">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5896,7 +5920,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-orgName-parent-org-reg-constraint-rule-21">
+                  id="wega_all-orgName-parent-org-reg-constraint-rule-25">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5908,7 +5932,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-orgName-parent-org-reg-constraint-rule-22">
+                  id="wega_all-orgName-parent-org-reg-constraint-rule-26">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -5920,7 +5944,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                     </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-orgName-parent-not-org-constraint-rule-23">
+                  id="wega_all-orgName-parent-not-org-constraint-rule-27">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -6654,7 +6678,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wega_all-att.witnessed-att-wit-constraint-rule-24">
+            id="wega_all-att.witnessed-att-wit-constraint-rule-28">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7121,7 +7145,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-div-abstractModel-structure-l-constraint-report-38">
+                  id="wega_all-div-abstractModel-structure-l-constraint-report-40">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -7131,7 +7155,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-div-abstractModel-structure-p-constraint-report-39">
+                  id="wega_all-div-abstractModel-structure-p-constraint-report-41">
             <rule context="tei:div">
                <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -7454,7 +7478,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
             <data type="anyURI"/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-addSpan-hand-hand-reference-constraint-rule-25">
+                  id="wega_all-addSpan-hand-hand-reference-constraint-rule-29">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7470,7 +7494,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
             <data type="anyURI"/>
          </attribute> 
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="wega_all-addSpan-spanTo-spanTo-7-constraint-rule-26">
+                  id="wega_all-addSpan-spanTo-spanTo-7-constraint-rule-30">
             <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                       xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                       xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7679,7 +7703,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wega_all-att.wega.rend-underline-n-constraint-rule-31">
+            id="wega_all-att.wega.rend-underline-n-constraint-rule-35">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7699,7 +7723,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
       </choice>
    </start>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wega_all-styleguide-document-node-content-constraint-rule-27">
+            id="wega_all-styleguide-document-node-content-constraint-rule-31">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7712,7 +7736,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wega_all-whitespaceOnlyContent-constraint-rule-28">
+            id="wega_all-whitespaceOnlyContent-constraint-rule-32">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7725,7 +7749,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wega_all-elementStartsWithWhitespace-constraint-rule-29">
+            id="wega_all-elementStartsWithWhitespace-constraint-rule-33">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
@@ -7738,7 +7762,7 @@ Sample values include: 1] explicit; 2] implicit</a:documentation>
                 </sch:rule>
    </pattern>  
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="wega_all-untrimmedAttributeValues-constraint-rule-30">
+            id="wega_all-untrimmedAttributeValues-constraint-rule-34">
       <sch:rule xmlns:mei="http://www.music-encoding.org/ns/mei"
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:s="http://www.ascc.net/xml/schematron"
diff --git a/src/Specs/common-specs.odd.xml b/src/Specs/common-specs.odd.xml
index 4d61ea17..f21e6e45 100644
--- a/src/Specs/common-specs.odd.xml
+++ b/src/Specs/common-specs.odd.xml
@@ -808,22 +808,26 @@
                 <memberOf key="att.typed" mode="delete"/>
                 <memberOf key="att.global.responsibility" mode="add"/>
             </classes>
-            <constraintSpec scheme="schematron" ident="dateHeuristics1">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>larger</emph> value than its corresponding <att>notAfter</att> (for dates AC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>größeren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten n.Chr.)</desc>
-                <constraint>
-                    <sch:report
-                        test="(@notBefore gt @notAfter) and not(starts-with(@notBefore, '-'))"
-                        >value of notBefore greater than notAfter</sch:report>
-                </constraint>
-            </constraintSpec>
             <constraintSpec scheme="schematron" ident="dateHeuristics2">
-                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> value than its corresponding <att>notAfter</att> (for dates BC)</desc>
-                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Wert als sein entsprechendes <att>notAfter</att> (für Daten v.Chr.)</desc>
+                <desc versionDate="2013-11-11" xml:lang="en">checks for the existence of an <att>notBefore</att> with a <emph>smaller</emph> date value than its corresponding <att>notAfter</att></desc>
+                <desc versionDate="2013-11-11" xml:lang="de">sucht nach der Existenz eines <att>notBefore</att> mit einem <emph>kleineren</emph> Datumswert als sein entsprechendes <att>notAfter</att></desc>
                 <constraint>
-                    <sch:report
-                        test="(@notBefore lt @notAfter) and starts-with(@notBefore, '-')"
-                        >value of notBefore smaller than notAfter</sch:report>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(@notAfter)"
+                            >the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(concat(@notAfter, '-01-01'))"
+                            >the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:gYear and @notAfter castable as xs:date]">
+                        <sch:report test="xs:date(concat(@notBefore, '-01-01')) gt xs:date(@notAfter)"
+                            >the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
+                    <sch:rule context="tei:date[@notBefore castable as xs:date and @notAfter castable as xs:gYear]">
+                        <sch:report test="xs:date(@notBefore) gt xs:date(concat(@notAfter, '-12-31'))"
+                            >the date value of notBefore is later than notAfter</sch:report>
+                    </sch:rule>
                 </constraint>
             </constraintSpec>
             <constraintSpec scheme="schematron" ident="dateHeuristics3">