[MU3 Backend] ENG-55: Infer tempo text #8412

iveshenry18 · 2021-06-22T23:48:54Z

Resolves: ENG-55: Tempi incorrectly rendered as Stave Text

This PR includes commits for inferring tempo text that is incorrectly exported as staff text.

Sometimes tempo text is incorrectly exported as staff text, often in the
form "q = 60". This commit adds regex-based inferencing for this case,
converting the left side of the equals sign to the proper symbol, and
calculating the resulting tempo from the resulting symbol and the value
of the right side.

Sometimes tempo text with additional instructions is exported as two
separate directions. Previously, this was imported as a Tempo Text
element and a separate Staff Text element. This commit adds a function
to infer these cases and merge the text from the Staff Text element
into the Tempo Text.

This now adds inferring based on common tempo text words such as "rit"
and "accel". In the case that one of these is inferred, the underlying
tempo remains the same.

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 · 2021-06-28T20:25:58Z

rebase needed

iveshenry18 · 2021-06-28T23:53:10Z

Rebased!

vpereverzev · 2021-07-05T23:10:39Z

one more time, pls :)

importexport/musicxml/importmxmlpass2.cpp

Sometimes tempo text is incorrectly exported as staff text, often in the form "q = 60". This commit adds regex-based inferencing for this case, converting the left side of the equals sign to the proper symbol, and calculating the resulting tempo from the resulting symbol and the value of the right side.

Sometimes tempo text with additional instructions is exported as two separate directions. Previously, this was imported as a Tempo Text element and a separate Staff Text element. This commit adds a function to infer these cases and merge the text from the Staff Text element into the Tempo Text.

This now adds inferencing based on common tempo text words such as "rit" and "accel". In the case that one of these is inferenced, the underlying tempo remains the same.

This commit adds another case of tempo inference, which handles staff text on beat 1 of a score (tick 0/1) that is above the staff and bold, regardless of the presence of keywords. NOTE: in doing so, it was highlighted in the testing that there is some existing unreliable behavior with exporting hidden tempo markings. This test has been temporarily disabled.

This commit changes the method by which Staff Text is checked for boldness, using a slightly more robust regex.

Rather than looking for in the XML text, this commit pulls isBold directly from the MusicXML, future-proofing the tempo text inference from potential changes to MuseScore's internal XMLText representation.

Sometimes tempo text is incorrectly exported as staff text, often in the form "q = 60". This commit adds regex-based inferencing for this case, converting the left side of the equals sign to the proper symbol, and calculating the resulting tempo from the resulting symbol and the value of the right side. Duplicate of musescore#8412, part 1

Sometimes tempo text with additional instructions is exported as two separate directions. Previously, this was imported as a Tempo Text element and a separate Staff Text element. This commit adds a function to infer these cases and merge the text from the Staff Text element into the Tempo Text. Duplicate of musescore#8412, part 2

This now adds inferencing based on common tempo text words such as "rit" and "accel". In the case that one of these is inferenced, the underlying tempo remains the same. Duplicate of musescore#8412, part 3

This commit adds another case of tempo inference, which handles staff text on beat 1 of a score (tick 0/1) that is above the staff and bold, regardless of the presence of keywords. NOTE: in doing so, it was highlighted in the testing that there is some existing unreliable behavior with exporting hidden tempo markings. This test has been temporarily disabled. Duplicate of musescore#8412, part 4

This commit changes the method by which Staff Text is checked for boldness, using a slightly more robust regex. Duplicate of musescore#8412, part 5

Rather than looking for in the XML text, this commit pulls isBold directly from the MusicXML, future-proofing the tempo text inference from potential changes to MuseScore's internal XMLText representation. Duplicate of musescore#8412, part 6

Duplicate of musescore#8412, part 7

Sometimes tempo text is incorrectly exported as staff text, often in the form "q = 60". This commit adds regex-based inferencing for this case, converting the left side of the equals sign to the proper symbol, and calculating the resulting tempo from the resulting symbol and the value of the right side. Duplicate of musescore#8412, part 1

Sometimes tempo text with additional instructions is exported as two separate directions. Previously, this was imported as a Tempo Text element and a separate Staff Text element. This commit adds a function to infer these cases and merge the text from the Staff Text element into the Tempo Text. Duplicate of musescore#8412, part 2

This now adds inferencing based on common tempo text words such as "rit" and "accel". In the case that one of these is inferenced, the underlying tempo remains the same. Duplicate of musescore#8412, part 3

