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.

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

317098 musicxml white space master #8833

Merged

RomanPudashkin merged 2 commits into musescore:master from lvinken:317098-musicxml-white-space-master

Aug 26, 2021

Contributor

lvinken commented Aug 11, 2021 •

edited

Resolves:
https://musescore.org/en/node/317098
https://musescore.org/en/node/317099

#317098:
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

#317099:
The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.
The assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer.
Other Q_ASSERTS have been replaced by ASSERT_IF_FAILED macros.

I signed CLA
I made sure the code in the PR follows the coding rules
I made sure the code compiles on my machine
I made sure there are no unnecessary changes in the code
I made sure the title of the PR reflects the core meaning of the issue you are solving
I made sure the commit message(s) contain a description and answer the question "Why do those changes fix that particular issue?" or "Why are those changes really necessary as improvements?"
I made sure the commit message title starts with "fix #424242:" if there is a related issue
I created the test (mtest, vtest, script test) to verify the changes I made

Jojo-Schmitz mentioned this pull request

[MU3 Issue] MuseScore 3.6.3 or 3.7.0, PRs to be merged and issues to be fixed. #7449

Closed

lvinken force-pushed the 317098-musicxml-white-space-master branch from ecd3d00 to 00a5da5 Compare

August 12, 2021 05:39

Contributor Author

lvinken commented Aug 12, 2021

Used "push -f" to fix failed code style check.

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

bac0e8c

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

3ea2891

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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


          Fixing mtest, apparent collision with ENG-91

18c70aa

musescore#8763, part 2 and one of the 2 commits of the backport of musescore#8833

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

5fb51e1

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

9404f2f

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

c74903a

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

bdc1300

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

ef6502d

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

7966fff

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

f413cf6

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

f259f31

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

RomanPudashkin approved these changes

View reviewed changes

Contributor

RomanPudashkin commented Aug 25, 2021

rebase needed

lvinken added 2 commits

August 26, 2021 20:21


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

c1e06c3

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by ASSERT_IF_FAILED macros.


          Fix #317098: [MusicXML import] check code for white space issues

bc7284b

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

lvinken force-pushed the 317098-musicxml-white-space-master branch from 00a5da5 to bc7284b Compare

August 26, 2021 18:22

Contributor Author

lvinken commented Aug 26, 2021

Rebased

RomanPudashkin merged commit 92466b7 into musescore:master

lvinken deleted the 317098-musicxml-white-space-master branch

August 27, 2021 05:34

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

0594fcd

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

4d5e45d

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

38bf3d7

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

0ff5b3b

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

Jojo-Schmitz mentioned this pull request

[MU3] Fix GH#7449: Almost everything suitable for 3.6.3 or 3.7.0 #9000

Closed

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


          Fix #317098: [MusicXML import] check code for white space issues

6e84244

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

2e53e5e

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

f45160b

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

50fec33

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

46b79a2

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

1ce4188

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

15a7729

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

2823c53

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

cad15f2

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

6e1db73

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

6552c19

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

55b10a9

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

153856e

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

d477325

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

58a0186

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

Jojo-Schmitz mentioned this pull request

Fix GH#7449: Almost everything suitable for 3.6.3 or 3.7.0 Jojo-Schmitz/MuseScore#80

Closed

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


          Fix #317099: [MusicXML import] replace assertions by proper error rep…

2854cae

…orting

The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.

These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual)
to the end user and the developer.

Other Q_ASSERTS have been replaced by `if` statements.

Backport of musescore#8833, part 1

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


          Fix #317098: [MusicXML import] check code for white space issues

bdbd5d9

The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.

Backport of musescore#8833, part 2

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