LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix vtest emmentaler-10

Browse source
This commit is contained in:
Werner Schweer 2017-12-19 15:41:37 +01:00
parent d8d5bac743
commit 4d9b5fed69
4 changed files with 34 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libmscore/note.cpp
View file

@ -1236,6 +1236,7 @@ void Note::read(XmlReader& e)
bool Note::readProperties(XmlReader& e) bool Note::readProperties(XmlReader& e)
{ {
const QStringRef& tag(e.name()); const QStringRef& tag(e.name());
if (tag == "pitch") if (tag == "pitch")
_pitch = e.readInt(); _pitch = e.readInt();
else if (tag == "tpc") { else if (tag == "tpc") {

6
libmscore/property.cpp
View file

@ -476,8 +476,10 @@ QVariant getProperty(P_ID id, XmlReader& e)
case P_TYPE::SYMID: case P_TYPE::SYMID:
return QVariant::fromValue(Sym::name2id(e.readElementText())); return QVariant::fromValue(Sym::name2id(e.readElementText()));
break; break;
case P_TYPE::HEAD_GROUP: case P_TYPE::HEAD_GROUP: {
return QVariant::fromValue(NoteHead::name2group(e.readElementText()));; QString s = e.readElementText();
return QVariant::fromValue(NoteHead::name2group(s));
}
case P_TYPE::HEAD_TYPE: case P_TYPE::HEAD_TYPE:
return QVariant::fromValue(NoteHead::name2type(e.readElementText())); return QVariant::fromValue(NoteHead::name2type(e.readElementText()));
case P_TYPE::POINT_MM: // not supported case P_TYPE::POINT_MM: // not supported

1
libmscore/read206.cpp
View file

@ -690,6 +690,7 @@ static NoteHead::Group convertHeadGroup(int i)
case 13: case 13:
val = NoteHead::Group::HEAD_BREVIS_ALT; val = NoteHead::Group::HEAD_BREVIS_ALT;
break; break;
case 0:
default: default:
val = NoteHead::Group::HEAD_NORMAL; val = NoteHead::Group::HEAD_NORMAL;
} }

105
vtest/emmentaler-10.mscx
View file

@ -9,19 +9,26 @@
</Synthesizer> </Synthesizer>
<Division>480</Division> <Division>480</Division>
<Style> <Style>
<pageWidth>3.93701</pageWidth>
<pageHeight>3.54331</pageHeight>
<pagePrintableWidth>3.77953</pagePrintableWidth>
<pageEvenLeftMargin>0.0787403</pageEvenLeftMargin>
<pageOddLeftMargin>0.0787403</pageOddLeftMargin>
<pageEvenTopMargin>0</pageEvenTopMargin>
<pageEvenBottomMargin>0</pageEvenBottomMargin>
<pageOddTopMargin>0</pageOddTopMargin>
<pageOddBottomMargin>0</pageOddBottomMargin>
<pageTwosided>0</pageTwosided>
<staffDistance>1</staffDistance> <staffDistance>1</staffDistance>
<lyricsMinBottomDistance>4</lyricsMinBottomDistance>
<clefLeftMargin>0.64</clefLeftMargin>
<clefKeyRightMargin>1.75</clefKeyRightMargin>
<barNoteDistance>1.2</barNoteDistance>
<pedalPosBelow>0</pedalPosBelow>
<trillPosAbove>0</trillPosAbove>
<showMeasureNumber>0</showMeasureNumber> <showMeasureNumber>0</showMeasureNumber>
<showFooter>0</showFooter> <showFooter>0</showFooter>
<page-layout> <dynamicsFontItalic>0</dynamicsFontItalic>
<page-height>510.236</page-height>
<page-width>566.929</page-width>
<page-margins type="both">
<left-margin>11.3386</left-margin>
<right-margin>11.3386</right-margin>
<top-margin>0</top-margin>
<bottom-margin>0</bottom-margin>
</page-margins>
</page-layout>
<Spatium>1.5</Spatium> <Spatium>1.5</Spatium>
</Style> </Style>
<showInvisible>1</showInvisible> <showInvisible>1</showInvisible>
@ -41,18 +48,11 @@
<metaTag name="translator"></metaTag> <metaTag name="translator"></metaTag>
<metaTag name="workNumber"></metaTag> <metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag> <metaTag name="workTitle"></metaTag>
<PageList>
<Page>
<System>
</System>
</Page>
</PageList>
<Part> <Part>
<Staff id="1"> <Staff id="1">
<StaffType group="pitched"> <StaffType group="pitched">
<name>stdNormal</name> <name>stdNormal</name>
</StaffType> </StaffType>
<bracket type="-1" span="0"/>
</Staff> </Staff>
<Staff id="2"> <Staff id="2">
<StaffType group="pitched"> <StaffType group="pitched">
@ -125,14 +125,10 @@ p, li { white-space: pre-wrap; }
</Part> </Part>
<Staff id="1"> <Staff id="1">
<Measure number="1"> <Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<TimeSig> <TimeSig>
<sigN>8</sigN> <sigN>8</sigN>
<sigD>4</sigD> <sigD>4</sigD>
<showCourtesySig>0</showCourtesySig> <showCourtesy>0</showCourtesy>
</TimeSig> </TimeSig>
<StaffText> <StaffText>
<pos x="-5" y="-5.5"/> <pos x="-5" y="-5.5"/>
@ -177,7 +173,6 @@ p, li { white-space: pre-wrap; }
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>double</subtype> <subtype>double</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
<Measure number="3"> <Measure number="3">
@ -223,21 +218,15 @@ p, li { white-space: pre-wrap; }
<durationType>quarter</durationType> <durationType>quarter</durationType>
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
</Staff> </Staff>
<Staff id="2"> <Staff id="2">
<Measure number="1"> <Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<TimeSig> <TimeSig>
<sigN>8</sigN> <sigN>8</sigN>
<sigD>4</sigD> <sigD>4</sigD>
<showCourtesySig>0</showCourtesySig> <showCourtesy>0</showCourtesy>
</TimeSig> </TimeSig>
<StaffText> <StaffText>
<pos x="0" y="-2.5"/> <pos x="0" y="-2.5"/>
@ -282,7 +271,6 @@ p, li { white-space: pre-wrap; }
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>double</subtype> <subtype>double</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
<Measure number="3"> <Measure number="3">
@ -295,7 +283,7 @@ p, li { white-space: pre-wrap; }
<Note> <Note>
<pitch>67</pitch> <pitch>67</pitch>
<tpc>15</tpc> <tpc>15</tpc>
<head>triangle</head> <head>triangle-down</head>
</Note> </Note>
</Chord> </Chord>
</Measure> </Measure>
@ -305,7 +293,7 @@ p, li { white-space: pre-wrap; }
<Note> <Note>
<pitch>67</pitch> <pitch>67</pitch>
<tpc>15</tpc> <tpc>15</tpc>
<head>triangle</head> <head>triangle-down</head>
</Note> </Note>
</Chord> </Chord>
<Chord> <Chord>
@ -313,7 +301,7 @@ p, li { white-space: pre-wrap; }
<Note> <Note>
<pitch>67</pitch> <pitch>67</pitch>
<tpc>15</tpc> <tpc>15</tpc>
<head>triangle</head> <head>triangle-down</head>
</Note> </Note>
</Chord> </Chord>
<Chord> <Chord>
@ -321,28 +309,22 @@ p, li { white-space: pre-wrap; }
<Note> <Note>
<pitch>67</pitch> <pitch>67</pitch>
<tpc>15</tpc> <tpc>15</tpc>
<head>triangle</head> <head>triangle-down</head>
</Note> </Note>
</Chord> </Chord>
<Rest> <Rest>
<durationType>quarter</durationType> <durationType>quarter</durationType>
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
</Staff> </Staff>
<Staff id="3"> <Staff id="3">
<Measure number="1"> <Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<TimeSig> <TimeSig>
<sigN>8</sigN> <sigN>8</sigN>
<sigD>4</sigD> <sigD>4</sigD>
<showCourtesySig>0</showCourtesySig> <showCourtesy>0</showCourtesy>
</TimeSig> </TimeSig>
<StaffText> <StaffText>
<pos x="0" y="-2.5"/> <pos x="0" y="-2.5"/>
@ -387,7 +369,6 @@ p, li { white-space: pre-wrap; }
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>double</subtype> <subtype>double</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
<Measure number="3"> <Measure number="3">
@ -433,21 +414,15 @@ p, li { white-space: pre-wrap; }
<durationType>quarter</durationType> <durationType>quarter</durationType>
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
</Staff> </Staff>
<Staff id="4"> <Staff id="4">
<Measure number="1"> <Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<TimeSig> <TimeSig>
<sigN>8</sigN> <sigN>8</sigN>
<sigD>4</sigD> <sigD>4</sigD>
<showCourtesySig>0</showCourtesySig> <showCourtesy>0</showCourtesy>
</TimeSig> </TimeSig>
<StaffText> <StaffText>
<pos x="0" y="-2.5"/> <pos x="0" y="-2.5"/>
@ -492,7 +467,6 @@ p, li { white-space: pre-wrap; }
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>double</subtype> <subtype>double</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
<Measure number="3"> <Measure number="3">
@ -538,21 +512,15 @@ p, li { white-space: pre-wrap; }
<durationType>quarter</durationType> <durationType>quarter</durationType>
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
</Staff> </Staff>
<Staff id="5"> <Staff id="5">
<Measure number="1"> <Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<TimeSig> <TimeSig>
<sigN>8</sigN> <sigN>8</sigN>
<sigD>4</sigD> <sigD>4</sigD>
<showCourtesySig>0</showCourtesySig> <showCourtesy>0</showCourtesy>
</TimeSig> </TimeSig>
<StaffText> <StaffText>
<pos x="0" y="-2.5"/> <pos x="0" y="-2.5"/>
@ -597,7 +565,6 @@ p, li { white-space: pre-wrap; }
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>double</subtype> <subtype>double</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
<Measure number="3"> <Measure number="3">
@ -643,21 +610,15 @@ p, li { white-space: pre-wrap; }
<durationType>quarter</durationType> <durationType>quarter</durationType>
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
</Staff> </Staff>
<Staff id="6"> <Staff id="6">
<Measure number="1"> <Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<TimeSig> <TimeSig>
<sigN>8</sigN> <sigN>8</sigN>
<sigD>4</sigD> <sigD>4</sigD>
<showCourtesySig>0</showCourtesySig> <showCourtesy>0</showCourtesy>
</TimeSig> </TimeSig>
<StaffText> <StaffText>
<pos x="0" y="-2.5"/> <pos x="0" y="-2.5"/>
@ -702,7 +663,6 @@ p, li { white-space: pre-wrap; }
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>double</subtype> <subtype>double</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
<Measure number="3"> <Measure number="3">
@ -748,21 +708,15 @@ p, li { white-space: pre-wrap; }
<durationType>quarter</durationType> <durationType>quarter</durationType>
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
</Staff> </Staff>
<Staff id="7"> <Staff id="7">
<Measure number="1"> <Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<TimeSig> <TimeSig>
<sigN>8</sigN> <sigN>8</sigN>
<sigD>4</sigD> <sigD>4</sigD>
<showCourtesySig>0</showCourtesySig> <showCourtesy>0</showCourtesy>
</TimeSig> </TimeSig>
<StaffText> <StaffText>
<pos x="0" y="-2.5"/> <pos x="0" y="-2.5"/>
@ -807,7 +761,6 @@ p, li { white-space: pre-wrap; }
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>double</subtype> <subtype>double</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
<Measure number="3"> <Measure number="3">
@ -871,8 +824,6 @@ p, li { white-space: pre-wrap; }
<durationType>quarter</durationType> <durationType>quarter</durationType>
</Rest> </Rest>
<BarLine> <BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine> </BarLine>
</Measure> </Measure>
</Staff> </Staff>