Merge branch 'develop'

Edirom · Jul 17, 2018 · 547bdc2 · 547bdc2
2 parents d721ad9 + 9bde6ce
commit 547bdc2
Show file tree

Hide file tree

Showing 65 changed files with 13,200 additions and 5,745 deletions.
diff --git a/build.properties b/build.properties
@@ -11,7 +11,7 @@ compiledODD.dir=compiled-ODD
 stylesheets.dir=/Users/pstadler/repos/Stylesheets
 
 # Path to local TEI p5subset.xml (get the latest release from http://sourceforge.net/projects/tei/files/TEI-P5-all/)
-tei.source=/Users/pstadler/static/tei-3.2.0/xml/tei/odd/p5subset.xml
+tei.source=/Users/pstadler/static/tei-3.3.0/xml/tei/odd/p5subset.xml
 
 # Path to local MEI driver.xml (get the latest release from https://code.google.com/p/music-encoding/downloads/list)
 mei.source=/Users/pstadler/static/MEI2013_v2.1.1/source/driver.xml
diff --git a/compiled-ODD/guidelines-de-wegaBiblio.compiled.xml b/compiled-ODD/guidelines-de-wegaBiblio.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaDiaries.compiled.xml b/compiled-ODD/guidelines-de-wegaDiaries.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaDocuments.compiled.xml b/compiled-ODD/guidelines-de-wegaDocuments.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaLetters.compiled.xml b/compiled-ODD/guidelines-de-wegaLetters.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaNews.compiled.xml b/compiled-ODD/guidelines-de-wegaNews.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaOrgs.compiled.xml b/compiled-ODD/guidelines-de-wegaOrgs.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaPersons.compiled.xml b/compiled-ODD/guidelines-de-wegaPersons.compiled.xml
diff --git a/compiled-ODD/guidelines-de-wegaPlaces.compiled.xml b/compiled-ODD/guidelines-de-wegaPlaces.compiled.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xml:base="file:/Users/pstadler/repos/WeGA-ODD/src/Guidelines/guidelines-de.xml" xml:lang="de"><?TEIVERSION Version 3.2.0. Last updated on
-	10th July 2017, revision 0fcf651?>
+<?xml version="1.0" encoding="utf-8"?><TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xml:base="file:/Users/pstadler/repos/WeGA-ODD/src/Guidelines/guidelines-de.xml" xml:lang="de"><?TEIVERSION Version 3.3.0. Last updated on
+	31st January 2018, revision f4d8439?>
 	<teiHeader>
 		<fileDesc>
 			<titleStmt>
@@ -986,7 +986,7 @@
 
 
 
-				<schemaSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:teix="http://www.tei-c.org/ns/Examples" ident="wegaPlaces" xml:lang="en" start="place" xml:base="../Specs/schemaSpec-places.odd.xml" defaultExceptions="http://www.tei-c.org/ns/1.0 teix:egXML" source="/Users/pstadler/static/tei-3.2.0/xml/tei/odd/p5subset.xml"><classSpec module="tei" type="atts" ident="att.canonical">
+				<schemaSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:teix="http://www.tei-c.org/ns/Examples" ident="wegaPlaces" xml:lang="en" start="place" xml:base="../Specs/schemaSpec-places.odd.xml" defaultExceptions="http://www.tei-c.org/ns/1.0 teix:egXML" source="/Users/pstadler/static/tei-3.3.0/xml/tei/odd/p5subset.xml"><classSpec module="tei" type="atts" ident="att.canonical">
   <desc versionDate="2008-09-05" xml:lang="en">provides attributes which can be used to associate a representation such as a name or title
     with canonical information about the object being named or referenced.</desc>
   <desc versionDate="2009-05-25" xml:lang="fr">fournit des attributs qui peuvent être utilisés pour
@@ -1708,14 +1708,14 @@ the TEI header.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="en">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND">
       <elementRef key="p" source="tei:2.0.1"/>
     </egXML>
     <p>Include in the schema an element named <gi>p</gi> available from the TEI P5 2.0.1
       release.</p>
   </exemplum>
   <exemplum xml:lang="en">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND">
       <schemaSpec ident="myODD" source="mycompiledODD.xml">
         <!-- further declarations specifying the components required -->
       </schemaSpec>
