* lily/align-interface.cc (align_elements_to_extents): warn if

[lilypond.git] / lily / skyline.cc

diff --git a/lily/skyline.cc b/lily/skyline.cc
index bbbf7f55808b15939c796546ee6d341a166cbbd2..455ebb2b9b5c9897c93f8effeb5a5968d3dd3328 100644 (file)
--- a/lily/skyline.cc
+++ b/lily/skyline.cc
@@ -68,7 +68,7 @@ insert_extent_into_skyline (Array<Skyline_entry> *line, Box b, Axis line_axis,
 
       if (!w.is_empty ()
          && w.length () > EPS
-         && d* (my_height - stick_out) < 0)
+         && d * (my_height - stick_out) < 0)
        {
          Interval e1 (line->elem (i).width_[LEFT], extent[LEFT]);
          Interval e3 (extent[RIGHT], line->elem (i).width_[RIGHT]);
@@ -81,12 +81,11 @@ insert_extent_into_skyline (Array<Skyline_entry> *line, Box b, Axis line_axis,
          if (!e1.is_empty () && e1.length () > EPS)
            line->insert (Skyline_entry (e1, my_height), i);
        }
-
     }
 }
 
 void
-merge_skyline (Array<Skyline_entry> * a1,
+merge_skyline (Array<Skyline_entry> *a1,
               Array<Skyline_entry> const &a2,
               Direction dir)
 {
@@ -156,7 +155,7 @@ skyline_meshing_distance (Array<Skyline_entry> const &buildings,
       w.intersect (clouds[j].width_);
 
       if (!w.is_empty ())
-       distance = distance >? (buildings[i].height_ - clouds[j].height_);
+       distance = max (distance, (buildings[i].height_ - clouds[j].height_));
 
       if (i > 0 && buildings[i].width_[LEFT] >= clouds[j].width_[LEFT])
        {
@@ -180,7 +179,6 @@ Skyline_entry::Skyline_entry (Interval i, Real r)
 {
   width_ = i;
   height_ = r;
-
 }
 
 void