X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=f493840d9585290af83648a7c86c17e4f2f5a8b4;hb=d150e172a453ea729f7d5a701587c491439810e6;hp=53e669483d5d980b3abd20d5535762b6a13735a6;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc
index 53e669483d..f493840d95 100644
--- 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@xs4all.nl>
+  (c) 1998--2007 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,13 +93,6 @@ 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++)
-    {
-      Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
-					 ly_symbol2scm ("right-items"),
-					 column);
-    }
-
   if (last_spacings_.staff_spacing_
       && last_spacings_.staff_spacing_->get_column () == column)
     last_spacings_.staff_spacing_->suicide ();
@@ -107,11 +101,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)
-      && Axis_group_interface::has_axis (it->get_parent (X_AXIS), 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")))
@@ -119,11 +113,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_);
 
@@ -133,7 +127,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 ());
 	}
 
@@ -145,14 +139,8 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
 	  Pointer_group_interface::add_grob (it, ly_symbol2scm ("left-items"),
 					     break_item_);
 
-	  if (int i = last_spacings_.note_spacings_.size ())
-	    {
-	      for (; i--;)
-		Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
-						   ly_symbol2scm ("right-items"),
-						   break_item_);
-	    }
-	  else if (last_spacings_.staff_spacing_)
+	  if (!last_spacings_.note_spacings_.size ()
+	      && last_spacings_.staff_spacing_)
 	    {
 	      SCM ri = last_spacings_.staff_spacing_->get_object ("right-items");
 	      Grob_array *ga = unsmob_grob_array (ri);
@@ -221,6 +209,5 @@ ADD_TRANSLATOR (Separating_line_group_engraver,
 		"SeparationItem "
 		"SeparatingGroupSpanner "
 		"StaffSpacing",
-		/* accept */ "",
 		/* read */ "createSpacing",
 		/* write */ "breakableSeparationItem");