XML fixes #29197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

miiizen merged 10 commits into musescore:master from miiizen:xml-fixes-46

Aug 18, 2025

Contributor

miiizen commented Aug 12, 2025 •

edited

Loading

Resolves: Sibelius & finale xml import issues:

Only apply word-font font-size to all elements when "Apply default typeface" is unchecked
Resize title box to avoid collisions between the title and composer/lyricist text
Don't apply offsets included in the XML to text in the title box as these are inaccurate.
Ignore "pedal" chords
Correct import of <staff-size> tags. This now applies to line distance, and the scaling attribute applies to the scale of the notation
Fix copyright text scaling - use new copyright text type instead of generic footer text

miiizen force-pushed the xml-fixes-46 branch from de9aa4a to 694b33f Compare

August 12, 2025 14:26

its-not-nice added this to MuseScore Studio 4.6

its-not-nice moved this to In Progress in MuseScore Studio 4.6

its-not-nice approved these changes

View reviewed changes

its-not-nice requested a review from mike-spa

August 12, 2025 15:04

rettinghaus reviewed

View reviewed changes

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

Comment on lines +3168 to +3169

		m_score->staff(staffIdx)->setProperty(Pid::MAG, scale);
		m_score->staff(staffIdx)->setProperty(Pid::LINE_DISTANCE, val);

Contributor

rettinghaus Aug 12, 2025

Shouldn't this then also be adjusted in the export?

mike-spa approved these changes

View reviewed changes

Contributor

mike-spa left a comment

Looks good to me, apart from the unit test failure

miiizen force-pushed the xml-fixes-46 branch from 694b33f to a95580b Compare

August 18, 2025 10:24

rettinghaus approved these changes

View reviewed changes

miiizen added 10 commits

August 18, 2025 14:24


          Only apply word-font size when config option is off

39a5c13


          Remove duplicate hbox at codas

a5587d1


          Resize title box to avoid collisions

d0fed87


          Fix import of staff scaling & line distance

a2bf9db


          Don't apply offsets to credit text

35adb8e

These values are incredibly unreliable


          Ignore "pedal" chords when importing xml

7abc28b


          Fix scaling copyright text

ad751af


          Fix tests

4b45e5f


          Update staff-size in xml export

3724a8a


          Don't apply vbox adjustment when testing

0a3266b

miiizen force-pushed the xml-fixes-46 branch from a9daeda to 0a3266b Compare

August 18, 2025 13:24

miiizen merged commit f20facf into musescore:master

13 checks passed

github-project-automation bot moved this from In Progress to Needs porting in MuseScore Studio 4.6

Jojo-Schmitz reviewed

View reviewed changes

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

@@ @@ -1810,7 +1811,7 @@ static void updateStyles(Score* score, @@
                           continue;
                       }
-                      bool needUseDefaultSize = tid == TextStyleType::HARMONY_ROMAN
+                      bool needUseDefaultSize = configuration()->needUseDefaultFont() || tid == TextStyleType::HARMONY_ROMAN

Contributor

Jojo-Schmitz Aug 18, 2025 •

edited

Loading

