X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch-scheme.cc;h=bc69b633a780dd3cb995e26ff40a91affd88719f;hb=e94c4a66c9d565749d8a121fc0267ddeb423ca13;hp=b059c6f1abf669ddfbc9b06c1cc95046362b15c0;hpb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;p=lilypond.git

diff --git a/lily/pitch-scheme.cc b/lily/pitch-scheme.cc
index b059c6f1ab..bc69b633a7 100644
--- a/lily/pitch-scheme.cc
+++ b/lily/pitch-scheme.cc
@@ -1,9 +1,20 @@
 /*
-  pitch-scheme.cc -- implement scheme functions for Pitch
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2008 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
+  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 "pitch.hh"
@@ -25,10 +36,11 @@ LY_DEFINE (ly_pitch_transpose, "ly:pitch-transpose",
 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 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.")
+	   " 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" 
+	   " 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);
@@ -156,6 +168,10 @@ LY_DEFINE (ly_set_middle_C_x, "ly:set-middle-C!",
   Context *c = unsmob_context (context);
   int clef_pos = robust_scm2int (c->get_property ("middleCClefPosition"), 0);
   int offset = robust_scm2int (c->get_property ("middleCOffset"), 0);
+  /* middleCCuePosition overrides the clef! */
+  SCM cue_pos = c->get_property ("middleCCuePosition");
+  if (scm_is_number (cue_pos))
+    clef_pos = robust_scm2int (cue_pos, 0);
 
   c->set_property (ly_symbol2scm ("middleCPosition"), scm_from_int (clef_pos + offset));
   return SCM_UNDEFINED;