Imported Upstream version 2.14.2

[lilypond.git] / lily / scale.cc

diff --git a/lily/scale.cc b/lily/scale.cc
index 99cd6d91db8dacc686bf49558e0c41f302fdcbb3..5de25f5c43c3df00f09fe9750146e91d3640890e 100644 (file)
--- 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 <hanwen@lilypond.org>
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2006--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
       2007--2008 Rune Zedeler
       2008       Joe Neeman <joeneeman@gmail.com>
+
+  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 "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);
 
@@ -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);