Merge pull request music-encoding#1457 from rettinghaus/feat/color

schema: make all members of att.controlEvent also part of att.color
musicEnfanthen · May 31, 2024 · a75d838 · a75d838
2 parents 5bc7405 + eb0861b
commit a75d838
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 79 deletions.
diff --git a/customizations/mei-Mensural.xml b/customizations/mei-Mensural.xml
@@ -123,10 +123,10 @@
           <classes>
             <memberOf key="att.common"/>
             <memberOf key="att.facsimile"/>
+            <memberOf key="att.dot.anl"/>
+            <memberOf key="att.dot.ges"/>
             <memberOf key="att.dot.log"/>
             <memberOf key="att.dot.vis"/>
-            <memberOf key="att.dot.ges"/>
-            <memberOf key="att.dot.anl"/>
             <memberOf key="model.noteModifierLike" mode="delete"/>
             <memberOf key="model.eventLike.mensural"/>
           </classes>
@@ -146,10 +146,10 @@
           <classes>
             <memberOf key="att.common"/>
             <memberOf key="att.facsimile"/>
+            <memberOf key="att.rest.anl"/>
+            <memberOf key="att.rest.ges"/>
             <memberOf key="att.rest.log"/>
             <memberOf key="att.rest.vis"/>
-            <memberOf key="att.rest.ges"/>
-            <memberOf key="att.rest.anl"/>
             <memberOf key="model.eventLike"/>
           </classes>
           <content>

diff --git a/source/modules/MEI.cmn.xml b/source/modules/MEI.cmn.xml
@@ -1255,10 +1255,10 @@
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.lang"/>
+      <memberOf key="att.attacca.anl"/>
+      <memberOf key="att.attacca.ges"/>
       <memberOf key="att.attacca.log"/>
       <memberOf key="att.attacca.vis"/>
-      <memberOf key="att.attacca.ges"/>
-      <memberOf key="att.attacca.anl"/>
       <memberOf key="model.controlEventLike.cmn"/>
       <!--<memberOf key="model.controlEventLike"/>-->
     </classes>

diff --git a/source/modules/MEI.cmnOrnaments.xml b/source/modules/MEI.cmnOrnaments.xml
@@ -158,10 +158,10 @@
     <classes>
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
+      <memberOf key="att.mordent.anl"/>
+      <memberOf key="att.mordent.ges"/>
       <memberOf key="att.mordent.log"/>
       <memberOf key="att.mordent.vis"/>
-      <memberOf key="att.mordent.ges"/>
-      <memberOf key="att.mordent.anl"/>
       <memberOf key="model.ornamentLike.cmn"/>
     </classes>
     <content>
@@ -187,10 +187,10 @@
     <classes>
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
+      <memberOf key="att.trill.anl"/>
+      <memberOf key="att.trill.ges"/>
       <memberOf key="att.trill.log"/>
       <memberOf key="att.trill.vis"/>
-      <memberOf key="att.trill.ges"/>
-      <memberOf key="att.trill.anl"/>
       <memberOf key="model.ornamentLike.cmn"/>
     </classes>
     <content>
@@ -221,10 +221,10 @@
     <classes>
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
+      <memberOf key="att.turn.anl"/>
+      <memberOf key="att.turn.ges"/>
       <memberOf key="att.turn.log"/>
       <memberOf key="att.turn.vis"/>
-      <memberOf key="att.turn.ges"/>
-      <memberOf key="att.turn.anl"/>
       <memberOf key="model.ornamentLike.cmn"/>
     </classes>
     <content>

diff --git a/source/modules/MEI.harmony.xml b/source/modules/MEI.harmony.xml
@@ -212,10 +212,10 @@
     <classes>
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
+      <memberOf key="att.harm.anl"/>
+      <memberOf key="att.harm.ges"/>
       <memberOf key="att.harm.log"/>
       <memberOf key="att.harm.vis"/>
-      <memberOf key="att.harm.ges"/>
-      <memberOf key="att.harm.anl"/>
       <memberOf key="model.harmLike"/>
     </classes>
     <content>