Merge with master

[lilypond.git] / lily / grace-spacing-engraver.cc

diff --git a/lily/grace-spacing-engraver.cc b/lily/grace-spacing-engraver.cc
index b784358a2c9dc335dd22a96ff338c3f89caa8d7e..689f76212f28e1e3b3c612e019352f9c760c3e11 100644 (file)
--- a/lily/grace-spacing-engraver.cc
+++ b/lily/grace-spacing-engraver.cc
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006 Han-Wen <hanwen@lilypond.org>
+  (c) 2006--2007 Han-Wen <hanwen@lilypond.org>
 
 */
 
 #include "engraver.hh"
-#include "spanner.hh"
+#include "moment.hh"
 #include "pointer-group-interface.hh"
+#include "spanner.hh"
 
 #include "translator.icc"
 
@@ -50,6 +51,11 @@ Grace_spacing_engraver::process_music ()
                                         column);
 
       column->set_object ("grace-spacing", grace_spacing_->self_scm ());
+
+      if (!grace_spacing_->get_bound (LEFT))
+       grace_spacing_->set_bound (LEFT, column);
+      else
+       grace_spacing_->set_bound (RIGHT, column);
     }
 }
 
@@ -68,9 +74,6 @@ ADD_TRANSLATOR (Grace_spacing_engraver,
 
                /* create */
                "GraceSpacing ",
-               
-               /* accept */
-               "",
 
                /* read */
                "currentMusicalColumn ",