From: Joe Neeman <joeneeman@gmail.com>
Date: Thu, 21 Dec 2006 17:36:26 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.5-1~39
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c14ca81399bf3357ad0d936106797bce356b561a;p=lilypond.git

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

Conflicts:

	lily/align-interface.cc
---

c14ca81399bf3357ad0d936106797bce356b561a
diff --cc lily/align-interface.cc
index 690f2a4921,319ca2db2e..58cd7098cc
--- a/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);