From bad8bc4fc815e6793973b7b00e8619bfc31c9dfa Mon Sep 17 00:00:00 2001
From: James Mizen <jamesmmizen@gmail.com>
Date: Fri, 15 Dec 2023 15:45:50 +0000
Subject: [PATCH] Export scores not starting with bar 1 correctly

---
 .../musicxml/internal/musicxml/exportxml.cpp  |  7 +-
 .../tests/data/testMeasureNumberOffset.xml    | 76 +++++++++++++++++++
 .../musicxml/tests/musicxml_tests.cpp         |  3 +
 3 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 src/importexport/musicxml/tests/data/testMeasureNumberOffset.xml

diff --git a/src/importexport/musicxml/internal/musicxml/exportxml.cpp b/src/importexport/musicxml/internal/musicxml/exportxml.cpp
index bdc8a36d084ee..72af6c1809b29 100644
--- a/src/importexport/musicxml/internal/musicxml/exportxml.cpp
+++ b/src/importexport/musicxml/internal/musicxml/exportxml.cpp
@@ -318,6 +318,7 @@ class MeasureNumberStateHandler final
 private:
     void init();
     int _measureNo;                             // number of next regular measure
+    int _measureNoOffset;                       // measure number offset
     int _irregularMeasureNo;                    // number of next irregular measure
     int _pickupMeasureNo;                       // number of next pickup measure
     QString _cachedAttributes;                  // attributes calculated by updateForMeasure()
@@ -7372,6 +7373,7 @@ MeasureNumberStateHandler::MeasureNumberStateHandler()
 void MeasureNumberStateHandler::init()
 {
     _measureNo = 1;
+    _measureNoOffset = 0;
     _irregularMeasureNo = 1;
     _pickupMeasureNo = 1;
 }
@@ -7393,7 +7395,8 @@ void MeasureNumberStateHandler::updateForMeasure(const Measure* const m)
     }
 
     // update measure numbers and cache result
-    _measureNo += m->noOffset();
+    _measureNoOffset = m->noOffset();
+    _measureNo += _measureNoOffset;
     _cachedAttributes = " number=";
     if ((_irregularMeasureNo + _measureNo) == 2 && m->irregular()) {
         _cachedAttributes += "\"0\" implicit=\"yes\"";
@@ -7412,7 +7415,7 @@ QString MeasureNumberStateHandler::measureNumber() const
 
 bool MeasureNumberStateHandler::isFirstActualMeasure() const
 {
-    return (_irregularMeasureNo + _measureNo + _pickupMeasureNo) == 4;
+    return (_irregularMeasureNo + (_measureNo - _measureNoOffset) + _pickupMeasureNo) == 4;
 }
 
 //---------------------------------------------------------
diff --git a/src/importexport/musicxml/tests/data/testMeasureNumberOffset.xml b/src/importexport/musicxml/tests/data/testMeasureNumberOffset.xml
new file mode 100644
index 0000000000000..34b35cdb06280
--- /dev/null
+++ b/src/importexport/musicxml/tests/data/testMeasureNumberOffset.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 4.0 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="4.0">
+  <work>
+    <work-title>Untitled score</work-title>
+    </work>
+  <identification>
+    <creator type="composer">Composer / arranger</creator>
+    <encoding>
+      <software>MuseScore 0.7.0</software>
+      <encoding-date>2007-09-10</encoding-date>
+      <supports element="accidental" type="yes"/>
+      <supports element="beam" type="yes"/>
+      <supports element="print" attribute="new-page" type="no"/>
+      <supports element="print" attribute="new-system" type="no"/>
+      <supports element="stem" type="yes"/>
+      </encoding>
+    </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>Flute</part-name>
+      <part-abbreviation>Fl.</part-abbreviation>
+      <score-instrument id="P1-I1">
+        <instrument-name>Flute</instrument-name>
+        </score-instrument>
+      <midi-device id="P1-I1" port="1"></midi-device>
+      <midi-instrument id="P1-I1">
+        <midi-channel>1</midi-channel>
+        <midi-program>74</midi-program>
+        <volume>78.7402</volume>
+        <pan>0</pan>
+        </midi-instrument>
+      </score-part>
+    </part-list>
+  <part id="P1">
+    <measure number="6">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          </key>
+        <time>
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+          </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+          </clef>
+        </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+        </note>
+      </measure>
+    <measure number="7">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+        </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        </barline>
+      </measure>
+    </part>
+  </score-partwise>
diff --git a/src/importexport/musicxml/tests/musicxml_tests.cpp b/src/importexport/musicxml/tests/musicxml_tests.cpp
index 22dead07d4b20..14040ba9dbf08 100644
--- a/src/importexport/musicxml/tests/musicxml_tests.cpp
+++ b/src/importexport/musicxml/tests/musicxml_tests.cpp
@@ -716,6 +716,9 @@ TEST_F(Musicxml_Tests, measureLength) {
 TEST_F(Musicxml_Tests, measureNumbers) {
     mxmlIoTest("testMeasureNumbers");
 }
+TEST_F(Musicxml_Tests, measureNumberOffset) {
+    mxmlIoTest("testMeasureNumberOffset");
+}
 TEST_F(Musicxml_Tests, measureRepeats1) {
     mxmlIoTestRef("testMeasureRepeats1");
 }