X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver-scheme.cc;h=970aebde55159e80132fc884ed3614a8e019821b;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=409831e8804e55a92770742d4a2c26379f63fd05;hpb=9158bc17904d4dd930a1f776cfe3226f1ad84092;p=lilypond.git

diff --git a/lily/engraver-scheme.cc b/lily/engraver-scheme.cc
index 409831e880..970aebde55 100644
--- a/lily/engraver-scheme.cc
+++ b/lily/engraver-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,36 +21,35 @@
 #include "grob.hh"
 
 LY_DEFINE (ly_engraver_make_grob, "ly:engraver-make-grob",
-	   3, 0, 0, (SCM engraver, SCM grob_name, SCM cause),
-	   "Create a grob originating from given @var{engraver} instance,"
-	   " with given @var{grob-name}, a symbol."
-	   "  @var{cause} should either be another grob"
-	   " or a music event.")
+           3, 0, 0, (SCM engraver, SCM grob_name, SCM cause),
+           "Create a grob originating from given @var{engraver} instance,"
+           " with given @var{grob-name}, a symbol."
+           "  @var{cause} should either be another grob"
+           " or a music event.")
 {
-  LY_ASSERT_TYPE (unsmob_engraver, engraver, 1);
+  LY_ASSERT_SMOB (Engraver, engraver, 1);
   LY_ASSERT_TYPE (ly_is_symbol, grob_name, 2);
   LY_ASSERT_TYPE (ly_is_grob_cause, cause, 3);
 
-  Grob *g = unsmob_engraver (engraver)->
-    internal_make_grob(grob_name, cause,
-		       ly_symbol2string (grob_name).c_str (),
-		       "scheme", 0, "scheme");
+  Grob *g = unsmob<Engraver> (engraver)->
+            internal_make_grob (grob_name, cause,
+                                "scheme", 0, "scheme");
   return g->self_scm ();
 }
 
 LY_DEFINE (ly_engraver_announce_end_grob, "ly:engraver-announce-end-grob",
-	   3, 0, 0, (SCM engraver, SCM grob, SCM cause),
-	   "Announce the end of a grob (i.e., the end of a spanner)"
-	   " originating from given @var{engraver} instance, with"
-	   " @var{grob} being a grob.  @var{cause} should either"
-	   " be another grob or a music event.")
+           3, 0, 0, (SCM engraver, SCM grob, SCM cause),
+           "Announce the end of a grob (i.e., the end of a spanner)"
+           " originating from given @var{engraver} instance, with"
+           " @var{grob} being a grob.  @var{cause} should either"
+           " be another grob or a music event.")
 {
-  LY_ASSERT_TYPE (unsmob_engraver, engraver, 1);
+  LY_ASSERT_SMOB (Engraver, engraver, 1);
   LY_ASSERT_SMOB (Grob, grob, 2);
   LY_ASSERT_TYPE (ly_is_grob_cause, cause, 3);
 
-  unsmob_engraver (engraver)->
-    announce_end_grob (unsmob_grob (grob), cause);
+  unsmob<Engraver> (engraver)->
+  announce_end_grob (unsmob<Grob> (grob), cause);
 
   return SCM_UNSPECIFIED;
 }