X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fobject-key-dumper-scheme.cc;h=bdcfff4d3369b8910c8fe362652e5755f05ce3ae;hb=cfee004dad1a3138b02a297884a41b8109d6df62;hp=082c213418ffc4bbc584a8c5417d1a6ec0365d78;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/object-key-dumper-scheme.cc b/lily/object-key-dumper-scheme.cc
index 082c213418..bdcfff4d33 100644
--- a/lily/object-key-dumper-scheme.cc
+++ b/lily/object-key-dumper-scheme.cc
@@ -1,48 +1,42 @@
 /*
-  object-key-dumper-scheme.cc --  implement Object_key_dumper bindings
+  object-key-dumper-scheme.cc -- implement Object_key_dumper bindings
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "object-key-dumper.hh"
 
 #include "moment.hh"
 
-LY_DEFINE(ly_make_dumper, "ly:make-dumper",
-	  0, 0, 0,
-	  (),
-	  "Create a key dumper. "
-	  )
+LY_DEFINE (ly_make_dumper, "ly:make-dumper",
+	   0, 0, 0,
+	   (),
+	   "Create a key dumper. ")
 {
   Object_key_dumper *u = new Object_key_dumper ();
-  SCM x = u->self_scm();
-  scm_gc_unprotect_object (x);
-  return x;
+  return u->unprotect ();
 }
 
-LY_DEFINE(ly_dumper_definitions, "ly:dumper-definitions",
-	  1, 0, 0,
-	  (SCM dumper),
-	  "Return list of key definitions. "
-	  )
+LY_DEFINE (ly_dumper_definitions, "ly:dumper-definitions",
+	   1, 0, 0,
+	   (SCM dumper),
+	   "Return list of key definitions. ")
 {
   Object_key_dumper *u = unsmob_key_dumper (dumper);
-  SCM_ASSERT_TYPE(u, dumper, SCM_ARG1, __FUNCTION__, "dumper");
-  return u->get_file_contents();
+  SCM_ASSERT_TYPE (u, dumper, SCM_ARG1, __FUNCTION__, "dumper");
+  return u->get_file_contents ();
 }
 
-LY_DEFINE(ly_dumper_key_serial, "ly:dumper-key-serial",
-	  2, 0, 0,
-	  (SCM dumper, SCM key),
-	  "Return the  key serial number @var{key}. "
-	  )
+LY_DEFINE (ly_dumper_key_serial, "ly:dumper-key-serial",
+	   2, 0, 0,
+	   (SCM dumper, SCM key),
+	   "Return the  key serial number @var{key}. ")
 {
-  Object_key_dumper* u = unsmob_key_dumper (dumper);
+  Object_key_dumper *u = unsmob_key_dumper (dumper);
   Object_key *k = unsmob_key (key);
-  SCM_ASSERT_TYPE(u, dumper, SCM_ARG1, __FUNCTION__, "dumper");
-  SCM_ASSERT_TYPE(k, key, SCM_ARG2, __FUNCTION__, "key");
+  SCM_ASSERT_TYPE (u, dumper, SCM_ARG1, __FUNCTION__, "dumper");
+  SCM_ASSERT_TYPE (k, key, SCM_ARG2, __FUNCTION__, "key");
   return u->dump_key (k);
 }