X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch-scheme.cc;h=07a9a096b3051fe4dfec6ff9117ad3a9e2c2bf1c;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=4461ce4a32d9920ecbb88885846f553f8dafb9d4;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git

diff --git a/lily/pitch-scheme.cc b/lily/pitch-scheme.cc
index 4461ce4a32..07a9a096b3 100644
--- a/lily/pitch-scheme.cc
+++ b/lily/pitch-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2014 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
@@ -32,18 +32,20 @@ LY_DEFINE (ly_pitch_transpose, "ly:pitch-transpose",
   return t->transposed (*d).smobbed_copy ();
 }
 
-/* Should add optional args.  */
 LY_DEFINE (ly_make_pitch, "ly:make-pitch",
            2, 1, 0, (SCM octave, SCM note, SCM alter),
            "@var{octave} is specified by an integer, zero for the octave"
-           " containing middle@tie{}C. @var{note} is a number indexing the"
+           " containing middle@tie{}C.  @var{note} is a number indexing the"
            " global default scale, with 0 corresponding to pitch@tie{}C"
-           " and 6 usually corresponding to pitch@tie{}B. @var{alter} is"
+           " and 6 usually corresponding to pitch@tie{}B."
+           "  Optional @var{alter} is"
            " a rational number of 200-cent whole tones for alteration.")
 
 {
   LY_ASSERT_TYPE (scm_is_integer, octave, 1);
   LY_ASSERT_TYPE (scm_is_integer, note, 2);
+  if (SCM_UNBNDP (alter))
+    alter = SCM_INUM0;
   LY_ASSERT_TYPE (scm_is_rational, alter, 3);
 
   Pitch p (scm_to_int (octave), scm_to_int (note),
@@ -92,7 +94,7 @@ LY_DEFINE (ly_pitch_alteration, "ly:pitch-alteration",
   return ly_rational2scm (q);
 }
 
-LY_DEFINE (pitch_notename, "ly:pitch-notename",
+LY_DEFINE (ly_pitch_notename, "ly:pitch-notename",
            1, 0, 0, (SCM pp),
            "Extract the note name from pitch @var{pp}.")
 {
@@ -102,6 +104,15 @@ LY_DEFINE (pitch_notename, "ly:pitch-notename",
   return scm_from_int (q);
 }
 
+LY_DEFINE (ly_pitch_tones, "ly:pitch-tones",
+           1, 0, 0, (SCM pp),
+           "Calculate the number of tones of@tie{}@var{pp} from"
+           " middle@tie{}C as a rational number.")
+{
+  LY_ASSERT_SMOB (Pitch, pp, 1);
+  return ly_rational2scm (unsmob_pitch (pp)->tone_pitch ());
+}
+
 LY_DEFINE (ly_pitch_quartertones, "ly:pitch-quartertones",
            1, 0, 0, (SCM pp),
            "Calculate the number of quarter tones of@tie{}@var{pp} from"
@@ -161,7 +172,7 @@ LY_DEFINE (ly_set_middle_C_x, "ly:set-middle-C!",
            1, 0, 0, (SCM context),
            "Set the @code{middleCPosition} variable in @var{context}"
            " based on the variables @code{middleCClefPosition} and"
-           " middleCOffset.")
+           " @code{middleCOffset}.")
 {
   LY_ASSERT_SMOB (Context, context, 1);
 
@@ -174,5 +185,5 @@ LY_DEFINE (ly_set_middle_C_x, "ly:set-middle-C!",
     clef_pos = robust_scm2int (cue_pos, 0);
 
   c->set_property (ly_symbol2scm ("middleCPosition"), scm_from_int (clef_pos + offset));
-  return SCM_UNDEFINED;
+  return SCM_UNSPECIFIED;
 }