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

Conflicts:

	lily/align-interface.cc

diff --cc lily/align-interface.cc
index 690f2a4921d7bd0c97297948364f7848297ac123,319ca2db2ec9a58e37edde8ef8319330e468b603..58cd7098ccda3385e49e70365db60c0978b24856
--- 1/lily/align-interface.cc
--- 2/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@@ -156,9 -144,11 +156,11 @@@ get_skylines (Grob *me
        Grob *g = (*elements)[i];
        Interval extent = g->maybe_pure_extent (g, a, pure, start, end);
        Interval other_extent = pure ? Interval (-infinity_f, infinity_f)
 -      : g->extent (other_axis_common, other_axis (a));
 +      : g->extent (common_refpoint, other_axis (a));
-       Box b = (a == X_AXIS) ? Box (extent, other_extent) : Box (other_extent, extent);
-       
+       Box b;
+       b[a] = extent;
+       b[other_axis (a)] = other_extent;
+ 
        if (extent.is_empty ())
        {
          elements->erase (elements->begin () + i);