Merge branch 'master' into lilypond/translation

[lilypond.git] / input / regression / part-combine.ly

diff --git a/input/regression/part-combine.ly b/input/regression/part-combine.ly
index cefd7fcc3283c7741e879ae3c2a75b56d51d83f4..5647b774f4c0df0c7103f1364aabc807f91c0be1 100644 (file)
--- a/input/regression/part-combine.ly
+++ b/input/regression/part-combine.ly
@@ -3,15 +3,15 @@
   texidoc ="The new part combiner stays apart from:
 @itemize @bullet
 @item different durations,
-@item different articulations (taking into account only slur/beam/tie), and
+@item different articulations (taking into account only slur/@/beam/@/tie), and
 @item wide pitch ranges.
 @end itemize
 "
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
-\version "2.6.0"
+\version "2.14.0"
 
 vone =  \relative a' {
   g2 g    g  g4 g f' c c( c) c c  c ~ c