From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 17 Jul 2000 23:26:40 +0000 (+0200)
Subject: patch::: 1.3.72.mb2: forwarded message from Mats Bengtsson
X-Git-Tag: release/1.3.73~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5e5e63e025543ac6e60b283f46f54e9515bc3814;p=lilypond.git

patch::: 1.3.72.mb2: forwarded message from Mats Bengtsson

1.3.72.mb2
======

* Removed \interscoreline after the last line, prevents some
  empty pages.

---
Generated by (address unknown),
>From = lilypond-1.3.72.mb1, To = lilypond-1.3.72.mb2

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.72.mb2.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
---

diff --git a/CHANGES b/CHANGES
index 17afb3dfa8..3e075d37a5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,15 @@
-* Robustness fix for minimise_least_squares ()
+--- ../lilypond-1.3.72.mb1/CHANGES	Thu Jul 13 18:50:24 2000
+++ b/CHANGES	Fri Jul 14 16:33:48 2000
+@@ -1,3 +1,9 @@
+1.3.72.mb2
+======
+
+* Removed \interscoreline after the last line, prevents some
+  empty pages.
+
+ 1.3.72.mb1
+ ======
+ * Robustness fix for minimise_least_squares ()
 
 * cleanups of Slur_bezier_bow, removed Bezier_bow.
 
diff --git a/VERSION b/VERSION
index cfd16bc230..5faea6a0dc 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=72
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/lily/include/line-of-score.hh b/lily/include/line-of-score.hh
index 96b3d6b265..8de2257cb3 100644
--- a/lily/include/line-of-score.hh
+++ b/lily/include/line-of-score.hh
@@ -31,7 +31,7 @@ class Line_of_score : public Spanner
 {
 public:
   int rank_i_;
-  void post_processing();
+  void post_processing(bool);
 
   Protected_scm output_;
   Line_of_score(SCM);
diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc
index ff641c0c24..bbe0690406 100644
--- a/lily/line-of-score.cc
+++ b/lily/line-of-score.cc
@@ -103,7 +103,7 @@ Line_of_score::output_lines ()
 
       if (verbose_global_b)
 	progress_indication ("[");
-      line_l->post_processing ();
+      line_l->post_processing (i+1 == broken_into_l_arr_.size ());
 
       if (verbose_global_b)
 	{
@@ -242,7 +242,7 @@ Line_of_score::pre_processing ()
 }
 
 void
-Line_of_score::post_processing ()
+Line_of_score::post_processing (bool last_line)
 {
   for (SCM s = get_elt_property ("all-elements");
        gh_pair_p (s); s = gh_cdr (s))
@@ -309,7 +309,14 @@ Line_of_score::post_processing ()
 
       output_molecule (m.get_expr (), o);
     }
-  output_scheme (gh_list (ly_symbol2scm ("stop-line"), SCM_UNDEFINED));
+  if (last_line)
+    {
+      output_scheme (gh_list (ly_symbol2scm ("stop-last-line"), SCM_UNDEFINED));
+    }
+  else
+    {
+      output_scheme (gh_list (ly_symbol2scm ("stop-line"), SCM_UNDEFINED));
+    }
 }