Merge branch 'master' into translation

[lilypond.git] / lily / include / music.hh

diff --git a/lily/include/music.hh b/lily/include/music.hh
index b61646224310e0fa19cb6d8666b5b2052fa5570a..c904dc3347fa457ad469aa04ad736a679a3dd835 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -48,17 +48,14 @@ public:
   Moment start_mom () const;
   void print () const;
 
-  /// Transpose, with the interval central C to #p#
-  void transpose (Pitch p);
-
   /// Scale the music in time by #factor#.
   void compress (Moment factor);
-  
+
   // Broadcast the event in a context's event-source.
   void send_to_context (Context *c);
 
   DECLARE_SCHEME_CALLBACK (duration_length_callback, (SCM));
- 
+
 protected:
   virtual SCM copy_mutable_properties () const;
   virtual void type_check_assignment (SCM, SCM) const;
@@ -69,14 +66,12 @@ protected:
   friend SCM ly_extended_make_music (SCM, SCM);
 };
 
-Music *unsmob_music (SCM);
 Music *make_music_by_name (SCM sym);
-SCM ly_music_deep_copy (SCM);
+SCM music_deep_copy (SCM m);
+void set_origin (SCM m, SCM origin);
+
 SCM ly_camel_case_2_lisp_identifier (SCM name_sym);
 
 extern SCM ly_music_p_proc;
 
-/* common transposition function for music and event */
-void transpose_mutable (SCM alist, Pitch delta);
-
 #endif /* MUSIC_HH */