X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch-scheme.cc;h=2eb36a65255b7feea0c7683fc0f0c7ce3445b29c;hb=8bd6516dd00621b493cab85de02e28bae383ea58;hp=9784bac703e410043e183773c3601d5cbfef724f;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/pitch-scheme.cc b/lily/pitch-scheme.cc
index 9784bac703..2eb36a6525 100644
--- a/lily/pitch-scheme.cc
+++ b/lily/pitch-scheme.cc
@@ -1,114 +1,127 @@
 /*
-  pitch-scheme.cc --  implement scheme functions for Pitch
+  pitch-scheme.cc -- implement scheme functions for Pitch
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pitch.hh"
 
 LY_DEFINE (ly_pitch_transpose, "ly:pitch-transpose",
 	   2, 0, 0, (SCM p, SCM delta),
-	   "Transpose @var{p} by the amount @var{delta}, "
-	   "where @var{delta} is relative to middle C.")
+	   "Transpose @var{p} by the amount @var{delta},"
+	   " where @var{delta} is relative to middle@tie{}C.")
 {
-  Pitch* t = unsmob_pitch (p);
+  LY_ASSERT_SMOB (Pitch, p, 1);
+  LY_ASSERT_SMOB (Pitch, delta, 2);
+
+  Pitch *t = unsmob_pitch (p);
   Pitch *d = unsmob_pitch (delta);
-  SCM_ASSERT_TYPE (t, p, SCM_ARG1, __FUNCTION__, "pitch");
-  SCM_ASSERT_TYPE (d, delta, SCM_ARG1, __FUNCTION__, "pitch");
   return t->transposed (*d).smobbed_copy ();
 }
 
 /* Should add optional args.  */
 LY_DEFINE (ly_make_pitch, "ly:make-pitch",
-	   3, 0, 0, (SCM octave, SCM note, SCM alter),
-	   "@var{octave} is specified by an integer, "
-	   "zero for the octave containing middle C.  "
-	   "@var{note} is a number from 0 to 6, "
-	   "with 0 corresponding to C and 6 corresponding to B.  "
-	   "The @var{alter} is zero for a natural, negative for "
-	   "flats, or positive for sharps. ")
+	   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 from 0"
+	   " to@tie{}6, with 0 corresponding to pitch@tie{}C and 6"
+	   " corresponding to pitch@tie{}B.  @var{alter} is a rational"
+	   " number of whole tones for alteration.")
 {
-  SCM_ASSERT_TYPE (scm_integer_p (octave)== SCM_BOOL_T , octave, SCM_ARG1, __FUNCTION__, "integer");
-  SCM_ASSERT_TYPE (scm_integer_p (note)== SCM_BOOL_T, note, SCM_ARG2, __FUNCTION__, "integer");
-  SCM_ASSERT_TYPE (scm_integer_p (alter)== SCM_BOOL_T, alter, SCM_ARG3, __FUNCTION__, "integer");
-
-  Pitch p (scm_to_int (octave), scm_to_int (note), scm_to_int (alter));
+  LY_ASSERT_TYPE (scm_is_integer, octave, 1);
+  LY_ASSERT_TYPE (scm_is_integer, note, 2);
+  LY_ASSERT_TYPE (scm_is_rational, alter, 3);
+  
+  Pitch p (scm_to_int (octave), scm_to_int (note),
+	   ly_scm2rational (alter));
+  
   return p.smobbed_copy ();
 }
 
