X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=234008d9830bcac736edd19ad69459a3a7931b67;hb=7719b3925322a347391fc6c5520a1d763695560f;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..234008d983 100644
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  separating-line-group-engraver.cc -- implement Separating_line_group_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
@@ -24,7 +35,7 @@
 struct Spacings
 {
   Item *staff_spacing_;
-  vector<Item*> note_spacings_;
+  vector<Item *> note_spacings_;
 
   Spacings ()
   {
@@ -48,13 +59,18 @@ protected:
   Spacings current_spacings_;
   Spacings last_spacings_;
 
-  DECLARE_ACKNOWLEDGER (item);
+  void acknowledge_item (Grob_info);
+  void acknowledge_break_aligned (Grob_info);
   void stop_translation_timestep ();
+  void start_translation_timestep ();
+
+  vector<Grob *> break_aligned_;
 public:
   TRANSLATOR_DECLARATIONS (Separating_line_group_engraver);
 };
 
-Separating_line_group_engraver::Separating_line_group_engraver ()
+Separating_line_group_engraver::Separating_line_group_engraver (Context *c)
+  : Engraver (c)
 {
 }
 
@@ -63,7 +79,7 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
 {
   Item *it = i.item ();
 
-  if (Note_spacing::has_interface (it))
+  if (has_interface<Note_spacing> (it))
     {
       current_spacings_.note_spacings_.push_back (it);
       return;
@@ -73,40 +89,89 @@ 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_)
-	{
-	  SCM ri = last_spacings_.staff_spacing_->get_object ("right-items");
-	  Grob_array *ga = unsmob_grob_array (ri);
-	  if (!ga)
-	    {
-	      SCM ga_scm = Grob_array::make_array ();
-	      last_spacings_.staff_spacing_->set_object ("right-items", ga_scm);
-	      ga = unsmob_grob_array (ga_scm);
-	    }
-	  
-	  ga->clear ();
-	  ga->add (unsmob_grob (get_property ("currentCommandColumn")));
-	}
+          && last_spacings_.staff_spacing_)
+        {
+          SCM ri = last_spacings_.staff_spacing_->get_object ("right-items");
+          Grob_array *ga = unsmob<Grob_array> (ri);
+          if (!ga)
+            {
+              SCM ga_scm = Grob_array::make_array ();
+              last_spacings_.staff_spacing_->set_object ("right-items", ga_scm);
+              ga = unsmob<Grob_array> (ga_scm);
+            }
+
+          ga->clear ();
+          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 ();
+}
+
+
+void
+Separating_line_group_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Separating_line_group_engraver, item);
+  ADD_ACKNOWLEDGER (Separating_line_group_engraver, break_aligned);
 }
 
-ADD_ACKNOWLEDGER (Separating_line_group_engraver, item);
 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 "
+               );