From d61d6041e44a53aea84be4c4ddd61639a3fef99c Mon Sep 17 00:00:00 2001
From: martha-thomae <thomaemartha@gmail.com>
Date: Thu, 8 Oct 2020 19:37:05 -0400
Subject: [PATCH 1/7] Add plica element and attributes

---
 source/modules/MEI.mensural.xml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/source/modules/MEI.mensural.xml b/source/modules/MEI.mensural.xml
index 1fdab8ed1..f1c42cfaf 100644
--- a/source/modules/MEI.mensural.xml
+++ b/source/modules/MEI.mensural.xml
@@ -268,6 +268,28 @@
   <classSpec ident="att.note.log.mensural" module="MEI.mensural" type="atts">
     <desc>Logical domain attributes in the Mensural repertoire.</desc>
   </classSpec>
+  <classSpec ident="att.plica" module="MEI.mensural" type="atts">
+    <desc>Attributes that describe the properties of a plica stem in the mensural repertoire.</desc>
+    <attList>
+      <attDef ident="dir" usage="opt">
+        <desc>Plica's direction.</desc>
+        <valList type="closed">
+          <valItem ident="down">
+            <desc>Plica stem pointing down.</desc>
+          </valItem>
+          <valItem ident="up">
+            <desc>Plica stem pointing up.</desc>
+          </valItem>
+        </valList>
+      </attDef>
+      <attDef ident="len" usage="opt">
+        <desc>Records the length of plica stem.</desc>
+        <datatype>
+          <rng:data type="positiveInteger"/>
+        </datatype>
+      </attDef>
+    </attList>
+  </classSpec>
   <classSpec ident="att.proport.log" module="MEI.mensural" type="atts">
     <desc>Logical domain attributes. These attributes describe augmentation or diminution of the
       normal value of the notes in mensural notation as a ratio.</desc>
@@ -461,6 +483,14 @@
         example, one slash is added for what we now call 'alla breve'.</p>
     </remarks>
   </elementSpec>
+  <elementSpec ident="plica" module="MEI.mensural">
+    <desc>plica</desc>
+    <classes>
+      <memberOf key="att.common"/>
+      <memberOf key="att.plica"/>
+      <memberOf key="model.noteModifierLike"/>
+    </classes>
+  </elementSpec>
   <elementSpec ident="proport" module="MEI.mensural">
     <desc>(proportion) – Description of note duration as arithmetic ratio.</desc>
     <classes>

From 04936e882a2b0451a348f0c629719d573a5d3da4 Mon Sep 17 00:00:00 2001
From: martha-thomae <thomaemartha@gmail.com>
Date: Fri, 9 Oct 2020 13:30:01 -0400
Subject: [PATCH 2/7] Fix: plica as child of layer This was done by removing
 the 'model.noteModifierLike' reference from the classes of the 'plica'
 element (which allowed plica to be both a child of note and layer) and adding
 it to the content model of the 'note' element instead. Other changes included
 in this commit are: - Add attribute classes for logical-, analytical-,
 gestural-, and visual-domain attributes of plica (rather than just one
 general 'att.plica' class). - Move the attributes 'dir' and 'len' into the
 'att.plica.vis' class for visual-domain plica-related attributes. - Within
 the plica element, add references to 'att.plica.log', 'att.plica.vis',
 'att.plica.anl', and 'att.plica.ges' plica-related attribute classes, and to
 the 'att.facsimile' class (for the 'facs' attribute).

---
 source/modules/MEI.mensural.xml | 22 +++++++++++++++++-----
 source/modules/MEI.shared.xml   |  1 +
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/source/modules/MEI.mensural.xml b/source/modules/MEI.mensural.xml
index f1c42cfaf..2dc345976 100644
--- a/source/modules/MEI.mensural.xml
+++ b/source/modules/MEI.mensural.xml
@@ -268,8 +268,17 @@
   <classSpec ident="att.note.log.mensural" module="MEI.mensural" type="atts">
     <desc>Logical domain attributes in the Mensural repertoire.</desc>
   </classSpec>
