X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Fregression%2Fpage-layout.ly;h=4eafd885a05a69da36a5f1146c3e3675461a27c7;hb=12a06e5c29a2f58081068ac7663f0d6a6d4bdf95;hp=de332bcd07d4b1b47165d0473dfe2583a906fb8d;hpb=81ff60043550ae51238b5f273462e875969d39be;p=lilypond.git

diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly
index de332bcd07..4eafd885a0 100644
--- a/input/regression/page-layout.ly
+++ b/input/regression/page-layout.ly
@@ -1,11 +1,18 @@
 
-\version "2.3.8"
+\version "2.19.21"
+
+
+
+\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.
+"
 
-\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 {
     title = "Title"
     subtitle = "(and (the) subtitle)"
     subsubtitle = "Sub sub title"
@@ -17,39 +24,45 @@ 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
+    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 {
     \score {
-        \notes {
+        \relative {
             \repeat unfold 10 {
-                \repeat unfold 4 {c4}
+                \repeat unfold 4 {c''4}
             }
         }
         \header {piece = "Piece I"}
-        \paper {linewidth = 13\cm}
+        \layout {line-width = 13\cm}
     }
     \score {
-        \notes {
+        \relative {
             \repeat unfold 10 {
-                \repeat unfold 4 {c4}
+                \repeat unfold 4 {c''4}
             }
         }
-        \header {piece = "Piece II"}
-        \paper {linewidth = 9\cm}
+        \header {
+	  breakbefore = ##f
+	  piece = "Piece II"
+	}
+        \layout {line-width = 9\cm}
     }
-}
\ No newline at end of file
+}