Merge commit 'origin' into includes

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

diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly
index 0ecc725e0bcc1b87555035464d324dfe241d8b22..6674e53e432a07112b070c262057b80ee5c8cc18 100644 (file)
--- a/input/regression/page-layout.ly
+++ b/input/regression/page-layout.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.12.0"
 
 
     
@@ -25,19 +25,24 @@ This file is best viewed outside the collated files document.
   }
 
 \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 {
@@ -48,7 +53,7 @@ This file is best viewed outside the collated files document.
             }
         }
         \header {piece = "Piece I"}
-        \layout {linewidth = 13\cm}
+        \layout {line-width = 13\cm}
     }
     \score {
         \relative c'' {
@@ -60,6 +65,6 @@ This file is best viewed outside the collated files document.
          breakbefore = ##f
          piece = "Piece II"
        }
-        \layout {linewidth = 9\cm}
+        \layout {line-width = 9\cm}
     }
 }