Merge pull request #850 from MarcSabatella/25454-unison-voices

fix #25454: unisons should share noteheads despite duration difference
musescore · Apr 19, 2014 · 9296c7e · 9296c7e
2 parents 7e3ba1b + a13b0d9
commit 9296c7e
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 4 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -248,6 +248,8 @@ void Score::layoutChords1(Segment* segment, int staffIdx)
                   Note* p = overlapNotes[0];
                   for (int i = 0, count = overlapNotes.size(); i < count; ++i) {
                         Note* n = overlapNotes[i];
+                        NoteHeadType nHeadType;
+                        NoteHeadType pHeadType;
                         if (n->mirror()) {
                               if (separation < 0) {
                                     // don't try to share heads if there is any mirroring
@@ -263,8 +265,10 @@ void Score::layoutChords1(Segment* segment, int staffIdx)
                                     // unison
                                     conflictUnison = true;
                                     matchPending = false;
-                                    if (n->headGroup() != p->headGroup() || n->headType() != p->headType() || n->chord()->durationType() != p->chord()->durationType()
-                                        || n->tpc() != p->tpc() || n->mirror() || p->mirror())
+                                    nHeadType = (n->headType() == NoteHeadType::HEAD_AUTO) ? n->chord()->durationType().headType() : n->headType();
+                                    pHeadType = (p->headType() == NoteHeadType::HEAD_AUTO) ? p->chord()->durationType().headType() : p->headType();
+                                    if (n->headGroup() != p->headGroup() || nHeadType != pHeadType || n->chord()->dots() != p->chord()->dots()
+                                        || n->tpc() != p->tpc() || !n->chord()->stem() || !p->chord()->stem() || n->mirror() || p->mirror())
                                           shareHeads = false;
                                     break;
                               case 1:

diff --git a/vtest/chord-layout-10-ref.png b/vtest/chord-layout-10-ref.png
diff --git a/vtest/chord-layout-10.mscz b/vtest/chord-layout-10.mscz
diff --git a/vtest/chord-layout-7-ref.png b/vtest/chord-layout-7-ref.png
diff --git a/vtest/chord-layout-9-ref.png b/vtest/chord-layout-9-ref.png
diff --git a/vtest/gen b/vtest/gen
@@ -23,7 +23,7 @@ else
        emmentaler-8 bravura-8 emmentaler-9 bravura-9 emmentaler-10 bravura-10\
        emmentaler-11 bravura-11 frametext ottava slurs-1\
        chord-layout-1 chord-layout-2 chord-layout-3 chord-layout-4 chord-layout-5\
-       chord-layout-6 chord-layout-7 chord-layout-8 chord-layout-9\
+       chord-layout-6 chord-layout-7 chord-layout-8 chord-layout-9 chord-layout-10\
        accidental-1 accidental-2 accidental-3 accidental-4 accidental-5 accidental-6\
        tie-1 grace-1"
 fi

diff --git a/vtest/gen.bat b/vtest/gen.bat
@@ -10,7 +10,7 @@ set SRC=mmrest-1,bravura-mmrest,mmrest-2,mmrest-4,mmrest-5,mmrest-6,mmrest-7,mmr
  emmentaler-6,bravura-6,emmentaler-7,bravura-7, ^
  emmentaler-8,bravura-8,emmentaler-9,bravura-9,emmentaler-10,bravura-10, ^
  chord-layout-1,chord-layout-2,chord-layout-3,chord-layout-4,chord-layout-5, ^
- chord-layout-6,chord-layout-7,chord-layout-8,chord-layout-9, ^
+ chord-layout-6,chord-layout-7,chord-layout-8,chord-layout-9,chord-layout-10, ^
  accidental-1,accidental-2,accidental-3,accidental-4,accidental-5,accidental-6, ^
  tie-1,grace-1