Imported Upstream version 2.14.2

[lilypond.git] / input / regression / page-spacing.ly

diff --git a/input/regression/page-spacing.ly b/input/regression/page-spacing.ly
index 015ad62285ddd66814b8391203b6164ce29cdeb9..b25589a4bbff4cd9c007eb811693213406e69c81 100644 (file)
--- a/input/regression/page-spacing.ly
+++ b/input/regression/page-spacing.ly
@@ -4,15 +4,16 @@
   texidoc = "By setting properties in NonMusicalPaperColumn, vertical
 spacing of page layout can be adjusted.
 
-For technical reasons, @code{outputProperty} has to be used for
-setting properties on individual object. @code{\override} may still be
+For technical reasons, @code{overrideProperty} has to be used for
+setting properties on individual object. @code{\\override} may still be
 used for global overrides.
 
+By setting @code{annotate-spacing}, we can see the effect of each property.
 "
 
 }
 
-\version "2.7.10"
+\version "2.14.0"
 
 #(set-global-staff-size 11)
 
@@ -23,13 +24,13 @@ used for global overrides.
        c1_"followed by default spacing"\break
        c\break
 
-       \outputProperty
+       \overrideProperty
        #"Score.NonMusicalPaperColumn"
        #'line-break-system-details
        #'((Y-extent . (-30 . 10)))
        c_"Big bounding box (property Y-extent)"\break
 
-       \outputProperty
+       \overrideProperty
        #"Score.NonMusicalPaperColumn"
        #'line-break-system-details
        #'((refpoint-Y-extent . (-37 . -10)))
@@ -39,24 +40,24 @@ used for global overrides.
            "Stretchable space runs between refpoints"
          }
        }
-       
+
        \break
-       
-       \outputProperty
+
+       \overrideProperty
        #"Score.NonMusicalPaperColumn"
        #'line-break-system-details
        #'((next-padding . 10))
 
        c_"Followed by padding, ie unstretchable space. (property next-padding)" \break
-       \outputProperty
+       \overrideProperty
        #"Score.NonMusicalPaperColumn"
        #'line-break-system-details
        #'((next-space . 20))
        c_"Followed by stretchable space (property next-space)"\break
        c\break
-       \outputProperty
+       \overrideProperty
        #"Score.NonMusicalPaperColumn" #'line-break-system-details
-       #'((bottom-space . 25.0)) 
+       #'((bottom-space . 25.0))
        c_"25 staff space to the bottom of the page. (property bottom-space)"\break
 
 
@@ -65,13 +66,16 @@ used for global overrides.
     >>
   }
   \paper {
-    raggedlastbottom = ##f
-    betweensystemspace = 1.0
+    ragged-last-bottom = ##f
+    annotate-spacing = ##t
+    obsolete-between-system-space = 1.0
+    system-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
+    score-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
     #(set! text-font-defaults
       (acons
        'font-size 6
        text-font-defaults)
-      
+
     )
   }
 }