+LY_DEFINE (ly_pitch_negate, "ly:pitch-negate", 1, 0, 0,
+	   (SCM p),
+	   "Negate @var{p}.")
+{
+  LY_ASSERT_SMOB (Pitch, p, 1);
+  Pitch *pp = unsmob_pitch (p);
+  return pp->negated ().smobbed_copy ();
+}
+
 LY_DEFINE (ly_pitch_steps, "ly:pitch-steps", 1, 0, 0,
 	   (SCM p),
-	   "Number of steps counted from middle C of the pitch @var{p}.")
+	   "Number of steps counted from middle@tie{}C of the"
+	   " pitch@tie{}@var{p}.")
 {
+  LY_ASSERT_SMOB (Pitch, p, 1);
   Pitch *pp = unsmob_pitch (p);
-  SCM_ASSERT_TYPE (pp, p, SCM_ARG1, __FUNCTION__, "Pitch");
-  return scm_int2num (pp->steps ());
+  return scm_from_int (pp->steps ());
 }
 
 LY_DEFINE (ly_pitch_octave, "ly:pitch-octave",
 	   1, 0, 0, (SCM pp),
-	   "Extract the octave from pitch @var{p}.")
+	   "Extract the octave from pitch@tie{}@var{pp}.")
 {
+  LY_ASSERT_SMOB (Pitch, pp, 1);
   Pitch *p = unsmob_pitch (pp);
-  SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
   int q = p->get_octave ();
-  return scm_int2num (q);
+  return scm_from_int (q);
 }
 
 LY_DEFINE (ly_pitch_alteration, "ly:pitch-alteration",
 	   1, 0, 0, (SCM pp),
-	   "Extract the alteration from pitch  @var{p}.")
+	   "Extract the alteration from pitch@tie{}@var{pp}.")
 {
+  LY_ASSERT_SMOB (Pitch, pp, 1);
   Pitch *p = unsmob_pitch (pp);
-  SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
-  int q = p->get_alteration ();
+  Rational q = p->get_alteration ();
 
-  return scm_int2num (q);
+  return ly_rational2scm (q);
 }
 
 LY_DEFINE (pitch_notename, "ly:pitch-notename",
 	   1, 0, 0, (SCM pp),
-	   "Extract the note name from pitch  @var{pp}.")
+	   "Extract the note name from pitch @var{pp}.")
 {
+  LY_ASSERT_SMOB (Pitch, pp, 1);
   Pitch *p = unsmob_pitch (pp);
-  SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
   int q = p->get_notename ();
-  return scm_int2num (q);
+  return scm_from_int (q);
 }
 
 LY_DEFINE (ly_pitch_quartertones, "ly:pitch-quartertones",
 	   1, 0, 0, (SCM pp),
-	   "Calculate the number of quarter tones of @var{p} from middle C.")
+	   "Calculate the number of quarter tones of@tie{}@var{pp} from"
+	   " middle@tie{}C.")
 {
+  LY_ASSERT_SMOB (Pitch, pp, 1);
   Pitch *p = unsmob_pitch (pp);
-  SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
-  int q = p->quartertone_pitch ();
-  return scm_int2num (q);
+  int q = p->rounded_quartertone_pitch ();
+  return scm_from_int (q);
 }
 
 LY_DEFINE (ly_pitch_semitones, "ly:pitch-semitones",
 	   1, 0, 0, (SCM pp),
-	   "calculate the number of semitones of @var{p} from middle C.")
+	   "Calculate the number of semitones of@tie{}@var{pp} from"
+	   " middle@tie{}C.")
 {
+  LY_ASSERT_SMOB (Pitch, pp, 1);
   Pitch *p = unsmob_pitch (pp);
-  SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
-  int q = p->semitone_pitch ();
-  return scm_int2num (q);
+  int q = p->rounded_semitone_pitch ();
+  return scm_from_int (q);
 }
 
 LY_DEFINE (ly_pitch_less_p, "ly:pitch<?",
 	   2, 0, 0, (SCM p1, SCM p2),
 	   "Is @var{p1} lexicographically smaller than @var{p2}?")
 {
+  LY_ASSERT_SMOB (Pitch, p1, 1);
+  LY_ASSERT_SMOB (Pitch, p2, 2);
+
   Pitch *a = unsmob_pitch (p1);
   Pitch *b = unsmob_pitch (p2);
 
-  SCM_ASSERT_TYPE (a, p1, SCM_ARG1, __FUNCTION__, "Pitch");
-  SCM_ASSERT_TYPE (b, p2, SCM_ARG2, __FUNCTION__, "Pitch");
-
   if (Pitch::compare (*a, *b) < 0)
     return SCM_BOOL_T;
   else
@@ -116,14 +129,34 @@ LY_DEFINE (ly_pitch_less_p, "ly:pitch<?",
 }
 
 LY_DEFINE (ly_pitch_diff, "ly:pitch-diff",
-	   2 , 0, 0, (SCM pitch, SCM  root),
-	   "Return pitch @var{delta} such that @code{pitch} transposed by "
-	   "@var{delta} equals @var{root}" )
+	   2, 0, 0, (SCM pitch, SCM root),
+	   "Return pitch @var{delta} such that @var{pitch} transposed by"
+	   " @var{delta} equals @var{root}.")
 {
+ 
+  LY_ASSERT_SMOB (Pitch, pitch, 1);
+  LY_ASSERT_SMOB (Pitch, root, 2);
+
   Pitch *p = unsmob_pitch (pitch);
   Pitch *r = unsmob_pitch (root);
-  SCM_ASSERT_TYPE (p, pitch, SCM_ARG1, __FUNCTION__, "Pitch");
-  SCM_ASSERT_TYPE (r, root, SCM_ARG2, __FUNCTION__, "Pitch");
 
   return pitch_interval (*r, *p).smobbed_copy ();
 }
+
+/* FIXME: probably isn't the right place for this function */
+#include "context.hh"
+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.")
+{
+  LY_ASSERT_SMOB (Context, context, 1);
+
+  Context *c = unsmob_context (context);
+  int clef_pos = robust_scm2int (c->get_property ("middleCClefPosition"), 0);
+  int offset = robust_scm2int (c->get_property ("middleCOffset"), 0);
+
+  c->set_property (ly_symbol2scm ("middleCPosition"), scm_from_int (clef_pos + offset));
+  return SCM_UNDEFINED;
+}