Merge pull request #30630 from cbjeukendrup/port/4.6.3

Port/4.6.3

Author: cbjeukendrup

buildscripts/packaging/Linux+BSD/org.musescore.MuseScore.appdata.xml.in

@@ -116,6 +116,9 @@
     </kudos>
     <!-- Only <releases> below this point please! -->
     <releases>
+        <release date="2025-10-21" version="4.6.3">
+            <url>https://musescore.org/en/4.6.3</url>
+        </release>
         <release date="2025-10-10" version="4.6.2">
             <url>https://musescore.org/en/4.6.2</url>
         </release>

src/engraving/dom/tiejumppointlist.cpp

@@ -64,13 +64,13 @@ void TieJumpPoint::undoSetActive(bool v)
     score->undo(new ChangeTieJumpPointActive(m_jumpPointList, m_id, v));
 }
 
-const String TieJumpPoint::menuTitle() const
+TranslatableString TieJumpPoint::menuTitle() const
 {
     const Measure* measure = m_note->findMeasure();
     const int measureNo = measure ? measure->no() + 1 : 0;
 
     //: %1 represents the preceding jump item eg. coda. %2 represents the measure number
-    return muse::mtrc("engraving", "Tie to %1 (m. %2)").arg(precedingJumpItemName(), String::number(measureNo));
+    return TranslatableString("engraving", "Tie to %1 (m. %2)").arg(precedingJumpItemName(), String::number(measureNo));
 }
 
 String TieJumpPoint::precedingJumpItemName() const

src/engraving/dom/tiejumppointlist.h

@@ -21,7 +21,9 @@
  */
 
 #pragma once
+
 #include "global/types/string.h"
