X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fpart-combine-silence-mixed.ly;h=a399431a006a70269b31db8a2a85d22729a35cc8;hb=ad399901bf44ddb175fe15f85566b237ad0aa3a5;hp=7d59777775819bf3a148caa7b1ce68d6a2375436;hpb=386c1fb71fef99d9ac865ccd1449412c26cef5cc;p=lilypond.git diff --git a/input/regression/part-combine-silence-mixed.ly b/input/regression/part-combine-silence-mixed.ly index 7d59777775..a399431a00 100644 --- a/input/regression/part-combine-silence-mixed.ly +++ b/input/regression/part-combine-silence-mixed.ly @@ -1,18 +1,18 @@ \version "2.19.16" \header { - texidoc = "Different kinds of silence are not merged into the shared voice even if they begin and end simultaneously." + texidoc = "Different kinds of silence are not merged into the shared voice even if they begin and end simultaneously; however, when rests and skips are present in the same part, the skips are ignored." } \score { << \new Staff { \partcombine - \relative f' { R1^"R" | s1^"s" | r1^"r" } - \relative f' { r1_"r" | R1_"R" | s1_"s" } + \relative f' { R1^"R" | s1^"s" | r1^"r" | << R1 s1 s4 >> | << r1 s2 s4 >> } + \relative f' { r1_"r" | R1_"R" | s1_"s" | << s4 s1 R1 >> | << s4 s2 r1 >> } } \new Staff { \partcombine - \relative f' { r1^"r" | R1^"R" | s1^"s" } - \relative f' { R1_"R" | s1_"s" | r1_"r" } + \relative f' { r1^"r" | R1^"R" | s1^"s" | << s4 s1 R1 >> | << s4 s2 r1 >> } + \relative f' { R1_"R" | s1_"s" | r1_"r" | << R1 s1 s4 >> | << r1 s2 s4 >> } } >> }