Skip to content

Commit

Permalink
fix musescore#21269
Browse files Browse the repository at this point in the history
  • Loading branch information
@lvinken
lvinken committed Jun 1, 2013
1 parent ee4736d commit c9a1a3e
Show file tree
Hide file tree
Showing 3 changed files with 164 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mscore/exportxml.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1221,9 +1221,9 @@ static QString tick2xml(const int ticks, int* dots)
// findVolta -- find volta starting in measure m
//---------------------------------------------------------

static Volta* findVolta(Measure* m, bool /*left*/)
static Volta* findVolta(Measure* m, bool left)
{
for (Spanner* el = m->spannerFor(); el; el = el->next()) {
for (Spanner* el = left ? m->spannerFor() : m->spannerBack(); el; el = el->next()) {
if (el->type() != Element::VOLTA)
continue;
return (Volta*) el;
Expand Down
81 changes: 81 additions & 0 deletions mtest/musicxml/io/testVolta1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,87 @@
<voice>1</voice>
<type>whole</type>
</note>
</measure>
<measure number="5">
<print new-system="yes"/>
<note>
<pitch>
<step>G</step>
<octave>4</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
</measure>
<measure number="6">
<barline location="left">
<ending number="1" type="start"/>
</barline>
<note>
<pitch>
<step>A</step>
<octave>4</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
</measure>
<measure number="7">
<note>
<pitch>
<step>B</step>
<octave>4</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
<barline location="right">
<bar-style>light-heavy</bar-style>
<ending number="1" type="stop"/>
<repeat direction="backward"/>
</barline>
</measure>
<measure number="8">
<barline location="left">
<ending number="2" type="start"/>
</barline>
<note>
<pitch>
<step>C</step>
<octave>5</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
</measure>
<measure number="9">
<note>
<pitch>
<step>D</step>
<octave>5</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
<barline location="right">
<ending number="2" type="discontinue"/>
</barline>
</measure>
<measure number="10">
<note>
<pitch>
<step>E</step>
<octave>5</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
<barline location="right">
<bar-style>light-heavy</bar-style>
</barline>
Expand Down
81 changes: 81 additions & 0 deletions test/musicxml/testVolta1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,87 @@
<voice>1</voice>
<type>whole</type>
</note>
</measure>
<measure number="5">
<print new-system="yes"/>
<note>
<pitch>
<step>G</step>
<octave>4</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
</measure>
<measure number="6">
<barline location="left">
<ending number="1" type="start"/>
</barline>
<note>
<pitch>
<step>A</step>
<octave>4</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
</measure>
<measure number="7">
<note>
<pitch>
<step>B</step>
<octave>4</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
<barline location="right">
<bar-style>light-heavy</bar-style>
<ending number="1" type="stop"/>
<repeat direction="backward"/>
</barline>
</measure>
<measure number="8">
<barline location="left">
<ending number="2" type="start"/>
</barline>
<note>
<pitch>
<step>C</step>
<octave>5</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
</measure>
<measure number="9">
<note>
<pitch>
<step>D</step>
<octave>5</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
<barline location="right">
<ending number="2" type="discontinue"/>
</barline>
</measure>
<measure number="10">
<note>
<pitch>
<step>E</step>
<octave>5</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
<barline location="right">
<bar-style>light-heavy</bar-style>
</barline>
Expand Down

0 comments on commit c9a1a3e

Please sign in to comment.