Nested book parts: take account of Joe's code review from 2008/11/03

[lilypond.git] / input / new / book-parts.ly

diff --git a/input/new/book-parts.ly b/input/new/book-parts.ly
index ddfe0c0767a307f4d629a8b55d226c9002985bda..1b4754dc6cea8a6f5cd3f99b45deff79f23b0564 100644 (file)
--- a/input/new/book-parts.ly
+++ b/input/new/book-parts.ly
@@ -13,43 +13,41 @@ difference with the book last page.
 
 #(set-default-paper-size "a6")
 
+\book {
 
-%% top-level paper, which is inherited by all children bookparts
-\paper {
-  id = "\nbook level paper\n"
-  ragged-last-bottom = ##t
-  %% Page footer: add a different part-tagline at part last page
-  oddFooterMarkup = \markup {
-    \column {
-      \fill-line {
-        %% Copyright header field only on book first page.
-        \on-the-fly #first-page \fromproperty #'header:copyright
-      }
-      \fill-line {
-        %% Part tagline header field only on each part last page.
-        \on-the-fly #part-last-page \fromproperty #'header:parttagline
-      }
-      \fill-line {
-        %% Tagline header field only on book last page.
-        \on-the-fly #last-page \fromproperty #'header:tagline
+  %% book paper, which is inherited by all children bookparts
+  \paper {
+    ragged-last-bottom = ##t
+    %% Page footer: add a different part-tagline at part last page
+    oddFooterMarkup = \markup {
+      \column {
+        \fill-line {
+          %% Copyright header field only on book first page.
+          \on-the-fly #first-page \fromproperty #'header:copyright
+        }
+        \fill-line {
+          %% Part tagline header field only on each part last page.
+          \on-the-fly #part-last-page \fromproperty #'header:parttagline
+        }
+        \fill-line {
+          %% Tagline header field only on book last page.
+          \on-the-fly #last-page \fromproperty #'header:tagline
+        }
       }
     }
   }
-}
-
-%% top-level header, which is inherited by the first bookpart
-\header {
-  title = "Book title"
-  copyright = "Copyright line on book first page"
-  parttagline = "Part tagline"
-  tagline = "Book tagline"
-}
-
-\book {
 
+  %% book header, which is inherited by the first bookpart
+  \header {
+    title = "Book title"
+    copyright = "Copyright line on book first page"
+    parttagline = "Part tagline"
+    tagline = "Book tagline"
+  }
+  
   \bookpart {
     %% a different page breaking function may be used on each part
-    %\paper { #(define page-breaking optimal-page-breaks) }
+    \paper { #(define page-breaking optimal-page-breaks) }
     \header { subtitle = "First part" }
     \markup { The first book part }
     \markup { a page break }