Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly
index 8cc5cf25f9103a859fd1a75b517a767ba651f28d..6674e53e432a07112b070c262057b80ee5c8cc18 100644 (file)
--- a/input/regression/page-layout.ly
+++ b/input/regression/page-layout.ly
@@ -1,11 +1,18 @@
 
-\version "2.3.22"
+\version "2.12.0"
 
-\header{ texidoc = "This shows how different settings on \paper
-modify the general page layout. Basically \paper will set the
-values for the whole paper while \layout for each \score block." }
 
- \header {
+    
+\header {
+
+     texidoc = "This shows how different settings on \paper modify the
+general page layout. Basically \paper will set the values for the
+whole paper while \layout for each \score block.
+
+This file is best viewed outside the collated files document.
+" 
+
+ 
     title = "Title"
     subtitle = "(and (the) subtitle)"
     subsubtitle = "Sub sub title"
@@ -18,19 +25,24 @@ values for the whole paper while \layout for each \score block." }
   }
 
 \paper {
-    %hsize = 2\cm
-    %vsize = 2\cm
-    topmargin = 2\cm
-    bottommargin = 2\cm
-    %headsep = 7\cm
-    %footsep = 7\cm
-    raggedbottom = ##t
-    raggedlastbottom = ##t
-    leftmargin = 3\cm
-    linewidth = 15\cm
+    %paper-width = 2\cm
+    %paper-height = 2\cm
+    top-margin = 2\cm
+    bottom-margin = 2\cm
+    %heap-separation = 7\cm
+    %foot-separation = 7\cm
+    ragged-bottom = ##t
+    ragged-last-bottom = ##t
+    left-margin = 3\cm
+    line-width = 15\cm
     %rigthmargin = 3\cm
     interscoreline = 3\cm
-}
+
+    annotate-spacing = ##t
+
+
+    
+  }
 
 
 \book {
@@ -41,7 +53,7 @@ values for the whole paper while \layout for each \score block." }
             }
         }
         \header {piece = "Piece I"}
-        \layout {linewidth = 13\cm}
+        \layout {line-width = 13\cm}
     }
     \score {
         \relative c'' {
@@ -49,7 +61,10 @@ values for the whole paper while \layout for each \score block." }
                 \repeat unfold 4 {c4}
             }
         }
-        \header {piece = "Piece II"}
-        \layout {linewidth = 9\cm}
+        \header {
+         breakbefore = ##f
+         piece = "Piece II"
+       }
+        \layout {line-width = 9\cm}
     }
 }