From: Joe Neeman <joeneeman@gmail.com>
Date: Sun, 5 Aug 2007 07:31:25 +0000 (+1000)
Subject: Ensure that cross-staff voices still get NoteSpacings between the notes.
X-Git-Tag: release/2.11.30-1~24^2^2~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=99f084afa1dbbce810ec802c88896d19070a1b91;p=lilypond.git

Ensure that cross-staff voices still get NoteSpacings between the notes.
---

diff --git a/lily/note-spacing-engraver.cc b/lily/note-spacing-engraver.cc
index 3131f17777..f1a8cbbf23 100644
--- a/lily/note-spacing-engraver.cc
+++ b/lily/note-spacing-engraver.cc
@@ -22,6 +22,7 @@ class Note_spacing_engraver : public Engraver
 {
   typedef map <Context*, Grob*> Last_spacing_map;
   Last_spacing_map last_spacings_;
+  Grob *last_spacing_;
   
   Grob *spacing_;
 
@@ -47,6 +48,7 @@ Note_spacing_engraver::derived_mark () const
 Note_spacing_engraver::Note_spacing_engraver ()
 {
   spacing_ = 0;
+  last_spacing_ = 0;
 }
 
 void
@@ -63,9 +65,8 @@ Note_spacing_engraver::add_spacing_item (Grob *g)
 					 ly_symbol2scm ("left-items"),
 					 g);
 
-      Grob *last_spacing = last_spacings_[context ()->get_parent_context ()];
-      if (last_spacing)
-	Pointer_group_interface::add_grob (last_spacing,
+      if (last_spacing_)
+	Pointer_group_interface::add_grob (last_spacing_,
 					   ly_symbol2scm ("right-items"),
 					   g);
     }
@@ -119,6 +120,7 @@ Note_spacing_engraver::stop_translation_timestep ()
   if (spacing_)
     {
       last_spacings_[parent] = spacing_;
+      last_spacing_ = spacing_;
       spacing_ = 0;
     }