Midi2ly: Fixes for key and time. Only initial settings are handled.

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

diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc
index 7953a3f150bdc6db226b2aa857a147ff4424f4b0..5a2411b3226a04bdb8450eaee9d17c8e7b4acf00 100644 (file)
--- a/lily/spacing-determine-loose-columns.cc
+++ b/lily/spacing-determine-loose-columns.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2011 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
@@ -210,6 +210,18 @@ Spacing_spanner::prune_loose_columns (Grob *me,
          loose = false;
          c->set_property ("maybe-loose", SCM_BOOL_T);
        }
+      /*
+       Unbreakable columns which only contain page-labels also
+       never get pruned, otherwise the labels are lost before they can
+       be collected by the System: so we mark these columns too.
+      */
+      if (!loose && !Paper_column::is_breakable (c)
+         && scm_is_pair (c->get_property ("labels")))
+       {
+         extract_grob_set (c, "elements", elts);
+         if (elts.empty ())
+           c->set_property ("maybe-loose", SCM_BOOL_T);
+       }
 
       if (loose)
        {