release commit

[lilypond.git] / lily / paper-column.cc

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 991e58983fe84cd00ccb101ca86ddb8fecfb5236..ce29a2011a1ce3539f9ec8360087ff8e777c3e23 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -27,20 +27,27 @@ Paper_column::clone (int count) const
 }
 
 ADD_INTERFACE (Paper_column, "paper-column-interface",
-              "@code{Paper_column} objects form the top-most X-parents for items. "
+              "@code{Paper_column} objects form the top-most X-parents for items."
               "  The are two types of columns: musical columns, where are attached to, and "
               "  non-musical columns, where bar-lines, clefs etc. are attached to. "
               "  The spacing engine determines the X-positions of these objects."
+              
               "\n\n"
               "They are\n"
               "  numbered, the first (leftmost) is column 0. Numbering happens before\n"
               "  line-breaking, and columns are not renumbered after line breaking.\n"
               "  Since many columns go unused, you should only use the rank field to\n"
               "  get ordering information.  Two adjacent columns may have\n"
-              "  non-adjacent numbers.\n"
-              "\n",
-              "between-cols when bounded-by-me "
-              "page-penalty shortest-playing-duration shortest-starter-duration");
+              "  non-adjacent numbers.\n",
+              
+              
+              "between-cols "
+              "bounded-by-me "
+              "page-penalty "
+              "shortest-playing-duration "
+              "shortest-starter-duration "
+              "used "
+              "when ");
 
 void
 Paper_column::do_break_processing ()
@@ -96,23 +103,27 @@ Paper_column::is_musical (Grob *me)
   SCM m = me->get_property ("shortest-starter-duration");
   Moment s (0);
   if (unsmob_moment (m))
-    {
-      s = *unsmob_moment (m);
-    }
+    s = *unsmob_moment (m);
   return s != Moment (0);
 }
 
 bool
 Paper_column::is_used (Grob *me)
 {
-  extract_grob_set (me ,"elements", elts);
-  if (elts.size())
+  extract_grob_set (me, "elements", elts);
+  if (elts.size ())
+    return true;
+
+  extract_grob_set (me, "bounded-by-me", bbm);
+  if (bbm.size ())
     return true;
   
-  extract_grob_set (me ,"bounded-by-me", bbm);
-  if (bbm.size())
+  if (Item::is_breakable (me))
+    return true;
+
+  if (to_boolean (me->get_property ("used")))
     return true;
-  return Item::is_breakable (me);
+  return false;
 }
 
 /*
@@ -129,7 +140,7 @@ Paper_column::print (SCM p)
 
   Moment *mom = unsmob_moment (me->get_property ("when"));
   String when = mom ? mom->to_string () : "?/?";
-    
+
   SCM properties = Font_interface::text_font_alist_chain (me);
 
   SCM scm_mol = Text_interface::interpret_markup (me->get_layout ()->self_scm (),
@@ -165,13 +176,13 @@ Paper_column::before_line_breaking (SCM grob)
   Grob *me = unsmob_grob (grob);
 
   SCM bbm = me->get_object ("bounded-by-me");
-  Grob_array * ga = unsmob_grob_array (bbm);
+  Grob_array *ga = unsmob_grob_array (bbm);
   if (!ga)
     return SCM_UNSPECIFIED;
-   
+
   Link_array<Grob> &array (ga->array_reference ());
-  
-  for (int i = array.size(); i--; )
+
+  for (int i = array.size (); i--;)
     {
       Grob *g = array[i];