Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc
index dfe4f47c16bab291286ee65c06021d4b7cb67247..365c3f434474166b64fa6b5df2b9dc03005ecfb5 100644 (file)
--- a/lily/music-scheme.cc
+++ b/lily/music-scheme.cc
@@ -6,11 +6,10 @@
   (c) 2005--2006 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),
@@ -215,27 +214,3 @@ LY_DEFINE (ly_transpose_key_alist, "ly:transpose-key-alist",
   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);
-}