Run grand replace for 2015.

[lilypond.git] / lily / moment-scheme.cc

diff --git a/lily/moment-scheme.cc b/lily/moment-scheme.cc
index 2d81e8075e6c554c8544cfe76a82b0d61f78ab17..9f17543bdbb47da6b07f5a7b1be4796280a9226c 100644 (file)
--- a/lily/moment-scheme.cc
+++ b/lily/moment-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--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
@@ -29,14 +29,14 @@ LY_DEFINE (ly_make_moment, "ly:make-moment",
            " a pair of rationals (@var{m},@tie{}@var{g}), where @var{m} is"
            " the timing for the main notes, and @var{g} the timing for"
            " grace notes.  In absence of grace notes, @var{g}@tie{}is zero.\n"
-          "\n"
-          "For compatibility reasons, it is possible to write two"
-          " numbers specifying numerator and denominator instead of"
+           "\n"
+           "For compatibility reasons, it is possible to write two"
+           " numbers specifying numerator and denominator instead of"
            " the rationals.  These forms cannot be mixed, and the two-"
-          "argument form is disambiguated by the sign of the second"
-          " argument: if it is positive, it can only be a denominator"
-          " and not a grace timing."
-)
+           "argument form is disambiguated by the sign of the second"
+           " argument: if it is positive, it can only be a denominator"
+           " and not a grace timing."
+          )
 {
   LY_ASSERT_TYPE (ly_is_rational, m, 1);
   if (SCM_UNBNDP (g))
@@ -46,14 +46,14 @@ LY_DEFINE (ly_make_moment, "ly:make-moment",
     {
       LY_ASSERT_TYPE (ly_is_rational, g, 2);
       if (scm_is_true (scm_positive_p (g)))
-       {
-         LY_ASSERT_TYPE (scm_is_integer, m, 1);
-         LY_ASSERT_TYPE (scm_is_integer, g, 2);
-         return Moment (Rational (scm_to_int64 (m),
-                                  scm_to_int64 (g))).smobbed_copy ();
-       }
+        {
+          LY_ASSERT_TYPE (scm_is_integer, m, 1);
+          LY_ASSERT_TYPE (scm_is_integer, g, 2);
+          return Moment (Rational (scm_to_int64 (m),
+                                   scm_to_int64 (g))).smobbed_copy ();
+        }
       return Moment (ly_scm2rational (m),
-                    ly_scm2rational (g)).smobbed_copy ();
+                     ly_scm2rational (g)).smobbed_copy ();
     }
 
   LY_ASSERT_TYPE (scm_is_integer, m, 1);
@@ -78,8 +78,8 @@ LY_DEFINE (ly_moment_sub, "ly:moment-sub",
   LY_ASSERT_SMOB (Moment, a, 1);
   LY_ASSERT_SMOB (Moment, b, 2);
 
-  Moment *ma = unsmob_moment (a);
-  Moment *mb = unsmob_moment (b);
+  Moment *ma = Moment::unsmob (a);
+  Moment *mb = Moment::unsmob (b);
 
   return (*ma - *mb).smobbed_copy ();
 }
@@ -91,8 +91,8 @@ LY_DEFINE (ly_moment_add, "ly:moment-add",
   LY_ASSERT_SMOB (Moment, a, 1);
   LY_ASSERT_SMOB (Moment, b, 2);
 
-  Moment *ma = unsmob_moment (a);
-  Moment *mb = unsmob_moment (b);
+  Moment *ma = Moment::unsmob (a);
+  Moment *mb = Moment::unsmob (b);
 
   return (*ma + *mb).smobbed_copy ();
 }
@@ -104,8 +104,8 @@ LY_DEFINE (ly_moment_mul, "ly:moment-mul",
   LY_ASSERT_SMOB (Moment, a, 1);
   LY_ASSERT_SMOB (Moment, b, 2);
 
-  Moment *ma = unsmob_moment (a);
-  Moment *mb = unsmob_moment (b);
+  Moment *ma = Moment::unsmob (a);
+  Moment *mb = Moment::unsmob (b);
   return (*ma * * mb).smobbed_copy ();
 }
 
@@ -116,8 +116,8 @@ LY_DEFINE (ly_moment_div, "ly:moment-div",
   LY_ASSERT_SMOB (Moment, a, 1);
   LY_ASSERT_SMOB (Moment, b, 2);
 
-  Moment *ma = unsmob_moment (a);
-  Moment *mb = unsmob_moment (b);
+  Moment *ma = Moment::unsmob (a);
+  Moment *mb = Moment::unsmob (b);
 
   return (*ma / * mb).smobbed_copy ();
 }
@@ -129,8 +129,8 @@ LY_DEFINE (ly_moment_mod, "ly:moment-mod",
   LY_ASSERT_SMOB (Moment, a, 1);
   LY_ASSERT_SMOB (Moment, b, 2);
 
-  Moment *ma = unsmob_moment (a);
-  Moment *mb = unsmob_moment (b);
+  Moment *ma = Moment::unsmob (a);
+  Moment *mb = Moment::unsmob (b);
   return (*ma % * mb).smobbed_copy ();
 }
 
@@ -140,7 +140,7 @@ LY_DEFINE (ly_moment_grace, "ly:moment-grace",
 {
   LY_ASSERT_SMOB (Moment, mom, 1);
 
-  return ly_rational2scm (unsmob_moment (mom)->grace_part_);
+  return ly_rational2scm (Moment::unsmob (mom)->grace_part_);
 }
 
 LY_DEFINE (ly_moment_grace_numerator, "ly:moment-grace-numerator",
@@ -149,7 +149,7 @@ LY_DEFINE (ly_moment_grace_numerator, "ly:moment-grace-numerator",
 {
   LY_ASSERT_SMOB (Moment, mom, 1);
 
-  Moment *ma = unsmob_moment (mom);
+  Moment *ma = Moment::unsmob (mom);
 
   return scm_from_int64 (ma->grace_part_.numerator ());
 }
@@ -159,7 +159,7 @@ LY_DEFINE (ly_moment_grace_denominator, "ly:moment-grace-denominator",
            "Extract denominator from grace timing.")
 {
   LY_ASSERT_SMOB (Moment, mom, 1);
-  Moment *ma = unsmob_moment (mom);
+  Moment *ma = Moment::unsmob (mom);
 
   return scm_from_int64 (ma->grace_part_.denominator ());
 }
@@ -170,16 +170,15 @@ LY_DEFINE (ly_moment_main, "ly:moment-main",
 {
   LY_ASSERT_SMOB (Moment, mom, 1);
 
-  return ly_rational2scm (unsmob_moment (mom)->main_part_);
+  return ly_rational2scm (Moment::unsmob (mom)->main_part_);
 }
 
-
 LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator",
            1, 0, 0, (SCM mom),
            "Extract numerator from main timing.")
 {
   LY_ASSERT_SMOB (Moment, mom, 1);
-  Moment *ma = unsmob_moment (mom);
+  Moment *ma = Moment::unsmob (mom);
 
   return scm_from_int64 (ma->main_part_.numerator ());
 }
@@ -189,7 +188,7 @@ LY_DEFINE (ly_moment_main_denominator, "ly:moment-main-denominator",
            "Extract denominator from main timing.")
 {
   LY_ASSERT_SMOB (Moment, mom, 1);
-  Moment *ma = unsmob_moment (mom);
+  Moment *ma = Moment::unsmob (mom);
 
   return scm_from_int64 (ma->main_part_.denominator ());
 }
@@ -201,8 +200,8 @@ LY_DEFINE (ly_moment_less_p, "ly:moment<?",
   LY_ASSERT_SMOB (Moment, a, 1);
   LY_ASSERT_SMOB (Moment, b, 2);
 
-  Moment *ma = unsmob_moment (a);
-  Moment *mb = unsmob_moment (b);
+  Moment *ma = Moment::unsmob (a);
+  Moment *mb = Moment::unsmob (b);
 
   return ly_bool2scm (*ma < *mb);
 }