X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fduration-scheme.cc;h=6c29c62917b915d1209b953e426cef931cea85bf;hb=66cf32a015a733a69d7faf46ad84dd1049a9fb38;hp=11e6b58d0d5be3619db549045015bf1fbbc921bb;hpb=e9a308e9c6002900fc336733950a0175bcbcc333;p=lilypond.git

diff --git a/lily/duration-scheme.cc b/lily/duration-scheme.cc
index 11e6b58d0d..6c29c62917 100644
--- a/lily/duration-scheme.cc
+++ b/lily/duration-scheme.cc
@@ -1,10 +1,21 @@
 /*
-  duration.cc -- implement Duration
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the LilyPond music typesetter
-
-  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2010 Jan Nieuwenhuizen <janneke@gnu.org>
   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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "duration.hh"
@@ -27,8 +38,8 @@ LY_DEFINE (ly_duration_less_p, "ly:duration<?",
 	   2, 0, 0, (SCM p1, SCM p2),
 	   "Is @var{p1} shorter than @var{p2}?")
 {
-  LY_ASSERT_SMOB(Duration, p1, 1);
-  LY_ASSERT_SMOB(Duration, p2, 2);
+  LY_ASSERT_SMOB (Duration, p1, 1);
+  LY_ASSERT_SMOB (Duration, p2, 2);
 
   Duration *a = unsmob_duration (p1);
   Duration *b = unsmob_duration (p2);
@@ -41,31 +52,31 @@ LY_DEFINE (ly_duration_less_p, "ly:duration<?",
 
 LY_DEFINE (ly_make_duration, "ly:make-duration",
 	   1, 3, 0, (SCM length, SCM dotcount, SCM num, SCM den),
-	   "@var{length} is the negative logarithm (base 2) of the duration:\n"
-	   "1 is a half note, 2 is a quarter note, 3 is an eighth\n"
-	   "note, etc.  The number of dots after the note is given by\n"
-	   "the optional argument @var{dotcount}.\n"
+	   "@var{length} is the negative logarithm (base 2) of the duration:"
+	   " 1@tie{}is a half note, 2@tie{}is a quarter note, 3@tie{}is an"
+	   " eighth note, etc.  The number of dots after the note is given by"
+	   " the optional argument @var{dotcount}.\n"
+	   "\n"
+	   "The duration factor is optionally given by @var{num} and"
+	   " @var{den}.\n"
 	   "\n"
-	   "The duration factor is optionally given by @var{num}\n"
-	   "and @var{den}.\n\n"
-	   "A duration is a musical duration, "
-	   "i.e. a length of time described by a power of two "
-	   "(whole, half, quarter, etc.) and a number of augmentation\n"
-	   "dots. \n")
+	   "A duration is a musical duration, i.e., a length of time"
+	   " described by a power of two (whole, half, quarter, etc.) and a"
+	   " number of augmentation dots.")
 {
   LY_ASSERT_TYPE (scm_is_integer, length, 1);
 
   int dots = 0;
   if (dotcount != SCM_UNDEFINED)
     {
-      LY_ASSERT_TYPE (scm_is_integer, dotcount,2);
+      LY_ASSERT_TYPE (scm_is_integer, dotcount, 2);
       dots = scm_to_int (dotcount);
     }
 
   bool compress = false;
   if (num != SCM_UNDEFINED)
     {
-      LY_ASSERT_TYPE (scm_is_number,num, 3);
+      LY_ASSERT_TYPE (scm_is_number, num, 3);
       compress = true;
     }
   else
@@ -73,7 +84,7 @@ LY_DEFINE (ly_make_duration, "ly:make-duration",
 
   if (den != SCM_UNDEFINED)
     {
-      LY_ASSERT_TYPE (scm_is_number,den, 4);
+      LY_ASSERT_TYPE (scm_is_number, den, 4);
       compress = true;
     }
   else
@@ -88,7 +99,7 @@ LY_DEFINE (ly_make_duration, "ly:make-duration",
 
 LY_DEFINE (ly_duration_log, "ly:duration-log",
 	   1, 0, 0, (SCM dur),
-	   "Extract the duration log from @var{dur}")
+	   "Extract the duration log from @var{dur}.")
 {
   LY_ASSERT_SMOB (Duration, dur, 1);
   return scm_from_int (unsmob_duration (dur)->duration_log ());
@@ -96,7 +107,7 @@ LY_DEFINE (ly_duration_log, "ly:duration-log",
 
 LY_DEFINE (ly_duration_dot_count, "ly:duration-dot-count",
 	   1, 0, 0, (SCM dur),
-	   "Extract the dot count from @var{dur}")
+	   "Extract the dot count from @var{dur}.")
 {
   LY_ASSERT_SMOB (Duration, dur, 1);
   return scm_from_int (unsmob_duration (dur)->dot_count ());
@@ -113,7 +124,7 @@ LY_DEFINE (ly_intlog2, "ly:intlog2",
 
 LY_DEFINE (ly_duration_length, "ly:duration-length",
 	   1, 0, 0, (SCM dur),
-	   "The length of the duration as a Moment.")
+	   "The length of the duration as a @code{moment}.")
 {
   LY_ASSERT_SMOB (Duration, dur, 1);
   return Moment (unsmob_duration (dur)->get_length ()).smobbed_copy ();
@@ -121,7 +132,7 @@ LY_DEFINE (ly_duration_length, "ly:duration-length",
 
 LY_DEFINE (ly_duration_2_string, "ly:duration->string",
 	   1, 0, 0, (SCM dur),
-	   "Convert @var{dur} to string.")
+	   "Convert @var{dur} to a string.")
 {
   LY_ASSERT_SMOB (Duration, dur, 1);
   return ly_string2scm (unsmob_duration (dur)->to_string ());
@@ -129,9 +140,10 @@ LY_DEFINE (ly_duration_2_string, "ly:duration->string",
 
 LY_DEFINE (ly_duration_factor, "ly:duration-factor",
 	   1, 0, 0, (SCM dur),
-	   "Extract the compression factor from @var{dur}. Return as a pair.")
+	   "Extract the compression factor from @var{dur}."
+	   "  Return it as a pair.")
 {
   LY_ASSERT_SMOB (Duration, dur, 1);
   Rational r = unsmob_duration (dur)->factor ();
-  return scm_cons (scm_from_int (r.num ()), scm_from_int (r.den ()));
+  return scm_cons (scm_from_int64 (r.num ()), scm_from_int64 (r.den ()));
 }