-  <classSpec ident="att.plica" module="MEI.mensural" type="atts">
-    <desc>Attributes that describe the properties of a plica stem in the mensural repertoire.</desc>
+  <classSpec ident="att.plica.anl" module="MEI.mensural" type="atts">
+    <desc>Analytical domain attributes that describe the properties of a plica in the mensural repertoire.</desc>
+  </classSpec>
+  <classSpec ident="att.plica.ges" module="MEI.mensural" type="atts">
+    <desc>Gestural domain attributes that describe the properties of a plica in the mensural repertoire.</desc>
+  </classSpec>
+  <classSpec ident="att.plica.log" module="MEI.mensural" type="atts">
+    <desc>Logical domain attributes that describe the properties of a plica in the mensural repertoire.</desc>
+  </classSpec>
+  <classSpec ident="att.plica.vis" module="MEI.mensural" type="atts">
+    <desc>Visual domain attributes that describe the properties of a plica stem in the mensural repertoire.</desc>
     <attList>
       <attDef ident="dir" usage="opt">
         <desc>Plica's direction.</desc>
@@ -484,11 +493,14 @@
     </remarks>
   </elementSpec>
   <elementSpec ident="plica" module="MEI.mensural">
-    <desc>plica</desc>
+    <desc>Plica</desc>
     <classes>
       <memberOf key="att.common"/>
-      <memberOf key="att.plica"/>
-      <memberOf key="model.noteModifierLike"/>
+      <memberOf key="att.fasimile"/>
+      <memberOf key="att.plica.log"/>
+      <memberOf key="att.plica.vis"/>
+      <memberOf key="att.plica.ges"/>
+      <memberOf key="att.plica.anl"/>
     </classes>
   </elementSpec>
   <elementSpec ident="proport" module="MEI.mensural">
diff --git a/source/modules/MEI.shared.xml b/source/modules/MEI.shared.xml
index d14218a2a..04a8c3cf4 100644
--- a/source/modules/MEI.shared.xml
+++ b/source/modules/MEI.shared.xml
@@ -6487,6 +6487,7 @@
           <rng:ref name="model.appLike"/>
           <rng:ref name="model.editLike"/>
           <rng:ref name="model.transcriptionLike"/>
+          <rng:ref name="plica"/>
         </rng:choice>
       </rng:zeroOrMore>
     </content>

From 064fe3470061ab890c6668ea67015f26d1c57d09 Mon Sep 17 00:00:00 2001
From: martha-thomae <thomaemartha@gmail.com>
Date: Fri, 9 Oct 2020 14:50:57 -0400
Subject: [PATCH 3/7] Modify stem and plica - Change the
 'att.STEMPROPERTIES.mensural' class name to 'att.stem.vis', and add empty
 classes for the other three domains (att.stem.log, att.stem.ges, and
 att.stem.anl). Then, copy the definitions of 'att.stem.vis' into
 'att.plica.vis' for the attributes related to stem direction and length. This
 implied that the name of the plica attribute for encoding the length of its
 stem was changed to 'length' (rather than 'len'). - Change the value of
 'length' in the stem element to encode only positive numbers (since there is
 already a 'dir' attribute for indicating direction). - Modify the stem
 element in a similar way as we did for 'plica' in the previous commit: remove
 the 'model.noteModifierLike' from its classes (this was causing the stem to
 be a valid child of layer) and instead add stem to the content model of note,
 add attribute classes for the four domains, and add 'att.facsimile'.

---
 source/modules/MEI.mensural.xml | 41 +++++++++++++++++++--------------
 source/modules/MEI.shared.xml   |  1 +
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/source/modules/MEI.mensural.xml b/source/modules/MEI.mensural.xml
index 2dc345976..896e71265 100644
--- a/source/modules/MEI.mensural.xml
+++ b/source/modules/MEI.mensural.xml
@@ -281,18 +281,13 @@
     <desc>Visual domain attributes that describe the properties of a plica stem in the mensural repertoire.</desc>
     <attList>
       <attDef ident="dir" usage="opt">
-        <desc>Plica's direction.</desc>
-        <valList type="closed">
-          <valItem ident="down">
-            <desc>Plica stem pointing down.</desc>
-          </valItem>
-          <valItem ident="up">
-            <desc>Plica stem pointing up.</desc>
-          </valItem>
-        </valList>
+        <desc>Describes the direction of a stem.</desc>
+        <datatype>
+          <rng:ref name="data.STEMDIRECTION.basic"/>
+        </datatype>
       </attDef>
