From fa938d4b51ccb3c18e489b395838f2587b531ec2 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Tue, 25 Jul 2006 01:16:05 +0000 Subject: [PATCH] * lily/grob.cc: * lily/gourlay-breaking.cc: Oops, these should have been included in my last commit --- ChangeLog | 6 ++++++ lily/gourlay-breaking.cc | 2 +- lily/grob.cc | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8580df7eab..1bf8a51173 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-07-25 Joe Neeman + + * lily/grob.cc: + * lily/gourlay-breaking.cc: Oops, these should have been included in my last + commit + 2006-07-24 Han-Wen Nienhuys * scripts/*.py (program_name): cleanup relocation snippets. diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc index 8e4b357232..f5e29ad18d 100644 --- 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 d13f127044..8628e8a590 100644 --- 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 Grob::spanned_rank_iv () { - return Interval_t (INT_MIN, INT_MAX); + return Interval_t (-1, 0); } /**************************************************************** -- 2.39.5