X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-spacing-engraver.cc;h=7a7ca7275fc832a0ee978e30400eb0a4ba754d48;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=33c459cb133d42330fbbcb10945f109183e0929e;hpb=4c6ce589763e6264ff65a83026b16aea682943e4;p=lilypond.git

diff --git a/lily/note-spacing-engraver.cc b/lily/note-spacing-engraver.cc
index 33c459cb13..7a7ca7275f 100644
--- a/lily/note-spacing-engraver.cc
+++ b/lily/note-spacing-engraver.cc
@@ -1,38 +1,64 @@
-/* 
-  note-spacing-engraver.cc -- implement Note_spacing_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2006 Han-Wen Nienhuys <hanwen@lilypond.org>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2006--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
+
+  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"
 
+#include "grob-array.hh"
+#include "context.hh"
 #include "item.hh"
 #include "pointer-group-interface.hh"
 
+#include <map>
+
 #include "translator.icc"
 
 class Note_spacing_engraver : public Engraver
 {
+  typedef map <Context *, Grob *> Last_spacing_map;
+  Last_spacing_map last_spacings_;
   Grob *last_spacing_;
+
   Grob *spacing_;
 
   void add_spacing_item (Grob *);
-
   TRANSLATOR_DECLARATIONS (Note_spacing_engraver);
 protected:
 
   DECLARE_ACKNOWLEDGER (rhythmic_grob);
   DECLARE_ACKNOWLEDGER (note_column);
   void stop_translation_timestep ();
+  virtual void finalize ();
+  virtual void derived_mark () const;
 };
 
+void
+Note_spacing_engraver::derived_mark () const
+{
+  for (Last_spacing_map::const_iterator i = last_spacings_.begin ();
+       i != last_spacings_.end (); i++)
+    scm_gc_mark (i->first->self_scm ());
+}
+
 Note_spacing_engraver::Note_spacing_engraver ()
 {
-  last_spacing_ = 0;
   spacing_ = 0;
+  last_spacing_ = 0;
 }
 
 void
@@ -42,24 +68,20 @@ Note_spacing_engraver::add_spacing_item (Grob *g)
     {
       spacing_ = make_item ("NoteSpacing", g->self_scm ());
     }
-  
-  
+
   if (spacing_)
     {
       Pointer_group_interface::add_grob (spacing_,
-					 ly_symbol2scm ("left-items"),
-					 g);
+                                         ly_symbol2scm ("left-items"),
+                                         g);
 
       if (last_spacing_)
-	{
-	  Pointer_group_interface::add_grob (last_spacing_,
-					     ly_symbol2scm ("right-items"),
-					     g);
-	}
+        Pointer_group_interface::add_grob (last_spacing_,
+                                           ly_symbol2scm ("right-items"),
+                                           g);
     }
 }
 
-
 void
 Note_spacing_engraver::acknowledge_note_column (Grob_info gi)
 {
@@ -72,21 +94,61 @@ Note_spacing_engraver::acknowledge_rhythmic_grob (Grob_info gi)
   add_spacing_item (gi.grob ());
 }
 
+void
+Note_spacing_engraver::finalize ()
+{
+  Context *parent = context ()->get_parent_context ();
+  Grob *last_spacing = last_spacings_[parent];
+
+  if (last_spacing
+      && !Grob_array::is_smob (last_spacing->get_object ("right-items")))
+    {
+      Grob *col = Grob::unsmob (get_property ("currentCommandColumn"));
+
+      Pointer_group_interface::add_grob (last_spacing,
+                                         ly_symbol2scm ("right-items"),
+                                         col);
+    }
+}
+
 void
 Note_spacing_engraver::stop_translation_timestep ()
 {
+  Context *parent = context ()->get_parent_context ();
+  Grob *last_spacing = last_spacings_[parent];
+
+  if (last_spacing
+      && to_boolean (get_property ("hasStaffSpacing")))
+    {
+      Grob *col = Grob::unsmob (get_property ("currentCommandColumn"));
+      Pointer_group_interface::add_grob (last_spacing,
+                                         ly_symbol2scm ("right-items"),
+                                         col);
+    }
+
   if (spacing_)
     {
+      last_spacings_[parent] = spacing_;
       last_spacing_ = spacing_;
       spacing_ = 0;
     }
+
 }
 
 ADD_ACKNOWLEDGER (Note_spacing_engraver, note_column);
 ADD_ACKNOWLEDGER (Note_spacing_engraver, rhythmic_grob);
 
 ADD_TRANSLATOR (Note_spacing_engraver,
-		/* doc */ "Generates NoteSpacing, an object linking horizontal lines for use in spacing.",
-		/* create */ "NoteSpacing",
-		/* read */ "",
-		/* write */ "");
+                /* doc */
+                "Generate @code{NoteSpacing}, an object linking horizontal"
+                " lines for use in spacing.",
+
+                /* create */
+                "NoteSpacing ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );