* lily/grob.cc:

* lily/gourlay-breaking.cc: Oops, these should have been included in my last
commit

diff --git a/ChangeLog b/ChangeLog
index 8580df7eaba53aacad32eb91fdda4b3c8c271144..1bf8a51173fc3b7ffabe93476c486378eefc3d71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-25  Joe Neeman  <joeneeman@gmail.com>
+
+       * lily/grob.cc:
+       * lily/gourlay-breaking.cc: Oops, these should have been included in my last
+       commit
+
 2006-07-24  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * scripts/*.py (program_name): cleanup relocation snippets.

diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index 8e4b357232918bd144830fa3bc02dd23a562ddf9..f5e29ad18d662463d796070a6a81cae7537f5206 100644 (file)
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -116,7 +116,7 @@ Gourlay_breaking::solve ()
                                                          line_dims[LEFT], ragged);
 
          if (ragged && last_line)
-           cp.force_ = 0.0;
+           cp.force_ = min (cp.force_, 0.0);
 
          if (fabs (cp.force_) > worst_force)
            worst_force = fabs (cp.force_);

diff --git a/lily/grob.cc b/lily/grob.cc
index d13f127044f0011ed7757dace63767d71108b8f2..8628e8a5909f1ba5d090d49e5eda8707a3bb3401 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -419,6 +419,10 @@ Grob::pure_height (Grob *refp, int start, int end)
                                       SCM_EOL));
   Real offset = pure_relative_y_coordinate (refp, start, end);
 
+  SCM min_ext = get_property ("minimum-Y-extent");
+  if (is_number_pair (min_ext))
+    iv.unite (ly_scm2interval (min_ext));
+
   iv.translate (offset);
   return iv;
 }
@@ -434,7 +438,7 @@ Grob::maybe_pure_extent (Grob *refp, Axis a, bool pure, int start, int end)
 Interval_t<int>
 Grob::spanned_rank_iv ()
 {
-  return Interval_t<int> (INT_MIN, INT_MAX);
+  return Interval_t<int> (-1, 0);
 }
 
 /****************************************************************