Merge branch 'master' into lilypond/translation

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

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index db8dea4a90e73c0bcb682a63efc78074a079a5c6..f27316bb278535ff049b3d736bebb9e2effb7025 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--2010 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
@@ -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 "