+#include "global/types/translatablestring.h"
 
 namespace mu::engraving {
 class Note;
@@ -48,7 +50,7 @@ class TieJumpPoint
     void setJumpPointList(TieJumpPointList* jumpPointList) { m_jumpPointList = jumpPointList; }
     TieJumpPointList* jumpPointList() { return m_jumpPointList; }
 
-    const muse::String menuTitle() const;
+    muse::TranslatableString menuTitle() const;
 
 private:
     muse::String precedingJumpItemName() const;

src/framework/global/serialization/textstream.cpp

@@ -101,7 +101,11 @@ TextStream& TextStream::operator<<(double val)
     || (!defined(__APPLE__) && defined(_LIBCPP_VERSION) && _LIBCPP_VERSION >= 14000) \
     || (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 11)
     std::array<char, 24> buf{};
-    const auto [last, ec] = std::to_chars(buf.data(), buf.data() + buf.size(), val);
+
+    // emulate std::stringstream default behavior
+    constexpr auto format = std::chars_format::general;
+    constexpr int precision = 6;
+    const auto [last, ec] = std::to_chars(buf.data(), buf.data() + buf.size(), val, format, precision);
     IF_ASSERT_FAILED(ec == std::errc {}) {
         return *this;
     }

src/framework/languages/internal/languagesservice.cpp

@@ -42,6 +42,8 @@
 
 #include "log.h"
 
+using namespace Qt::Literals::StringLiterals;
+
 using namespace muse;
 using namespace muse::languages;
 using namespace muse::network;
@@ -211,56 +213,49 @@ void LanguagesService::setCurrentLanguage(const QString& languageCode)
 
 QString LanguagesService::effectiveLanguageCode(QString languageCode) const
 {
-    languageCode.replace('-', '_');
-    // Tries decreasingly specific versions of `code`. For example:
-    // "nl_NL" -> not found -> try just "nl" -> found -> returns "nl".
-    auto tryCode = [this](QString code) -> QString {
-        for (;;) {
-            if (m_languagesHash.contains(code)) {
-                return code;
-            }
+    languageCode.replace(u'-', u'_');
 
-            static const std::map<QString, QString> SPECIAL_CASES {
-                { "ca_valencia", "ca@valencia" },
-                { "ca_ES_valencia", "ca@valencia" },
-                { "en_AU", "en_GB" },
-                { "en_NZ", "en_GB" },
-                { "en", "en_US" },
-                { "hi", "hi_IN" },
-                { "mn", "mn_MN" },
-                { "zh", "zh_CN" }
-            };
-
-            auto it = SPECIAL_CASES.find(code);
-            if (it != SPECIAL_CASES.cend()) {
-                return it->second;
-            }
-
-            int rightmost = code.lastIndexOf('_');
-            if (rightmost <= 0) {
-                break;
-            }
+    auto tryCode = [this](const QString& code) -> QString {
+        if (m_languagesHash.contains(code)) {
+            return code;
+        }
 
-            code.truncate(rightmost);
+        static const std::map<QString, QString> SPECIAL_CASES {
+            { u"ca_valencia"_s, u"ca@valencia"_s },
+            { u"ca_ES_valencia"_s, u"ca@valencia"_s },
+            { u"en_AU"_s, u"en_GB"_s },
+            { u"en_NZ"_s, u"en_GB"_s },
+            { u"en"_s, u"en_US"_s },
+            { u"hi"_s, u"hi_IN"_s },
+            { u"mn"_s, u"mn_MN"_s },
+            { u"zh"_s, u"zh_CN"_s }
+        };
+
+        auto it = SPECIAL_CASES.find(code);
+        if (it != SPECIAL_CASES.cend()) {
+            return it->second;
         }
 
         // Not found
         return QString();
     };
 
     if (languageCode.isEmpty() || languageCode == SYSTEM_LANGUAGE_CODE) {
-        for (const QString& code : QLocale::system().uiLanguages()) {
-            LOGI() << "System language code: " << code;
-            QString effectiveCode = code;
-            effectiveCode.replace('-', '_');
+        const QStringList systemLanguages = QLocale::system().uiLanguages();
+        LOGI() << "System languages: " << systemLanguages;
+
+        for (QString code : systemLanguages) {
+            code.replace(u'-', u'_');
+
             // Prefer Swedish (Modern) over Swedish (Traditional)
             // when using system language.
-            if (effectiveCode == "sv_SE") {
-                effectiveCode = "sv";
+            if (code == u"sv_SE"_s) {
+                code = u"sv"_s;
             }
-            effectiveCode = tryCode(effectiveCode);
-            if (!effectiveCode.isEmpty()) {
-                return effectiveCode;
+
+            code = tryCode(code);
+            if (!code.isEmpty()) {
+                return code;
             }
         }
 

src/importexport/musicxml/internal/musicxml/export/exportmusicxml.cpp

@@ -832,19 +832,22 @@ static String slurTieBezier(const SlurTie* st, const bool start)
 
     String attributeString;
     const int spatium = st->spatium();
-    if (start) {
-        const SlurTieSegment* front = toSlurTieSegment(st->frontSegment());
-        const PointF startP = front->ups(Grip::START).pos();
-        const PointF bezierP = front->ups(Grip::BEZIER1).pos();
-        attributeString += String(u" bezier-x=\"%1\"").arg(10 * (bezierP.x() - startP.x()) / spatium);
-        attributeString += String(u" bezier-y=\"%1\"").arg(-10 * (bezierP.y() - startP.y()) / spatium);
-    } else {
-        const SlurTieSegment* back = toSlurTieSegment(st->backSegment());
-        const PointF endP = back->ups(Grip::END).pos();
-        const PointF bezierP = back->ups(Grip::BEZIER2).pos();
-        attributeString += String(u" bezier-x=\"%1\"").arg(10 * (bezierP.x() - endP.x()) / spatium);
-        attributeString += String(u" bezier-y=\"%1\"").arg(-10 * (bezierP.y() - endP.y()) / spatium);
+    if (!st->spannerSegments().empty()) {
+        if (start) {
+            const SlurTieSegment* front = toSlurTieSegment(st->frontSegment());
+            const PointF startP = front->ups(Grip::START).pos();
+            const PointF bezierP = front->ups(Grip::BEZIER1).pos();
+            attributeString += String(u" bezier-x=\"%1\"").arg(10 * (bezierP.x() - startP.x()) / spatium);
+            attributeString += String(u" bezier-y=\"%1\"").arg(-10 * (bezierP.y() - startP.y()) / spatium);
+        } else {
+            const SlurTieSegment* back = toSlurTieSegment(st->backSegment());
+            const PointF endP = back->ups(Grip::END).pos();
+            const PointF bezierP = back->ups(Grip::BEZIER2).pos();
+            attributeString += String(u" bezier-x=\"%1\"").arg(10 * (bezierP.x() - endP.x()) / spatium);
+            attributeString += String(u" bezier-y=\"%1\"").arg(-10 * (bezierP.y() - endP.y()) / spatium);
+        }
     }
+
     return attributeString;
 }
 
@@ -936,9 +939,11 @@ void SlurHandler::doSlurs(const ChordRest* chordRest, Notations& notations, XmlW
             if (sp->generated() || !sp->isSlur()) {
                 continue;
             }
-            if (sp->isHammerOnPullOff()) {
+            if (sp->isHammerOnPullOff() && !sp->spannerSegments().empty()) {
                 const HammerOnPullOffSegment* hopoSeg = static_cast<const HammerOnPullOffSegment*>(sp->spannerSegments().front());
-                tagName = hopoSeg->hopoText().front()->isHammerOn() ? u"hammer-on" : u"pull-off";
+                if (!hopoSeg->hopoText().empty()) {
+                    tagName = hopoSeg->hopoText().front()->isHammerOn() ? u"hammer-on" : u"pull-off";
+                }
             }
             if (chordRest == sp->startElement() || chordRest == sp->endElement()) {
                 const Slur* s = static_cast<const Slur*>(sp);

src/importexport/musicxml/internal/musicxml/import/importmusicxmlpass2.cpp

@@ -7248,7 +7248,7 @@ Note* MusicXmlParserPass2::note(const String& partId,
     // handle notations
     if (cr) {
         notations.addToScore(cr, note,
-                             noteStartTime.ticks(), m_slurs, m_glissandi, m_spanners, m_trills, m_ties, m_unstartedTieNotes,
+                             noteStartTime, m_slurs, m_glissandi, m_spanners, m_trills, m_ties, m_unstartedTieNotes,
                              m_unendedTieNotes, arpMap, delayedArps);
 
         // if no tie added yet, convert the "tie" into "tied" and add it.
@@ -8187,7 +8187,7 @@ void MusicXmlParserNotations::slur()
 //   addSlur
 //---------------------------------------------------------
 
-static void addSlur(const Notation& notation, SlurStack& slurs, ChordRest* cr, Note* note, const int tick,
+static void addSlur(const Notation& notation, SlurStack& slurs, ChordRest* cr, Note* note, const Fraction& tick,
                     MusicXmlLogger* logger, const XmlStreamReader* const xmlreader)
 {
     int slurNo = notation.attribute(u"number").toInt();
@@ -8212,8 +8212,9 @@ static void addSlur(const Notation& notation, SlurStack& slurs, ChordRest* cr, N
         } else if (slurs[slurNo].isStop()) {
             // slur start when slur already stopped: wrap up
             Slur* newSlur = slurs[slurNo].slur();
+            slurs[slurNo] = SlurDesc();
+
             if (newSlur->endElement() == cr && note) {
-                slurs[slurNo] = SlurDesc();
                 delete newSlur;
 
                 // Slur starts & ends on same chord - add lv instead
@@ -8222,16 +8223,16 @@ static void addSlur(const Notation& notation, SlurStack& slurs, ChordRest* cr, N
                 note->score()->undoAddElement(lvTie);
                 return;
             }
-            newSlur->setTrack(track);
-            newSlur->setTick(Fraction::fromTicks(tick));
-            newSlur->setStartElement(cr);
-            newSlur->setTick2(newSlur->endElement()->tick());
-            if (newSlur->ticks().negative()) {
+            const Fraction tick2 = newSlur->endElement()->tick();
+            if (tick2 < tick) {
                 logger->logError(String(u"slur end is before slur start"), xmlreader);
-                slurs[slurNo] = SlurDesc();
                 delete newSlur;
                 return;
             }
+            newSlur->setTrack(track);
+            newSlur->setTick(tick);
+            newSlur->setStartElement(cr);
+            newSlur->setTick2(tick2);
             score->addElement(newSlur);
         } else {
             // slur start for new slur: init
@@ -8251,7 +8252,7 @@ static void addSlur(const Notation& notation, SlurStack& slurs, ChordRest* cr, N
             }
             newSlur->setVisible(notation.visible());
             colorItem(newSlur, Color::fromString(notation.attribute(u"color")));
-            newSlur->setTick(Fraction::fromTicks(tick));
+            newSlur->setTick(tick);
             newSlur->setStartElement(cr);
             if (configuration()->importLayout()) {
                 const String orientation = notation.attribute(u"orientation");
@@ -8274,9 +8275,9 @@ static void addSlur(const Notation& notation, SlurStack& slurs, ChordRest* cr, N
         if (slurs[slurNo].isStart()) {
             // slur stop when slur already started: wrap up
             Slur* newSlur = slurs[slurNo].slur();
+            slurs[slurNo] = SlurDesc();
 
             if (newSlur->startElement() == cr && note) {
-                slurs[slurNo] = SlurDesc();
                 delete newSlur;
 
                 // Slur starts & ends on same chord - add lv instead
@@ -8287,11 +8288,10 @@ static void addSlur(const Notation& notation, SlurStack& slurs, ChordRest* cr, N
             }
 
             if (!(cr->isGrace())) {
-                newSlur->setTick2(Fraction::fromTicks(tick));
+                newSlur->setTick2(tick);
                 newSlur->setTrack2(track);
             }
             newSlur->setEndElement(cr);
-            slurs[slurNo] = SlurDesc();
             score->addElement(newSlur);
         } else if (slurs[slurNo].isStop()) {
             // slur stop when slur already stopped: report error
@@ -9335,14 +9335,14 @@ void MusicXmlParserNotations::addNotation(const Notation& notation, ChordRest* c
  as in that case note is a nullptr.
  */
 
-void MusicXmlParserNotations::addToScore(ChordRest* const cr, Note* const note, const int tick, SlurStack& slurs,
+void MusicXmlParserNotations::addToScore(ChordRest* const cr, Note* const note, const Fraction& tick, SlurStack& slurs,
                                          Glissando* glissandi[MAX_NUMBER_LEVEL][2], MusicXmlSpannerMap& spanners,
                                          TrillStack& trills, MusicXmlTieMap& ties, std::vector<Note*>& unstartedTieNotes,
                                          std::vector<Note*>& unendedTieNotes, ArpeggioMap& arpMap,
                                          DelayedArpMap& delayedArps)
 {
     addArpeggio(cr, m_arpeggioType, m_arpeggioNo, m_arpeggioColor, arpMap, delayedArps);
-    addWavyLine(cr, Fraction::fromTicks(tick), m_wavyLineNo, m_wavyLineType, spanners, trills, m_logger, &m_e);
+    addWavyLine(cr, tick, m_wavyLineNo, m_wavyLineType, spanners, trills, m_logger, &m_e);
 
     for (const Notation& notation : m_notations) {
         if (notation.symId() != SymId::noSym) {
@@ -9367,7 +9367,7 @@ void MusicXmlParserNotations::addToScore(ChordRest* const cr, Note* const note,
         Dynamic* dynamic = Factory::createDynamic(m_score->dummy()->segment());
         dynamic->setDynamicType(d);
         colorItem(dynamic, m_dynamicsColor);
-        m_pass2.addElemOffset(dynamic, cr->track(), m_dynamicsPlacement, cr->measure(), Fraction::fromTicks(tick));
+        m_pass2.addElemOffset(dynamic, cr->track(), m_dynamicsPlacement, cr->measure(), tick);
     }
 }
 

src/importexport/musicxml/internal/musicxml/import/importmusicxmlpass2.h

@@ -344,7 +344,7 @@ class MusicXmlParserNotations
 public:
     MusicXmlParserNotations(muse::XmlStreamReader& e, engraving::Score* score, MusicXmlLogger* logger, MusicXmlParserPass2& pass2);
     void parse();
-    void addToScore(engraving::ChordRest* const cr, engraving::Note* const note, const int tick, SlurStack& slurs,
+    void addToScore(engraving::ChordRest* const cr, engraving::Note* const note, const engraving::Fraction& tick, SlurStack& slurs,
                     engraving::Glissando* glissandi[MAX_NUMBER_LEVEL][2], MusicXmlSpannerMap& spanners, TrillStack& trills,
                     MusicXmlTieMap& ties, std::vector<engraving::Note*>& unstartedTieNotes, std::vector<engraving::Note*>& unendedTieNotes,
                     ArpeggioMap& arpMap, DelayedArpMap& delayedArps);

src/inspector/internal/services/elementrepositoryservice.cpp

@@ -397,8 +397,10 @@ EngravingItem* ElementRepositoryService::findTextDelegate(EngravingItem* element
     switch (element->type()) {
     case ElementType::BAR_LINE: {
         Segment* seg = toBarLine(element)->segment();
-        PlayCountText* playCountText = toPlayCountText(seg->findAnnotation(ElementType::PLAY_COUNT_TEXT, 0, 0));
-        return playCountText;
+        if (PlayCountText* playCountText = toPlayCountText(seg->findAnnotation(ElementType::PLAY_COUNT_TEXT, 0, 0))) {
+            return playCountText;
+        }
+        return element;
     }
     default:
         return element;

src/notation/internal/notationinteraction.cpp

@@ -2743,7 +2743,6 @@ void NotationInteraction::applyPaletteElementToRange(EngravingItem* element, boo
         }
         default: break;
         }
-        return;
     }
 
     const track_idx_t track1 = sel.staffStart() * mu::engraving::VOICES;