X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fpage-layout.ly;h=65d13eddc367dfa18d112f297fb8cb58103fe31b;hb=5206d86a9de2bd8bd480940fb5c861d8bd0b17c2;hp=254544f7d6affb8594c6df7de7a094afbd919ba8;hpb=06b1da466f99f6c4a01ee6a3e611d25bd5359d4c;p=lilypond.git

diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly
index 254544f7d6..65d13eddc3 100644
--- a/input/regression/page-layout.ly
+++ b/input/regression/page-layout.ly
@@ -1,11 +1,18 @@
 
-\version "2.3.17"
+\version "2.10.0"
 
-\header{ texidoc = "This shows how different settings on \bookpaper
-modify the general page layout. Basically \bookpaper will set the
-values for the whole paper while \paper 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"
@@ -17,20 +24,25 @@ values for the whole paper while \paper for each \score block." }
     instrument = "Instrument"
   }
 
-\bookpaper {
-    %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 {
+    %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 \paper for each \score block." }
             }
         }
         \header {piece = "Piece I"}
-        \paper {linewidth = 13\cm}
+        \layout {line-width = 13\cm}
     }
     \score {
         \relative c'' {
@@ -49,7 +61,10 @@ values for the whole paper while \paper for each \score block." }
                 \repeat unfold 4 {c4}
             }
         }
-        \header {piece = "Piece II"}
-        \paper {linewidth = 9\cm}
+        \header {
+	  breakbefore = ##f
+	  piece = "Piece II"
+	}
+        \layout {line-width = 9\cm}
     }
 }