X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscale.cc;h=5de25f5c43c3df00f09fe9750146e91d3640890e;hb=03f79cd4492c3ef03d4a79d16eb898aaee32cd1c;hp=23490c889084cb2dff8192d1fb53fb939cbbec43;hpb=5ea982187f9aebfe588225813be14c48020452f3;p=lilypond.git diff --git a/lily/scale.cc b/lily/scale.cc index 23490c8890..5de25f5c43 100644 --- a/lily/scale.cc +++ b/lily/scale.cc @@ -1,11 +1,22 @@ -/* - scale.cc -- implement Scale - - source file of the GNU LilyPond music typesetter - - (c) 2006--2008 Han-Wen Nienhuys +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 2006--2011 Han-Wen Nienhuys 2007--2008 Rune Zedeler 2008 Joe Neeman + + 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 . */ #include "scale.hh" @@ -20,7 +31,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 +69,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 +78,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);