* The grand 2005-2006 replace.

[lilypond.git] / lily / separation-item.cc

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 0cf923a2d04a56768939dce54b3b30f7a76698c4..37e4ef2ef0d7c04d90645ef6946c1aadada366e5 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "separation-item.hh"
 
 #include "paper-column.hh"
 #include "warn.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
 #include "accidental-placement.hh"
 
 void
@@ -18,7 +18,6 @@ Separation_item::add_item (Grob *s, Item *i)
 {
   assert (i);
   Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"), i);
-  s->add_dependency (i);
 }
 
 void
@@ -39,29 +38,22 @@ Separation_item::conditional_width (Grob *me, Grob *left)
   Item *item = dynamic_cast<Item *> (me);
   Paper_column *pc = item->get_column ();
 
-  for (SCM s = me->get_property ("conditional-elements"); scm_is_pair (s); s = scm_cdr (s))
+  extract_grob_set (me, "conditional-elements", elts);
+  for (int i = 0; i < elts.size (); i++)
     {
-      SCM elt = scm_car (s);
-      if (!unsmob_grob (elt))
-       continue;
-
-      Item *il = unsmob_item (elt);
+      Item *il = dynamic_cast<Item *> (elts[i]);
       if (pc != il->get_column ())
        {
          /* this shouldn't happen, but let's continue anyway. */
-         programming_error (_ ("Separation_item:  I've been drinking too much"));
+         programming_error ("Separation_item:  I've been drinking too much");
          continue;             /*UGH UGH*/
        }
 
       if (to_boolean (il->get_property ("no-spacing-rods")))
-       {
-         continue;
-       }
+       continue;
 
       if (Accidental_placement::has_interface (il))
-       {
-         w.unite (Accidental_placement::get_relevant_accidental_extent (il, pc, left));
-       }
+       w.unite (Accidental_placement::get_relevant_accidental_extent (il, pc, left));
     }
 
   SCM pad = me->get_property ("padding");
@@ -75,38 +67,29 @@ Separation_item::width (Grob *me)
 {
   SCM sw = me->get_property ("X-extent");
   if (is_number_pair (sw))
-    {
-      return ly_scm2interval (sw);
-    }
+    return ly_scm2interval (sw);
 
   Item *item = dynamic_cast<Item *> (me);
   Paper_column *pc = item->get_column ();
   Interval w;
 
-  for (SCM s = me->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s))
+  extract_grob_set (me, "elements", elts);
+  for (int i = 0; i < elts.size (); i++)
     {
-      SCM elt = scm_car (s);
-      if (!unsmob_grob (elt))
-       continue;
-
-      Item *il = unsmob_item (elt);
+      Item *il = dynamic_cast<Item *> (elts[i]);
       if (pc != il->get_column ())
        {
          /* this shouldn't happen, but let's continue anyway. */
-         programming_error (_ ("Separation_item:  I've been drinking too much"));
+         programming_error ("Separation_item:  I've been drinking too much");
          continue;             /*UGH UGH*/
        }
 
       if (to_boolean (il->get_property ("no-spacing-rods")))
-       {
-         continue;
-       }
+       continue;
 
       Interval iv (il->extent (pc, X_AXIS));
       if (!iv.is_empty ())
-       {
-         w.unite (iv);
-       }
+       w.unite (iv);
     }
 
   SCM pad = me->get_property ("padding");
@@ -131,24 +114,29 @@ Separation_item::relative_width (Grob *me, Grob *common)
   sticking out at direction D. The x size is put in LAST_EXT
 */
 Grob *
-Separation_item::extremal_break_aligned_grob (Grob *separation_item, Direction d,
+Separation_item::extremal_break_aligned_grob (Grob *me,
+                                             Direction d,
                                              Interval *last_ext)
 {
-  Grob *col = dynamic_cast<Item *> (separation_item)->get_column ();
+  Grob *col = dynamic_cast<Item *> (me)->get_column ();
   last_ext->set_empty ();
   Grob *last_grob = 0;
-  for (SCM s = separation_item->get_property ("elements");
-       scm_is_pair (s); s = scm_cdr (s))
-    {
-      Grob *break_item = unsmob_grob (scm_car (s));
 
+  extract_grob_set (me, "elements", elts);
+  for (int i = elts.size (); i--;)
+    {
+      Grob *break_item = elts[i];
       if (!scm_is_symbol (break_item->get_property ("break-align-symbol")))
        continue;
 
+      if (!scm_is_pair (break_item->get_property ("space-alist")))
+       continue;
+
       Interval ext = break_item->extent (col, X_AXIS);
 
       if (ext.is_empty ())
        continue;
+
       if (!last_grob
          || (last_grob && d * (ext[d]- (*last_ext)[d]) > 0))
        {