From 47b2d924b42f9c1b059bf9460abc72733311222b Mon Sep 17 00:00:00 2001 From: sammik Date: Thu, 19 Sep 2024 13:09:20 +0200 Subject: [PATCH] Fix GH#24809: In section breaks, take also frames into account Backport of #24817 --- libmscore/measure.cpp | 12 +- vtest/gen | 2 +- vtest/gen.bat | 2 +- vtest/measure-number-6-ref.png | Bin 0 -> 28381 bytes vtest/measure-number-6.mscx | 335 +++++++++++++++++++++++++++++++++ 5 files changed, 345 insertions(+), 6 deletions(-) create mode 100644 vtest/measure-number-6-ref.png create mode 100644 vtest/measure-number-6.mscx diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp index 5c7a82c3f00b1..7e9a1a4ed6496 100644 --- a/libmscore/measure.cpp +++ b/libmscore/measure.cpp @@ -508,8 +508,7 @@ bool Measure::showsMeasureNumberInAutoMode() // Measure numbers should not show on first measure unless specified with Sid::showMeasureNumberOne // except, when showing numbers on each measure, and first measure is after anacrusis - then show always - if (!prevMeasure || prevMeasure->sectionBreak() - || (prevMeasure->irregular() && prevMeasure->isFirstInSection() && interval != 1)) + if (isFirstInSection() || (prevMeasure->irregular() && prevMeasure->isFirstInSection() && interval != 1)) return score()->styleB(Sid::showMeasureNumberOne); if (score()->styleB(Sid::measureNumberSystem)) @@ -2618,8 +2617,13 @@ bool Measure::isFirstInSystem() const bool Measure::isFirstInSection() const { - Measure* prevMeasure = this->prevMeasure(); - return !prevMeasure || prevMeasure->sectionBreak(); + for (MeasureBase* m = prev(); m; m = m->prev()) { + if (m->sectionBreak()) + return true; + else if (m->isMeasure()) + return false; + } + return true; } //--------------------------------------------------------- diff --git a/vtest/gen b/vtest/gen index b41819eb0f04f..16c931be48ec1 100755 --- a/vtest/gen +++ b/vtest/gen @@ -81,7 +81,7 @@ else layout-sequence-5 layout-sequence-6 layout-sequence-7 layout-sequence-8\ layout-sequence-9 layout-sequence-10 layout-sequence-11 layout-sequence-12\ layout-sequence-13 layout-sequence-14 layout-sequence-15 layout-sequence-16\ - measure-number-1 measure-number-2 measure-number-3 measure-number-4 measure-number-5\ + measure-number-1 measure-number-2 measure-number-3 measure-number-4 measure-number-5 measure-number-6\ custom-keysig-1 custom-keysig-2 custom-keysig-3 custom-keysig-4" fi diff --git a/vtest/gen.bat b/vtest/gen.bat index d74748bca7b1c..24f4c5cba928d 100644 --- a/vtest/gen.bat +++ b/vtest/gen.bat @@ -57,7 +57,7 @@ set SRC=bravura-mmrest,gonville-mmrest, ^ layout-sequence-5,layout-sequence-6,layout-sequence-7,layout-sequence-8, ^ layout-sequence-9,layout-sequence-10,layout-sequence-11,layout-sequence-12, ^ layout-sequence-13, layout-sequence-14, layout-sequence-15,layout-sequence-16, ^ - measure-number-1,measure-number-2,measure-number-3,measure-number-4,measure-number-5 ^ + measure-number-1,measure-number-2,measure-number-3,measure-number-4,measure-number-5 measure-number-6 ^ custom-keysig-1,custom-keysig-2,custom-keysig-2,custom-keysig-3,custom-keysig-4 IF NOT "%1"=="" ( diff --git a/vtest/measure-number-6-ref.png b/vtest/measure-number-6-ref.png new file mode 100644 index 0000000000000000000000000000000000000000..eb1793fe4445e8c94ea66894c0dab5006cc5d28b GIT binary patch literal 28381 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 literal 0 HcmV?d00001 diff --git a/vtest/measure-number-6.mscx b/vtest/measure-number-6.mscx new file mode 100644 index 0000000000000..391a2e8d534f1 --- /dev/null +++ b/vtest/measure-number-6.mscx @@ -0,0 +1,335 @@ + + + 3.6.3 + + + + 0 + 480 + + 1 + 1 + 1 + 0 + + Composer / arranger + + 2024-09-19 + + + + 3.02 + Linux + + + Subtitle + + + Untitled score + + Orchestra + + Oboen + +
+ flutes + oboes + clarinets + saxophones + bassoons + +
+
+ horns + trumpets + cornets + flugelhorns + trombones + baritone-horns + euphoniums + tubas +
+
+ timpani +
+
+ keyboard-percussion + drums + unpitched-metal-percussion + unpitched-wooden-percussion + other-percussion +
+ keyboards + harps + organs + synths +
+ plucked-strings +
+ +
+ voices +
+
+ orchestral-strings +
+ +
+ + + + stdNormal + + + Oboe + + Oboe + Ob. + Oboe + 58 + 96 + 58 + 87 + wind.reed.oboe + + + + Fluid + + + + + + 10 + + + Measure numbers + + + + Hide first - section break test + + + + Composer / arranger + + + + + + 4 + 4 + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + section + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + 5 + + section + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + section + + + + measure + 4/4 + + + + + 5 + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + 5 + + section + + + + 5 + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + +
+