@@ -2146,7 +2146,7 @@ sub-classification for the element additional to that provided by its
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPTL">16.1.1. Pointers and Links</ref>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</ref>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLK">12.2. Linking the Apparatus to the Text</ref>
-    <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDTAGCONT">22.5.2. RELAX NG Content Models</ref>
+    <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDTAGCONT">22.5.1.2. Defining Content Models: RELAX NG</ref>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/TS.html#TSBA">8.3. Elements Unique to Spoken Texts</ref>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/USE.html#MDMDAL">23.3.1.4. Modification of Attribute and Attribute Value Lists</ref>
   </listRef>
@@ -4163,7 +4163,7 @@ means of a <gi>glyph</gi> or <gi>char</gi> element referenced here as <code>#sym
                </p>
         </egXML>
         <p>Not all custom date formulations will have Gregorian equivalents.</p>
-        <p>The <att>when-custom</att> attribute and other custom dating are not contrained to a datatype by the TEI, but
+        <p>The <att>when-custom</att> attribute and other custom dating are not constrained to a datatype by the TEI, but
         individual projects are recommended to regularize and document their dating formats.</p>
       </exemplum>
     </attDef>
@@ -4379,21 +4379,21 @@ means of a <gi>glyph</gi> or <gi>char</gi> element referenced here as <code>#sym
   </remarks>
   <remarks versionDate="2007-06-12" xml:lang="en">
     <p>If both <att>when-iso</att> and <att>dur-iso</att> are specified, the values should be interpreted as indicating a span of time by its
-            starting time (or date) and duration. That is, <egXML xmlns="http://www.tei-c.org/ns/Examples"><date when-iso="2007-06-01" dur-iso="P8D"/></egXML> indicates the same time period as <egXML xmlns="http://www.tei-c.org/ns/Examples"><date when-iso="2007-06-01/P8D"/></egXML>
+            starting time (or date) and duration. That is, <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"><date when-iso="2007-06-01" dur-iso="P8D"/></egXML> indicates the same time period as <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"><date when-iso="2007-06-01/P8D"/></egXML>
         </p>
     <p>In providing a <soCalled>regularized</soCalled> form, no claim is made that the form in the source text is incorrect; the regularized form
             is simply that chosen as the main form for purposes of unifying variant forms under a single heading.</p>
   </remarks>
   <remarks versionDate="2009-03-19" xml:lang="fr">
     <p>Si les attributs <att>when-iso</att> et <att>dur-iso</att> sont tous les deux spécifiés, les valeurs doivent être interprétées comme
-            indiquant un intervalle de temps au moyen de son point de départ (ou date) et de sa durée. C'est à dire, <egXML xmlns="http://www.tei-c.org/ns/Examples"><date when-iso="2007-06-01" dur-iso="P8D"/></egXML> indique la même période temporelle que <egXML xmlns="http://www.tei-c.org/ns/Examples"><date when-iso="2007-06-01/P8D"/></egXML>
+            indiquant un intervalle de temps au moyen de son point de départ (ou date) et de sa durée. C'est à dire, <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"><date when-iso="2007-06-01" dur-iso="P8D"/></egXML> indique la même période temporelle que <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"><date when-iso="2007-06-01/P8D"/></egXML>
         </p>
     <p>En fournissant une forme dite "régularisée", il n'est rien affirmé sur la correction ou l'incorrection de la forme dans le texte source ;
             la forme régularisée est simplement celle qui est choisie comme forme principale afin de réunir les variantes de forme sous une seule
             rubrique.</p>
   </remarks>
   <remarks xml:lang="ja" versionDate="2008-04-05">
