Add plica element & fix stem element #722
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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).
- 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'.
- 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.
kepper
added
the
Status: Ready To Merge
|
thanks @martha-thomae |
musicEnfanthen
removed
the
Status: Ready To Merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
This PR adds support for a
<plica>element to be used as child of<note>. The plica element has two attributes (which are shared with the already existing<stem>element):@dirand@len. A<note>element can have only one child<plica>.This PR also contains some corrections regarding the
<stem>element and its attributes:<memberOf key="model.noteModifierLike"/>from the<stem>element classes since, in addition to allow<stem>as a child of<note>(which was the intention), it also allowed<stem>to be a direct child of<layer>. Instead, I added<stem>directly into the content of<note>.@lengthattribute of<stem>by@len(to be more consistent with MEI).@colorattribute.For both stem and plica, added corresponding
anl,log,ges, andvisattribute classes.Acknowledgement:
Thanks to @pe-ro for helping me getting this PR ready. He noticed issues with it that are fixed now.