(parse_symbol_list): Bugfix.

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

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 14de60d2dcebd156f0607748ea43beb23c8364e7..d86caaa735b14395648abe0b6e1f45a89557b89b 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -13,10 +13,12 @@
 #include "warn.hh"
 #include "axis-group-interface.hh"
 #include "spaceable-grob.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "lookup.hh"
 #include "font-interface.hh"
 #include "output-def.hh"
+#include "pointer-group-interface.hh"
+#include "grob-array.hh"
 
 Grob *
 Paper_column::clone (int count) const
@@ -103,8 +105,14 @@ Paper_column::is_musical (Grob *me)
 bool
 Paper_column::is_used (Grob *me)
 {
-  return scm_is_pair (me->get_property ("elements")) || Item::is_breakable (me)
-    || scm_is_pair (me->get_property ("bounded-by-me"));
+  extract_grob_set (me, "elements", elts);
+  if (elts.size ())
+    return true;
+
+  extract_grob_set (me, "bounded-by-me", bbm);
+  if (bbm.size ())
+    return true;
+  return Item::is_breakable (me);
 }
 
 /*
@@ -118,12 +126,20 @@ Paper_column::print (SCM p)
   Grob *me = unsmob_grob (p);
 
   String r = to_string (Paper_column::get_rank (me));
+
+  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 (),
                                                  properties,
                                                  scm_makfrom0str (r.to_str0 ()));
+  SCM when_mol = Text_interface::interpret_markup (me->get_layout ()->self_scm (),
+                                                  properties,
+                                                  scm_makfrom0str (when.to_str0 ()));
   Stencil t = *unsmob_stencil (scm_mol);
+  t.add_at_edge (Y_AXIS, DOWN, *unsmob_stencil (when_mol), 0.1, 0.1);
   t.align_to (X_AXIS, CENTER);
   t.align_to (Y_AXIS, DOWN);
 
@@ -137,7 +153,8 @@ Paper_column::print (SCM p)
 /*
   This is all too hairy. We use bounded-by-me to make sure that some
   columns are kept "alive". Unfortunately, when spanners are suicided,
-  this falls apart again. (sigh.)
+  this falls apart again, because suicided spanners are still in
+  bounded-by-me
 
   THIS IS BROKEN KLUDGE. WE SHOULD INVENT SOMETHING BETTER.
 */
@@ -147,23 +164,22 @@ Paper_column::before_line_breaking (SCM grob)
 {
   Grob *me = unsmob_grob (grob);
 
-  SCM c = me->get_property ("bounded-by-me");
-  SCM *ptrptr = &c;
+  SCM bbm = me->get_object ("bounded-by-me");
+  Grob_array *ga = unsmob_grob_array (bbm);
+  if (!ga)
+    return SCM_UNSPECIFIED;
 
-  while (scm_is_pair (*ptrptr))
+  Link_array<Grob> &array (ga->array_reference ());
+
+  for (int i = array.size (); i--;)
     {
-      Grob *g = unsmob_grob (scm_car (*ptrptr));
+      Grob *g = array[i];
 
       if (!g || !g->is_live ())
-       {
-         *ptrptr = scm_cdr (*ptrptr);
-       }
-      else
-       {
-         ptrptr = SCM_CDRLOC (*ptrptr);
+       {                       // UGH . potentially quadratic.
+         array.del (i);
        }
     }
 
-  me->set_property ("bounded-by-me", c);
   return SCM_UNSPECIFIED;
 }