X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=38bb5a3b402a429d4ebe7e6779217089c80b55a3;hb=a04cebcd9706fd5457d250b2d5df2d54dfc1c8cc;hp=7fe9ae9115db8d85e4c8ef5237d29d1769798483;hpb=62f3c5d4ddb492bc771f2d25b971cd3c9f38676d;p=lilypond.git

diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc
index 7fe9ae9115..38bb5a3b40 100644
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -49,7 +49,11 @@ protected:
   Spacings last_spacings_;
 
   DECLARE_ACKNOWLEDGER (item);
+  DECLARE_ACKNOWLEDGER (break_aligned);
   void stop_translation_timestep ();
+  void start_translation_timestep ();
+
+  vector<Grob*> break_aligned_;
 public:
   TRANSLATOR_DECLARATIONS (Separating_line_group_engraver);
 };
@@ -73,7 +77,14 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
       && !current_spacings_.staff_spacing_
       && to_boolean (get_property ("createSpacing")))
     {
+      Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
+
       current_spacings_.staff_spacing_ = make_item ("StaffSpacing", SCM_EOL);
+      context ()->set_property ("hasStaffSpacing", SCM_BOOL_T);
+
+      Pointer_group_interface::add_grob (current_spacings_.staff_spacing_,
+					 ly_symbol2scm ("left-items"),
+					 col);
       
       if (!last_spacings_.note_spacings_.size ()
 	  && last_spacings_.staff_spacing_)
@@ -88,25 +99,62 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
 	    }
 	  
 	  ga->clear ();
-	  ga->add (unsmob_grob (get_property ("currentCommandColumn")));
+	  ga->add (col);
 	}
     }
 }
 
+void
+Separating_line_group_engraver::acknowledge_break_aligned (Grob_info gi)
+{
+  break_aligned_.push_back (gi.grob ());
+}
+
+void
+Separating_line_group_engraver::start_translation_timestep ()
+{
+  context ()->unset_property (ly_symbol2scm ("hasStaffSpacing"));
+}
+
 void
 Separating_line_group_engraver::stop_translation_timestep ()
 {
+  for (vsize i = 0; i < break_aligned_.size (); i++)
+    {
+      SCM smob = break_aligned_[i]->self_scm ();
+
+      if (Item *sp = current_spacings_.staff_spacing_)
+	Pointer_group_interface::add_grob (sp, ly_symbol2scm ("left-break-aligned"), smob);
+
+      for (vsize j = 0; j < last_spacings_.note_spacings_.size (); j++)
+	Pointer_group_interface::add_grob (last_spacings_.note_spacings_[j],
+					   ly_symbol2scm ("right-break-aligned"), smob);
+    }
+
   if (!current_spacings_.is_empty ())
     last_spacings_ = current_spacings_;
 
+  if (Item *sp = current_spacings_.staff_spacing_)
+    if (Grob *col = unsmob_grob (get_property ("currentMusicalColumn")))
+      Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"), col);
+
   current_spacings_.clear ();
+  break_aligned_.clear ();
 }
 
 ADD_ACKNOWLEDGER (Separating_line_group_engraver, item);
+ADD_ACKNOWLEDGER (Separating_line_group_engraver, break_aligned);
+
 ADD_TRANSLATOR (Separating_line_group_engraver,
-		/* doc */ "Generates objects for computing spacing parameters.",
+		/* doc */
+		"Generate objects for computing spacing parameters.",
+
+		/* create */
+		"StaffSpacing ",
+
+		/* read */
+		"createSpacing ",
 
-		/* create */ "StaffSpacing",
-		/* read */ "createSpacing",
-		/* write */ ""
+		/* write */
+		"hasStaffSpacing "
 		);