-      <attDef ident="len" usage="opt">
-        <desc>Records the length of plica stem.</desc>
+      <attDef ident="length" usage="opt">
+        <desc>Encodes the stem length.</desc>
         <datatype>
           <rng:data type="positiveInteger"/>
         </datatype>
@@ -349,8 +344,17 @@
       <memberOf key="att.mensural.vis"/>
     </classes>
   </classSpec>
-  <classSpec ident="att.STEMPROPERTIES.mensural" module="MEI.mensural" type="atts">
-    <desc>Attributes that describe the properties of stems in the mensural repertoire.</desc>
+  <classSpec ident="att.stem.anl" module="MEI.mensural" type="atts">
+    <desc>Analytical domain attributes that describe the properties of a stem in the mensural repertoire.</desc>
+  </classSpec>
+  <classSpec ident="att.stem.ges" module="MEI.mensural" type="atts">
+    <desc>Gestural domain attributes that describe the properties of a stem in the mensural repertoire.</desc>
+  </classSpec>
+  <classSpec ident="att.stem.log" module="MEI.mensural" type="atts">
+    <desc>Logical domain attributes that describe the properties of a stem in the mensural repertoire.</desc>
+  </classSpec>
+  <classSpec ident="att.stem.vis" module="MEI.mensural" type="atts">
+    <desc>Visual domain attributes that describe the properties of a stem in the mensural repertoire.</desc>
     <classes>
         <memberOf key="att.xy"/>
     </classes>
@@ -364,7 +368,7 @@
       <attDef ident="length" usage="opt">
         <desc>Encodes the stem length.</desc>
         <datatype>
-          <rng:ref name="data.MEASUREMENTABS"/>
+          <rng:data type="positiveInteger"/>
         </datatype>
       </attDef>
       <attDef ident="form" usage="opt">
@@ -496,7 +500,7 @@
     <desc>Plica</desc>
     <classes>
       <memberOf key="att.common"/>
-      <memberOf key="att.fasimile"/>
+      <memberOf key="att.facsimile"/>
       <memberOf key="att.plica.log"/>
       <memberOf key="att.plica.vis"/>
       <memberOf key="att.plica.ges"/>
@@ -529,8 +533,11 @@
     <desc>A stem element.</desc>
     <classes>
       <memberOf key="att.common"/>
-      <memberOf key="att.STEMPROPERTIES.mensural"/>
-      <memberOf key="model.noteModifierLike"/>
+      <memberOf key="att.facsimile"/>
+      <memberOf key="att.stem.log"/>
+      <memberOf key="att.stem.vis"/>
+      <memberOf key="att.stem.ges"/>
+      <memberOf key="att.stem.anl"/>
     </classes>
     <content>
       <rng:empty/>
diff --git a/source/modules/MEI.shared.xml b/source/modules/MEI.shared.xml
index 04a8c3cf4..e17e68f35 100644
--- a/source/modules/MEI.shared.xml
+++ b/source/modules/MEI.shared.xml
@@ -6488,6 +6488,7 @@
           <rng:ref name="model.editLike"/>
           <rng:ref name="model.transcriptionLike"/>
           <rng:ref name="plica"/>
+          <rng:ref name="stem"/>
         </rng:choice>
       </rng:zeroOrMore>
     </content>

From 9c743d46bab293a2bc858777e8aad5a700096fb6 Mon Sep 17 00:00:00 2001
From: martha-thomae <thomaemartha@gmail.com>
Date: Tue, 20 Oct 2020 23:05:53 -0400
Subject: [PATCH 4/7] Fix attribute name (len) and data type. - The 'len'
 attribute is used in all other cases, so 'att.plica.vis' and 'att.stem.vis'
 are using this attribute name too. - Change back the data type of this 'len'
 attribute to data.MEASUREMENTABS.

---
 source/modules/MEI.mensural.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/modules/MEI.mensural.xml b/source/modules/MEI.mensural.xml
