X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollision-merge-differently-dotted.ly;h=ba08617dc8f0a52f15c87f8ef87761cec5e6b137;hb=a1344e55b5c00f84fd0b07c53a175bf2855d00b1;hp=f967c95eb9cab25f8b5e70c2bd5ac978a387a0bd;hpb=641486a1a5522a9e66b470d8c762a1f789219573;p=lilypond.git diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly index f967c95eb9..ba08617dc8 100644 --- a/input/regression/collision-merge-differently-dotted.ly +++ b/input/regression/collision-merge-differently-dotted.ly @@ -1,30 +1,29 @@ -\version "2.4.0" +\version "2.10.0" \header { - texidoc = "If NoteCollision has merge-differently-dotted = ##t note + texidoc = "If @code{NoteCollision} has + @code{merge-differently-dotted = ##t} note heads that have differing dot counts may be merged anyway. Dots should not disappear when merging similar note heads." } -\layout { raggedright= ##t } +\layout { ragged-right= ##t } -\score { - \context Staff \relative c'' << - { - g8[ g8] - \override Staff.NoteCollision #'merge-differently-dotted = ##t - g8[ g8] - g4. r8 g8. g16 - g8 g4 r8 g4 - } - \\ - { - g8.[ f16] - g8.[ f16] - g8 g4 r8 g4 - g4. r8 g8. g16 - } - >> -} +\context Staff \relative c'' << + { + g8[ g8] + \override Staff.NoteCollision #'merge-differently-dotted = ##t + g8[ g8] + g4. r8 g8. g16 + g8 g4 r8 g4 + } + \\ + { + g8.[ f16] + g8.[ f16] + g8 g4 r8 g4 + g4. r8 g8. g16 + } +>>