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

fix #275382: Tuplet numbers are incorrectly positioned

Browse source 
Add new position of tuplet number.

Set default font of the number in tuplet to italic

add different tuplets to vtests
This commit is contained in:
alexandr 2018-08-29 15:39:15 +02:00
parent 209b5c78a7
commit 1d48226720
20 changed files with 622 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libmscore/tuplet.cpp
View file

@ -112,6 +112,19 @@ void Tuplet::setVisible(bool f)
_number->setVisible(f);
}
//---------------------------------------------------------
// resetNumberProperty
// reset number properties to default values
// Set FONT_ITALIC to true, because for tuplets number should be italic
//---------------------------------------------------------
void Tuplet::resetNumberProperty()
{
for (auto p : { Pid::FONT_FACE, Pid::FONT_SIZE, Pid::FONT_BOLD, Pid::FONT_UNDERLINE, Pid::ALIGN })
_number->resetProperty(p);
_number->setProperty(Pid::FONT_ITALIC, true);
}
//---------------------------------------------------------
// layout
//---------------------------------------------------------
@ -137,8 +150,7 @@ void Tuplet::layout()
_number->setTrack(track());
_number->setParent(this);
_number->setVisible(visible());
for (auto p : { Pid::FONT_FACE, Pid::FONT_SIZE, Pid::FONT_BOLD, Pid::FONT_ITALIC, Pid::FONT_UNDERLINE, Pid::ALIGN })
_number->resetProperty(p);
resetNumberProperty();
}
if (_numberType == TupletNumberType::SHOW_NUMBER)
_number->setXmlText(QString("%1").arg(_ratio.numerator()));
@ -508,7 +520,7 @@ void Tuplet::layout()
_number->layout();
numberWidth = _number->bbox().width();
qreal y3 = p1.y() + (p2.y() - p1.y()) * .5 - l1 * (_isUp ? 1.0 : -1.0);
qreal y3 = p1.y() + (p2.y() - p1.y()) * .5 - l1 * (_isUp ? 1.0 : -1.0) - _number->bbox().height() / 2;
//
// for beamed tuplets, center number on beam
//
@ -538,11 +550,13 @@ void Tuplet::layout()
if (_number) {
bracketL[0] = QPointF(p1.x(), p1.y());
bracketL[1] = QPointF(p1.x(), p1.y() - l1);
qreal x = x3 - numberWidth * .5 - _spatium * .5;
//set width of bracket hole
qreal x = x3 - numberWidth * .25 - _spatium * .5;
qreal y = p1.y() + (x - p1.x()) * slope;
bracketL[2] = QPointF(x, y - l1);
x = x3 + numberWidth * .5 + _spatium * .5;
//set width of bracket hole, use 1.25 for symmetry
x = x3 + numberWidth * 1.25 + _spatium * .5;
y = p1.y() + (x - p1.x()) * slope;
bracketR[0] = QPointF(x, y - l1);
bracketR[1] = QPointF(p2.x(), p2.y() - l1);
@ -559,11 +573,13 @@ void Tuplet::layout()
if (_number) {
bracketL[0] = QPointF(p1.x(), p1.y());
bracketL[1] = QPointF(p1.x(), p1.y() + l1);
qreal x = x3 - numberWidth * .5 - _spatium * .5;
//set width of bracket hole
qreal x = x3 - numberWidth * .25 - _spatium * .5;
qreal y = p1.y() + (x - p1.x()) * slope;
bracketL[2] = QPointF(x, y + l1);
x = x3 + numberWidth * .5 + _spatium * .5;
//set width of bracket hole, use 1.25 for symmetry
x = x3 + numberWidth * 1.25 + _spatium * .5;
y = p1.y() + (x - p1.x()) * slope;
bracketR[0] = QPointF(x, y + l1);
bracketR[1] = QPointF(p2.x(), p2.y() + l1);

2
libmscore/tuplet.h
View file

@ -58,6 +58,8 @@ class Tuplet final : public DurationElement {
QPointF bracketL[4];
QPointF bracketR[3];
void resetNumberProperty();
public:
Tuplet(Score*);
Tuplet(const Tuplet&);

2
mtest/capella/io/testTuplet1.capx-ref.mscx
View file

@ -63,6 +63,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -118,6 +119,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>

14
mtest/capella/io/testTuplet2.cap-ref.mscx
View file

@ -63,6 +63,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -136,6 +137,7 @@
<actualNotes>5</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>5</text>
</Number>
</Tuplet>
@ -209,6 +211,7 @@
<actualNotes>7</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>7</text>
</Number>
</Tuplet>
@ -324,6 +327,7 @@
<actualNotes>9</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>9</text>
</Number>
</Tuplet>
@ -452,6 +456,7 @@
<actualNotes>6</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>6</text>
</Number>
</Tuplet>
@ -536,6 +541,7 @@
<actualNotes>2</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>2</text>
</Number>
</Tuplet>
@ -604,6 +610,7 @@
<actualNotes>4</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>4</text>
</Number>
</Tuplet>
@ -694,6 +701,7 @@
<actualNotes>8</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>8</text>
</Number>
</Tuplet>
@ -798,6 +806,7 @@
<actualNotes>10</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>10</text>
</Number>
</Tuplet>
@ -916,6 +925,7 @@
<actualNotes>14</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>14</text>
</Number>
</Tuplet>
@ -1134,6 +1144,7 @@
<actualNotes>11</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>11</text>
</Number>
</Tuplet>
@ -1259,6 +1270,7 @@
<actualNotes>12</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>12</text>
</Number>
</Tuplet>
@ -1385,6 +1397,7 @@
<actualNotes>13</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>13</text>
</Number>
</Tuplet>
@ -1571,6 +1584,7 @@
<actualNotes>15</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>15</text>
</Number>
</Tuplet>

14
mtest/capella/io/testTuplet2.capx-ref.mscx
View file

@ -63,6 +63,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -136,6 +137,7 @@
<actualNotes>5</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>5</text>
</Number>
</Tuplet>
@ -209,6 +211,7 @@
<actualNotes>7</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>7</text>
</Number>
</Tuplet>
@ -324,6 +327,7 @@
<actualNotes>9</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>9</text>
</Number>
</Tuplet>
@ -452,6 +456,7 @@
<actualNotes>6</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>6</text>
</Number>
</Tuplet>
@ -536,6 +541,7 @@
<actualNotes>2</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>2</text>
</Number>
</Tuplet>
@ -604,6 +610,7 @@
<actualNotes>4</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>4</text>
</Number>
</Tuplet>
@ -694,6 +701,7 @@
<actualNotes>8</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>8</text>
</Number>
</Tuplet>
@ -798,6 +806,7 @@
<actualNotes>10</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>10</text>
</Number>
</Tuplet>
@ -916,6 +925,7 @@
<actualNotes>14</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>14</text>
</Number>
</Tuplet>
@ -1134,6 +1144,7 @@
<actualNotes>11</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>11</text>
</Number>
</Tuplet>
@ -1259,6 +1270,7 @@
<actualNotes>12</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>12</text>
</Number>
</Tuplet>
@ -1385,6 +1397,7 @@
<actualNotes>13</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>13</text>
</Number>
</Tuplet>
@ -1571,6 +1584,7 @@
<actualNotes>15</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>15</text>
</Number>
</Tuplet>

3
mtest/guitarpro/dotted-tuplets.gp5-ref.mscx
View file

@ -90,6 +90,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -280,6 +281,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -391,6 +393,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>

3
mtest/guitarpro/testIrrTuplet.gp4-ref.mscx
View file

@ -90,6 +90,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -298,6 +299,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -428,6 +430,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>

9
mtest/guitarpro/tuplets.gpx-ref.mscx
View file

@ -121,6 +121,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -168,6 +169,7 @@
<actualNotes>5</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>5</text>
</Number>
</Tuplet>
@ -268,6 +270,7 @@
<actualNotes>15</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>15:8</text>
</Number>
</Tuplet>
@ -661,6 +664,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -715,6 +719,7 @@
<actualNotes>5</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>5</text>
</Number>
</Tuplet>
@ -830,6 +835,7 @@
<actualNotes>15</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>15:8</text>
</Number>
</Tuplet>
@ -1135,6 +1141,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1191,6 +1198,7 @@
<actualNotes>5</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>5</text>
</Number>
</Tuplet>
@ -1306,6 +1314,7 @@
<actualNotes>15</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>15:8</text>
</Number>
</Tuplet>

9
mtest/guitarpro/tuplets2.gpx-ref.mscx
View file

@ -298,6 +298,7 @@ solo concert</text>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -369,6 +370,7 @@ solo concert</text>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -436,6 +438,7 @@ solo concert</text>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1059,6 +1062,7 @@ solo concert</text>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1138,6 +1142,7 @@ solo concert</text>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1213,6 +1218,7 @@ solo concert</text>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1730,6 +1736,7 @@ solo concert</text>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1809,6 +1816,7 @@ solo concert</text>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1881,6 +1889,7 @@ solo concert</text>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>

54
mtest/guitarpro/volta.gp5-ref.mscx
View file

@ -95,6 +95,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -142,6 +143,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -189,6 +191,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -254,6 +257,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -304,6 +308,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -351,6 +356,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -419,6 +425,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -466,6 +473,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -513,6 +521,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -578,6 +587,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -625,6 +635,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -672,6 +683,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -737,6 +749,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -784,6 +797,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -834,6 +848,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -899,6 +914,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -949,6 +965,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -996,6 +1013,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1317,6 +1335,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1371,6 +1390,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1425,6 +1445,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1499,6 +1520,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1556,6 +1578,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1610,6 +1633,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1687,6 +1711,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1741,6 +1766,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1795,6 +1821,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1869,6 +1896,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1923,6 +1951,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -1977,6 +2006,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2051,6 +2081,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2105,6 +2136,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2162,6 +2194,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2236,6 +2269,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2293,6 +2327,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2347,6 +2382,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2586,6 +2622,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2642,6 +2679,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2696,6 +2734,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2770,6 +2809,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2824,6 +2864,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2878,6 +2919,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -2952,6 +2994,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -3006,6 +3049,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -3060,6 +3104,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -3134,6 +3179,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -3188,6 +3234,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -3242,6 +3289,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -3316,6 +3364,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -3370,6 +3419,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -3424,6 +3474,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -3498,6 +3549,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -3552,6 +3604,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -3606,6 +3659,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>

2
mtest/libmscore/implode_explode/undoImplode01-ref.mscx
View file

@ -227,6 +227,7 @@
<actualNotes>3</actualNotes>
<baseNote>quarter</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -269,6 +270,7 @@
<actualNotes>3</actualNotes>
<baseNote>quarter</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>

4
mtest/libmscore/tuplet/split1-ref.mscx
View file

@ -116,6 +116,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -131,6 +132,7 @@
<actualNotes>3</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -174,6 +176,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -182,6 +185,7 @@
<actualNotes>3</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>

3
mtest/libmscore/tuplet/split2-ref.mscx
View file

@ -116,6 +116,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -124,6 +125,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -184,6 +186,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>

3
mtest/libmscore/tuplet/split3-ref.mscx
View file

@ -116,6 +116,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -154,6 +155,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -181,6 +183,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>

6
mtest/libmscore/tuplet/split4-ref.mscx
View file

@ -116,6 +116,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -132,6 +133,7 @@
<actualNotes>3</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -151,6 +153,7 @@
<actualNotes>3</actualNotes>
<baseNote>32nd</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -194,6 +197,7 @@
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -203,6 +207,7 @@
<actualNotes>3</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
@ -211,6 +216,7 @@
<actualNotes>3</actualNotes>
<baseNote>32nd</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>

8
vtest/gen.bat
View file

@ -25,8 +25,10 @@ set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmres
chord-layout-11,chord-layout-12,chord-layout-13,chord-layout-14,chord-layout-15,chord-layout-16,chord-layout-17, ^
cross-1,cross-2, ^
accidental-1,accidental-2,accidental-3,accidental-4,accidental-5, ^
accidental-6,accidental-7,accidental-8,accidental-9,accidental-10, accidental-mirror ^
tie-1,tie-2,tie-3,grace-1,grace-2,grace-3,grace-4,tuplets-1,tuplets-2,breath-1, ^
accidental-6,accidental-7,accidental-8,accidental-9,accidental-10, accidental-mirror, ^
tie-1,tie-2,tie-3,grace-1,grace-2,grace-3,grace-4, ^
tuplets-1,tuplets-2,tuplets-3,tuplets-4, ^
breath-1, ^
harmony-1,harmony-2,harmony-3,harmony-4,harmony-5,harmony-6,harmony-7, ^
harmony-8,harmony-9,harmony-10,harmony-11,harmony-12, ^
beams-1,beams-2,beams-3,beams-4,beams-5,beams-6,beams-7,beams-8,beams-9,beams-10, ^
@ -41,7 +43,7 @@ set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmres
IF NOT "%1"=="" (
SET INSTALL_PATH=%1
) ELSE (
SET INSTALL_PATH=msvc.install
SET INSTALL_PATH=msvc.install_x64
)
set MSCORE=..\%INSTALL_PATH%\bin\musescore.exe

BIN
vtest/tuplets-3-ref.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

206
vtest/tuplets-3.mscx Normal file
View file

@ -0,0 +1,206 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.01">
<programVersion>3.0.0</programVersion>
<programRevision>3543170</programRevision>
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Synthesizer>
</Synthesizer>
<Division>480</Division>
<Style>
<pageWidth>3.93701</pageWidth>
<pageHeight>1.1811</pageHeight>
<pagePrintableWidth>3.77953</pagePrintableWidth>
<pageEvenLeftMargin>0.0787403</pageEvenLeftMargin>
<pageOddLeftMargin>0.0787403</pageOddLeftMargin>
<pageEvenTopMargin>0</pageEvenTopMargin>
<pageEvenBottomMargin>0</pageEvenBottomMargin>
<pageOddTopMargin>0</pageOddTopMargin>
<pageOddBottomMargin>0</pageOddBottomMargin>
<pageTwosided>0</pageTwosided>
<lyricsMinBottomDistance>4</lyricsMinBottomDistance>
<clefLeftMargin>0.64</clefLeftMargin>
<clefKeyRightMargin>1.75</clefKeyRightMargin>
<barNoteDistance>1.2</barNoteDistance>
<pedalPosBelow>0</pedalPosBelow>
<trillPosAbove>0</trillPosAbove>
<showMeasureNumber>0</showMeasureNumber>
<showFooter>0</showFooter>
<dynamicsFontItalic>0</dynamicsFontItalic>
<Spatium>1.764</Spatium>
</Style>
<showInvisible>1</showInvisible>
<showUnprintable>1</showUnprintable>
<showFrames>1</showFrames>
<showMargins>0</showMargins>
<metaTag name="arranger"></metaTag>
<metaTag name="composer"></metaTag>
<metaTag name="copyright"></metaTag>
<metaTag name="creationDate">2016-04-25</metaTag>
<metaTag name="lyricist"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="platform">Linux</metaTag>
<metaTag name="poet"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="translator"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag>
<Part>
<Staff id="1">
<StaffType group="pitched">
<name>Standard</name>
</StaffType>
</Staff>
<trackName>Piano</trackName>
<Instrument>
<shortName>Pno.</shortName>
<trackName>Piano</trackName>
<minPitchP>21</minPitchP>
<maxPitchP>108</maxPitchP>
<minPitchA>21</minPitchA>
<maxPitchA>108</maxPitchA>
<Articulation>
<velocity>100</velocity>
<gateTime>70</gateTime>
</Articulation>
<Articulation name="staccato">
<velocity>100</velocity>
<gateTime>40</gateTime>
</Articulation>
<Articulation name="tenuto">
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>120</velocity>
<gateTime>100</gateTime>
</Articulation>
<Channel>
<program value="0"/>
<synti>Fluid</synti>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure>
<voice>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Tuplet>
<normalNotes>2</normalNotes>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
<Chord>
<durationType>eighth</durationType>
<Note>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<endTuplet/>
<Tuplet>
<normalNotes>2</normalNotes>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Chord>
<durationType>eighth</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<endTuplet/>
<Tuplet>
<normalNotes>2</normalNotes>
<actualNotes>3</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
<Chord>
<durationType>32nd</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Chord>
<durationType>32nd</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Chord>
<durationType>32nd</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Chord>
<durationType>32nd</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Chord>
<durationType>32nd</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Chord>
<durationType>32nd</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<endTuplet/>
<Rest>
<durationType>eighth</durationType>
</Rest>
<Rest>
<durationType>quarter</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
</BarLine>
</voice>
</Measure>
</Staff>
</Score>
</museScore>

BIN
vtest/tuplets-4-ref.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.4 KiB

260
vtest/tuplets-4.mscx Normal file
View file

@ -0,0 +1,260 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.01">
<programVersion>3.0.0</programVersion>
<programRevision>3543170</programRevision>
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Synthesizer>
</Synthesizer>
<Division>480</Division>
<Style>
<pageWidth>3.93701</pageWidth>
<pageHeight>1.1811</pageHeight>
<pagePrintableWidth>3.77953</pagePrintableWidth>
<pageEvenLeftMargin>0.0787403</pageEvenLeftMargin>
<pageOddLeftMargin>0.0787403</pageOddLeftMargin>
<pageEvenTopMargin>0</pageEvenTopMargin>
<pageEvenBottomMargin>0</pageEvenBottomMargin>
<pageOddTopMargin>0</pageOddTopMargin>
<pageOddBottomMargin>0</pageOddBottomMargin>
<pageTwosided>0</pageTwosided>
<lyricsMinBottomDistance>4</lyricsMinBottomDistance>
<clefLeftMargin>0.64</clefLeftMargin>
<clefKeyRightMargin>1.75</clefKeyRightMargin>
<barNoteDistance>1.2</barNoteDistance>
<pedalPosBelow>0</pedalPosBelow>
<trillPosAbove>0</trillPosAbove>
<showMeasureNumber>0</showMeasureNumber>
<showFooter>0</showFooter>
<dynamicsFontItalic>0</dynamicsFontItalic>
<Spatium>1.764</Spatium>
</Style>
<showInvisible>1</showInvisible>
<showUnprintable>1</showUnprintable>
<showFrames>1</showFrames>
<showMargins>0</showMargins>
<metaTag name="arranger"></metaTag>
<metaTag name="composer"></metaTag>
<metaTag name="copyright"></metaTag>
<metaTag name="creationDate">2016-04-25</metaTag>
<metaTag name="lyricist"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="platform">Linux</metaTag>
<metaTag name="poet"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="translator"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag>
<Part>
<Staff id="1">
<StaffType group="pitched">
<name>Standard</name>
</StaffType>
</Staff>
<trackName>Piano</trackName>
<Instrument>
<shortName>Pno.</shortName>
<trackName>Piano</trackName>
<minPitchP>21</minPitchP>
<maxPitchP>108</maxPitchP>
<minPitchA>21</minPitchA>
<maxPitchA>108</maxPitchA>
<Articulation>
<velocity>100</velocity>
<gateTime>70</gateTime>
</Articulation>
<Articulation name="staccato">
<velocity>100</velocity>
<gateTime>40</gateTime>
</Articulation>
<Articulation name="tenuto">
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>120</velocity>
<gateTime>100</gateTime>
</Articulation>
<Channel>
<program value="0"/>
<synti>Fluid</synti>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure>
<voice>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Tuplet>
<normalNotes>4</normalNotes>
<actualNotes>7</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>7</text>
</Number>
</Tuplet>
<Chord>
<durationType>16th</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Chord>
<durationType>16th</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Chord>
<durationType>16th</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Rest>
<durationType>16th</durationType>
</Rest>
<Chord>
<durationType>16th</durationType>
<Note>
<pitch>69</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Rest>
<durationType>16th</durationType>
</Rest>
<Chord>
<durationType>16th</durationType>
<Note>
<pitch>71</pitch>
<tpc>19</tpc>
</Note>
</Chord>
<endTuplet/>
<location>
<fractions>-1/640</fractions>
</location>
<Tuplet>
<normalNotes>2</normalNotes>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
<Chord>
<durationType>16th</durationType>
<Note>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Chord>
<durationType>16th</durationType>
<Note>
<pitch>79</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Rest>
<durationType>eighth</durationType>
</Rest>
<Chord>
<durationType>16th</durationType>
<Note>
<pitch>65</pitch>
<tpc>13</tpc>
</Note>
</Chord>
<Chord>
<durationType>16th</durationType>
<Note>
<pitch>62</pitch>
<tpc>16</tpc>
</Note>
</Chord>
<endTuplet/>
<Tuplet>
<bracketType>1</bracketType>
<normalNotes>2</normalNotes>
<actualNotes>3</actualNotes>
<baseNote>32nd</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
<Chord>
<durationType>32nd</durationType>
<Note>
<pitch>65</pitch>
<tpc>13</tpc>
</Note>
</Chord>
<Chord>
<durationType>32nd</durationType>
<Note>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Chord>
<durationType>32nd</durationType>
<Note>
<pitch>81</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<endTuplet/>
<Rest>
<durationType>16th</durationType>
</Rest>
<Tuplet>
<normalNotes>2</normalNotes>
<actualNotes>3</actualNotes>
<baseNote>16th</baseNote>
<Number>
<italic>1</italic>
<text>3</text>
</Number>
</Tuplet>
<Chord>
<durationType>16th</durationType>
<Note>
<pitch>79</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<durationType>16th</durationType>
<Note>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Rest>
<durationType>16th</durationType>
</Rest>
<endTuplet/>
<Rest>
<durationType>quarter</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
</BarLine>
</voice>
</Measure>
</Staff>
</Score>
</museScore>