index 896e71265..a761a8695 100644
--- a/source/modules/MEI.mensural.xml
+++ b/source/modules/MEI.mensural.xml
@@ -286,10 +286,10 @@
           <rng:ref name="data.STEMDIRECTION.basic"/>
         </datatype>
       </attDef>
-      <attDef ident="length" usage="opt">
+      <attDef ident="len" usage="opt">
         <desc>Encodes the stem length.</desc>
         <datatype>
-          <rng:data type="positiveInteger"/>
+          <rng:ref name="data.MEASUREMENTABS"/>
         </datatype>
       </attDef>
     </attList>
@@ -365,10 +365,10 @@
           <rng:ref name="data.STEMPOSITION"/>
         </datatype>
       </attDef>
-      <attDef ident="length" usage="opt">
+      <attDef ident="len" usage="opt">
         <desc>Encodes the stem length.</desc>
         <datatype>
-          <rng:data type="positiveInteger"/>
+          <rng:ref name="data.MEASUREMENTABS"/>
         </datatype>
       </attDef>
       <attDef ident="form" usage="opt">

From b2844ecf4fe947c03a21b0981a4efca0a138cf9c Mon Sep 17 00:00:00 2001
From: martha-thomae <thomaemartha@gmail.com>
Date: Tue, 20 Oct 2020 23:08:25 -0400
Subject: [PATCH 5/7] Add schematron rule for allowing only one plica per note

---
 source/modules/MEI.mensural.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/source/modules/MEI.mensural.xml b/source/modules/MEI.mensural.xml
index a761a8695..164ebcb4f 100644
--- a/source/modules/MEI.mensural.xml
+++ b/source/modules/MEI.mensural.xml
@@ -506,6 +506,13 @@
       <memberOf key="att.plica.ges"/>
       <memberOf key="att.plica.anl"/>
     </classes>
+    <constraintSpec ident="Check_plica" scheme="isoschematron">
+      <constraint>
+        <sch:rule context="mei:plica">
+          <sch:assert test="count(../mei:plica) &lt;= 1)">Only one plica is allowed.</sch:assert>
+        </sch:rule>
+      </constraint>
+    </constraintSpec>
   </elementSpec>
   <elementSpec ident="proport" module="MEI.mensural">
     <desc>(proportion) – Description of note duration as arithmetic ratio.</desc>

From c7a59b902ddee3e2904cac499d222dc431820832 Mon Sep 17 00:00:00 2001
From: martha-thomae <thomaemartha@gmail.com>
Date: Tue, 20 Oct 2020 23:17:11 -0400
Subject: [PATCH 6/7] Add color attribute to 'att.stem.vis' class

---
 source/modules/MEI.mensural.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/modules/MEI.mensural.xml b/source/modules/MEI.mensural.xml
index 164ebcb4f..69a001108 100644
--- a/source/modules/MEI.mensural.xml
+++ b/source/modules/MEI.mensural.xml
@@ -357,6 +357,7 @@
     <desc>Visual domain attributes that describe the properties of a stem in the mensural repertoire.</desc>
     <classes>
         <memberOf key="att.xy"/>
+        <memberOf key="att.color"/>
     </classes>
     <attList>
       <attDef ident="pos" usage="opt">

From c1d1d5d811031d39a4e78ecc5a574f2c21b06fa4 Mon Sep 17 00:00:00 2001
From: martha-thomae <thomaemartha@gmail.com>
Date: Wed, 21 Oct 2020 00:39:20 -0400
Subject: [PATCH 7/7] Fix typo in schematron rule

---
 source/modules/MEI.mensural.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/modules/MEI.mensural.xml b/source/modules/MEI.mensural.xml
index 69a001108..85f7788f9 100644
--- a/source/modules/MEI.mensural.xml
+++ b/source/modules/MEI.mensural.xml
@@ -510,7 +510,7 @@
     <constraintSpec ident="Check_plica" scheme="isoschematron">
       <constraint>
         <sch:rule context="mei:plica">
-          <sch:assert test="count(../mei:plica) &lt;= 1)">Only one plica is allowed.</sch:assert>
+          <sch:assert test="count(../mei:plica) &lt;= 1">Only one plica is allowed.</sch:assert>
         </sch:rule>
       </constraint>
     </constraintSpec>