Merge commit 'origin' into beamlets2

[lilypond.git] / lily / scale.cc

diff --git a/lily/scale.cc b/lily/scale.cc
index aa17285510e531d1823baa63a7d7fd87c0fee48a..99cd6d91db8dacc686bf49558e0c41f302fdcbb3 100644 (file)
--- a/lily/scale.cc
+++ b/lily/scale.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006--2007 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
       2007--2008 Rune Zedeler
       2008       Joe Neeman <joeneeman@gmail.com>
 */
@@ -18,9 +18,9 @@
 */
 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.")
+          "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.")
 {
   bool type_ok = scm_is_vector (steps);
 
@@ -57,8 +57,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;
 }
 
 
@@ -121,19 +121,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 ("#<Scale>", port); 
   return 1;
 }
 
-
 SCM
-Scale::mark_smob (SCM x)
+Scale::mark_smob (SCM)
 {
-  (void) x;
   return SCM_UNSPECIFIED;
 }