(stencil2line): Bugfix: put stencil in line.

diff --git a/ChangeLog b/ChangeLog
index ed90e8fb304d51c39f4019467946e5f02db9c991..d8a80a6382b1e59c10e83033d352b57ac8a8e189 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-03-15  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/paper-book.cc (stencil2line): Bugfix: put stencil in line.
+
        * lily/system.cc (get_line): Return Paper_line.  Change all users.
 
        * lily/include/paper-line.hh:

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 9810f2159984136850cd6a23a0826333c10913f2..83653b6804325b4b72129c04ab40fe93235061e0 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -29,7 +29,7 @@ stencil2line (Stencil* stil, bool is_title = false)
     z = scm_permanent_object (ly_offset2scm (Offset (0, 0)));
   Offset dim = Offset (stil->extent (X_AXIS).length (),
                       stil->extent (Y_AXIS).length ());
-  Paper_line pl (dim, stil->smobbed_copy (), is_title);
+  Paper_line pl (dim, scm_cons (stil->smobbed_copy (), SCM_EOL), is_title);
   return pl.smobbed_copy ();
 }
 
@@ -140,7 +140,7 @@ Page::output (Paper_outputter *out, bool is_last)
                        is_last && gh_pair_p (ly_cdr (s)) && !get_copyright ()
                        && !get_tagline () && !get_footer ());
       if (gh_pair_p (ly_cdr (s)) && unsmob_paper_line (line)->is_title ())
-       o[Y_AXIS] += vfill; 
+       o[Y_AXIS] += vfill;
     }
 
   o[Y_AXIS] = vsize_ - bottom_margin_;

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 7e5fc947c9f81e9e6060f14d00a9a8e887c48ef3..7e2a5368beb8e78ccd931264bd4eab0be197078a 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -194,6 +194,8 @@ Paper_outputter::output_line (SCM line, Offset *origin, bool is_last)
       /* Only if !PAGE_LAYOUT */
       else if (ly_caar (s) == ly_symbol2scm ("between-system-string"))
        between = ly_cdar (s);
+      else
+       time (0);
     }
 
   if (is_last)