Add a warning if music overflows page.

[lilypond.git] / lily / spacing-loose-columns.cc

diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc
index 3a69e26802aa46cd42ad2e78bd58df58efd3beed..4c2447053032974dc468b3683a40ab8248031a75 100644 (file)
--- a/lily/spacing-loose-columns.cc
+++ b/lily/spacing-loose-columns.cc
@@ -1,9 +1,20 @@
 /*
-  spacing-loose-columns.cc -- implement loose column spacing.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2007 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 "system.hh"
@@ -119,23 +130,19 @@ set_loose_columns (System *which, Column_x_positions const *posns)
          else
            programming_error ("Column without spacing object");
 
-         bool expand_only = false;
          Real base_note_space = 0.0;
 
          if (Paper_column::is_musical (next_col)
              && Paper_column::is_musical (loose_col))
-           base_note_space = Spacing_spanner::note_spacing (spacing, loose_col, next_col, 
-                                                            &options, &expand_only);
+           base_note_space = Spacing_spanner::note_spacing (spacing, loose_col, next_col,
+                                                            &options);
          else
            {
-             Real fixed, space;
-             
-             Spacing_spanner::standard_breakable_column_spacing (spacing, 
-                                                                 loose_col, next_col,
-                                                                 &fixed, &space,
-                                                                 &options);
-
-             base_note_space = space;
+             Spring spring = Spacing_spanner::standard_breakable_column_spacing (spacing,
+                                                                                 loose_col, next_col,
+                                                                                 &options);
+
+             base_note_space = spring.distance ();
            }
 
          base_note_space = max (base_note_space,