Merge branch 'master' into translation

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 76e1ef6f58b8214419cd9b422369480a8ace2fa4..7891a1b9eb8fe17f44409f314ef6be32fe4d229c 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -52,12 +52,12 @@ Grob_info
 Engraver::make_grob_info (Grob *e, SCM cause)
 {
   /* TODO: Remove Music code when it's no longer needed */
-  if (Music *m = Music::unsmob (cause))
+  if (Music *m = unsmob<Music> (cause))
     {
       cause = m->to_event ()->unprotect ();
     }
   if (scm_is_null (e->get_property ("cause"))
-      && (Stream_event::is_smob (cause) || Grob::is_smob (cause)))
+      && (unsmob<Stream_event> (cause) || unsmob<Grob> (cause)))
     e->set_property ("cause", cause);
 
   return Grob_info (this, e);
@@ -137,9 +137,9 @@ Engraver::internal_make_grob (SCM symbol,
 
 #ifdef DEBUG
   if (ly_is_procedure (creation_callback))
-    scm_apply_0 (creation_callback,
-                 scm_list_n (grob->self_scm (), scm_from_utf8_string (file),
-                             scm_from_int (line), scm_from_ascii_string (fun), SCM_UNDEFINED));
+    scm_call_4 (creation_callback,
+                grob->self_scm (), scm_from_utf8_string (file),
+                scm_from_int (line), scm_from_ascii_string (fun));
 #endif
 
   return grob;
@@ -174,7 +174,7 @@ Engraver::internal_make_spanner (SCM x, SCM cause, char const *name,
 bool
 ly_is_grob_cause (SCM obj)
 {
-  return Grob::is_smob (obj) || Stream_event::is_smob (obj) || scm_is_null (obj);
+  return unsmob<Grob> (obj) || unsmob<Stream_event> (obj) || scm_is_null (obj);
 }
 
 #include "translator.icc"