X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscale.cc;h=c1f9a81f0550c394a8f9ec6dc06e9b06d5c68869;hb=76f060825126f528cdadd56fb88b47fdb3d9560d;hp=9e39d8a99e83fa992a31c1be95fdb37a362c15ac;hpb=e344ae579fa1d81fc6c6f3049494697872fd39f9;p=lilypond.git diff --git a/lily/scale.cc b/lily/scale.cc index 9e39d8a99e..c1f9a81f05 100644 --- a/lily/scale.cc +++ b/lily/scale.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2006--2008 Han-Wen Nienhuys + (c) 2006--2009 Han-Wen Nienhuys 2007--2008 Rune Zedeler 2008 Joe Neeman */ @@ -20,7 +20,8 @@ LY_DEFINE (ly_make_scale, "ly:make-scale", 1, 0, 0, (SCM steps), "Create a scale." " The argument is a vector of rational numbers, each of which" - " represents the number of tones of a pitch above the tonic.") + " represents the number of 200 cent tones of a pitch above the" + " tonic.") { bool type_ok = scm_is_vector (steps); @@ -57,8 +58,8 @@ LY_DEFINE (ly_default_scale, "ly:default-scale", "Get the global default scale.") { return default_global_scale - ? SCM_BOOL_F - : default_global_scale->self_scm (); + ? default_global_scale->self_scm () + : SCM_BOOL_F; } @@ -66,7 +67,12 @@ Scale * default_global_scale = 0; LY_DEFINE (ly_set_default_scale, "ly:set-default-scale", 1, 0, 0, (SCM scale), - "Set the global default scale.") + "Set the global default scale. This determines the tuning of" + " pitches with no accidentals or key signatures. The first" + " pitch is C. Alterations are calculated relative to this" + " scale. The number of pitches in this scale determines the" + " number of scale steps that make up an octave. Usually the" + " 7-note major scale.") { LY_ASSERT_SMOB (Scale, scale, 1); @@ -121,19 +127,17 @@ Scale::normalize_step (int step) const } int -Scale::print_smob (SCM x, SCM port, scm_print_state *) +Scale::print_smob (SCM /* x */, + SCM port, + scm_print_state *) { - (void) x; - scm_puts ("#", port); return 1; } - SCM -Scale::mark_smob (SCM x) +Scale::mark_smob (SCM) { - (void) x; return SCM_UNSPECIFIED; }