Merge master into nested-bookparts

[lilypond.git] / input / lsr / page-label.ly

diff --git a/input/lsr/page-label.ly b/input/lsr/page-label.ly
index e6a50acf156194220eda4941b2a310723a1cf653..205281c59eb1dd47275c0ae59d659d1606ecb272 100644 (file)
--- a/input/lsr/page-label.ly
+++ b/input/lsr/page-label.ly
@@ -1,28 +1,28 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.38"
-\layout { ragged-right= ##t }
+\version "2.11.62"
 \header {
-  doctitle = "Page label"
   lsrtags = "spacing"
   texidoc = "Page labels may be placed inside music or at top-level,
-and refered to in markups."
-}
-% begin verbatim
+and referred to in markups."
+  doctitle = "Page label"
+} % begin verbatim
+
 #(set-default-paper-size "a6")
 
-#(define-markup-command (toc-line layout props label text) (symbol? markup?)
+#(define-markup-command (toc-line layout props label text)
+  (symbol? markup?)
   (interpret-markup layout props
    (markup #:fill-line (text #:page-ref label "8" "?"))))
 
 \book {
-  \markup \huge \fill-line { \null "Title Page" \null }
+  \markup \huge \fill-line { \null Title Page \null }
 
   \pageBreak
 
   \label #'toc
   \markup \column {
-    \large \fill-line { \null "Table of contents" \null }
+    \large \fill-line { \null Table of contents \null }
     \toc-line #'toc "Table of contents"
     \toc-line #'firstScore "First Score"
     \toc-line #'markA "Mark A"
@@ -35,14 +35,18 @@ and refered to in markups."
 
   \label #'firstScore
   \score {
-    { c'2 c'
-      \mark \markup { A (page \concat { \page-ref #'markA "0" "?" ) }} \label #'markA 
-      c' c'
+    \new Staff \relative c' {
+      c2 c
+      \mark \markup {
+        A (page \concat { \page-ref #'markA "0" "?" ) }
+      } \label #'markA
+      c2 c
       \pageBreak
       \mark "B" \label #'markB
-      d' d'
-      d' d'
-      \once \override Score . RehearsalMark #'break-visibility = #begin-of-line-invisible
+      d2 d
+      d2 d
+      \once \override Score.RehearsalMark #'break-visibility =
+        #begin-of-line-invisible
       \mark "C" \label #'markC
     }
     \header { piece = "First score" }