Merge pull request #26819 from mike-spa/portStuff

Port stuff
musescore · Feb 28, 2025 · 7c19778 · 7c19778
2 parents 0398ca8 + c55184b
commit 7c19778
Show file tree

Hide file tree

Showing 52 changed files with 98 additions and 92 deletions.
diff --git a/share/templates/01-General/01-Treble_Clef/score_style.mss b/share/templates/01-General/01-Treble_Clef/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/01-General/02-Bass_Clef/score_style.mss b/share/templates/01-General/02-Bass_Clef/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/01-General/03-Grand_Staff/score_style.mss b/share/templates/01-General/03-Grand_Staff/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/02-Choral/01-SATB/score_style.mss b/share/templates/02-Choral/01-SATB/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/02-Choral/02-SATB_+_Organ/score_style.mss b/share/templates/02-Choral/02-SATB_+_Organ/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/02-Choral/03-SATB_+_Piano/score_style.mss b/share/templates/02-Choral/03-SATB_+_Piano/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/02-Choral/04-SATB_Closed_Score/score_style.mss b/share/templates/02-Choral/04-SATB_Closed_Score/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/02-Choral/05-SATB_Closed_Score_+_Organ/score_style.mss b/share/templates/02-Choral/05-SATB_Closed_Score_+_Organ/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/02-Choral/06-SATB_Closed_Score_+_Piano/score_style.mss b/share/templates/02-Choral/06-SATB_Closed_Score_+_Piano/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/02-Choral/07-Voice_+_Piano/score_style.mss b/share/templates/02-Choral/07-Voice_+_Piano/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/02-Choral/08-Barbershop_Quartet_(Men)/score_style.mss b/share/templates/02-Choral/08-Barbershop_Quartet_(Men)/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/02-Choral/09-Barbershop_Quartet_(Women)/score_style.mss b/share/templates/02-Choral/09-Barbershop_Quartet_(Women)/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/02-Choral/10-Liturgical_Unmetrical/score_style.mss b/share/templates/02-Choral/10-Liturgical_Unmetrical/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/02-Choral/11-Liturgical_Unmetrical_+_Organ/score_style.mss b/share/templates/02-Choral/11-Liturgical_Unmetrical_+_Organ/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/03-Chamber_Music/01-String_Quartet/score_style.mss b/share/templates/03-Chamber_Music/01-String_Quartet/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/03-Chamber_Music/02-Wind_Quartet/score_style.mss b/share/templates/03-Chamber_Music/02-Wind_Quartet/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/03-Chamber_Music/03-Wind_Quintet/score_style.mss b/share/templates/03-Chamber_Music/03-Wind_Quintet/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/03-Chamber_Music/04-Saxophone_Quartet/score_style.mss b/share/templates/03-Chamber_Music/04-Saxophone_Quartet/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/03-Chamber_Music/05-Brass_Quartet/score_style.mss b/share/templates/03-Chamber_Music/05-Brass_Quartet/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/03-Chamber_Music/06-Brass_Quintet/score_style.mss b/share/templates/03-Chamber_Music/06-Brass_Quintet/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/04-Solo/01-Guitar/score_style.mss b/share/templates/04-Solo/01-Guitar/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/04-Solo/02-Guitar_+_Tablature/score_style.mss b/share/templates/04-Solo/02-Guitar_+_Tablature/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/04-Solo/03-Guitar_Tablature/score_style.mss b/share/templates/04-Solo/03-Guitar_Tablature/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/04-Solo/04-Piano/score_style.mss b/share/templates/04-Solo/04-Piano/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/05-Jazz/01-Jazz_Lead_Sheet/score_style.mss b/share/templates/05-Jazz/01-Jazz_Lead_Sheet/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/05-Jazz/02-Big_Band/score_style.mss b/share/templates/05-Jazz/02-Big_Band/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/05-Jazz/03-Jazz_Combo/score_style.mss b/share/templates/05-Jazz/03-Jazz_Combo/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/06-Popular/01-Rock_Band/score_style.mss b/share/templates/06-Popular/01-Rock_Band/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/06-Popular/02-Bluegrass_Band/score_style.mss b/share/templates/06-Popular/02-Bluegrass_Band/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/07-Band_and_Percussion/01-Concert_Band/score_style.mss b/share/templates/07-Band_and_Percussion/01-Concert_Band/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/07-Band_and_Percussion/02-Small_Concert_Band/score_style.mss b/share/templates/07-Band_and_Percussion/02-Small_Concert_Band/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/07-Band_and_Percussion/03-Brass_Band/score_style.mss b/share/templates/07-Band_and_Percussion/03-Brass_Band/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/07-Band_and_Percussion/04-Marching_Band/score_style.mss b/share/templates/07-Band_and_Percussion/04-Marching_Band/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/07-Band_and_Percussion/05-Small_Marching_Band/score_style.mss b/share/templates/07-Band_and_Percussion/05-Small_Marching_Band/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/07-Band_and_Percussion/06-Battery_Percussion/score_style.mss b/share/templates/07-Band_and_Percussion/06-Battery_Percussion/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/07-Band_and_Percussion/07-Large_Pit_Percussion/score_style.mss b/share/templates/07-Band_and_Percussion/07-Large_Pit_Percussion/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/07-Band_and_Percussion/08-Small_Pit_Percussion/score_style.mss b/share/templates/07-Band_and_Percussion/08-Small_Pit_Percussion/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/07-Band_and_Percussion/09-European_Concert_Band/score_style.mss b/share/templates/07-Band_and_Percussion/09-European_Concert_Band/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/08-Orchestral/01-Classical_Orchestra/score_style.mss b/share/templates/08-Orchestral/01-Classical_Orchestra/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/08-Orchestral/02-Symphony_Orchestra/score_style.mss b/share/templates/08-Orchestral/02-Symphony_Orchestra/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/08-Orchestral/03-String_Orchestra/score_style.mss b/share/templates/08-Orchestral/03-String_Orchestra/score_style.mss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Style>
     <pageWidth>8.26772</pageWidth>
     <pageHeight>11.6929</pageHeight>

