Merge branch 'develop'

.gitignore

@@ -1,3 +1,4 @@
 build/
 local.build.properties
 .DS_Store
+*.xpr

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.3.0/xml/tei/odd/p5subset.xml
+tei.source=/Users/pstadler/static/tei-3.4.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

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.3.0. Last updated on
-	31st January 2018, revision f4d8439?>
+<?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.4.0. Last updated on
+	23rd July 2018, revision 1fa0b54?>
 	<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.3.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.4.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
@@ -2971,7 +2971,7 @@ expliquer d'autres parties d'un document.</desc>
   <listRef>
     <ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STEC">1.3. The TEI Class System</ref>
   </listRef>
-</classSpec><macroSpec module="tei" type="pe" ident="macro.phraseSeq">
+</classSpec><macroSpec module="tei" ident="macro.phraseSeq">
   <gloss versionDate="2005-01-14" xml:lang="en">phrase sequence</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">구 연쇄</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">詞組序列</gloss>
@@ -4272,7 +4272,7 @@ means of a <gi>glyph</gi> or <gi>char</gi> element referenced here as <code>#sym
       <exemplum xml:lang="en">
         <p>The following are examples of ISO date, time, and date &amp; time formats that are <emph>not</emph> valid W3C format
                     normalizations.</p>
-        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+        <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#NONE">
           <date when-iso="1996-09-24T07:25+00">Sept. 24th, 1996 at 3:25 in the morning</date>
           <date when-iso="1996-09-24T03:25-04">Sept. 24th, 1996 at 3:25 in the morning</date>
           <time when-iso="1999-01-04T20:42-05">4 Jan 1999 at 8:42 pm</time>
@@ -4288,7 +4288,7 @@ means of a <gi>glyph</gi> or <gi>char</gi> element referenced here as <code>#sym
       <exemplum versionDate="2008-04-06" xml:lang="fr">
         <p>Les exemples qui suivent sont des mentions de date, d'heure, de temps au format ISO qui
             ne sont <emph> pas </emph>normalisées au format W3C </p>
-        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+        <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#NONE">
           <date when-iso="1996-09-24T07:25+00">le 24 sept. 1996, à 3 h 25 du matin.</date>
           <date when-iso="1996-09-24T03:25-04">le 24 sept. 1996, à 3 h 25 du matin.</date>
           <time when-iso="1999-01-04T20:42-05">le 4 janvier 1999 à 8 h.42 du soir </time>
@@ -4552,7 +4552,7 @@ means of a <gi>glyph</gi> or <gi>char</gi> element referenced here as <code>#sym
   </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="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>
+                <sch:assert test="matches(., '^\-?\d+(\.\d+)? \-?\d+(\.\d+)?$')">There must be two coordinates, separated with a whitespace only (no comma!)</sch:assert>
             </constraint>
         </constraintSpec><attList/><exemplum xml:lang="und">
 
@@ -4731,6 +4731,12 @@ means of a <gi>glyph</gi> or <gi>char</gi> element referenced here as <code>#sym
             <content 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">
                 <dataRef name="string" restriction="A22\d{4}"/>
             </content>
+        </dataSpec><dataSpec rend="add" module="derived-module-wegaPlaces" ident="wega.addenda.pointer">
+            <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" xml:lang="de" versionDate="2018-11-16">definiert das Muster für Addenda-Dokument-IDs innerhalb der WeGA</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" xml:lang="en" versionDate="2018-11-16">defines the possible attribute values for addenda document IDs within the WeGA</desc>
+            <content 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">
+                <dataRef name="string" restriction="A12\d{4}"/>
+            </content>
         </dataSpec><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="styleguide-document-node-content">
             <constraint>
                 <sch:rule context="document-node()">
@@ -4770,6 +4776,15 @@ means of a <gi>glyph</gi> or <gi>char</gi> element referenced here as <code>#sym
                     <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><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="emojiCheck">
+
+            <desc versionDate="2018-12-05" xml:lang="en">warnings for characters that are displayed (in browsers) as emojis per default</desc>
+            <desc versionDate="2018-12-05" xml:lang="de">Warnung bei Zeichen die in Browsern standardmäßig als Emojis dargestellt werden</desc>
+            <constraint>
+                <sch:rule context="*[some $i in text() satisfies normalize-space($i) ne '']">
+                    <sch:report test="matches(., '[⌚-⌛]|[⏩-⏬]|[⏰]|[⏳]|[◽-◾]|[☔-☕]|[♈-♓]|[♿]|[⚓]|[⚡]|[⚪-⚫]|[⚽-⚾]|[⛄-⛅]|[⛎]|[⛔]|[⛪]|[⛲-⛳]|[⛵]|[⛺]|[⛽]|[✅]|[✊-✋]|[✨]|[❌]|[❎]|[❓-❕]|[❗]|[➕-➗]|[➰]|[➿]|[⬛-⬜]|[⭐]|[⭕]|[🀄]|[🃏]|[🆎]|[🆑-🆚]|[🇦-🇿]|[🈁]|[🈚]|[🈯]|[🈲-🈶]|[🈸-🈺]|[🉐-🉑]|[🌀-🌠]|[🌭-🌯]|[🌰-🌵]|[🌷-🍼]|[🍾-🍿]|[🎀-🎓]|[🎠-🏄]|[🏅]|[🏆-🏊]|[🏏-🏓]|[🏠-🏰]|[🏴]|[🏸-🏿]|[🐀-🐾]|[👀]|[👂-📷]|[📸]|[📹-📼]|[📿]|[🔀-🔽]|[🕋-🕎]|[🕐-🕧]|[🕺]|[🖕-🖖]|[🖤]|[🗻-🗿]|[😀]|[😁-😐]|[😑]|[😒-😔]|[😕]|[😖]|[😗]|[😘]|[😙]|[😚]|[😛]|[😜-😞]|[😟]|[😠-😥]|[😦-😧]|[😨-😫]|[😬]|[😭]|[😮-😯]|[😰-😳]|[😴]|[😵-🙀]|[🙁-🙂]|[🙃-🙄]|[🙅-🙏]|[🚀-🛅]|[🛌]|[🛐]|[🛑-🛒]|[🛕]|[🛫-🛬]|[🛴-🛶]|[🛷-🛸]|[🛹]|[🛺]|[🟠-🟫]|[🤍-🤏]|[🤐-🤘]|[🤙-🤞]|[🤟]|[🤠-🤧]|[🤨-🤯]|[🤰]|[🤱-🤲]|[🤳-🤺]|[🤼-🤾]|[🤿]|[🥀-🥅]|[🥇-🥋]|[🥌]|[🥍-🥏]|[🥐-🥞]|[🥟-🥫]|[🥬-🥰]|[🥱]|[🥳-🥶]|[🥺]|[🥻]|[🥼-🥿]|[🦀-🦄]|[🦅-🦑]|[🦒-🦗]|[🦘-🦢]|[🦥-🦪]|[🦮-🦯]|[🦰-🦹]|[🦺-🦿]|[🧀]|[🧁-🧂]|[🧃-🧊]|[🧍-🧏]|[🧐-🧦]|[🧧-🧿]|[🩰-🩳]|[🩸-🩺]|[🪀-🪂]|[🪐-🪕]')">Text contains characters with Emoji presentation as default.</sch:report>
+                </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>