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

Merge pull request #12294 from asattely/beam-stem-shortening

Browse source 
Allow stems on either side of beam to shorten, reduce middle stems by less
This commit is contained in:
RomanPudashkin 2022-07-12 11:56:22 +03:00 committed by GitHub
commit 0042a4d192
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 518 additions and 399 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

189
src/engraving/libmscore/beam.cpp
View file

@ -490,7 +490,8 @@ void Beam::layout()
int Beam::getMiddleStaffLine(ChordRest* startChord, ChordRest* endChord, int staffLines) const
{
bool useWideBeams = score()->styleB(Sid::useWideBeams);
int startMiddleLine = Chord::minStaffOverlap(_up, staffLines, startChord->beams(), false, _beamSpacing / 4.0, useWideBeams, !_isGrace);
bool isFullSize = RealIsEqual(_mag, 1.0);
int startMiddleLine = Chord::minStaffOverlap(_up, staffLines, startChord->beams(), false, _beamSpacing / 4.0, useWideBeams, isFullSize);
int endMiddleLine = Chord::minStaffOverlap(_up, staffLines, endChord->beams(), false, _beamSpacing / 4.0, useWideBeams, !_isGrace);
// offset middle line by 1 or -1 since the anchor is at the middle of the beam,
@ -588,19 +589,19 @@ int Beam::getMaxSlope() const
beamWidth /= spatium();
int maxSlope = _maxSlopes.back();
if (beamWidth < 3.0) {
maxSlope = _maxSlopes[0];
} else if (beamWidth < 5.0) {
maxSlope = _maxSlopes[1];
} else if (beamWidth < 8.0) {
} else if (beamWidth < 5.0) {
maxSlope = _maxSlopes[2];
} else if (beamWidth < 13.0) {
} else if (beamWidth < 8.0) {
maxSlope = _maxSlopes[3];
} else if (beamWidth < 21.0) {
} else if (beamWidth < 13.0) {
maxSlope = _maxSlopes[4];
} else if (beamWidth < 34.0) {
} else if (beamWidth < 21.0) {
maxSlope = _maxSlopes[5];
} else {
} else if (beamWidth < 34.0) {
maxSlope = _maxSlopes[6];
} else {
maxSlope = _maxSlopes[7];
}
return maxSlope;
@ -1052,51 +1053,103 @@ void Beam::offsetBeamToRemoveCollisions(const std::vector<ChordRest*> chordRests
// stems in the middle of the beam can be shortened to a minimum of.....
// 1 beam 2 beams etc
constexpr double middleStemMinLength[5] = { 2.75, 3.25, 3.75, 4.5, 5.25 };
for (ChordRest* chordRest : chordRests) {
if (!chordRest->isChord()) {
if (!chordRest->isChord() || chordRest == _elements.back() || chordRest == _elements.front()) {
continue;
}
Chord* chord = toChord(chordRest);
PointF anchor = chordBeamAnchor(chord, ChordBeamAnchorType::Middle) - pagePos();
double reduction = 0;
if (chordRest != _elements.back() && chordRest != _elements.front()) {
double minLength = chord->beams() < 6
? middleStemMinLength[chord->beams() - 1]
: middleStemMinLength[4] + ((chord->beams() - 5) * 0.75);
minLength *= spatium();
reduction = (chord->stem() ? chord->stem()->length() : chord->defaultStemLength()) - minLength;
int slope = abs(dictator - pointer);
double reduction = 0.0;
if (!isFlat) {
if (slope <= 3) {
reduction = 0.25;
} else if (slope <= 6) {
reduction = 0.5;
} else { // slope > 6
reduction = 0.75;
}
}
// avoid division by zero for zero-length beams (can exist as a pre-layout state used
// for horizontal spacing computations)
const double proportionAlongX = (anchor.x() - startX) / (endX - startX);
if (endX != startX) {
// avoid division by zero for zero-length beams (can exist as a pre-layout state used
// for horizontal spacing computations)
double proportionAlongX = (anchor.x() - startX) / (endX - startX);
while (true) {
double desiredY = proportionAlongX * (endY - startY) + startY;
bool beamClearsAnchor = (_up && RealIsEqualOrLess(desiredY, anchor.y() + reduction))
|| (!_up && RealIsEqualOrMore(desiredY, anchor.y() - reduction));
if (beamClearsAnchor) {
break;
while (true) {
double desiredY = proportionAlongX * (endY - startY) + startY;
bool beamClearsAnchor = (_up && RealIsEqualOrLess(desiredY, anchor.y() + reduction))
|| (!_up && RealIsEqualOrMore(desiredY, anchor.y() - reduction));
if (beamClearsAnchor) {
break;
}
if (isFlat) {
dictator += _up ? -1 : 1;
pointer += _up ? -1 : 1;
} else if (std::abs(dictator - pointer) == 1) {
dictator += _up ? -1 : 1;
} else {
pointer += _up ? -1 : 1;
}
startY = (isStartDictator ? dictator : pointer) * spatium() / 4 + tolerance;
endY = (isStartDictator ? pointer : dictator) * spatium() / 4 + tolerance;
}
if (isFlat) {
dictator += _up ? -1 : 1;
pointer += _up ? -1 : 1;
} else if (std::abs(dictator - pointer) == 1) {
dictator += _up ? -1 : 1;
} else {
pointer += _up ? -1 : 1;
}
startY = (isStartDictator ? dictator : pointer) * spatium() / 4 + tolerance;
endY = (isStartDictator ? pointer : dictator) * spatium() / 4 + tolerance;
}
}
}
void Beam::offsetBeamWithAnchorShortening(std::vector<ChordRest*> chordRests, int& dictator, int& pointer, int beamCount, int staffLines,
bool isStartDictator, int stemLengthDictator, int stemLengthPointer) const
{
// min stem lengths according to how many beams there are (starting with 1)
static const int minStemLengths[] = { 11, 13, 15, 18, 21 };
const int middleLine = getMiddleStaffLine(chordRests.front(), chordRests.back(), staffLines);
int maxDictatorReduce = stemLengthDictator - minStemLengths[(isStartDictator ? chordRests.back() : chordRests.front())->beams() - 1];
maxDictatorReduce = std::min(abs(dictator - middleLine), maxDictatorReduce);
bool isFlat = dictator == pointer;
bool isAscending = chordRests.front()->line() > chordRests.back()->line();
int towardBeam = _up ? -1 : 1;
int newDictator = dictator;
int newPointer = pointer;
int reduce = 0;
while (!isValidBeamPosition(newDictator, isStartDictator, isAscending, isFlat, staffLines, beamCount)) {
if (++reduce > maxDictatorReduce) {
// we can't shorten this stem at all. bring it back to default and start extending
newDictator = dictator;
newPointer = pointer;
while (!isValidBeamPosition(newDictator, isStartDictator, isAscending, isFlat, staffLines, beamCount)) {
newDictator += towardBeam;
newPointer += towardBeam;
}
break;
}
newDictator += -towardBeam;
newPointer += -towardBeam;
}
// newDictator is guaranteed either valid, or ==dictator
// first, constrain pointer to valid position
newPointer = _up ? std::min(newPointer, middleLine) : std::max(newPointer, middleLine);
// walk it back beamwards until we get a position that satisfies both pointer and dictator
while (!isValidBeamPosition(newDictator, isStartDictator, isAscending, isFlat, staffLines, beamCount)
|| !isValidBeamPosition(newPointer, !isStartDictator, isAscending, isFlat, staffLines, beamCount)) {
if (isFlat) {
newDictator += towardBeam;
newPointer += towardBeam;
} else if (std::abs(newDictator - newPointer) == 1) {
newDictator += towardBeam;
} else {
newPointer += towardBeam;
}
}
dictator = newDictator;
pointer = newPointer;
}
void Beam::extendStem(Chord* chord, double addition)
{
PointF anchor = chordBeamAnchor(chord, ChordBeamAnchorType::Middle);
@ -1118,16 +1171,18 @@ void Beam::extendStem(Chord* chord, double addition)
}
}
bool Beam::isBeamInsideStaff(int yPos, int staffLines) const
bool Beam::isBeamInsideStaff(int yPos, int staffLines, bool isDictator) const
{
return yPos > -3 && yPos < staffLines * 4 - 1;
int aboveStaff = isDictator ? -3 : -2;
int belowStaff = (staffLines - 1) * 4 + (isDictator ? 3 : 2);
return yPos > aboveStaff && yPos < belowStaff;
}
int Beam::getOuterBeamPosOffset(int innerBeam, int beamCount, int staffLines) const
{
int spacing = (_up ? -_beamSpacing : _beamSpacing);
int offset = (beamCount - 1) * spacing;
while (offset != 0 && !isBeamInsideStaff(innerBeam + offset, staffLines)) {
while (offset != 0 && !isBeamInsideStaff(innerBeam + offset, staffLines, true)) {
offset -= spacing;
}
return offset;
@ -1136,13 +1191,15 @@ int Beam::getOuterBeamPosOffset(int innerBeam, int beamCount, int staffLines) co
bool Beam::isValidBeamPosition(int yPos, bool isStart, bool isAscending, bool isFlat, int staffLines, int beamCount) const
{
// outside the staff
if (!isBeamInsideStaff(yPos, staffLines)) {
bool isDictator = isFlat ? false : (isStart ? _up != isAscending : _up == isAscending);
if (!isBeamInsideStaff(yPos, staffLines, isDictator)) {
return true;
}
// removes modulo weirdness with negative numbers (i.e., right above staff)
yPos += 8;
// is floater (doesn't apply to 3+ beams)
if (beamCount < 3 && yPos % 4 == 2) {
// is floater
if (yPos % 4 == 2) {
return false;
}
if (isFlat) {
@ -1152,12 +1209,14 @@ bool Beam::isValidBeamPosition(int yPos, bool isStart, bool isAscending, bool is
if (yPos % 4 == 0) {
return true;
}
bool isSitting = yPos % 4 == 3;
if (isSitting) {
return !((isAscending && isStart) || (!isAscending && !isStart));
// is sitting
if (yPos % 4 == 3) {
// return true only if we're starting here and descending, or ascending and ending here
return isAscending != isStart;
}
// hanging
return !((!isAscending && isStart) || (isAscending && !isStart));
// is hanging
// return true only if we're starting here and ascending, or decending and ending here
return isAscending == isStart;
}
bool Beam::is64thBeamPositionException(int& yPos, int staffLines) const
@ -1239,14 +1298,14 @@ void Beam::setValidBeamPositions(int& dictator, int& pointer, int beamCount, int
}
}
void Beam::addMiddleLineSlant(int& dictator, int& pointer, int beamCount, int middleLine, int interval)
void Beam::addMiddleLineSlant(int& dictator, int& pointer, int beamCount, int middleLine, int interval, int desiredSlant)
{
if (interval == 0 || (beamCount > 2 && _beamSpacing != 4) || noSlope()) {
return;
}
bool isOnMiddleLine = pointer == middleLine && (std::abs(pointer - dictator) < 2);
if (isOnMiddleLine) {
if (interval == 1 || (beamCount == 2 && _beamSpacing != 4)) {
if (abs(desiredSlant) == 1 || interval == 1 || (beamCount == 2 && _beamSpacing != 4)) {
dictator = middleLine + (_up ? -1 : 1);
} else {
dictator = middleLine + (_up ? -2 : 2);
@ -1304,6 +1363,12 @@ void Beam::layout2(const std::vector<ChordRest*>& chordRests, SpannerSegmentType
Chord* endChord = toChord(chordRests.back());
_startAnchor = chordBeamAnchor(startChord, ChordBeamAnchorType::Start);
_endAnchor = chordBeamAnchor(endChord, ChordBeamAnchorType::End);
Note* startNote = _up ? startChord->downNote() : startChord->upNote();
Note* endNote = _up ? endChord->downNote() : endChord->upNote();
double startLength = startChord->defaultStemLength();
double endLength = endChord->defaultStemLength();
double startAnchorBase = _startAnchor.y() + (_up ? startLength : -startLength);
double endAnchorBase = _endAnchor.y() + (_up ? endLength : -endLength);
if (_isGrace) {
_beamDist *= score()->styleD(Sid::graceNoteMag);
@ -1553,22 +1618,38 @@ void Beam::layout2(const std::vector<ChordRest*>& chordRests, SpannerSegmentType
const int middleLine = getMiddleStaffLine(startChord, endChord, staffLines);
int slant = computeDesiredSlant(startNote, endNote, middleLine, dictator, pointer);
pointer = dictator + slant;
bool isFlat = slant == 0;
if (isFlat) {
dictator = _up ? std::min(pointer, dictator) : std::max(pointer, dictator);
pointer = dictator;
} else {
pointer = dictator + slant;
}
bool isAscending = startNote > endNote;
int beamCount = getBeamCount(chordRests);
int stemLengthStart = abs(round((startAnchorBase - _startAnchor.y()) / spatium() * 4));
int stemLengthEnd = abs(round((endAnchorBase - _endAnchor.y()) / spatium() * 4));
int stemLengthDictator = isStartDictator ? stemLengthStart : stemLengthEnd;
int stemLengthPointer = isStartDictator ? stemLengthEnd : stemLengthStart;
bool isSmall = mag() < 1.;
if (endAnchor.x() > startAnchor.x()) {
/* When beam layout is called before horizontal spacing (see LayoutMeasure::getNextMeasure() to
* know why) the x positions aren't yet determined and may be all zero, which would cause the
* following function to get stuck in a loop. The if() condition avoids that case. */
if (!isSmall) {
// Adjust anchor stems
offsetBeamWithAnchorShortening(chordRests, dictator, pointer, beamCount, staffLines, isStartDictator, stemLengthDictator,
stemLengthPointer);
}
// Adjust inner stems
offsetBeamToRemoveCollisions(chordRests, dictator, pointer, startAnchor.x(), endAnchor.x(), isFlat, isStartDictator);
}
if (!_tab) {
if (!_isGrace) {
setValidBeamPositions(dictator, pointer, beamCount, staffLines, isStartDictator, isFlat, isAscending);
}
addMiddleLineSlant(dictator, pointer, beamCount, middleLine, interval);
addMiddleLineSlant(dictator, pointer, beamCount, middleLine, interval, slant);
}
_startAnchor.setY(quarterSpace * (isStartDictator ? dictator : pointer) + pagePos().y());

8
src/engraving/libmscore/beam.h
View file

@ -98,14 +98,16 @@ class Beam final : public EngravingItem
int getBeamCount(std::vector<ChordRest*> chordRests) const;
void offsetBeamToRemoveCollisions(std::vector<ChordRest*> chordRests, int& dictator, int& pointer, const double startX,
const double endX, bool isFlat, bool isStartDictator) const;
bool isBeamInsideStaff(int yPos, int staffLines) const;
void offsetBeamWithAnchorShortening(std::vector<ChordRest*> chordRests, int& dictator, int& pointer, int beamCount, int staffLines,
bool isStartDictator, int stemLengthDictator, int stemLengthPointer) const;
bool isBeamInsideStaff(int yPos, int staffLines, bool isDictator) const;
int getOuterBeamPosOffset(int innerBeam, int beamCount, int staffLines) const;
bool isValidBeamPosition(int yPos, bool isStart, bool isAscending, bool isFlat, int staffLines, int beamCount) const;
bool is64thBeamPositionException(int& yPos, int staffLines) const;
int findValidBeamOffset(int outer, int beamCount, int staffLines, bool isStart, bool isAscending, bool isFlat) const;
void setValidBeamPositions(int& dictator, int& pointer, int beamCount, int staffLines, bool isStartDictator, bool isFlat,
bool isAscending);
void addMiddleLineSlant(int& dictator, int& pointer, int beamCount, int middleLine, int interval);
void addMiddleLineSlant(int& dictator, int& pointer, int beamCount, int middleLine, int interval, int desiredSlant);
void add8thSpaceSlant(mu::PointF& dictatorAnchor, int dictator, int pointer, int beamCount, int interval, int middleLine, bool Flat);
void extendStem(Chord* chord, double addition);
bool calcIsBeamletBefore(Chord* chord, int i, int level, bool isAfter32Break, bool isAfter64Break) const;
@ -233,7 +235,7 @@ public:
private:
void initBeamEditData(EditData& ed);
static constexpr std::array _maxSlopes = { 1, 2, 3, 4, 5, 6, 7 };
static constexpr std::array _maxSlopes = { 0, 1, 2, 3, 4, 5, 6, 7 };
};
} // namespace mu::engraving
#endif

54
src/engraving/libmscore/chord.cpp
View file

@ -1452,10 +1452,10 @@ int Chord::calcMinStemLength()
}
if (_beam) {
static const int minInnerStemLengths[4] = { 10, 9, 8, 7 };
int innerStemLength = minInnerStemLengths[std::min(beams(), 3)] * _relativeMag;
int innerStemLength = minInnerStemLengths[std::min(beams(), 3)];
int beamsHeight = beams() * (score()->styleB(Sid::useWideBeams) ? 4 : 3) - 1;
minStemLength = std::max(minStemLength, innerStemLength);
minStemLength += beamsHeight * _relativeMag;
minStemLength += beamsHeight;
}
return minStemLength;
}
@ -1503,7 +1503,7 @@ int Chord::maxReduction(int extensionOutsideStaff) const
// [extensionOutsideStaff][beamCount]
static const int maxReductions[4][5] = {
//1sp 1.5sp 2sp 2.5sp >=3sp -- extensionOutsideStaff
{ 0, 1, 2, 3, 4 }, // 0 beams
{ 1, 2, 3, 4, 4 }, // 0 beams
{ 0, 1, 2, 3, 3 }, // 1 beam
{ 0, 1, 1, 1, 1 }, // 2 beams
{ 0, 0, 0, 1, 1 }, // 3 beams
@ -1512,7 +1512,7 @@ int Chord::maxReduction(int extensionOutsideStaff) const
if (beamCount >= 4) {
return 0;
}
int extensionHalfSpaces = ceil(extensionOutsideStaff / 2.0);
int extensionHalfSpaces = floor(extensionOutsideStaff / 2.0);
extensionHalfSpaces = std::min(extensionHalfSpaces, 4);
int reduction = maxReductions[beamCount][extensionHalfSpaces];
if (_relativeMag < 1) {
@ -1605,8 +1605,8 @@ double Chord::calcDefaultStemLength()
}
// extraHeight represents the extra vertical distance between notehead and stem start
// eg. slashed noteheads etc
double extraHeight = abs(_up ? upNote()->stemUpSE().y() : downNote()->stemDownNW().y()) / _relativeMag / _spatium;
int shortestStem = score()->styleB(Sid::useWideBeams) ? 12 : (score()->styleD(Sid::shortestStem) + extraHeight) * 4;
double extraHeight = (_up ? upNote()->stemUpSE().y() : downNote()->stemDownNW().y()) / _relativeMag / _spatium;
int shortestStem = score()->styleB(Sid::useWideBeams) ? 12 : (score()->styleD(Sid::shortestStem) + abs(extraHeight)) * 4;
int chordHeight = (downLine() - upLine()) * 2; // convert to quarter spaces
int stemLength = defaultStemLength;
@ -1633,7 +1633,8 @@ double Chord::calcDefaultStemLength()
}
idealStemLength = std::max(idealStemLength - reduction, shortestStem);
} else if (stemEndPosition > middleLine) {
idealStemLength += stemEndPosition - middleLine;
// this case will be taken care of below; even if we were to adjust here we'd have
// to adjust again later if the line spacing != 1.0 or if _relativeMag != 1.0
} else {
idealStemLength -= stemOpticalAdjustment(stemEndPosition);
idealStemLength = std::max(idealStemLength, shortestStem);
@ -1652,7 +1653,8 @@ double Chord::calcDefaultStemLength()
}
idealStemLength = std::max(idealStemLength - reduction, shortestStem);
} else if (stemEndPosition < middleLine) {
idealStemLength += middleLine - stemEndPosition;
// this case will be taken care of below; even if we were to adjust here we'd have
// to adjust again later if the line spacing != 1.0 or if _relativeMag != 1.0
} else {
idealStemLength -= stemOpticalAdjustment(stemEndPosition);
idealStemLength = std::max(idealStemLength, shortestStem);
@ -1663,8 +1665,42 @@ double Chord::calcDefaultStemLength()
if (beams() == 4) {
stemLength = calc4BeamsException(stemLength);
}
double finalStemLength = (chordHeight / 4.0 * _spatium) + ((stemLength / 4.0 * _spatium) * _relativeMag);
return finalStemLength;
// when the chord's magnitude is < 1, the stem length with mag can find itself below the middle line.
// in those cases, we have to add the extra amount to it to bring it to a minimum.
Note* startNote = _up ? downNote() : upNote();
double upValue = _up ? -1. : 1.;
double stemStart = startNote->pos().y();
double stemEndMag = stemStart + (finalStemLength * upValue);
double lineDistance = (staff() ? staff()->lineDistance(tick()) : 1.0) * _spatium;
double topLine = 0.0;
double bottomLine = lineDistance * (staffLineCount - 1.0);
double target = 0.0;
if (RealIsEqualOrMore(lineDistance / _spatium, 1.0)) {
// need to extend 2sp into the staff, or to opposite line if staff is < 2sp tall
if (bottomLine < 2 * _spatium) {
target = _up ? topLine : bottomLine;
} else {
target = _up ? bottomLine - (2 * _spatium) : topLine + (2 * _spatium);
}
} else {
// need to extend to second line in staff, or to opposite line if staff has < 3 lines
if (staffLineCount < 3) {
target = _up ? topLine : bottomLine;
} else {
target = _up ? bottomLine - (2 * lineDistance) : topLine + (2 * lineDistance);
}
}
double extraLength = 0.0;
if (_up && stemEndMag > target) {
extraLength = stemEndMag - target;
} else if (!_up && stemEndMag < target) {
extraLength = target - stemEndMag;
}
return finalStemLength + extraLength;
}
Chord* Chord::prev() const

56
src/engraving/utests/beam_data/Beam-A.mscx
View file

@ -120,8 +120,8 @@
</Chord>
<Beam>
<StemDirection>down</StemDirection>
<l1>40</l1>
<l2>40</l2>
<l1>42</l1>
<l2>42</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -157,8 +157,8 @@
<voice>
<Beam>
<StemDirection>up</StemDirection>
<l1>-6</l1>
<l2>-8</l2>
<l1>-4</l1>
<l2>-6</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -176,7 +176,7 @@
</Note>
</Chord>
<Beam>
<l1>40</l1>
<l1>42</l1>
<l2>38</l2>
</Beam>
<Chord>
@ -347,8 +347,8 @@
</Note>
</Chord>
<Beam>
<l1>10</l1>
<l2>8</l2>
<l1>18</l1>
<l2>14</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -389,8 +389,8 @@
<voice>
<Beam>
<StemDirection>up</StemDirection>
<l1>2</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -613,8 +613,8 @@
<voice>
<Beam>
<StemDirection>down</StemDirection>
<l1>22</l1>
<l2>24</l2>
<l1>16</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -650,8 +650,8 @@
</Note>
</Chord>
<Beam>
<l1>30</l1>
<l2>32</l2>
<l1>22</l1>
<l2>26</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -731,8 +731,8 @@
</Note>
</Chord>
<Beam>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>42</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -912,8 +912,8 @@
<voice>
<Beam>
<StemDirection>down</StemDirection>
<l1>40</l1>
<l2>38</l2>
<l1>42</l1>
<l2>40</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -931,7 +931,7 @@
</Chord>
<Beam>
<StemDirection>down</StemDirection>
<l1>40</l1>
<l1>42</l1>
<l2>38</l2>
</Beam>
<Chord>
@ -950,8 +950,8 @@
</Note>
</Chord>
<Beam>
<l1>40</l1>
<l2>38</l2>
<l1>42</l1>
<l2>36</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -968,8 +968,8 @@
</Note>
</Chord>
<Beam>
<l1>40</l1>
<l2>38</l2>
<l1>42</l1>
<l2>36</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -995,8 +995,8 @@
<voice>
<Beam>
<StemDirection>down</StemDirection>
<l1>40</l1>
<l2>38</l2>
<l1>42</l1>
<l2>36</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -1014,8 +1014,8 @@
</Chord>
<Beam>
<StemDirection>down</StemDirection>
<l1>40</l1>
<l2>38</l2>
<l1>42</l1>
<l2>36</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -1034,8 +1034,8 @@
</Chord>
<Beam>
<StemDirection>down</StemDirection>
<l1>40</l1>
<l2>38</l2>
<l1>42</l1>
<l2>36</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

36
src/engraving/utests/beam_data/Beam-B.mscx
View file

@ -192,8 +192,8 @@
</Note>
</Chord>
<Beam>
<l1>10</l1>
<l2>8</l2>
<l1>18</l1>
<l2>14</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -230,8 +230,8 @@
</Note>
</Chord>
<Beam>
<l1>2</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -324,8 +324,8 @@
<voice>
<Beam>
<StemDirection>up</StemDirection>
<l1>-6</l1>
<l2>-8</l2>
<l1>-8</l1>
<l2>-10</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -518,8 +518,8 @@
<voice>
<Beam>
<StemDirection>up</StemDirection>
<l1>-8</l1>
<l2>-6</l2>
<l1>-6</l1>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -538,7 +538,7 @@
<Beam>
<StemDirection>up</StemDirection>
<l1>-6</l1>
<l2>0</l2>
<l2>-4</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -666,8 +666,8 @@
<voice>
<Beam>
<StemDirection>down</StemDirection>
<l1>40</l1>
<l2>38</l2>
<l1>38</l1>
<l2>36</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -685,7 +685,7 @@
</Chord>
<Beam>
<l1>38</l1>
<l2>32</l2>
<l2>36</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -810,8 +810,8 @@
<voice>
<Beam>
<StemDirection>down</StemDirection>
<l1>38</l1>
<l2>40</l2>
<l1>40</l1>
<l2>42</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -1020,8 +1020,8 @@
</Note>
</Chord>
<Beam>
<l1>22</l1>
<l2>24</l2>
<l1>14</l1>
<l2>18</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -1057,8 +1057,8 @@
</Note>
</Chord>
<Beam>
<l1>30</l1>
<l2>32</l2>
<l1>22</l1>
<l2>26</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>

64
src/engraving/utests/beam_data/Beam-C.mscx
View file

@ -153,8 +153,8 @@
<Measure>
<voice>
<Beam>
<l1>10</l1>
<l2>8</l2>
<l1>16</l1>
<l2>14</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -191,8 +191,8 @@
</Note>
</Chord>
<Beam>
<l1>2</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -274,8 +274,8 @@
</Note>
</Chord>
<Beam>
<l1>-6</l1>
<l2>-8</l2>
<l1>-4</l1>
<l2>-10</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -417,8 +417,8 @@
<Measure>
<voice>
<Beam>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -436,7 +436,7 @@
</Chord>
<Beam>
<l1>38</l1>
<l2>40</l2>
<l2>42</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -454,8 +454,8 @@
</Note>
</Chord>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l1>-10</l1>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -472,8 +472,8 @@
</Note>
</Chord>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l1>-10</l1>
<l2>-4</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -498,8 +498,8 @@
</LayoutBreak>
<voice>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l1>-10</l1>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -516,8 +516,8 @@
</Note>
</Chord>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l1>-10</l1>
<l2>-4</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -535,8 +535,8 @@
</Note>
</Chord>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l1>-10</l1>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -597,8 +597,8 @@
</Note>
</Chord>
<Beam>
<l1>22</l1>
<l2>24</l2>
<l1>14</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -641,8 +641,8 @@
</LayoutBreak>
<voice>
<Beam>
<l1>30</l1>
<l2>32</l2>
<l1>22</l1>
<l2>26</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -703,8 +703,8 @@
<Measure>
<voice>
<Beam>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -722,7 +722,7 @@
</Chord>
<Beam>
<l1>38</l1>
<l2>40</l2>
<l2>42</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -740,8 +740,8 @@
</Note>
</Chord>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l1>-10</l1>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -758,8 +758,8 @@
</Note>
</Chord>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l1>-10</l1>
<l2>-4</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -781,8 +781,8 @@
<Measure>
<voice>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l1>-10</l1>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

50
src/engraving/utests/beam_data/Beam-D.mscx
View file

@ -176,8 +176,8 @@
</Note>
</Chord>
<Beam>
<l1>2</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -261,8 +261,8 @@
</Chord>
<Beam>
<StemDirection>up</StemDirection>
<l1>-6</l1>
<l2>-8</l2>
<l1>-4</l1>
<l2>-10</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -308,8 +308,8 @@
<voice>
<Beam>
<StemDirection>up</StemDirection>
<l1>8</l1>
<l2>10</l2>
<l1>14</l1>
<l2>16</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -326,8 +326,8 @@
</Note>
</Chord>
<Beam>
<l1>8</l1>
<l2>10</l2>
<l1>14</l1>
<l2>18</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -345,8 +345,8 @@
</Note>
</Chord>
<Beam>
<l1>8</l1>
<l2>10</l2>
<l1>14</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -363,8 +363,8 @@
</Note>
</Chord>
<Beam>
<l1>8</l1>
<l2>10</l2>
<l1>14</l1>
<l2>18</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -386,8 +386,8 @@
<Measure>
<voice>
<Beam>
<l1>8</l1>
<l2>10</l2>
<l1>14</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -404,8 +404,8 @@
</Note>
</Chord>
<Beam>
<l1>8</l1>
<l2>10</l2>
<l1>14</l1>
<l2>18</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -443,7 +443,7 @@
<Beam>
<StemDirection>up</StemDirection>
<l1>-12</l1>
<l2>-8</l2>
<l2>-10</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -462,7 +462,7 @@
<Beam>
<StemDirection>up</StemDirection>
<l1>-12</l1>
<l2>-6</l2>
<l2>-8</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -645,8 +645,8 @@
</Note>
</Chord>
<Beam>
<l1>22</l1>
<l2>24</l2>
<l1>14</l1>
<l2>18</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -689,8 +689,8 @@
</Note>
</Chord>
<Beam>
<l1>30</l1>
<l2>32</l2>
<l1>22</l1>
<l2>26</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -751,7 +751,7 @@
</Note>
</Chord>
<Beam>
<l1>32</l1>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
@ -771,8 +771,8 @@
</Chord>
<Beam>
<StemDirection>down</StemDirection>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>42</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

54
src/engraving/utests/beam_data/Beam-E.mscx
View file

@ -157,8 +157,8 @@
<voice>
<Beam>
<StemDirection>up</StemDirection>
<l1>2</l1>
<l2>0</l2>
<l1>8</l1>
<l2>6</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -241,8 +241,8 @@
<voice>
<Beam>
<StemDirection>up</StemDirection>
<l1>-6</l1>
<l2>-8</l2>
<l1>-4</l1>
<l2>-10</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -345,8 +345,8 @@
</Note>
</Chord>
<Beam>
<l1>10</l1>
<l2>8</l2>
<l1>18</l1>
<l2>14</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -610,8 +610,8 @@
<voice>
<Beam>
<StemDirection>down</StemDirection>
<l1>32</l1>
<l2>30</l2>
<l1>26</l1>
<l2>24</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -628,8 +628,8 @@
</Note>
</Chord>
<Beam>
<l1>32</l1>
<l2>30</l2>
<l1>26</l1>
<l2>22</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -647,8 +647,8 @@
</Note>
</Chord>
<Beam>
<l1>32</l1>
<l2>30</l2>
<l1>26</l1>
<l2>22</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -665,8 +665,8 @@
</Note>
</Chord>
<Beam>
<l1>32</l1>
<l2>30</l2>
<l1>26</l1>
<l2>22</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -691,8 +691,8 @@
</LayoutBreak>
<voice>
<Beam>
<l1>32</l1>
<l2>30</l2>
<l1>26</l1>
<l2>22</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -709,8 +709,8 @@
</Note>
</Chord>
<Beam>
<l1>32</l1>
<l2>30</l2>
<l1>26</l1>
<l2>22</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -728,8 +728,8 @@
</Note>
</Chord>
<Beam>
<l1>32</l1>
<l2>30</l2>
<l1>26</l1>
<l2>22</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -791,8 +791,8 @@
</Chord>
<Beam>
<StemDirection>down</StemDirection>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -811,7 +811,7 @@
<Beam>
<StemDirection>down</StemDirection>
<l1>38</l1>
<l2>40</l2>
<l2>42</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -926,8 +926,8 @@
</Note>
</Chord>
<Beam>
<l1>22</l1>
<l2>24</l2>
<l1>14</l1>
<l2>18</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -963,8 +963,8 @@
</Note>
</Chord>
<Beam>
<l1>30</l1>
<l2>32</l2>
<l1>22</l1>
<l2>26</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>

54
src/engraving/utests/beam_data/Beam-F.mscx
View file

@ -214,8 +214,8 @@
</Note>
</Chord>
<Beam>
<l1>-6</l1>
<l2>-8</l2>
<l1>-4</l1>
<l2>-10</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -326,8 +326,8 @@
</Note>
</Chord>
<Beam>
<l1>10</l1>
<l2>8</l2>
<l1>18</l1>
<l2>14</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -363,8 +363,8 @@
</Note>
</Chord>
<Beam>
<l1>2</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -463,8 +463,8 @@
<voice>
<Beam>
<StemDirection>up</StemDirection>
<l1>0</l1>
<l2>2</l2>
<l1>6</l1>
<l2>8</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -482,8 +482,8 @@
</Chord>
<Beam>
<StemDirection>up</StemDirection>
<l1>0</l1>
<l2>2</l2>
<l1>6</l1>
<l2>10</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -502,8 +502,8 @@
</Chord>
<Beam>
<StemDirection>up</StemDirection>
<l1>0</l1>
<l2>2</l2>
<l1>6</l1>
<l2>10</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -521,8 +521,8 @@
</Chord>
<Beam>
<StemDirection>up</StemDirection>
<l1>0</l1>
<l2>2</l2>
<l1>6</l1>
<l2>10</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -548,8 +548,8 @@
<voice>
<Beam>
<StemDirection>up</StemDirection>
<l1>0</l1>
<l2>2</l2>
<l1>6</l1>
<l2>10</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -566,8 +566,8 @@
</Note>
</Chord>
<Beam>
<l1>0</l1>
<l2>2</l2>
<l1>6</l1>
<l2>10</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -585,8 +585,8 @@
</Note>
</Chord>
<Beam>
<l1>0</l1>
<l2>2</l2>
<l1>6</l1>
<l2>10</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -754,8 +754,8 @@
<Measure>
<voice>
<Beam>
<l1>30</l1>
<l2>32</l2>
<l1>24</l1>
<l2>26</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -811,8 +811,8 @@
</Chord>
<Beam>
<StemDirection>down</StemDirection>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -836,7 +836,7 @@
<Beam>
<StemDirection>down</StemDirection>
<l1>38</l1>
<l2>40</l2>
<l2>42</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -946,8 +946,8 @@
</Note>
</Chord>
<Beam>
<l1>22</l1>
<l2>24</l2>
<l1>14</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

52
src/engraving/utests/beam_data/Beam-G.mscx
View file

@ -176,7 +176,7 @@
</Note>
</Chord>
<Beam>
<l1>0</l1>
<l1>-4</l1>
<l2>-6</l2>
</Beam>
<Chord>
@ -195,8 +195,8 @@
</Note>
</Chord>
<Beam>
<l1>-6</l1>
<l2>-8</l2>
<l1>-4</l1>
<l2>-10</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -326,8 +326,8 @@
</Note>
</Chord>
<Beam>
<l1>10</l1>
<l2>8</l2>
<l1>18</l1>
<l2>14</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -363,8 +363,8 @@
</Note>
</Chord>
<Beam>
<l1>2</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -595,8 +595,8 @@
<voice>
<Beam>
<StemDirection>down</StemDirection>
<l1>24</l1>
<l2>22</l2>
<l1>18</l1>
<l2>16</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -613,8 +613,8 @@
</Note>
</Chord>
<Beam>
<l1>24</l1>
<l2>22</l2>
<l1>18</l1>
<l2>14</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -632,8 +632,8 @@
</Note>
</Chord>
<Beam>
<l1>24</l1>
<l2>22</l2>
<l1>18</l1>
<l2>14</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -650,8 +650,8 @@
</Note>
</Chord>
<Beam>
<l1>24</l1>
<l2>22</l2>
<l1>18</l1>
<l2>14</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -676,8 +676,8 @@
</LayoutBreak>
<voice>
<Beam>
<l1>24</l1>
<l2>22</l2>
<l1>18</l1>
<l2>14</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -694,8 +694,8 @@
</Note>
</Chord>
<Beam>
<l1>24</l1>
<l2>22</l2>
<l1>18</l1>
<l2>14</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -744,8 +744,8 @@
</Note>
</Chord>
<Beam>
<l1>30</l1>
<l2>32</l2>
<l1>22</l1>
<l2>26</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -807,8 +807,8 @@
<voice>
<Beam>
<StemDirection>down</StemDirection>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -826,7 +826,7 @@
</Chord>
<Beam>
<l1>38</l1>
<l2>40</l2>
<l2>42</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -883,7 +883,7 @@
<Beam>
<StemDirection>down</StemDirection>
<l1>44</l1>
<l2>40</l2>
<l2>42</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -902,7 +902,7 @@
<Beam>
<StemDirection>down</StemDirection>
<l1>44</l1>
<l2>38</l2>
<l2>40</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>

4
src/engraving/utests/beam_data/beamNoSlope.mscx
View file

@ -265,8 +265,8 @@
<Measure>
<voice>
<Beam>
<l1>10</l1>
<l2>10</l2>
<l1>14</l1>
<l2>14</l2>
</Beam>
<Chord>
<durationType>32nd</durationType>

102
src/engraving/utests/beam_data/beamPositions.mscx
View file

@ -909,8 +909,8 @@
</LayoutBreak>
<voice>
<Beam>
<l1>10</l1>
<l2>10</l2>
<l1>18</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>32nd</durationType>
@ -930,8 +930,8 @@
<durationType>16th</durationType>
</Rest>
<Beam>
<l1>10</l1>
<l2>10</l2>
<l1>18</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>32nd</durationType>
@ -951,8 +951,8 @@
<durationType>16th</durationType>
</Rest>
<Beam>
<l1>10</l1>
<l2>10</l2>
<l1>14</l1>
<l2>14</l2>
</Beam>
<Chord>
<durationType>32nd</durationType>
@ -1253,8 +1253,8 @@
<Measure>
<voice>
<Beam>
<l1>22</l1>
<l2>22</l2>
<l1>18</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>32nd</durationType>
@ -1274,8 +1274,8 @@
<durationType>16th</durationType>
</Rest>
<Beam>
<l1>22</l1>
<l2>22</l2>
<l1>14</l1>
<l2>14</l2>
</Beam>
<Chord>
<durationType>32nd</durationType>
@ -1295,8 +1295,8 @@
<durationType>16th</durationType>
</Rest>
<Beam>
<l1>22</l1>
<l2>22</l2>
<l1>14</l1>
<l2>14</l2>
</Beam>
<Chord>
<durationType>32nd</durationType>
@ -1316,8 +1316,8 @@
<durationType>16th</durationType>
</Rest>
<Beam>
<l1>22</l1>
<l2>22</l2>
<l1>14</l1>
<l2>14</l2>
</Beam>
<Chord>
<durationType>32nd</durationType>
@ -1343,31 +1343,31 @@
</Measure>
<Measure>
<voice>
<Beam>
<l1>18</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
<Note>
<pitch>55</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<durationType>64th</durationType>
<Note>
<pitch>55</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Rest>
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>6</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
<Note>
<pitch>55</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<durationType>64th</durationType>
<Note>
<pitch>55</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Rest>
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>4</l1>
<l2>4</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
<Note>
@ -1428,8 +1428,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>2</l1>
<l2>2</l2>
<l1>0</l1>
<l2>0</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
@ -1470,8 +1470,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>-6</l1>
<l2>-6</l2>
<l1>-8</l1>
<l2>-8</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
@ -1512,8 +1512,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>-14</l1>
<l2>-14</l2>
<l1>-16</l1>
<l2>-16</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
@ -1555,8 +1555,8 @@
</Rest>
<Beam>
<StemDirection>down</StemDirection>
<l1>46</l1>
<l2>46</l2>
<l1>48</l1>
<l2>48</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
@ -1599,8 +1599,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>38</l1>
<l2>38</l2>
<l1>40</l1>
<l2>40</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
@ -1641,8 +1641,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>30</l1>
<l2>30</l2>
<l1>32</l1>
<l2>32</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
@ -1708,8 +1708,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>28</l1>
<l2>28</l2>
<l1>26</l1>
<l2>26</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
@ -1729,8 +1729,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>26</l1>
<l2>26</l2>
<l1>14</l1>
<l2>14</l2>
</Beam>
<Chord>
<durationType>64th</durationType>

4
src/engraving/utests/beam_data/beamStemDir-01-ref.mscx
View file

@ -62,8 +62,8 @@
</TimeSig>
<Beam>
<StemDirection>up</StemDirection>
<l1>-8</l1>
<l2>-8</l2>
<l1>-10</l1>
<l2>-10</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

8
src/engraving/utests/beam_data/flatBeams.mscx
View file

@ -364,8 +364,8 @@
<Measure>
<voice>
<Beam>
<l1>0</l1>
<l2>0</l2>
<l1>-2</l1>
<l2>-2</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -749,8 +749,8 @@
<Measure>
<voice>
<Beam>
<l1>32</l1>
<l2>32</l2>
<l1>34</l1>
<l2>34</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

32
src/engraving/utests/beam_data/wideBeams.mscx
View file

@ -166,7 +166,7 @@
<durationType>eighth</durationType>
</Rest>
<Beam>
<l1>14</l1>
<l1>16</l1>
<l2>18</l2>
</Beam>
<Chord>
@ -209,7 +209,7 @@
</Rest>
<Beam>
<l1>18</l1>
<l2>14</l2>
<l2>16</l2>
</Beam>
<Chord>
<durationType>16th</durationType>
@ -254,7 +254,7 @@
<durationType>16th</durationType>
</Rest>
<Beam>
<l1>6</l1>
<l1>8</l1>
<l2>10</l2>
</Beam>
<Chord>
@ -297,7 +297,7 @@
</Rest>
<Beam>
<l1>10</l1>
<l2>6</l2>
<l2>8</l2>
</Beam>
<Chord>
<durationType>32nd</durationType>
@ -338,7 +338,7 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>-2</l1>
<l1>0</l1>
<l2>2</l2>
</Beam>
<Chord>
@ -381,7 +381,7 @@
</Rest>
<Beam>
<l1>2</l1>
<l2>-2</l2>
<l2>0</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
@ -696,7 +696,7 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>34</l1>
<l1>32</l1>
<l2>30</l2>
</Beam>
<Chord>
@ -739,7 +739,7 @@
</Rest>
<Beam>
<l1>30</l1>
<l2>34</l2>
<l2>32</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
@ -823,8 +823,8 @@
</Note>
</Chord>
<Beam>
<l1>10</l1>
<l2>10</l2>
<l1>18</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>32nd</durationType>
@ -890,8 +890,8 @@
</LayoutBreak>
<voice>
<Beam>
<l1>2</l1>
<l2>2</l2>
<l1>14</l1>
<l2>14</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
@ -1020,8 +1020,8 @@
</Note>
</Chord>
<Beam>
<l1>22</l1>
<l2>22</l2>
<l1>14</l1>
<l2>14</l2>
</Beam>
<Chord>
<durationType>32nd</durationType>
@ -1087,8 +1087,8 @@
</LayoutBreak>
<voice>
<Beam>
<l1>30</l1>
<l2>30</l2>
<l1>18</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>64th</durationType>

2
src/engraving/utests/chordsymbol_data/realize-triplet-ref.mscx
View file

@ -749,7 +749,7 @@
</Tuplet>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>16th</durationType>

4
src/engraving/utests/copypaste_data/copypaste11-ref.mscx
View file

@ -118,7 +118,7 @@
</Chord>
<Beam>
<l1>-6</l1>
<l2>-2</l2>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -216,7 +216,7 @@
</Chord>
<Beam>
<l1>-6</l1>
<l2>-2</l2>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

4
src/engraving/utests/copypaste_data/copypaste17-ref.mscx
View file

@ -101,7 +101,7 @@
<durationType>eighth</durationType>
</Rest>
<Beam>
<l1>-12</l1>
<l1>-14</l1>
<l2>-16</l2>
</Beam>
<Chord>
@ -120,7 +120,7 @@
</Chord>
<Beam>
<l1>-20</l1>
<l2>-16</l2>
<l2>-18</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

2
src/engraving/utests/copypaste_data/copypaste20-ref.mscx
View file

@ -91,7 +91,7 @@
<sigD>4</sigD>
</TimeSig>
<Beam>
<l1>-8</l1>
<l1>-10</l1>
<l2>-12</l2>
</Beam>
<Chord>

4
src/engraving/utests/copypastesymbollist_data/copypastesymbollist-articulation-ref.mscx
View file

@ -181,7 +181,7 @@
</Note>
</Chord>
<Beam>
<l1>24</l1>
<l1>30</l1>
<l2>32</l2>
</Beam>
<Chord>
@ -287,7 +287,7 @@
<Measure>
<voice>
<Beam>
<l1>24</l1>
<l1>30</l1>
<l2>32</l2>
</Beam>
<Chord>

4
src/engraving/utests/copypastesymbollist_data/copypastesymbollist-chordnames-ref.mscx
View file

@ -166,7 +166,7 @@
<root>15</root>
</Harmony>
<Beam>
<l1>24</l1>
<l1>30</l1>
<l2>32</l2>
</Beam>
<Chord>
@ -254,7 +254,7 @@
<root>16</root>
</Harmony>
<Beam>
<l1>24</l1>
<l1>30</l1>
<l2>32</l2>
</Beam>
<Chord>

4
src/engraving/utests/copypastesymbollist_data/copypastesymbollist-lyrics-ref.mscx
View file

@ -178,7 +178,7 @@
</Note>
</Chord>
<Beam>
<l1>24</l1>
<l1>30</l1>
<l2>32</l2>
</Beam>
<Chord>
@ -287,7 +287,7 @@
<Measure>
<voice>
<Beam>
<l1>24</l1>
<l1>30</l1>
<l2>32</l2>
</Beam>
<Chord>

4
src/engraving/utests/copypastesymbollist_data/copypastesymbollist-stafftext-ref.mscx
View file

@ -186,7 +186,7 @@
<text>11</text>
</StaffText>
<Beam>
<l1>24</l1>
<l1>30</l1>
<l2>32</l2>
</Beam>
<Chord>
@ -292,7 +292,7 @@
<text>5</text>
</StaffText>
<Beam>
<l1>24</l1>
<l1>30</l1>
<l2>32</l2>
</Beam>
<Chord>

4
src/engraving/utests/copypastesymbollist_data/copypastesymbollist-sticking-ref.mscx
View file

@ -186,7 +186,7 @@
<text>11</text>
</Sticking>
<Beam>
<l1>24</l1>
<l1>30</l1>
<l2>32</l2>
</Beam>
<Chord>
@ -292,7 +292,7 @@
<text>5</text>
</Sticking>
<Beam>
<l1>24</l1>
<l1>30</l1>
<l2>32</l2>
</Beam>
<Chord>

2
src/engraving/utests/exchangevoices_data/exchangevoices-slurs-ref.mscx
View file

@ -88,7 +88,7 @@
<voice>
<Beam>
<l1>60</l1>
<l2>52</l2>
<l2>54</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

6
src/engraving/utests/implode_explode_data/implode1-ref.mscx
View file

@ -1113,8 +1113,8 @@
</Note>
</Chord>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l1>-6</l1>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -1155,7 +1155,7 @@
</Chord>
<Beam>
<l1>-6</l1>
<l2>-8</l2>
<l2>-10</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

6
src/engraving/utests/implode_explode_data/implode1.mscx
View file

@ -698,8 +698,8 @@
</Note>
</Chord>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l1>-6</l1>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -740,7 +740,7 @@
</Chord>
<Beam>
<l1>-6</l1>
<l2>-8</l2>
<l2>-10</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

8
src/engraving/utests/implode_explode_data/undoExplode01-ref.mscx
View file

@ -372,8 +372,8 @@
</Number>
</Tuplet>
<Beam>
<l1>22</l1>
<l2>24</l2>
<l1>14</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -732,7 +732,7 @@
</Number>
</Tuplet>
<Beam>
<l1>32</l1>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
@ -913,7 +913,7 @@
</Tuplet>
<Beam>
<l1>-6</l1>
<l2>0</l2>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

4
src/engraving/utests/implode_explode_data/undoExplode02-ref.mscx
View file

@ -526,8 +526,8 @@
</Number>
</Tuplet>
<Beam>
<l1>22</l1>
<l2>24</l2>
<l1>14</l1>
<l2>18</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

4
src/engraving/utests/rhythmicGrouping_data/groupArticulationsTies-ref.mscx
View file

@ -90,8 +90,8 @@
</Number>
</Tuplet>
<Beam>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

4
src/engraving/utests/rhythmicGrouping_data/groupSubbeats-ref.mscx
View file

@ -114,8 +114,8 @@
</Note>
</Chord>
<Beam>
<l1>44</l1>
<l2>44</l2>
<l1>46</l1>
<l2>46</l2>
</Beam>
<Chord>
<durationType>16th</durationType>

2
src/engraving/utests/spanners_data/glissando-graces01-ref.mscx
View file

@ -101,7 +101,7 @@
</Note>
</Chord>
<Beam>
<l1>-22</l1>
<l1>-20</l1>
<l2>-18</l2>
</Beam>
<Chord>

4
src/engraving/utests/tuplet_data/split2-ref.mscx
View file

@ -129,8 +129,8 @@
</Number>
</Tuplet>
<Beam>
<l1>8</l1>
<l2>8</l2>
<l1>2</l1>
<l2>2</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

4
src/engraving/utests/tuplet_data/split4-ref.mscx
View file

@ -214,8 +214,8 @@
</Number>
</Tuplet>
<Beam>
<l1>8</l1>
<l2>7</l2>
<l1>6</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>32nd</durationType>

14
src/engraving/utests/unrollrepeats_data/clef-key-ts-ref.mscx
View file

@ -270,7 +270,7 @@
</Chord>
<Beam>
<l1>44</l1>
<l2>38</l2>
<l2>36</l2>
</Beam>
<Chord>
<durationType>16th</durationType>
@ -473,7 +473,7 @@
</Chord>
<Beam>
<l1>44</l1>
<l2>38</l2>
<l2>36</l2>
</Beam>
<Chord>
<durationType>16th</durationType>
@ -811,7 +811,7 @@
</Chord>
<Beam>
<l1>44</l1>
<l2>38</l2>
<l2>36</l2>
</Beam>
<Chord>
<durationType>16th</durationType>
@ -1110,8 +1110,8 @@
</Note>
</Chord>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l1>-6</l1>
<l2>-4</l2>
</Beam>
<Chord>
<linkedMain/>
@ -1653,8 +1653,8 @@
</Note>
</Chord>
<Beam>
<l1>-8</l1>
<l2>-6</l2>
<l1>-6</l1>
<l2>-4</l2>
</Beam>
<Chord>
<linked>

2
src/importexport/capella/tests/data/test4.cap-ref.mscx
View file

@ -140,7 +140,7 @@
</LayoutBreak>
<voice>
<Beam>
<l1>0</l1>
<l1>-4</l1>
<l2>-6</l2>
</Beam>
<Chord>

2
src/importexport/capella/tests/data/test4.capx-ref.mscx
View file

@ -140,7 +140,7 @@
</LayoutBreak>
<voice>
<Beam>
<l1>0</l1>
<l1>-4</l1>
<l2>-6</l2>
</Beam>
<Chord>

48
src/importexport/capella/tests/data/test7.cap-ref.mscx
View file

@ -60,8 +60,8 @@
<sigD>4</sigD>
</TimeSig>
<Beam>
<l1>8</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -92,8 +92,8 @@
</Note>
</Chord>
<Beam>
<l1>0</l1>
<l2>-8</l2>
<l1>-4</l1>
<l2>-10</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -134,8 +134,8 @@
<accidental>4</accidental>
</KeySig>
<Beam>
<l1>8</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -209,8 +209,8 @@
<accidental>5</accidental>
</KeySig>
<Beam>
<l1>8</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -283,8 +283,8 @@
<accidental>6</accidental>
</KeySig>
<Beam>
<l1>8</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -358,8 +358,8 @@
<accidental>7</accidental>
</KeySig>
<Beam>
<l1>8</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -432,8 +432,8 @@
<accidental>-2</accidental>
</KeySig>
<Beam>
<l1>8</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -507,8 +507,8 @@
<accidental>-3</accidental>
</KeySig>
<Beam>
<l1>8</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -581,8 +581,8 @@
<accidental>-4</accidental>
</KeySig>
<Beam>
<l1>8</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -656,8 +656,8 @@
<accidental>-5</accidental>
</KeySig>
<Beam>
<l1>8</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -730,8 +730,8 @@
<accidental>-6</accidental>
</KeySig>
<Beam>
<l1>8</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
@ -808,8 +808,8 @@
<accidental>-7</accidental>
</KeySig>
<Beam>
<l1>8</l1>
<l2>0</l2>
<l1>10</l1>
<l2>6</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>

8
src/importexport/musicxml/tests/data/testDurationRoundingError_ref.mscx
View file

@ -129,8 +129,8 @@
</Tuplet>
<Beam>
<StemDirection>up</StemDirection>
<l1>-8</l1>
<l2>-8</l2>
<l1>-10</l1>
<l2>-10</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
@ -167,8 +167,8 @@
</Tuplet>
<Beam>
<StemDirection>up</StemDirection>
<l1>-8</l1>
<l2>-8</l2>
<l1>-10</l1>
<l2>-10</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>