Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1882,6 +1882,11 @@ static void cleanupUnterminatedTie(Tie* tie, const Score* score, bool fixForCros
// Delete unterminated ties pending fully featured l.v. ties & ties over repeats
unterminatedTieNote->remove(tie);
delete tie;

// Add Laissez Vibrer instead
LaissezVib* lvTie = Factory::createLaissezVib(unterminatedTieNote);
lvTie->setParent(unterminatedTieNote);
unterminatedTieNote->score()->undoAddElement(lvTie);
}

//---------------------------------------------------------
Expand Down
61 changes: 32 additions & 29 deletions src/importexport/musicxml/tests/data/importTie1_ref.mscx
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,9 @@
<StemDirection>down</StemDirection>
<Note>
<eid>o_o</eid>
<LaissezVib>
<eid>p_p</eid>
</LaissezVib>
<pitch>62</pitch>
<tpc>16</tpc>
</Note>
Expand All @@ -317,27 +320,27 @@
<concertClefType>F</concertClefType>
<transposingClefType>F</transposingClefType>
<isHeader>1</isHeader>
<eid>p_p</eid>
<eid>q_q</eid>
</Clef>
<KeySig>
<eid>q_q</eid>
<eid>r_r</eid>
<concertKey>1</concertKey>
</KeySig>
<TimeSig>
<eid>r_r</eid>
<eid>s_s</eid>
<sigN>3</sigN>
<sigD>4</sigD>
</TimeSig>
<Chord>
<eid>s_s</eid>
<eid>t_t</eid>
<dots>1</dots>
<durationType>half</durationType>
<StemDirection>up</StemDirection>
<Note>
<eid>t_t</eid>
<eid>u_u</eid>
<Spanner type="Tie">
<Tie>
<eid>u_u</eid>
<eid>v_v</eid>
<up>up</up>
</Tie>
<next>
Expand All @@ -353,12 +356,12 @@
</voice>
<voice>
<Chord>
<eid>v_v</eid>
<eid>w_w</eid>
<dots>1</dots>
<durationType>half</durationType>
<StemDirection>down</StemDirection>
<Note>
<eid>w_w</eid>
<eid>x_x</eid>
<pitch>50</pitch>
<tpc>16</tpc>
</Note>
Expand All @@ -368,11 +371,11 @@
<Measure>
<voice>
<Chord>
<eid>x_x</eid>
<eid>y_y</eid>
<durationType>half</durationType>
<StemDirection>up</StemDirection>
<Note>
<eid>y_y</eid>
<eid>z_z</eid>
<Spanner type="Tie">
<prev>
<location>
Expand All @@ -385,33 +388,33 @@
</Note>
</Chord>
<Chord>
<eid>z_z</eid>
<eid>0_0</eid>
<durationType>quarter</durationType>
<StemDirection>up</StemDirection>
<Note>
<eid>0_0</eid>
<eid>1_1</eid>
<pitch>57</pitch>
<tpc>17</tpc>
</Note>
</Chord>
</voice>
<voice>
<Chord>
<eid>1_1</eid>
<eid>2_2</eid>
<durationType>half</durationType>
<StemDirection>down</StemDirection>
<Note>
<eid>2_2</eid>
<eid>3_3</eid>
<pitch>47</pitch>
<tpc>19</tpc>
</Note>
</Chord>
<Chord>
<eid>3_3</eid>
<eid>4_4</eid>
<durationType>quarter</durationType>
<StemDirection>down</StemDirection>
<Note>
<eid>4_4</eid>
<eid>5_5</eid>
<pitch>50</pitch>
<tpc>16</tpc>
</Note>
Expand All @@ -421,66 +424,66 @@
<Measure>
<voice>
<Chord>
<eid>5_5</eid>
<eid>6_6</eid>
<durationType>quarter</durationType>
<StemDirection>up</StemDirection>
<Note>
<eid>6_6</eid>
<eid>7_7</eid>
<pitch>59</pitch>
<tpc>19</tpc>
</Note>
</Chord>
<Chord>
<eid>7_7</eid>
<eid>8_8</eid>
<durationType>quarter</durationType>
<StemDirection>up</StemDirection>
<Note>
<eid>8_8</eid>
<eid>9_9</eid>
<pitch>57</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Chord>
<eid>9_9</eid>
<eid>+_+</eid>
<durationType>quarter</durationType>
<StemDirection>up</StemDirection>
<Note>
<eid>+_+</eid>
<eid>/_/</eid>
<pitch>54</pitch>
<tpc>20</tpc>
</Note>
</Chord>
<BarLine>
<eid>/_/</eid>
<eid>AB_AB</eid>
</BarLine>
</voice>
<voice>
<Chord>
<eid>AB_AB</eid>
<eid>BB_BB</eid>
<durationType>quarter</durationType>
<StemDirection>down</StemDirection>
<Note>
<eid>BB_BB</eid>
<eid>CB_CB</eid>
<pitch>47</pitch>
<tpc>19</tpc>
</Note>
</Chord>
<Chord>
<eid>CB_CB</eid>
<eid>DB_DB</eid>
<durationType>quarter</durationType>
<StemDirection>down</StemDirection>
<Note>
<eid>DB_DB</eid>
<eid>EB_EB</eid>
<pitch>48</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Chord>
<eid>EB_EB</eid>
<eid>FB_FB</eid>
<durationType>quarter</durationType>
<StemDirection>down</StemDirection>
<Note>
<eid>FB_FB</eid>
<eid>GB_GB</eid>
<pitch>50</pitch>
<tpc>16</tpc>
</Note>
Expand Down
Loading
Loading