X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver.cc;h=dcda3031b4835508dd14b6b5524b2b3d60603792;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=c8eb805638d4619ba378968f103c815842f162b4;hpb=d8082113a0df616e7beabc0417c3590a3fac7320;p=lilypond.git

diff --git a/lily/engraver.cc b/lily/engraver.cc
index c8eb805638..dcda3031b4 100644
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,14 +3,13 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 
 #include "context.hh"
 #include "international.hh"
-#include "lilypond-key.hh"
 #include "music.hh"
 #include "paper-column.hh"
 #include "score-engraver.hh"
@@ -71,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);
@@ -91,14 +91,13 @@ 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.")
 {
-  SCM_ASSERT_TYPE(ly_is_procedure (cb), cb, SCM_ARG1, __FUNCTION__,
-		  "procedure");
+  LY_ASSERT_TYPE (ly_is_procedure, cb, 1);
 
   creation_callback = cb;
 
@@ -112,21 +111,21 @@ Engraver::internal_make_grob (SCM symbol, SCM cause, char const *name, char cons
   (void) file;
   (void) fun;
   (void) line;
+  (void) name;
   
   SCM props = updated_grob_properties (context (), symbol);
 
-  Object_key const *key = context ()->get_grob_key (name);
   Grob *grob = 0;
 
   SCM handle = scm_sloppy_assq (ly_symbol2scm ("meta"), props);
   SCM klass = scm_cdr (scm_sloppy_assq (ly_symbol2scm ("class"), scm_cdr (handle)));
 
   if (klass == ly_symbol2scm ("Item"))
-    grob = new Item (props, key);
+    grob = new Item (props);
   else if (klass == ly_symbol2scm ("Spanner"))
-    grob = new Spanner (props, key);
+    grob = new Spanner (props);
   else if (klass == ly_symbol2scm ("Paper_column"))
-    grob = new Paper_column (props, key);
+    grob = new Paper_column (props);
 
   assert (grob);
   announce_grob (grob, cause);
@@ -134,8 +133,8 @@ Engraver::internal_make_grob (SCM symbol, SCM cause, char const *name, char cons
 #ifndef NDEBUG
   if (ly_is_procedure (creation_callback))
     scm_apply_0 (creation_callback,
-		 scm_list_n (grob->self_scm (), scm_makfrom0str (file),
-			     scm_from_int (line), scm_makfrom0str (fun), SCM_UNDEFINED));
+		 scm_list_n (grob->self_scm (), scm_from_locale_string (file),
+			     scm_from_int (line), scm_from_locale_string (fun), SCM_UNDEFINED));
 #endif
 
   return grob;
@@ -169,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 */
+		""
+		);