Merge branch 'master' of ssh+git://jneem@git.sv.gnu.org/srv/git/lilypond

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 2f5ca17d123302cba5561ddfde7735cac913db5b..7edb236e5eb4ede1562315fb51d68cdcd58a3833 100644 (file)
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -87,6 +87,8 @@ Axis_group_interface::cached_pure_height (Grob *me,
       if (end == r)
        end_index = i;
     }
+  if (end == INT_MAX)
+    end_index = breaks.size () - 1;
 
   if (start_index == VPOS || end_index == VPOS)
     {

diff --git a/lily/skyline.cc b/lily/skyline.cc
index ebdc891cdc2c705585944ff372d5717feb8ad696..8fdaeedd0ca95c01691517ea2a2d095ccad91b46 100644 (file)
--- a/lily/skyline.cc
+++ b/lily/skyline.cc
@@ -220,7 +220,8 @@ single_skyline (Building const &b, list<Building> *const ret, Real max_slope)
   if (!isinf (b.iv_[RIGHT]))
     ret->push_front (Building (b.iv_[RIGHT], b.height_[RIGHT],
                               -infinity_f, infinity_f, max_slope));
-  ret->push_front (b);
+  if (b.iv_[RIGHT] > b.iv_[LEFT])
+    ret->push_front (b);
   if (!isinf (b.iv_[LEFT]))
     ret->push_front (Building (-infinity_f, -infinity_f,
                               b.height_[LEFT], b.iv_[LEFT], max_slope));