* scm/framework-ps.scm (ps-font-command): use string-hash for

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

diff --git a/lily/moment-scheme.cc b/lily/moment-scheme.cc
index 018ace20b252c808e7f9d5cce9a23a13a38576eb..0450259135eaa96a0b1b2d10621672ea15a8393c 100644 (file)
--- a/lily/moment-scheme.cc
+++ b/lily/moment-scheme.cc
@@ -1,14 +1,13 @@
-/*   
-  moment.cc --  implement Moment bindings
+/*
+  moment.cc -- implement Moment bindings
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "moment.hh"
 
-
 /* TODO: add optional factor argument. */
 LY_DEFINE (ly_make_moment, "ly:make-moment",
           2, 2, 0, (SCM n, SCM d, SCM gn, SCM gd),
@@ -17,7 +16,7 @@ LY_DEFINE (ly_make_moment, "ly:make-moment",
           "\n"
           "\n"
           "Moment is a point in musical time.  "
-          "It is consists of a pair of rationals (@var{m},@var{g}), "
+          "It is consists of a pair of rationals (@var{m}, @var{g}), "
           "where @var{m} is the timing for the main\n"
           "notes, and @var{g} the timing for grace notes.  "
           "In absence of grace notes, @var{g} is zero.\n")
@@ -54,7 +53,7 @@ LY_DEFINE (ly_add_moment, "ly:add-moment",
   return (*ma + *mb).smobbed_copy ();
 }
 
-LY_DEFINE (ly_mul_moment,"ly:mul-moment",
+LY_DEFINE (ly_mul_moment, "ly:mul-moment",
           2, 0, 0, (SCM a, SCM b),
           "Multiply two moments.")
 {
@@ -62,10 +61,10 @@ LY_DEFINE (ly_mul_moment,"ly:mul-moment",
   Moment *mb = unsmob_moment (b);
   SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
   SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
-  return (*ma * *mb).smobbed_copy ();
+  return (*ma * * mb).smobbed_copy ();
 }
 
-LY_DEFINE (ly_div_moment,"ly:div-moment",
+LY_DEFINE (ly_div_moment, "ly:div-moment",
           2, 0, 0, (SCM a, SCM b),
           "Divide two moments.")
 {
@@ -73,30 +72,30 @@ LY_DEFINE (ly_div_moment,"ly:div-moment",
   Moment *mb = unsmob_moment (b);
   SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
   SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
-  return (*ma / *mb).smobbed_copy ();
+  return (*ma / * mb).smobbed_copy ();
 }
 
-LY_DEFINE (ly_moment_main_numerator,"ly:moment-main-numerator",
+LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator",
           1, 0, 0, (SCM mom),
           "Extract numerator from main timing.")
 {
   Moment *ma = unsmob_moment (mom);
   SCM_ASSERT_TYPE (ma, mom, SCM_ARG1, __FUNCTION__, "moment");
 
-  return scm_from_int (ma->main_part_.numerator ()); 
+  return scm_from_int (ma->main_part_.numerator ());
 }
 
-LY_DEFINE (ly_moment_main_denominator,"ly:moment-main-denominator",
+LY_DEFINE (ly_moment_main_denominator, "ly:moment-main-denominator",
           1, 0, 0, (SCM mom),
           "Extract denominator from main timing.")
 {
   Moment *ma = unsmob_moment (mom);
   SCM_ASSERT_TYPE (ma, mom, SCM_ARG1, __FUNCTION__, "moment");
 
-  return scm_from_int (ma->main_part_.denominator ()); 
+  return scm_from_int (ma->main_part_.denominator ());
 }
 
-LY_DEFINE (ly_moment_less_p,"ly:moment<?",
+LY_DEFINE (ly_moment_less_p, "ly:moment<?",
           2, 0, 0, (SCM a, SCM b),
           "Compare two moments.")
 {
@@ -104,6 +103,6 @@ LY_DEFINE (ly_moment_less_p,"ly:moment<?",
   Moment *mb = unsmob_moment (b);
   SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
   SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
-  return ly_bool2scm (*ma <  *mb);
+  return ly_bool2scm (*ma < *mb);
 }