Run `make grand-replace'.

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 84780dd0a2fc489997560a472ab67db2bb18fab3..dcda3031b4835508dd14b6b5524b2b3d60603792 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,7 +3,7 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -70,7 +70,8 @@ Engraver::announce_end_grob (Grob *e, SCM cause)
     {
       cause = m->to_event ()->unprotect ();
     }
-  if (unsmob_stream_event (cause) || unsmob_grob (cause))
+  if (e->get_property ("cause") == SCM_EOL
+      && (unsmob_stream_event (cause) || unsmob_grob (cause)))
     e->set_property ("cause", cause);
 
   Grob_info i (this, e);
@@ -90,11 +91,11 @@ Engraver::Engraver ()
 static SCM creation_callback = SCM_EOL;
 LY_DEFINE (ly_set_grob_creation_callback, "ly:set-grob-creation-callback",
           1, 0, 0, (SCM cb),
-          "Specify a procedure that will be called every time a new grob "
-          "is created. The callback will receive as arguments the grob "
-          "that was created, the name of the C++ source file that caused "
-          "the grob to be created and the corresponding line number in the "
-          "C++ source file.")
+          "Specify a procedure that will be called every time a new grob"
+          " is created.  The callback will receive as arguments the grob"
+          " that was created, the name of the C++ source file that caused"
+          " the grob to be created, and the corresponding line number in"
+          " the C++ source file.")
 {
   LY_ASSERT_TYPE (ly_is_procedure, cb, 1);
 
@@ -167,8 +168,16 @@ Engraver::internal_make_spanner (SCM x, SCM cause, char const *name, char const
 #include "translator.icc"
 
 ADD_TRANSLATOR (Engraver,
-               "Base class for engravers. Does nothing, so it is not used.",
+               /* doc */
+               "Base class for engravers.  Does nothing, so it is not used.",
+
+               /* create */
                "",
+
+               /* read */
                "",
-               "");
+
+               /* write */
+               ""
+               );