Merge pull request music-encoding#591 from vigliensoni/fix-MEI-neume-…

…validation Fix: custos and clef elements should be within layer
baz-ga · Nov 4, 2020 · d976b37 · d976b37
2 parents 8ed9271 + e7b2940
commit d976b37
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/customizations/mei-Neumes.xml b/customizations/mei-Neumes.xml
@@ -111,13 +111,13 @@
         <classSpec ident="model.layerPart.cmn" module="MEI.shared" type="model" mode="delete"/>
 
         <!-- Disallow events within layer -->
-        <classSpec ident="model.eventLike" module="MEI.shared" type="model" mode="replace">
+        <!-- <classSpec ident="model.eventLike" module="MEI.shared" type="model" mode="replace">
           <desc>groups event elements that occur in all notational repertoires.</desc>
           <classes>
             <memberOf key="model.syllablePart"/>
             <memberOf key="model.rdgPart.critapp"/>
           </classes>
-        </classSpec>
+        </classSpec> -->
 
         <!-- Disallow neume events within layer; only permitted in mei-all customization -->
         <classSpec ident="model.eventLike.neumes" module="MEI.neumes" type="model" mode="replace">
@@ -127,6 +127,26 @@
             <memberOf key="model.rdgPart.critapp"/>
           </classes>
         </classSpec>
+
+        <!-- Allow custos and clef to appear within layer; compensate side effect of removing membership in model.layerPart from model.eventLike -->
+        <elementSpec ident="custos" module="MEI.shared" mode="change">
+          <classes mode="change">
+            <memberOf key="model.layerPart.neumes" mode="add"/>
+          </classes>
+        </elementSpec>
+        <elementSpec ident="clef" module="MEI.shared" mode="change">
+          <classes mode="change">
+            <memberOf key="model.layerPart.neumes" mode="add"/>
+          </classes>
+        </elementSpec>
+
+        <!-- remove custos and clef (among others) from within syllable -->
+        <classSpec ident="model.eventLike" module="MEI.shared" type="model" mode="change">
+          <classes mode="change">
+            <memberOf key="model.syllablePart" mode="delete"/>
+          </classes>
+        </classSpec>
+
 
       </schemaSpec>
     </body>