(find_font): Add "lm" to try-AFM-first

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

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index b6f6618e7998b91254187061385f6a1e91089188..a17a631039383001e0e3a71c5ed2c94f9db1a7b9 100644 (file)
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,51 +1,37 @@
 /*   
-  music-wrapper.cc --  implement 
+  music-wrapper.cc --  implement Music_wrapper
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-
 #include "music-wrapper.hh"
 
-Music_wrapper::~Music_wrapper ()
-{
-  delete element_p_;
-}
-
-Music_wrapper::Music_wrapper (Music_wrapper const&s)
-  : Music (s)
+Music_wrapper::Music_wrapper ()
+  : Music ()
 {
-  element_p_ = (s.element_p_)?s.element_p_->clone ():0;
 }
 
-
-void
-Music_wrapper::do_print () const
+Moment
+Music_wrapper::get_length () const
 {
-  element_p_->print ();
+  return element ()->get_length ();
 }
 
-
-void
-Music_wrapper::transpose (Musical_pitch p)
+Music*
+Music_wrapper::element () const
 {
-  if (element_p_)
-    element_p_-> transpose (p);
+  return unsmob_music (get_property ("element"));
 }
 
 
-Music_wrapper::Music_wrapper(Music*p)
-{
-  element_p_ = p;
-}
+ADD_MUSIC (Music_wrapper);
 
-IMPLEMENT_IS_TYPE_B1 (Music_wrapper, Music);
 
-MInterval
-Music_wrapper::time_int () const
+Moment
+Music_wrapper::start_mom () const
 {
-  return element_p_->time_int ();
+  return element ()->start_mom ();
 }