From: janneke <janneke>
Date: Mon, 15 Mar 2004 22:12:38 +0000 (+0000)
Subject: (stencil2line): Bugfix: put stencil in line.
X-Git-Tag: release/2.1.36~105
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ca0bb501ddd60244327fafd1df3fd9ff4fbd8eff;p=lilypond.git

(stencil2line): Bugfix: put stencil in line.
---

diff --git a/ChangeLog b/ChangeLog
index ed90e8fb30..d8a80a6382 100644
--- 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 9810f21599..83653b6804 100644
--- 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 7e5fc947c9..7e2a5368be 100644
--- 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)