-    <p> 属性<att>when-iso</att>と<att>dur-iso</att>が付与されている場合， 当該属性値は時間幅を示し，それぞれ始点と幅を示すものになる． 例えば，以下のような場合， <egXML xmlns="http://www.tei-c.org/ns/Examples"><date when-iso="2007-06-01" dur-iso="P8D"/></egXML> この記述は，以下のようにも書くことができる． <egXML xmlns="http://www.tei-c.org/ns/Examples"><date when-iso="2007-06-01/P8D"/></egXML>
+    <p> 属性<att>when-iso</att>と<att>dur-iso</att>が付与されている場合， 当該属性値は時間幅を示し，それぞれ始点と幅を示すものになる． 例えば，以下のような場合， <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"><date when-iso="2007-06-01" dur-iso="P8D"/></egXML> この記述は，以下のようにも書くことができる． <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"><date when-iso="2007-06-01/P8D"/></egXML>
         </p>
     <p><soCalled>正規化</soCalled>形式ということで，元テキストにある形式 が不正確であるということを含むものではない． ここでいう正規化形式とは，単に，ひとつの項目に同じ値を付与すること を目的とするものである． </p>
   </remarks>
@@ -4550,7 +4550,7 @@ means of a <gi>glyph</gi> or <gi>char</gi> element referenced here as <code>#sym
   <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="geo"><gloss rend="replace" versionDate="2013-11-11" xml:lang="en">geographical coordinates</gloss><gloss rend="replace" versionDate="2013-11-11" xml:lang="en">geographische Koordinaten</gloss><desc rend="replace" versionDate="2013-11-11" xml:lang="en">contains any expression of a set of geographic coordinates, representing a point, line, or area on the surface of the earth in some notation.</desc><desc rend="replace" versionDate="2013-11-11" xml:lang="de">enthält einen Terminus eines Sets von geographischen Koordinaten, die einen Punkt, eine Linie oder einen Bereich der Erde in einer bestimmten Schreibweise darstellen.</desc><classes><memberOf key="model.measureLike"/></classes><content><textNode/></content><constraintSpec scheme="schematron" ident="whitespace-separated-coordinates">
+</elementSpec><elementSpec rend="change" module="namesdates" ident="geo"><gloss rend="replace" versionDate="2013-11-11" xml:lang="en">geographical coordinates</gloss><gloss rend="replace" versionDate="2018-03-29" xml:lang="de">geographische Koordinaten</gloss><desc rend="replace" versionDate="2013-11-11" xml:lang="en">contains any expression of a set of geographic coordinates, representing a point, line, or area on the surface of the earth in some notation.</desc><desc rend="replace" versionDate="2013-11-11" xml:lang="de">enthält einen Terminus eines Sets von geographischen Koordinaten, die einen Punkt, eine Linie oder einen Bereich der Erde in einer bestimmten Schreibweise darstellen.</desc><classes><memberOf key="model.measureLike"/></classes><content><textNode/></content><constraintSpec scheme="schematron" ident="whitespace-separated-coordinates">
             <constraint>
                 <sch:assert test="(count(tokenize(., '\s+')) eq 2) and matches(., '\d\s+\-?\d')">There must be two coordinates, separated with a whitespace only (no comma!)</sch:assert>
             </constraint>
@@ -4762,6 +4762,14 @@ means of a <gi>glyph</gi> or <gi>char</gi> element referenced here as <code>#sym
                     <sch: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.</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="wegaTargets">
+            <desc versionDate="2018-06-13" xml:lang="en">constraints the "wega:"-prefixed URIs to be (syntactically) valid WeGA IDs</desc>
+            <desc versionDate="2018-06-13" xml:lang="de">überprüft die mit "wega:" präfigierten URIs auf (syntaktische) Validität</desc>
+            <constraint>
+                <sch:rule context="*[starts-with(@target, 'wega:')]">
+                    <sch:assert test="matches(@target, '^wega:A[0-9A-F]{6}(#.+)?$')">"wega"-prefixed URIs must follow the pattern "wega:A002068" (i.e. without any file extension)</sch:assert>
+                </sch:rule>
+            </constraint>
         </constraintSpec><moduleSpec n="ST" xml:id="DSTTEI2" ident="tei" type="core"/><moduleSpec xmlns:xi="http://www.w3.org/2001/XInclude" n="HD" xml:id="DHD" ident="header"/><moduleSpec n="ND" xml:id="DND" ident="namesdates"/></schemaSpec>