diff --git a/share/templates/Marching_Bass_Drums.drm b/share/templates/Marching_Bass_Drums.drm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Drum pitch="37">
     <head>normal</head>
     <line>9</line>

diff --git a/share/templates/Marching_Snare_Drums.drm b/share/templates/Marching_Snare_Drums.drm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="4.40">
+<museScore version="4.50">
   <Drum pitch="55">
     <head>plus</head>
     <line>-1</line>

diff --git a/src/engraving/rendering/score/horizontalspacing.cpp b/src/engraving/rendering/score/horizontalspacing.cpp
@@ -342,13 +342,17 @@ void HorizontalSpacing::spaceAgainstPreviousSegments(Segment* segment, std::vect
         }
 
         bool timeSigAboveBarlineCase = segmentHasTimeSigAboveStaff && prevSeg->isEndBarLineType() && prevSeg->tick() == segment->tick();
-        bool timeSigAboveKeySigCase = segmentHasTimeSigAboveStaff && prevSeg->isType(SegmentType::KeySigType)
+        bool timeSigAboveKeySigCase = segmentHasTimeSigAboveStaff && prevSeg->isType(SegmentType::KeySig)
                                       && prevSeg->tick() == segment->tick();
+        bool timeSigAboveRepeatKeySigCase = segmentHasTimeSigAboveStaff && prevSeg->isType(SegmentType::KeySigRepeatAnnounce)
+                                            && prevSeg->tick() == segment->tick();
 
         if (timeSigAboveBarlineCase) {
             x = xPrevSeg + prevSeg->minRight() - 0.5 * prevSeg->style().styleMM(Sid::barWidth); // align to the preceding barline
         } else if (timeSigAboveKeySigCase) {
             x = xPrevSeg + segment->minLeft(); // align to the preceding keySig
+        } else if (timeSigAboveRepeatKeySigCase) {
+            x = xPrevSeg + prevSeg->minRight();
         } else {
             double minHorDist = minHorizontalDistance(prevSeg, segment, ctx.squeezeFactor);
             minHorDist = std::max(minHorDist, spaceLyricsAgainstBarlines(prevSeg, segment, ctx));
@@ -390,7 +394,7 @@ bool HorizontalSpacing::stopCheckingPreviousSegments(const SegmentPosition& prev
     Fraction prevSegEndTick = prevSeg->tick() + prevSeg->ticks();
     Fraction curSegTick = curSeg->tick();
 
-    if (prevSegEndTick >= curSegTick) {
+    if (prevSegEndTick >= curSegTick || curSeg->hasTimeSigAboveStaves()) {
         return false;
     }
 
@@ -1544,6 +1548,8 @@ KerningType HorizontalSpacing::doComputeKerningType(const EngravingItem* item1,
         return computeNoteKerningType(toNote(item1), item2);
     case ElementType::STEM_SLASH:
         return computeStemSlashKerningType(toStemSlash(item1), item2);
+    case ElementType::PARENTHESIS:
+        return item2->isBarLine() ? KerningType::NON_KERNING : KerningType::KERNING;
     default:
         return KerningType::KERNING;
     }

diff --git a/src/engraving/rendering/score/masklayout.cpp b/src/engraving/rendering/score/masklayout.cpp
@@ -141,6 +141,7 @@ void MaskLayout::maskBarlineForText(BarLine* barline, const std::vector<TextBase
     }
 
     if (mask.empty()) {
+        barline->mutldata()->setMask(mask);
         return;
     }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         if (mask.empty()) {
+            barline->mutldata()->setMask(mask);
             return;
         }
@@ Expand Down @@