Don't crash if vertical spacing is called early.

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

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 2931043303a42b04f22666d1fc60d2f7405e81e0..e9d47a77ec46a9ff829985cc651f8b31c3a158b7 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 ())
@@ -146,10 +159,6 @@ Align_interface::get_minimum_translations (Grob *me,
 
   get_skylines (me, &elems, a, pure, start, end, &skylines);
 
-  SCM forced_distances = ly_assoc_get (ly_symbol2scm ("alignment-distances"),
-                                      Page_layout_problem::get_details (me),
-                                      SCM_EOL);
-
   Real where = 0;
   Real default_padding = robust_scm2double (me->get_property ("padding"), 0.0);
   vector<Real> translates;
@@ -192,15 +201,6 @@ Align_interface::get_minimum_translations (Grob *me,
                                                          &min_distance,
                                                          ly_symbol2scm ("minimum-distance")))
                dy = max (dy, min_distance + stacking_dir*(last_spaceable_element_pos - where));
-
-             if (scm_is_pair (forced_distances))
-               {
-                 SCM forced_dist = scm_car (forced_distances);
-                 forced_distances = scm_cdr (forced_distances);
-
-                 if (scm_is_number (forced_dist))
-                   dy = scm_to_double (forced_dist) + stacking_dir * (last_spaceable_element_pos - where);
-               }
            }
        }
 
@@ -240,9 +240,13 @@ void
 Align_interface::align_elements_to_ideal_distances (Grob *me)
 {
   System *sys = me->get_system ();
-  Page_layout_problem layout (NULL, SCM_EOL, scm_list_1 (sys->self_scm ()));
-
-  layout.solution (true);
+  if (sys)
+    {
+      Page_layout_problem layout (NULL, SCM_EOL, scm_list_1 (sys->self_scm ()));
+      layout.solution (true);
+    }
+  else
+    programming_error ("vertical alignment called before line breaking");
 }
 
 void
@@ -330,10 +334,7 @@ ADD_INTERFACE (Align_interface,
               " or bottom to top.  For vertical alignments of staves, the"
               " @code{break-system-details} of the left"
               " @rinternals{NonMusicalPaperColumn} may be set to tune"
-              " vertical spacing.  Set @code{alignment-extra-space} to add"
-              " extra space for staves.  Set"
-              " @code{fixed-alignment-extra-space} to force staves in"
-              " @code{PianoStaff}s further apart.",
+              " vertical spacing.",
               
               /* properties */
               "align-dir "