resolve merge

[lilypond.git] / input / regression / alignment-vertical-manual-setting.ly

diff --git a/input/regression/alignment-vertical-manual-setting.ly b/input/regression/alignment-vertical-manual-setting.ly
index b176e931cec7ffe5dd1323d379e951e1694c23d2..1448acf835dabaca883b5a3932cc512db642e518 100644 (file)
--- a/input/regression/alignment-vertical-manual-setting.ly
+++ b/input/regression/alignment-vertical-manual-setting.ly
@@ -1,12 +1,12 @@
 \header {
 
-  texidoc = "Alignments may be changed pre system by setting
-  @code{alignment-offsets} in the @code{line-break-system-details}
+  texidoc = "Alignments may be changed per system by setting
+  @code{alignment-distances} in the @code{line-break-system-details}
   property"
 
 }
 
-\version "2.12.0"
+\version "2.14.0"
 
 \book {
   \score {
@@ -17,17 +17,17 @@
        \overrideProperty
        #"Score.NonMusicalPaperColumn"
        #'line-break-system-details
-       #'((alignment-offsets . (#f #f -30)))
+       #'((alignment-distances . (#f 20)))
        c1 \break
        \overrideProperty
        #"Score.NonMusicalPaperColumn"
        #'line-break-system-details
-       #'((alignment-offsets . (0 -5 -20)))
+       #'((alignment-distances . (5 15)))
        c1 \break
        \overrideProperty
        #"Score.NonMusicalPaperColumn"
        #'line-break-system-details
-       #'((alignment-offsets . (0 -15 -20)))
+       #'((alignment-distances . (15 5)))
        c1 c
       }
     >>