ported #6580, #6541, #7004, #7192, #7212

musescore · Feb 8, 2021 · 9fc9146 · 9fc9146
1 parent 57057e6
commit 9fc9146
Show file tree

Hide file tree

Showing 17 changed files with 91 additions and 56 deletions.
diff --git a/src/libmscore/bracket.cpp b/src/libmscore/bracket.cpp
@@ -286,7 +286,6 @@ void Bracket::draw(QPainter* painter) const
     break;
     case BracketType::LINE: {
         qreal h = 2 * h2;
-        qreal _spatium = spatium();
         qreal w = 0.67 * score()->styleP(Sid::bracketWidth);
         QPen pen(curColor(), w, Qt::SolidLine, Qt::FlatCap);
         painter->setPen(pen);

diff --git a/src/libmscore/changeMap.cpp b/src/libmscore/changeMap.cpp
@@ -533,10 +533,9 @@ void ChangeMap::dump()
         if (event.type == ChangeEventType::FIX) {
             qDebug().nospace() << "===" << tick.ticks() << " : FIX " << event.value;
         } else if (event.type == ChangeEventType::RAMP) {
-            qDebug().nospace() << "===" << tick.ticks() << " to " << (tick + event.length).ticks() << " : RAMP diff "
-                               << event.value << " " << ChangeMap::changeMethodToName(event.method) << " ("
-                               << event.cachedStartVal
-                               << ", " << event.cachedEndVal << ")";
+            qDebug().nospace() << "===" << tick.ticks() << " to " << (tick + event.length).ticks() << " : RAMP diff " << event.value
+                               << " " << ChangeMap::changeMethodToName(event.method) << " (" << event.cachedStartVal << ", "
+                               << event.cachedEndVal << ")";
         } else if (event.type == ChangeEventType::INVALID) {
             qDebug().nospace() << "===" << tick.ticks() << " : INVALID value" << event.value;
         }

diff --git a/src/libmscore/chord.cpp b/src/libmscore/chord.cpp
@@ -2270,8 +2270,7 @@ void Chord::layoutTablature()
     // or duration longer than half (if halves have stems) or duration longer than crochet
     // remove stems
     if (tab->stemless() || _noStem || measure()->stemless(staffIdx()) || durationType().type()
-        < (tab->minimStyle()
-           != TablatureMinimStyle::NONE ? TDuration::DurationType::V_HALF : TDuration::DurationType::V_QUARTER)) {
+        < (tab->minimStyle() != TablatureMinimStyle::NONE ? TDuration::DurationType::V_HALF : TDuration::DurationType::V_QUARTER)) {
         if (_stem) {
             score()->undo(new RemoveElement(_stem));
         }

diff --git a/src/libmscore/chordlist.cpp b/src/libmscore/chordlist.cpp
@@ -1227,8 +1227,8 @@ bool ParsedChord::parse(const QString& s, const ChordList* cl, bool syntaxOnly,
 //   fromXml
 //---------------------------------------------------------
 
-QString ParsedChord::fromXml(const QString& rawKind, const QString& rawKindText, const QString& useSymbols,
-                             const QString& useParens, const QList<HDegree>& dl, const ChordList* cl)
+QString ParsedChord::fromXml(const QString& rawKind, const QString& rawKindText, const QString& useSymbols, const QString& useParens,
+                             const QList<HDegree>& dl, const ChordList* cl)
 {
     QString kind = rawKind;
     QString kindText = rawKindText;

diff --git a/src/libmscore/chordrest.cpp b/src/libmscore/chordrest.cpp
@@ -969,8 +969,7 @@ bool ChordRest::isGraceBefore() const
 bool ChordRest::isGraceAfter() const
 {
     return isChord()
-           && (toChord(this)->noteType()
-               & (NoteType::GRACE8_AFTER | NoteType::GRACE16_AFTER | NoteType::GRACE32_AFTER));
+           && (toChord(this)->noteType() & (NoteType::GRACE8_AFTER | NoteType::GRACE16_AFTER | NoteType::GRACE32_AFTER));
 }
 
 //---------------------------------------------------------

diff --git a/src/libmscore/cmd.cpp b/src/libmscore/cmd.cpp
@@ -1042,8 +1042,14 @@ Fraction Score::makeGap(Segment* segment, int track, const Fraction& _sd, Tuplet
             accumulated = _sd;
             Fraction rd = td - sd;
             Fraction tick = cr->tick() + actualTicks(sd, tuplet, timeStretch);
-            std::vector<TDuration> dList = toRhythmicDurationList(rd, true, tick - measure->tick(), sigmap()->timesig(
-                                                                      tick).nominal(), measure, 0);
+
+            std::vector<TDuration> dList;
+            if (tuplet || staff(track / VOICES)->isLocalTimeSignature(tick)) {
+                dList = toDurationList(rd, false);
+                std::reverse(dList.begin(), dList.end());
+            } else {
+                dList = toRhythmicDurationList(rd, true, tick - measure->tick(), sigmap()->timesig(tick).nominal(), measure, 0);
+            }
             if (dList.empty()) {
                 break;
             }

diff --git a/src/libmscore/edit.cpp b/src/libmscore/edit.cpp
@@ -440,8 +440,14 @@ Rest* Score::setRest(const Fraction& _tick, int track, const Fraction& _l, bool
             //
             // compute list of durations which will fit l
             //
-            std::vector<TDuration> dList = toRhythmicDurationList(f, true, tick - measure->tick(), sigmap()->timesig(
-                                                                      tick).nominal(), measure, useDots ? 1 : 0);
+            std::vector<TDuration> dList;
+            if (tuplet || staff->isLocalTimeSignature(tick)) {
+                dList = toDurationList(l, useDots);
+                std::reverse(dList.begin(), dList.end());
+            } else {
+                dList
+                    = toRhythmicDurationList(f, true, tick - measure->tick(), sigmap()->timesig(tick).nominal(), measure, useDots ? 1 : 0);
+            }
             if (dList.empty()) {
                 return 0;
             }
@@ -876,9 +882,8 @@ bool Score::rewriteMeasures(Measure* fm, Measure* lm, const Fraction& ns, int st
                         if (trem->chord2() == chord) {
                             continue;
                         }
-                        auto newP = std::tuple<Fraction, Fraction, Tremolo*, int>(cr->tick(),
-                                                                                  trem->chord2()->segment()->tick(), trem,
-                                                                                  track);
+                        auto newP
+                            = std::tuple<Fraction, Fraction, Tremolo*, int>(cr->tick(), trem->chord2()->segment()->tick(), trem, track);
                         tremoloChordTicks.push_back(newP);
                     }
                 }
@@ -1228,22 +1233,22 @@ void Score::cmdAddTimeSig(Measure* fm, int staffIdx, TimeSig* ts, bool local)
                 if (changeActual) {
                     m->undoChangeProperty(Pid::TIMESIG_ACTUAL, QVariant::fromValue(ns));
                 }
-                std::pair<int, int> staffIdxRange = getStaffIdxRange(score);
-                for (int si = staffIdxRange.first; si < staffIdxRange.second; ++si) {
-                    TimeSig* nsig = toTimeSig(seg->element(si * VOICES));
-                    if (!nsig) {
-                        continue;
-                    }
-                    nsig->undoChangeProperty(Pid::SHOW_COURTESY, ts->showCourtesySig());
-                    nsig->undoChangeProperty(Pid::TIMESIG, QVariant::fromValue(ts->sig()));
-                    nsig->undoChangeProperty(Pid::TIMESIG_TYPE, int(ts->timeSigType()));
-                    nsig->undoChangeProperty(Pid::NUMERATOR_STRING, ts->numeratorString());
-                    nsig->undoChangeProperty(Pid::DENOMINATOR_STRING, ts->denominatorString());
-                    nsig->undoChangeProperty(Pid::TIMESIG_STRETCH, QVariant::fromValue(ts->stretch()));
-                    nsig->undoChangeProperty(Pid::GROUPS, QVariant::fromValue(ts->groups()));
-                    nsig->setSelected(false);
-                    nsig->setDropTarget(0);
+            }
+            std::pair<int, int> staffIdxRange = getStaffIdxRange(score);
+            for (int si = staffIdxRange.first; si < staffIdxRange.second; ++si) {
+                TimeSig* nsig = toTimeSig(seg->element(si * VOICES));
+                if (!nsig) {
+                    continue;
                 }
+                nsig->undoChangeProperty(Pid::SHOW_COURTESY, ts->showCourtesySig());
+                nsig->undoChangeProperty(Pid::TIMESIG, QVariant::fromValue(ts->sig()));
+                nsig->undoChangeProperty(Pid::TIMESIG_TYPE, int(ts->timeSigType()));
+                nsig->undoChangeProperty(Pid::NUMERATOR_STRING, ts->numeratorString());
+                nsig->undoChangeProperty(Pid::DENOMINATOR_STRING, ts->denominatorString());
+                nsig->undoChangeProperty(Pid::TIMESIG_STRETCH, QVariant::fromValue(ts->stretch()));
+                nsig->undoChangeProperty(Pid::GROUPS, QVariant::fromValue(ts->groups()));
+                nsig->setSelected(false);
+                nsig->setDropTarget(0);
             }
         }
     } else {
@@ -1364,7 +1369,9 @@ void Score::cmdRemoveTimeSig(TimeSig* ts)
     Score* rScore = masterScore();
     Measure* rm = rScore->tick2measure(m->tick());
     Segment* rs = rm->findSegment(SegmentType::TimeSig, s->tick());
-    rScore->undoRemoveElement(rs);
+    if (rs) {
+        rScore->undoRemoveElement(rs);
+    }
 
     Measure* pm = m->prevMeasure();
     Fraction ns(pm ? pm->timesig() : Fraction(4,4));
@@ -5364,7 +5371,7 @@ void Score::undoAddElement(Element* element)
                 if (ne->isFretDiagram()) {
                     FretDiagram* fd = toFretDiagram(ne);
                     Harmony* fdHarmony = fd->harmony();
-                    if (fd) {
+                    if (fdHarmony) {
                         fdHarmony->setScore(score);
                         fdHarmony->setSelected(false);
                         fdHarmony->setTrack(staffIdx * VOICES + element->voice());
@@ -5442,8 +5449,7 @@ void Score::undoAddElement(Element* element)
                      || element->isFermata()
                      || element->isHarmony()) {
                 Segment* segment
-                    = element->parent()->isFretDiagram() ? toSegment(element->parent()->parent()) : toSegment(
-                          element->parent());
+                    = element->parent()->isFretDiagram() ? toSegment(element->parent()->parent()) : toSegment(element->parent());
                 Fraction tick    = segment->tick();
                 Measure* m       = score->tick2measure(tick);
                 if ((segment->segmentType() == SegmentType::EndBarLine) && (m->tick() == tick)) {

diff --git a/src/libmscore/element.cpp b/src/libmscore/element.cpp
@@ -114,7 +114,7 @@ namespace Ms {
 
 void Element::spatiumChanged(qreal oldValue, qreal newValue)
 {
-    if (sizeIsSpatiumDependent()) {
+    if (offsetIsSpatiumDependent()) {
         _offset *= (newValue / oldValue);
     }
 }
@@ -126,7 +126,7 @@ void Element::spatiumChanged(qreal oldValue, qreal newValue)
 
 void Element::localSpatiumChanged(qreal oldValue, qreal newValue)
 {
-    if (sizeIsSpatiumDependent()) {
+    if (offsetIsSpatiumDependent()) {
         _offset *= (newValue / oldValue);
     }
 }
@@ -145,6 +145,15 @@ qreal Element::spatium() const
     }
 }
 
+//---------------------------------------------------------
+//   offsetIsSpatiumDependent
+//---------------------------------------------------------
+
+bool Element::offsetIsSpatiumDependent() const
+{
+    return sizeIsSpatiumDependent() || (_flags & ElementFlag::ON_STAFF);
+}
+
 //---------------------------------------------------------
 //   magS
 //---------------------------------------------------------
@@ -461,8 +470,8 @@ QPointF Element::pagePos() const
     }
 
     if (_flags & ElementFlag::ON_STAFF) {
-        System* system = 0;
-        Measure* measure = 0;
+        System* system = nullptr;
+        Measure* measure = nullptr;
         if (parent()->isSegment()) {
             measure = toSegment(parent())->measure();
         } else if (parent()->isMeasure()) {           // used in measure number
@@ -2286,7 +2295,7 @@ void Element::endEditDrag(EditData& ed)
     ElementEditData* eed = ed.getData(this);
     bool changed = false;
     if (eed) {
-        for (PropertyData pd : eed->propertyData) {
+        for (const PropertyData& pd : qAsConst(eed->propertyData)) {
             setPropertyFlags(pd.id, pd.f);       // reset initial property flags state
             if (score()->undoPropertyChanged(this, pd.id, pd.data)) {
                 changed = true;

diff --git a/src/libmscore/element.h b/src/libmscore/element.h
@@ -251,6 +251,7 @@ class Element : public ScoreElement
 
     virtual bool sizeIsSpatiumDependent() const override { return !flag(ElementFlag::SIZE_SPATIUM_DEPENDENT); }
     void setSizeIsSpatiumDependent(bool v) { setFlag(ElementFlag::SIZE_SPATIUM_DEPENDENT, !v); }
+    virtual bool offsetIsSpatiumDependent() const override;
 
     Placement placement() const { return Placement(!flag(ElementFlag::PLACE_ABOVE)); }
     void setPlacement(Placement val) { setFlag(ElementFlag::PLACE_ABOVE, !bool(val)); }

diff --git a/src/libmscore/figuredbass.cpp b/src/libmscore/figuredbass.cpp
@@ -159,8 +159,7 @@ bool FiguredBassItem::parse(QString& str)
     // prefix, digit, suffix and cont.line cannot be ALL empty
     // suffix cannot combine with empty digit
     if ((_prefix != Modifier::NONE && _suffix != Modifier::NONE)
-        || (_prefix == Modifier::NONE && _digit == FBIDigitNone && _suffix == Modifier::NONE
-            && _contLine == ContLine::NONE)
+        || (_prefix == Modifier::NONE && _digit == FBIDigitNone && _suffix == Modifier::NONE && _contLine == ContLine::NONE)
         || ((_suffix == Modifier::CROSS || _suffix == Modifier::BACKSLASH || _suffix == Modifier::SLASH)
             && _digit == FBIDigitNone)) {
         return false;

diff --git a/src/libmscore/fret.cpp b/src/libmscore/fret.cpp
@@ -916,13 +916,16 @@ void FretDiagram::setDot(int string, int fret, bool add /*= false*/, FretDotType
         }
 
         _dots[string].push_back(FretItem::Dot(fret, dtype));
-        setMarker(string, FretMarkerType::NONE);
+        if (!add) {
+            setMarker(string, FretMarkerType::NONE);
+        }
     }
 }
 
 //---------------------------------------------------------
 //   setMarker
-//    Remove any dots and barres if the marker is being set to anything other than none.
+//    Removal of dots and barres if "Multiple dots" is inactive
+//    is handled in FretCanvas::mousePressEvent()
 //---------------------------------------------------------
 
 void FretDiagram::setMarker(int string, FretMarkerType mtype)

diff --git a/src/libmscore/harmony.cpp b/src/libmscore/harmony.cpp
@@ -1207,8 +1207,8 @@ const ChordDescription* Harmony::fromXml(const QString& kind)
 //    then generate chord description from that
 //---------------------------------------------------------
 
-const ChordDescription* Harmony::fromXml(const QString& kind, const QString& kindText, const QString& symbols,
-                                         const QString& parens, const QList<HDegree>& dl)
+const ChordDescription* Harmony::fromXml(const QString& kind, const QString& kindText, const QString& symbols, const QString& parens,
+                                         const QList<HDegree>& dl)
 {
     ParsedChord* pc = new ParsedChord;
     _textName = pc->fromXml(kind, kindText, symbols, parens, dl, score()->style().chordList());
@@ -1546,8 +1546,12 @@ void Harmony::draw(QPainter* painter) const
     for (const TextSegment* ts : textList) {
         QFont f(ts->font);
         f.setPointSizeF(f.pointSizeF() * MScore::pixelRatio);
+#ifndef Q_OS_MACOS
+        TextBase::drawTextWorkaround(painter, f, ts->pos(), ts->text);
+#else
         painter->setFont(f);
         painter->drawText(ts->pos(), ts->text);
+#endif
     }
 }
 

diff --git a/src/libmscore/scoreElement.cpp b/src/libmscore/scoreElement.cpp
@@ -412,7 +412,7 @@ void ScoreElement::readProperty(XmlReader& e, Pid id)
         v = v.toPointF() * score()->spatium();
         break;
     case P_TYPE::POINT_SP_MM:
-        if (sizeIsSpatiumDependent()) {
+        if (offsetIsSpatiumDependent()) {
             v = v.toPointF() * score()->spatium();
         } else {
             v = v.toPointF() * DPMM;
@@ -497,7 +497,7 @@ void ScoreElement::writeProperty(XmlWriter& xml, Pid pid) const
                 return;
             }
         }
-        qreal q = sizeIsSpatiumDependent() ? score()->spatium() : DPMM;
+        qreal q = offsetIsSpatiumDependent() ? score()->spatium() : DPMM;
         p = QVariant(p1 / q);
         d = QVariant();
     }
@@ -960,7 +960,7 @@ QVariant ScoreElement::styleValue(Pid pid, Sid sid) const
     }
     case P_TYPE::POINT_SP_MM: {
         QPointF val = score()->styleV(sid).toPointF();
-        if (sizeIsSpatiumDependent()) {
+        if (offsetIsSpatiumDependent()) {
             val *= score()->spatium();
             if (isElement()) {
                 const Element* e = toElement(this);

diff --git a/src/libmscore/scoreElement.h b/src/libmscore/scoreElement.h
@@ -245,6 +245,7 @@ class ScoreElement
     virtual void resetProperty(Pid id);
     QVariant propertyDefault(Pid pid, Tid tid) const;
     virtual bool sizeIsSpatiumDependent() const { return true; }
+    virtual bool offsetIsSpatiumDependent() const { return true; }
 
     virtual void reset();                       // reset all properties & position to default
 

diff --git a/src/libmscore/spanner.cpp b/src/libmscore/spanner.cpp
@@ -108,7 +108,7 @@ void SpannerSegment::setSystem(System* s)
 void SpannerSegment::spatiumChanged(qreal ov, qreal nv)
 {
     Element::spatiumChanged(ov, nv);
-    if (sizeIsSpatiumDependent()) {
+    if (offsetIsSpatiumDependent()) {
         _offset2 *= (nv / ov);
     }
 }

diff --git a/src/libmscore/textbase.cpp b/src/libmscore/textbase.cpp
@@ -878,6 +878,19 @@ void TextFragment::draw(QPainter* p, const TextBase* t) const
     QFont f(font(t));
     f.setPointSizeF(f.pointSizeF() * MScore::pixelRatio);
 #ifndef Q_OS_MACOS
+    TextBase::drawTextWorkaround(p, f, pos, text);
+#else
+    p->setFont(f);
+    p->drawText(pos, text);
+#endif
+}
+
+//---------------------------------------------------------
+//   drawTextWorkaround
+//---------------------------------------------------------
+
+void TextBase::drawTextWorkaround(QPainter* p, QFont& f, const QPointF pos, const QString text)
+{
     qreal mm = p->worldTransform().m11();
     if (!(MScore::pdfPrinting) && (mm < 1.0) && f.bold() && !(f.underline())) {
         // workaround for https://musescore.org/en/node/284218
@@ -973,10 +986,6 @@ void TextFragment::draw(QPainter* p, const TextBase* t) const
         p->setFont(f);
         p->drawText(pos, text);
     }
-#else
-    p->setFont(f);
-    p->drawText(pos, text);
-#endif
 }
 
 //---------------------------------------------------------

diff --git a/src/libmscore/textbase.h b/src/libmscore/textbase.h
@@ -285,6 +285,7 @@ class TextBase : public Element
 
     virtual void draw(QPainter*) const override;
     virtual void drawEditMode(QPainter* p, EditData& ed) override;
+    static void drawTextWorkaround(QPainter* p, QFont& f, const QPointF pos, const QString text);
 
     static QString plainToXmlText(const QString& s) { return s.toHtmlEscaped(); }
     void setPlainText(const QString& t) { setXmlText(plainToXmlText(t)); }