Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / separating-line-group-engraver.cc

diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc
index c2b6be3b02fcb342e31be8ceed7b4309533a8230..b2aeb9b2ab4e72fe492f84114cb1cd1e06cb59a2 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -1,9 +1,9 @@
 /*
-  '  separating-line-group-engraver.cc -- implement Separating_line_group_engraver
+  separating-line-group-engraver.cc -- implement Separating_line_group_engraver
 
   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 "engraver.hh"
@@ -16,6 +16,7 @@
 #include "note-spacing.hh"
 #include "accidental-placement.hh"
 #include "context.hh"
+#include "spanner.hh"
 #include "grob-array.hh"
 #include "pointer-group-interface.hh"
 
@@ -24,7 +25,7 @@
 struct Spacings
 {
   Item *staff_spacing_;
-  Link_array<Item> note_spacings_;
+  vector<Item*> note_spacings_;
 
   Spacings ()
   {
@@ -92,7 +93,7 @@ Separating_line_group_engraver::finalize ()
   sep_span_->set_bound (RIGHT, unsmob_grob (ccol));
   sep_span_ = 0;
 
-  for (int i = 0; i < last_spacings_.note_spacings_.size (); i++)
+  for (vsize i = 0; i < last_spacings_.note_spacings_.size (); i++)
     {
       Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
                                         ly_symbol2scm ("right-items"),
@@ -107,12 +108,11 @@ Separating_line_group_engraver::finalize ()
 void
 Separating_line_group_engraver::acknowledge_item (Grob_info i)
 {
-  Item *it = dynamic_cast<Item *> (i.grob ());
-  if (!it)
-    return;
+  Item *it = i.item ();
   if (it->get_parent (X_AXIS)
-      && it->get_parent (X_AXIS)
-      ->has_extent_callback (Axis_group_interface::group_extent_callback_proc, X_AXIS))
+      && it->get_parent (X_AXIS) == it->get_parent (Y_AXIS)
+      && Axis_group_interface::has_axis (it->get_parent (X_AXIS), X_AXIS)
+      && Axis_group_interface::has_axis (it->get_parent (Y_AXIS), Y_AXIS))
     return;
 
   if (to_boolean (it->get_property ("no-spacing-rods")))
@@ -120,11 +120,11 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
 
   if (Note_spacing::has_interface (it))
     {
-      current_spacings_.note_spacings_.push (it);
+      current_spacings_.note_spacings_.push_back (it);
       return;
     }
 
-  bool ib = Item::is_breakable (it);
+  bool ib = Item::is_non_musical (it);
   Item *&p_ref_ (ib ? break_item_
                 : musical_item_);
 
@@ -134,7 +134,7 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
 
       if (ib)
        {
-         p_ref_->set_property ("breakable", SCM_BOOL_T);
+         p_ref_->set_property ("non-musical", SCM_BOOL_T);
          context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ());
        }
 
@@ -222,6 +222,5 @@ ADD_TRANSLATOR (Separating_line_group_engraver,
                "SeparationItem "
                "SeparatingGroupSpanner "
                "StaffSpacing",
-               /* accept */ "",
                /* read */ "createSpacing",
                /* write */ "breakableSeparationItem");