This commit adds another case of tempo inference, which handles staff text on beat 1 of a score (tick 0/1) that is above the staff and bold, regardless of the presence of keywords. NOTE: in doing so, it was highlighted in the testing that there is some existing unreliable behavior with exporting hidden tempo markings. This test has been temporarily disabled. Duplicate of musescore#8412, part 4

This commit changes the method by which Staff Text is checked for boldness, using a slightly more robust regex. Duplicate of musescore#8412, part 5

Rather than looking for in the XML text, this commit pulls isBold directly from the MusicXML, future-proofing the tempo text inference from potential changes to MuseScore's internal XMLText representation. Duplicate of musescore#8412, part 6

Duplicate of musescore#8412, part 7

Sometimes tempo text is incorrectly exported as staff text, often in the form "q = 60". This commit adds regex-based inferencing for this case, converting the left side of the equals sign to the proper symbol, and calculating the resulting tempo from the resulting symbol and the value of the right side. Duplicate of musescore#8412, part 1

Sometimes tempo text with additional instructions is exported as two separate directions. Previously, this was imported as a Tempo Text element and a separate Staff Text element. This commit adds a function to infer these cases and merge the text from the Staff Text element into the Tempo Text. Duplicate of musescore#8412, part 2

This now adds inferencing based on common tempo text words such as "rit" and "accel". In the case that one of these is inferenced, the underlying tempo remains the same. Duplicate of musescore#8412, part 3

This commit adds another case of tempo inference, which handles staff text on beat 1 of a score (tick 0/1) that is above the staff and bold, regardless of the presence of keywords. NOTE: in doing so, it was highlighted in the testing that there is some existing unreliable behavior with exporting hidden tempo markings. This test has been temporarily disabled. Duplicate of musescore#8412, part 4

This commit changes the method by which Staff Text is checked for boldness, using a slightly more robust regex. Duplicate of musescore#8412, part 5

Rather than looking for in the XML text, this commit pulls isBold directly from the MusicXML, future-proofing the tempo text inference from potential changes to MuseScore's internal XMLText representation. Duplicate of musescore#8412, part 6

Duplicate of musescore#8412, part 7

Sometimes tempo text is incorrectly exported as staff text, often in the form "q = 60". This commit adds regex-based inferencing for this case, converting the left side of the equals sign to the proper symbol, and calculating the resulting tempo from the resulting symbol and the value of the right side. Duplicate of musescore#8412, part 1

Sometimes tempo text with additional instructions is exported as two separate directions. Previously, this was imported as a Tempo Text element and a separate Staff Text element. This commit adds a function to infer these cases and merge the text from the Staff Text element into the Tempo Text. Duplicate of musescore#8412, part 2

This now adds inferencing based on common tempo text words such as "rit" and "accel". In the case that one of these is inferenced, the underlying tempo remains the same. Duplicate of musescore#8412, part 3

This commit adds another case of tempo inference, which handles staff text on beat 1 of a score (tick 0/1) that is above the staff and bold, regardless of the presence of keywords. NOTE: in doing so, it was highlighted in the testing that there is some existing unreliable behavior with exporting hidden tempo markings. This test has been temporarily disabled. Duplicate of musescore#8412, part 4

This commit changes the method by which Staff Text is checked for boldness, using a slightly more robust regex. Duplicate of musescore#8412, part 5

Rather than looking for in the XML text, this commit pulls isBold directly from the MusicXML, future-proofing the tempo text inference from potential changes to MuseScore's internal XMLText representation. Duplicate of musescore#8412, part 6

Duplicate of musescore#8412, part 7

Sometimes tempo text is incorrectly exported as staff text, often in the form "q = 60". This commit adds regex-based inferencing for this case, converting the left side of the equals sign to the proper symbol, and calculating the resulting tempo from the resulting symbol and the value of the right side. Duplicate of musescore#8412, part 1

Sometimes tempo text with additional instructions is exported as two separate directions. Previously, this was imported as a Tempo Text element and a separate Staff Text element. This commit adds a function to infer these cases and merge the text from the Staff Text element into the Tempo Text. Duplicate of musescore#8412, part 2

This now adds inferencing based on common tempo text words such as "rit" and "accel". In the case that one of these is inferenced, the underlying tempo remains the same. Duplicate of musescore#8412, part 3

This commit adds another case of tempo inference, which handles staff text on beat 1 of a score (tick 0/1) that is above the staff and bold, regardless of the presence of keywords. NOTE: in doing so, it was highlighted in the testing that there is some existing unreliable behavior with exporting hidden tempo markings. This test has been temporarily disabled. Duplicate of musescore#8412, part 4

