-
Notifications
You must be signed in to change notification settings - Fork 3k
Import ottavas from Sibelius correctly #21499
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
271 changes: 271 additions & 0 deletions
271
src/importexport/musicxml/tests/data/testSibOttavas_ref.mscx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,271 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <museScore version="4.20"> | ||
| <Score> | ||
| <Division>480</Division> | ||
| <Style> | ||
| <pageWidth>8.50197</pageWidth> | ||
| <pageHeight>11.003</pageHeight> | ||
| <pagePrintableWidth>7.50197</pagePrintableWidth> | ||
| <pageEvenLeftMargin>0.5</pageEvenLeftMargin> | ||
| <pageOddLeftMargin>0.5</pageOddLeftMargin> | ||
| <pageEvenTopMargin>0.5</pageEvenTopMargin> | ||
| <pageEvenBottomMargin>0.5</pageEvenBottomMargin> | ||
| <pageOddTopMargin>0.5</pageOddTopMargin> | ||
| <pageOddBottomMargin>0.5</pageOddBottomMargin> | ||
| <pageTwosided>0</pageTwosided> | ||
| <minSystemDistance>12</minSystemDistance> | ||
| <barWidth>0.15625</barWidth> | ||
| <endBarWidth>0.5</endBarWidth> | ||
| <stemWidth>0.125</stemWidth> | ||
| <staffLineWidth>0.09375</staffLineWidth> | ||
| <ledgerLineWidth>0.15625</ledgerLineWidth> | ||
| <chordSymbolAFontFace>Times New Roman</chordSymbolAFontFace> | ||
| <chordSymbolBFontFace>Times New Roman</chordSymbolBFontFace> | ||
| <nashvilleNumberFontFace>Times New Roman</nashvilleNumberFontFace> | ||
| <smallNoteMag>0.75</smallNoteMag> | ||
| <graceNoteMag>0.6</graceNoteMag> | ||
| <slurEndWidth>0.0625</slurEndWidth> | ||
| <slurMidWidth>0.21875</slurMidWidth> | ||
| <tieEndWidth>0.0625</tieEndWidth> | ||
| <tieMidWidth>0.21875</tieMidWidth> | ||
| <tupletFontFace>Times New Roman</tupletFontFace> | ||
| <fingeringFontFace>Times New Roman</fingeringFontFace> | ||
| <lhGuitarFingeringFontFace>Times New Roman</lhGuitarFingeringFontFace> | ||
| <rhGuitarFingeringFontFace>Times New Roman</rhGuitarFingeringFontFace> | ||
| <stringNumberFontFace>Times New Roman</stringNumberFontFace> | ||
| <longInstrumentFontFace>Times New Roman</longInstrumentFontFace> | ||
| <shortInstrumentFontFace>Times New Roman</shortInstrumentFontFace> | ||
| <partInstrumentFontFace>Times New Roman</partInstrumentFontFace> | ||
| <expressionFontFace>Times New Roman</expressionFontFace> | ||
| <tempoFontFace>Times New Roman</tempoFontFace> | ||
| <tempoChangeFontFace>Times New Roman</tempoChangeFontFace> | ||
| <metronomeFontFace>Times New Roman</metronomeFontFace> | ||
| <measureNumberFontFace>Times New Roman</measureNumberFontFace> | ||
| <mmRestRangeFontFace>Times New Roman</mmRestRangeFontFace> | ||
| <translatorFontFace>Times New Roman</translatorFontFace> | ||
| <systemFontFace>Times New Roman</systemFontFace> | ||
| <staffFontFace>Times New Roman</staffFontFace> | ||
| <rehearsalMarkFontFace>Times New Roman</rehearsalMarkFontFace> | ||
| <repeatLeftFontFace>Times New Roman</repeatLeftFontFace> | ||
| <repeatRightFontFace>Times New Roman</repeatRightFontFace> | ||
| <frameFontFace>Times New Roman</frameFontFace> | ||
| <glissandoFontFace>Times New Roman</glissandoFontFace> | ||
| <bendFontFace>Times New Roman</bendFontFace> | ||
| <headerFontFace>Times New Roman</headerFontFace> | ||
| <footerFontFace>Times New Roman</footerFontFace> | ||
| <instrumentChangeFontFace>Times New Roman</instrumentChangeFontFace> | ||
| <stickingFontFace>Times New Roman</stickingFontFace> | ||
| <user1FontFace>Times New Roman</user1FontFace> | ||
| <user2FontFace>Times New Roman</user2FontFace> | ||
| <user3FontFace>Times New Roman</user3FontFace> | ||
| <user4FontFace>Times New Roman</user4FontFace> | ||
| <user5FontFace>Times New Roman</user5FontFace> | ||
| <user6FontFace>Times New Roman</user6FontFace> | ||
| <user7FontFace>Times New Roman</user7FontFace> | ||
| <user8FontFace>Times New Roman</user8FontFace> | ||
| <user9FontFace>Times New Roman</user9FontFace> | ||
| <user10FontFace>Times New Roman</user10FontFace> | ||
| <user11FontFace>Times New Roman</user11FontFace> | ||
| <user12FontFace>Times New Roman</user12FontFace> | ||
| <Spatium>1.75</Spatium> | ||
| </Style> | ||
| <showInvisible>1</showInvisible> | ||
| <showUnprintable>1</showUnprintable> | ||
| <showFrames>1</showFrames> | ||
| <showMargins>0</showMargins> | ||
| <metaTag name="arranger"></metaTag> | ||
| <metaTag name="composer"></metaTag> | ||
| <metaTag name="copyright"></metaTag> | ||
| <metaTag name="lyricist"></metaTag> | ||
| <metaTag name="movementNumber"></metaTag> | ||
| <metaTag name="movementTitle"></metaTag> | ||
| <metaTag name="source"></metaTag> | ||
| <metaTag name="translator"></metaTag> | ||
| <metaTag name="workNumber"></metaTag> | ||
| <metaTag name="workTitle"></metaTag> | ||
| <Part id="1"> | ||
| <Staff id="1"> | ||
| <StaffType group="pitched"> | ||
| <name>stdNormal</name> | ||
| </StaffType> | ||
| <hideWhenEmpty>3</hideWhenEmpty> | ||
| </Staff> | ||
| <trackName>[Unnamed (treble staff)]</trackName> | ||
| <Instrument id="grand-piano"> | ||
| <trackName></trackName> | ||
| <minPitchP>21</minPitchP> | ||
| <maxPitchP>108</maxPitchP> | ||
| <minPitchA>21</minPitchA> | ||
| <maxPitchA>108</maxPitchA> | ||
| <instrumentId>keyboard.piano.grand</instrumentId> | ||
| <clef staff="2">F</clef> | ||
| <singleNoteDynamics>0</singleNoteDynamics> | ||
| <Articulation> | ||
| <velocity>100</velocity> | ||
| <gateTime>95</gateTime> | ||
| </Articulation> | ||
| <Articulation name="staccatissimo"> | ||
| <velocity>100</velocity> | ||
| <gateTime>33</gateTime> | ||
| </Articulation> | ||
| <Articulation name="staccato"> | ||
| <velocity>100</velocity> | ||
| <gateTime>50</gateTime> | ||
| </Articulation> | ||
| <Articulation name="portato"> | ||
| <velocity>100</velocity> | ||
| <gateTime>67</gateTime> | ||
| </Articulation> | ||
| <Articulation name="tenuto"> | ||
| <velocity>100</velocity> | ||
| <gateTime>100</gateTime> | ||
| </Articulation> | ||
| <Articulation name="marcato"> | ||
| <velocity>120</velocity> | ||
| <gateTime>67</gateTime> | ||
| </Articulation> | ||
| <Articulation name="sforzato"> | ||
| <velocity>150</velocity> | ||
| <gateTime>100</gateTime> | ||
| </Articulation> | ||
| <Articulation name="sforzatoStaccato"> | ||
| <velocity>150</velocity> | ||
| <gateTime>50</gateTime> | ||
| </Articulation> | ||
| <Articulation name="marcatoStaccato"> | ||
| <velocity>120</velocity> | ||
| <gateTime>50</gateTime> | ||
| </Articulation> | ||
| <Articulation name="marcatoTenuto"> | ||
| <velocity>120</velocity> | ||
| <gateTime>100</gateTime> | ||
| </Articulation> | ||
| <Channel> | ||
| <program value="0"/> | ||
| <controller ctrl="10" value="63"/> | ||
| </Channel> | ||
| </Instrument> | ||
| </Part> | ||
| <Staff id="1"> | ||
| <VBox> | ||
| <height>10</height> | ||
| </VBox> | ||
| <Measure> | ||
| <voice> | ||
| <Clef> | ||
| <concertClefType>G</concertClefType> | ||
| <transposingClefType>G</transposingClefType> | ||
| <isHeader>1</isHeader> | ||
| </Clef> | ||
| <TimeSig> | ||
| <sigN>4</sigN> | ||
| <sigD>4</sigD> | ||
| </TimeSig> | ||
| <Spanner type="Ottava"> | ||
| <Ottava> | ||
| <subtype>8va</subtype> | ||
| </Ottava> | ||
| <next> | ||
| <location> | ||
| <fractions>1/2</fractions> | ||
| </location> | ||
| </next> | ||
| </Spanner> | ||
| <Chord> | ||
| <durationType>eighth</durationType> | ||
| <StemDirection>up</StemDirection> | ||
| <Note> | ||
| <pitch>65</pitch> | ||
| <tpc>13</tpc> | ||
| </Note> | ||
| </Chord> | ||
| <Chord> | ||
| <dots>1</dots> | ||
| <durationType>quarter</durationType> | ||
| <StemDirection>up</StemDirection> | ||
| <Note> | ||
| <pitch>65</pitch> | ||
| <tpc>13</tpc> | ||
| </Note> | ||
| </Chord> | ||
| <Spanner type="Ottava"> | ||
| <prev> | ||
| <location> | ||
| <fractions>-1/2</fractions> | ||
| </location> | ||
| </prev> | ||
| </Spanner> | ||
| <Spanner type="Ottava"> | ||
| <Ottava> | ||
| <subtype>8vb</subtype> | ||
| </Ottava> | ||
| <next> | ||
| <location> | ||
| <measures>1</measures> | ||
| </location> | ||
| </next> | ||
| </Spanner> | ||
| <Chord> | ||
| <durationType>half</durationType> | ||
| <StemDirection>up</StemDirection> | ||
| <Note> | ||
| <Spanner type="Tie"> | ||
| <Tie> | ||
| </Tie> | ||
| <next> | ||
| <location> | ||
| <measures>1</measures> | ||
| <fractions>-1/2</fractions> | ||
| </location> | ||
| </next> | ||
| </Spanner> | ||
| <pitch>65</pitch> | ||
| <tpc>13</tpc> | ||
| </Note> | ||
| </Chord> | ||
| </voice> | ||
| </Measure> | ||
| <Measure> | ||
| <voice> | ||
| <Chord> | ||
| <durationType>quarter</durationType> | ||
| <StemDirection>up</StemDirection> | ||
| <Note> | ||
| <Spanner type="Tie"> | ||
| <prev> | ||
| <location> | ||
| <measures>-1</measures> | ||
| <fractions>1/2</fractions> | ||
| </location> | ||
| </prev> | ||
| </Spanner> | ||
| <pitch>65</pitch> | ||
| <tpc>13</tpc> | ||
| </Note> | ||
| </Chord> | ||
| <Chord> | ||
| <durationType>quarter</durationType> | ||
| <StemDirection>up</StemDirection> | ||
| <Note> | ||
| <pitch>65</pitch> | ||
| <tpc>13</tpc> | ||
| </Note> | ||
| </Chord> | ||
| <Spanner type="Ottava"> | ||
| <prev> | ||
| <location> | ||
| <measures>-1</measures> | ||
| </location> | ||
| </prev> | ||
| </Spanner> | ||
| <Rest> | ||
| <durationType>half</durationType> | ||
| </Rest> | ||
| <BarLine> | ||
| <subtype>end</subtype> | ||
| </BarLine> | ||
| </voice> | ||
| </Measure> | ||
| </Staff> | ||
| </Score> | ||
| </museScore> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't mix and match with
MuseScore/src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp
Line 3221 in 56723d1