Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / scale.cc

diff --git a/lily/scale.cc b/lily/scale.cc
index c9fa8b7f22afc7499a1782a0f956122eb3e804d4..5d8ccc9a38f9edb7467a9f53f9dc78c7705c6b77 100644 (file)
--- a/lily/scale.cc
+++ b/lily/scale.cc
@@ -17,7 +17,7 @@
 */
 LY_DEFINE (ly_make_scale, "ly:make-scale",
           1, 0, 0, (SCM steps),
-          "Create a scale. Takes a vector of ints as argument")
+          "Create a scale.  Takes a vector of integers as argument.")
 {
   bool type_ok = scm_is_vector (steps);
 
@@ -66,9 +66,9 @@ LY_DEFINE (ly_set_default_scale, "ly:set-default-scale",
           1, 0, 0, (SCM scale),
           "Set the global default scale.")
 {
-  Scale *s = Scale::unsmob (scale);
-  SCM_ASSERT_TYPE (s, scale, SCM_ARG1, __FUNCTION__, "scale");
+  LY_ASSERT_SMOB (Scale, scale, 1);
 
+  Scale *s = Scale::unsmob (scale);
   if (default_global_scale)
     default_global_scale->unprotect ();
   default_global_scale = s;
@@ -111,5 +111,5 @@ Scale::~Scale ()
 {
 }
 
-IMPLEMENT_SMOBS(Scale);
-IMPLEMENT_DEFAULT_EQUAL_P(Scale);
+IMPLEMENT_SMOBS (Scale);
+IMPLEMENT_DEFAULT_EQUAL_P (Scale);