This commit changes the method by which Staff Text is checked for boldness, using a slightly more robust regex. Duplicate of musescore#8412, part 5

Rather than looking for in the XML text, this commit pulls isBold directly from the MusicXML, future-proofing the tempo text inference from potential changes to MuseScore's internal XMLText representation. Duplicate of musescore#8412, part 6

Duplicate of musescore#8412, part 7

oktophonie approved these changes Jun 24, 2021

View reviewed changes

iveshenry18 force-pushed the ENG-55-infer-tempo branch from 292788c to 9cf09a4 Compare June 28, 2021 23:52

Jojo-Schmitz mentioned this pull request Jun 29, 2021

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

Closed

wizofaus reviewed Jul 5, 2021

View reviewed changes

importexport/musicxml/importmxmlpass2.cpp Outdated Show resolved Hide resolved

wizofaus reviewed Jul 5, 2021

View reviewed changes

importexport/musicxml/importmxmlpass2.cpp Show resolved Hide resolved

wizofaus reviewed Jul 5, 2021

View reviewed changes

importexport/musicxml/importmxmlpass2.cpp Show resolved Hide resolved

iveshenry18 force-pushed the ENG-55-infer-tempo branch 2 times, most recently from c319258 to fc9bc32 Compare July 7, 2021 00:46

wizofaus reviewed Jul 7, 2021

View reviewed changes

importexport/musicxml/importmxmlpass2.cpp Show resolved Hide resolved

Jojo-Schmitz reviewed Jul 7, 2021

View reviewed changes

importexport/musicxml/importmxmlpass2.cpp Outdated Show resolved Hide resolved

iveshenry18 added 7 commits July 20, 2021 14:44

ENG-55: Infer more tempo text

e0af95c

This now adds inferencing based on common tempo text words such as "rit" and "accel". In the case that one of these is inferenced, the underlying tempo remains the same.

Tweak MusicXML tempo inference logic

64cd361

This commit changes the method by which Staff Text is checked for boldness, using a slightly more robust regex.

Make direction boldness distinction more robust

84aaa37

Rather than looking for in the XML text, this commit pulls isBold directly from the MusicXML, future-proofing the tempo text inference from potential changes to MuseScore's internal XMLText representation.

Clean up an old foreach in MusicXML import pass2

b7edab2

iveshenry18 force-pushed the ENG-55-infer-tempo branch from 256d4d2 to b7edab2 Compare July 20, 2021 21:08

vpereverzev approved these changes Jul 22, 2021

View reviewed changes

vpereverzev merged commit 59c8d43 into musescore:3.6.2_backend Jul 22, 2021

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jul 22, 2021

Clean up an old foreach in MusicXML import pass2

94358ea

Duplicate of musescore#8412, part 7

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 2, 2021

Clean up an old foreach in MusicXML import pass2

4af5346

Duplicate of musescore#8412, part 7

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 10, 2021

Clean up an old foreach in MusicXML import pass2

8a4db8b

Duplicate of musescore#8412, part 7

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 23, 2021

Clean up an old foreach in MusicXML import pass2

3167973

Duplicate of musescore#8412, part 7

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request May 12, 2022

Clean up an old foreach in MusicXML import pass2

3c40b1f

Duplicate of musescore#8412, part 7

Jojo-Schmitz mentioned this pull request Mar 1, 2023

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 Mar 5, 2023

Tweak MusicXML tempo inference logic

f4a5610

This commit changes the method by which Staff Text is checked for boldness, using a slightly more robust regex. Duplicate of musescore#8412, part 5

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Mar 5, 2023

Clean up an old foreach in MusicXML import pass2

e3107b7

Duplicate of musescore#8412, part 7

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MU3 Backend] ENG-55: Infer tempo text #8412

[MU3 Backend] ENG-55: Infer tempo text #8412

iveshenry18 commented Jun 22, 2021 •

edited

Jojo-Schmitz commented Jun 28, 2021

iveshenry18 commented Jun 28, 2021

vpereverzev commented Jul 5, 2021

[MU3 Backend] ENG-55: Infer tempo text #8412

[MU3 Backend] ENG-55: Infer tempo text #8412

Conversation

iveshenry18 commented Jun 22, 2021 • edited

Jojo-Schmitz commented Jun 28, 2021

iveshenry18 commented Jun 28, 2021

vpereverzev commented Jul 5, 2021

iveshenry18 commented Jun 22, 2021 •

edited