LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #275706 Place articulations at stem side if voices exists, else at note head but strong accents above staff.

Browse source
This commit is contained in:
Tobias Kretschmar 2018-11-15 23:08:17 +01:00
parent db594ae9a5
commit 52ba935457
6 changed files with 30 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libmscore/articulation.cpp
View file

@ -84,13 +84,12 @@ int Articulation::subtype() const
void Articulation::setUp(bool val)
{
if (val != _up) {
QString s = Sym::id2name(_symId);
if (s.endsWith(_up ? "Above" : "Below")) {
QString s2 = s.left(s.size() - 5) + (val ? "Above" : "Below");
_symId = Sym::name2id(s2);
}
_up = val;
_up = val;
bool dup = _direction == Direction::AUTO ? val : _direction == Direction::UP;
QString s = Sym::id2name(_symId);
if (s.endsWith(!dup ? "Above" : "Below")) {
QString s2 = s.left(s.size() - 5) + (dup ? "Above" : "Below");
_symId = Sym::name2id(s2);
}
}
@ -601,6 +600,3 @@ void Articulation::doAutoplace()
}
}

31
libmscore/chord.cpp
View file

@ -3245,28 +3245,21 @@ void Chord::layoutArticulations()
//
for (Articulation* a : _articulations) {
if (a->direction() != Direction::AUTO)
a->setUp(a->direction() == Direction::UP);
else {
if (a->anchor() == ArticulationAnchor::CHORD)
a->setUp(!up());
else
a->setUp(a->anchor() == ArticulationAnchor::TOP_STAFF || a->anchor() == ArticulationAnchor::TOP_CHORD);
if (a->anchor() == ArticulationAnchor::CHORD) {
if (measure()->hasVoices(a->staffIdx()))
a->setUp(up()); // if there are voices place articulation at stem
else if (a->symId() >= SymId::articMarcatoAbove && a->symId() <= SymId::articMarcatoTenutoBelow)
a->setUp(true); // Gould, p. 117: strong accents above staff
else
a->setUp(!up()); // place articulation at note head
}
else
a->setUp(a->anchor() == ArticulationAnchor::TOP_STAFF || a->anchor() == ArticulationAnchor::TOP_CHORD);
if (!a->layoutCloseToNote())
continue;
ArticulationAnchor aa = a->anchor();
if (aa != ArticulationAnchor::CHORD && aa != ArticulationAnchor::TOP_CHORD && aa != ArticulationAnchor::BOTTOM_CHORD)
continue;
bool bottom; // true: articulation is below chord; false: articulation is above chord
// if there area voices, articulation is on stem side
// otherwise, look at specific anchor type (and at chord up/down if necessary)
if ((aa == ArticulationAnchor::CHORD) && measure()->hasVoices(a->staffIdx()))
bottom = !up();
else
bottom = (aa == ArticulationAnchor::BOTTOM_CHORD) || (aa == ArticulationAnchor::CHORD && up());
a->setUp(!bottom);
bool bottom = !a->up(); // true: articulation is below chord; false: articulation is above chord
a->layout();
bool headSide = bottom == up();

12
mtest/libmscore/compat206/articulations-double-ref.mscx
View file

@ -231,7 +231,7 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoStaccatoBelow</subtype>
<subtype>articMarcatoStaccatoAbove</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -282,7 +282,7 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoTenutoBelow</subtype>
<subtype>articMarcatoTenutoAbove</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -536,7 +536,7 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoTenutoBelow</subtype>
<subtype>articMarcatoTenutoAbove</subtype>
<linkedMain/>
<color r="255" g="0" b="0" a="255"/>
</Articulation>
@ -2000,7 +2000,7 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoStaccatoBelow</subtype>
<subtype>articMarcatoStaccatoAbove</subtype>
<linked>
</linked>
</Articulation>
@ -2058,7 +2058,7 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoTenutoBelow</subtype>
<subtype>articMarcatoTenutoAbove</subtype>
<linked>
</linked>
</Articulation>
@ -2360,7 +2360,7 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoTenutoBelow</subtype>
<subtype>articMarcatoTenutoAbove</subtype>
<linked>
</linked>
<color r="255" g="0" b="0" a="255"/>

2
mtest/libmscore/compat206/articulations-ref.mscx
View file

@ -563,7 +563,7 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoBelow</subtype>
<subtype>articMarcatoAbove</subtype>
</Articulation>
<Note>
<pitch>60</pitch>

4
mtest/libmscore/implode_explode/undoExplode01-ref.mscx
View file

@ -640,7 +640,7 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoBelow</subtype>
<subtype>articMarcatoAbove</subtype>
</Articulation>
<Note>
<pitch>69</pitch>
@ -820,7 +820,7 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoBelow</subtype>
<subtype>articMarcatoAbove</subtype>
</Articulation>
<Note>
<pitch>65</pitch>

6
mtest/libmscore/parts/voices-ref.mscx
View file

@ -306,7 +306,7 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articAccentAbove</subtype>
<subtype>articAccentBelow</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -722,7 +722,7 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articAccentAbove</subtype>
<subtype>articAccentBelow</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -1236,7 +1236,7 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articAccentBelow</subtype>
<subtype>articAccentAbove</subtype>
<linked>
<location>
<voices>1</voices>