don't change signatures depending on NDEBUG

[lilypond.git] / lily / music-scheme.cc

diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc
index dfe4f47c16bab291286ee65c06021d4b7cb67247..711df4d1a194352790df0dc839e8ce142316408d 100644 (file)
--- a/lily/music-scheme.cc
+++ b/lily/music-scheme.cc
@@ -3,14 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "duration.hh"
-#include "warn.hh"
 #include "music.hh"
-#include "pitch.hh"
 
+#include "duration.hh"
+#include "warn.hh"
 
 LY_DEFINE (ly_music_length, "ly:music-length",
           1, 0, 0, (SCM mus),
@@ -192,50 +191,26 @@ LY_DEFINE (ly_transpose_key_alist, "ly:transpose-key-alist",
        {
          Pitch orig (scm_to_int (scm_car (key)),
                      scm_to_int (scm_cdr (key)),
-                     scm_to_int (alter));
+                     ly_scm2rational (alter));
 
          orig = orig.transposed (*p);
 
          SCM key = scm_cons (scm_from_int (orig.get_octave ()),
                              scm_from_int (orig.get_notename ()));
 
-         newlist = scm_cons (scm_cons (key, scm_from_int (orig.get_alteration ())),
+         newlist = scm_cons (scm_cons (key, ly_rational2scm (orig.get_alteration ())),
                              newlist);
        }
       else if (scm_is_number (key))
        {
-         Pitch orig (0, scm_to_int (key), scm_to_int (alter));
+         Pitch orig (0, scm_to_int (key), ly_scm2rational (alter));
          orig = orig.transposed (*p);
 
          key = scm_from_int (orig.get_notename ());
-         alter = scm_from_int (orig.get_alteration ());
+         alter = ly_rational2scm (orig.get_alteration ());
          newlist = scm_cons (scm_cons (key, alter), newlist);
        }
     }
   return scm_reverse_x (newlist, SCM_EOL);
 }
 
-/*
-  TODO: does this belong here?
-*/
-LY_DEFINE (ly_camel_case_to_lisp_identifier, "ly:camel-case->lisp-identifier",
-          1, 0, 0, (SCM name_sym),
-          "Convert music name to corresponding event class name.")
-{
-  /* UGH. There should be a better way. */
-  const string in = ly_symbol2string (name_sym);
-  /* this should be sufficient */
-  char out[in.size() * 2 + 2];
-  /* don't add '-' before first character */
-  out[0] = tolower (in[0]);
-  size_t outpos = 1;
-  for (size_t inpos = 1; inpos < in.size (); inpos++)
-    {
-      if (isupper (in[inpos]))
-       out[outpos++] = '-';
-      out[outpos++] = tolower (in[inpos]);      
-    }
-  out[outpos] = 0;
-
-  return ly_symbol2scm (out);
-}