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

[lilypond.git] / lily / align-interface.cc

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 786e91010bf00c10c9958306893a4caf72ab0588..db71c32b8f2baa8f5adf9d858e5f747efed11552 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -110,7 +110,8 @@ get_skylines (Grob *me,
       
       child_refpoints.push_back (child_common);
     }
-  Grob *common_refpoint = common_refpoint_of_array (child_refpoints, me, other_axis (a));
+
+  Grob *other_common = common_refpoint_of_array (child_refpoints, me, other_axis (a));
   
   for (vsize i = elements->size (); i--;)
     {
@@ -122,28 +123,30 @@ get_skylines (Grob *me,
         to some absolute reference point */
       if (!pure)
        {
-         Skyline_pair *skys = Skyline_pair::unsmob (g->get_property ("skylines"));
+         Skyline_pair *skys = Skyline_pair::unsmob (g->get_property (a == Y_AXIS
+                                                                     ? "vertical-skylines"
+                                                                     : "horizontal-skylines"));
          if (skys)
            skylines = *skys;
-         else
-           programming_error ("no skylines for alignment-child\n");
 
          /* this is perhaps an abuse of minimum-?-extent: maybe we should create
             another property? But it seems that the only (current) use of
             minimum-Y-extent is to separate vertically-aligned elements */
-         SCM min_extent = g->get_property (a == X_AXIS ? "minimum-X-extent" : "minimum-Y-extent");
+         SCM min_extent = g->get_property (a == X_AXIS
+                                           ? ly_symbol2scm ("minimum-X-extent")
+                                           : ly_symbol2scm ("minimum-Y-extent"));
 
          if (is_number_pair (min_extent))
            {
              Box b;
-             Interval other_extent = g->extent (common_refpoint, other_axis (a));
+             Interval other_extent = g->extent (other_common, other_axis (a));
              b[a] = ly_scm2interval (min_extent);
              b[other_axis (a)] = other_extent;
              if (!other_extent.is_empty ())
                skylines.insert (b, 0, other_axis (a));
            }
 
-         Real offset = child_refpoints[i]->relative_coordinate (common_refpoint, other_axis (a));
+         Real offset = child_refpoints[i]->relative_coordinate (other_common, other_axis (a));
          skylines.shift (offset);
        }
       else
@@ -185,9 +188,7 @@ Align_interface::get_extents_aligned_translates (Grob *me,
        line_break_details = me_spanner->get_bound (LEFT)->get_property ("line-break-system-details");
 
       if (!me->get_system () && !pure)
-       me->warning (_ ("vertical alignment called before line-breaking.\n"
-                       "Only do cross-staff spanners with PianoStaff."));
-
+       me->programming_error ("vertical alignment called before line-breaking");
     }
   
   Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"),
@@ -220,6 +221,9 @@ Align_interface::get_extents_aligned_translates (Grob *me,
          dy = down_skyline.distance (skylines[j][-stacking_dir]);
        }
 
+      if (isinf (dy)) /* if the skyline is empty, maybe max_height is infinity_f */
+       dy = 0.0;
+
       dy = max (0.0, dy + padding + extra_space / elems.size ());
       down_skyline.raise (-stacking_dir * dy);
       where += stacking_dir * dy;
@@ -275,12 +279,12 @@ Align_interface::stretch (Grob *me, Real amount, Axis a)
   Real non_empty_elts = stretchable_children_count (me);
   Real offset = 0.0;
   Direction dir = robust_scm2dir (me->get_property ("stacking-dir"), DOWN);
-  for (vsize i = 0; i < elts.size (); i++)
+  for (vsize i = 1; i < elts.size (); i++)
     {
-      elts[i]->translate_axis (dir * offset, a);
       if (!elts[i]->extent (me, a).is_empty ()
          && !to_boolean (elts[i]->get_property ("keep-fixed-while-stretching")))
        offset += amount / non_empty_elts;
+      elts[i]->translate_axis (dir * offset, a);
     }
   me->flush_extent_cache (Y_AXIS);
 }
@@ -394,22 +398,6 @@ Align_interface::calc_max_stretch (SCM smob)
   return scm_from_double (ret);
 }
 
-/*
-  Find Y-axis parent of G that has a #'forced-distance property. This
-  has the effect of finding the piano-staff given an object in that
-  piano staff.
-
-  FIXME: piano staves no longer have forced-distance. The code that
-  relies on this function (in line-spanner) is broken.
-*/
-Grob *
-find_fixed_alignment_parent (Grob *g)
-{
-  (void) g;
-  programming_error ("deprecated. We don't use forced-distance anymore");
-  return 0;
-}
-
 ADD_INTERFACE (Align_interface,
               
               "Order grobs from top to bottom, left to right, right to left or bottom "