From 9279cab31f59beb2823f31a225aeac61e1bc1901 Mon Sep 17 00:00:00 2001 From: franz kelnreiter Date: Thu, 11 Apr 2019 14:40:34 +0200 Subject: [PATCH 1/3] extended att.stems class with @stem.sameas - adds support for notes that share one stem but are located in different layers - neded in orchestral scores - fixes music-encoding#551 --- CONTRIBUTING.md | 2 +- source/modules/MEI.shared.xml | 21 +++++++++++++ tests/mei-CMN/stem-sameas-testing.mei | 44 +++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 tests/mei-CMN/stem-sameas-testing.mei diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9ab52c101..fa8608ae1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,7 +62,7 @@ Do **not** simply reference another issue or pull request by number in the summa The details of the commit go in the body. Specifically, the body should include the motivation for the change. For commits that fix bugs you should contrast behavior before the commit with behavior after the commit. -### Message Summary +### Message Footer If the commit closes an issue by fixing the bug, implementing a feature, or rendering it obsolete, or if it references an issue without closing it, that should be indicated in the message footer. diff --git a/source/modules/MEI.shared.xml b/source/modules/MEI.shared.xml index 51768791d..79fcde219 100644 --- a/source/modules/MEI.shared.xml +++ b/source/modules/MEI.shared.xml @@ -3115,6 +3115,27 @@ + + Points to a note element in a different layer whose stem is shared. + The linked notes should be rendered like a chord though they are part of different layers. + + + + + + + + + @stem.sameas attribute + should have content. + The value in @stem.sameas should + correspond to the @xml:id attribute of the linked note + element of a different layer. + + + + Determines whether a stem should be displayed. diff --git a/tests/mei-CMN/stem-sameas-testing.mei b/tests/mei-CMN/stem-sameas-testing.mei new file mode 100644 index 000000000..b5778aedd --- /dev/null +++ b/tests/mei-CMN/stem-sameas-testing.mei @@ -0,0 +1,44 @@ + + + + + + + + stem.sameas example + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + From e05e14e7cc151dd35b112ac56acf4bcd318c3545 Mon Sep 17 00:00:00 2001 From: franz kelnreiter Date: Thu, 11 Apr 2019 15:43:54 +0200 Subject: [PATCH 2/3] added @dur assert for @stem.sameas - notes that are linked through stem.sameas should have equal @dur values - updated testing file --- source/modules/MEI.shared.xml | 4 ++++ tests/mei-CMN/stem-sameas-testing.mei | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/modules/MEI.shared.xml b/source/modules/MEI.shared.xml index 79fcde219..e876e3009 100644 --- a/source/modules/MEI.shared.xml +++ b/source/modules/MEI.shared.xml @@ -3126,12 +3126,16 @@ + @stem.sameas attribute should have content. The value in @stem.sameas should correspond to the @xml:id attribute of the linked note element of a different layer. + The linked notes by @stem.sameas should have the same @dur values. + diff --git a/tests/mei-CMN/stem-sameas-testing.mei b/tests/mei-CMN/stem-sameas-testing.mei index b5778aedd..5cb9a163e 100644 --- a/tests/mei-CMN/stem-sameas-testing.mei +++ b/tests/mei-CMN/stem-sameas-testing.mei @@ -29,9 +29,9 @@ - + - + From 07ffeb522251e0a77f3e7a2b0044ef4dc3935a93 Mon Sep 17 00:00:00 2001 From: franz kelnreiter Date: Thu, 18 Apr 2019 10:40:50 +0200 Subject: [PATCH 3/3] Update MEI.shared.xml adjusted indenting --- source/modules/MEI.shared.xml | 51 ++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/source/modules/MEI.shared.xml b/source/modules/MEI.shared.xml index e876e3009..7e140a128 100644 --- a/source/modules/MEI.shared.xml +++ b/source/modules/MEI.shared.xml @@ -3115,31 +3115,32 @@ - - Points to a note element in a different layer whose stem is shared. - The linked notes should be rendered like a chord though they are part of different layers. - - - - - - - - - - @stem.sameas attribute - should have content. - The value in @stem.sameas should - correspond to the @xml:id attribute of the linked note - element of a different layer. - The linked notes by @stem.sameas should have the same @dur values. - - - - - + + Points to a note element in a different layer whose stem is shared. + The linked notes should be rendered like a chord though they are part of different layers. + + + + + + + + + + @stem.sameas attribute + should have content. + + The value in @stem.sameas should correspond to the @xml:id attribute of the linked note + element of a different layer. + + The linked notes by @stem.sameas should have the same @dur values. + + + + + Determines whether a stem should be displayed.