* tex/lilyponddefs.tex (\lilypondend): Undo change from 2004-10-20.

diff --git a/ChangeLog b/ChangeLog
index 843da8b4cb4a229dafff25e08e09c299573ebc21..9113b573d1d3e50d04802d5b9ba6fee966836fdc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-22  Werner Lemberg  <wl@gnu.org>
+
+       * tex/lilyponddefs.tex (\lilypondend): Undo change from 2004-10-20.
+
 2004-10-21  Werner Lemberg  <wl@gnu.org>
 
        * tex/lily-pdf-defs.tex, tex/lily-ps-defs.tex

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index da6386c1dc27a6e491c1b2bac743272757ae568e..6a0bffc9e87448ed8bc2ce947ae982a7a9efff76 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -230,8 +230,11 @@
 %%
 \gdef\lilypondend{
   %% Handle the `lastpagefill' parameter from the \layout block.
-  \lilypondifundefined{lilypondpaperlastpagefill}
-    {\vskip 0pt plus\lilypondpaperinterscorelinefill00 fill}
+  %% Ignore it if \lilypondbook is defined.
+  \lilypondifundefined{lilypondbook}
+    {\lilypondifundefined{lilypondpaperlastpagefill}
+       {\vskip 0pt plus\lilypondpaperinterscorelinefill00 fill}
+       {}}
     {}
 
   \begingroup