Nested book parts: update LSR example

diff --git a/input/new/book-parts.ly b/input/new/book-parts.ly
index 19617d026d73f273df8d09bb03941a9cbb030033..ddfe0c0767a307f4d629a8b55d226c9002985bda 100644 (file)
--- a/input/new/book-parts.ly
+++ b/input/new/book-parts.ly
@@ -2,55 +2,54 @@
 
 \header {
   lsrtags = "paper-and-layout"
-  texidocs = "@code{\\bookpart} can be used to split a book into several parts.
+  texidocs = "@code{\\bookpart} can be used to split a book into
+several parts.
 Each part last page can be affected by @code{ragged-bottom-last}.
+Header and footer markups can detect a part last page, and make the
+difference with the book last page.
 "
   doctitle = "Book parts"
 }
 
 #(set-default-paper-size "a6")
 
-\paper {
-  oddFooterMarkup = "toplevel paper footer"
-  id ="\ntoplevel paper\n"
-}
 
-\book {
-  %% book-level paper, which is inherited by all 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
-        }
-        toto
+%% 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-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"
-  }
+}
+
+%% 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 {
 
-  %% first book part
   \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 }
@@ -58,9 +57,10 @@ Each part last page can be affected by @code{ragged-bottom-last}.
     \markup { first part last page }
     \markup \wordwrap { with ragged-last-bottom (see the space below this text) }
   }
-  %% an other book part
+
   \bookpart {
     \header { subtitle = "Second part" }
     { c' }
   }
+
 }