Docs xref checking: append rather than prepend Documentation/ to search path

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

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 2931043303a42b04f22666d1fc60d2f7405e81e0..77bd54cb051d9cbc6903b501b36407632b28d4c0 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -1,9 +1,20 @@
 /*
-  align-interface.cc -- implement Align_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "align-interface.hh"
@@ -89,13 +100,6 @@ get_skylines (Grob *me,
        {
          assert (a == Y_AXIS);
          Interval extent = g->pure_height (g, start, end);
-         if (!extent.is_empty ())
-           {
-             Box b;
-             b[a] = extent;
-             b[other_axis (a)] = Interval (0, infinity_f);
-             skylines.insert (b, 0, other_axis (a));
-           }
 
          // This is a hack to get better accuracy on the pure-height of VerticalAlignment.
          // It's quite common for a treble clef to be the highest element of one system
@@ -111,6 +115,7 @@ get_skylines (Grob *me,
          if (Axis_group_interface::has_interface (g)
              && !Hara_kiri_group_spanner::request_suicide (g, start, end))
            {
+             extent = Axis_group_interface::rest_of_line_pure_height (g, start, end);
              Interval begin_of_line_extent = Axis_group_interface::begin_of_line_pure_height (g, start);
              if (!begin_of_line_extent.is_empty ())
                {
@@ -120,6 +125,14 @@ get_skylines (Grob *me,
                  skylines.insert (b, 0, other_axis (a));
                }
            }
+
+         if (!extent.is_empty ())
+           {
+             Box b;
+             b[a] = extent;
+             b[other_axis (a)] = Interval (0, infinity_f);
+             skylines.insert (b, 0, other_axis (a));
+           }
        }
 
       if (skylines.is_empty ())