Why not using `this?

        bool needUseDefaultSize = needUseDefaultFont || tid == TextStyleType::HARMONY_ROMAN

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Only apply word-font size when config option is off

e69eab8

Backport of musescore#29197, commit 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Resize title box to avoid collisions (TODO)

9a60ed8

Backport of musescore#29197, commit 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Fix import of staff scaling & line distance

95d389d

Backport of musescore#29197, commit 4

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply offsets to credit text

bbae973

These values are incredibly unreliable

Backport from musescore#29197, commit 5

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Update staff-size in xml export

fbc06b1

Backport of musescore#29197, commit 9

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply vbox adjustment when testing

Backport of musescore#29197, commit 10

Jojo-Schmitz mentioned this pull request

XML fixes Jojo-Schmitz/MuseScore#1009

Draft

Jojo-Schmitz reviewed

View reviewed changes

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

+                      }
+                  }
+                  double heightInSp = calculatedVBoxHeight / vbox->spatium();

Contributor

Jojo-Schmitz Aug 19, 2025

Why not this?

    double heightInSp = calculatedVBoxHeight / padding;

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply offsets to credit text

These values are incredibly unreliable

Backport from musescore#29197, commit 5

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply offsets to credit text

6f214c2

These values are incredibly unreliable

Backport from musescore#29197, commit 5 plus (the relevant) part of commit 8

x

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Only apply word-font size when config option is off

e8972bc

Backport of musescore#29197, commit 1, plus (the relevant) part of commit 8 and some other mtest fixes (order and names)

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Resize title box to avoid collisions (TODO)

16eb250

Backport of musescore#29197, commit 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Fix import of staff scaling & line distance (TODO)

c47c8f0

Backport of musescore#29197, commit 4

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply offsets to credit text

be31886

These values are incredibly unreliable

Backport from musescore#29197, commit 5 plus (the relevant) part of commit 8

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Update staff-size in xml export

21523b4

Backport of musescore#29197, commit 9

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply vbox adjustment when testing

55392c7

Backport of musescore#29197, commit 10

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply offsets to credit text

7d91a33

These values are incredibly unreliable

Backport from musescore#29197, commit 5 plus (the relevant) part of commit 8

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply offsets to credit text

dc450c8

These values are incredibly unreliable

Backport from musescore#29197, commit 5 plus (the relevant) part of commit 8

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Update staff-size in xml export

d006f5f

Backport of musescore#29197, commit 9

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply vbox adjustment when testing

b7d09c3

Backport of musescore#29197, commit 10

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Update staff-size in xml export

9860ec2

Backport of musescore#29197, commit 9

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Only apply word-font size when config option is off

fbdbf93

Backport of musescore#29197, commit 1, plus (the relevant) part of commit 8 and some other mtest fixes (order and names)

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply offsets to credit text

1499ebb

These values are incredibly unreliable

Backport from musescore#29197, commit 5 plus (the relevant) part of commit 8

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Update staff-size in xml export

d08b228

Backport of musescore#29197, commit 9

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Update staff-size in xml export

b88eb47

Backport of musescore#29197, commit 9

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Fix import of staff scaling & line distance, update staff-size in xml…

a870c3e

… export

Backport of musescore#29197, commit 4 and 9

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply offsets to credit text

b57fe4a

These values are incredibly unreliable

Backport from musescore#29197, commit 5 plus (the relevant) part of commit 8

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Resize title box to avoid collisions (TODO)

81a53b9

Backport of musescore#29197, commits 3 and 10

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Fix import of staff scaling & line distance, update staff-size in xml…

31e92dc

… export

Backport of musescore#29197, commit 4 and 9

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply offsets to credit text

34edf65

These values are incredibly unreliable

Backport from musescore#29197, commit 5 plus (the relevant) part of commit 8

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Only apply word-font size when config option is off

4e2170c

Backport of musescore#29197, commit 1, plus (the relevant) part of commit 8 and some other mtest fixes (order and names)

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Resize title box to avoid collisions (TODO)

311ed7f

Backport of musescore#29197, commits 3 and 10

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Fix import of staff scaling & line distance, update staff-size in xml…

9631de9

… export

Backport of musescore#29197, commit 4 and 9

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Don't apply offsets to credit text

37035b7

These values are incredibly unreliable

Backport from musescore#29197, commit 5 plus (the relevant) part of commit 8

mike-spa pushed a commit to mike-spa/MuseScore that referenced this pull request


          Merge pull request musescore#29197 from miiizen/xml-fixes-46

ccb91ec

XML fixes

mike-spa mentioned this pull request

Port stuff #29381

Merged

RomanPudashkin moved this from Needs porting to Done in MuseScore Studio 4.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet