* python/lilylib.py (make_ps_images): only compute bbox when needed.

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

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 4512e26fc2033bbb0b9ff8df701cc871dbc95ed1..3eac65aec6f4688469611208c0d78cd1754ae089 100644 (file)
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -3,73 +3,38 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 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);
 
 
 Moment
-Music_wrapper::length_mom () const
-{
-  return element_p_->length_mom ();
-}
-
-Musical_pitch
-Music_wrapper::to_relative_octave (Musical_pitch p)
-{
-  return element_p_->to_relative_octave (p);
-}
-
-Music_iterator*
-Music_wrapper::to_rhythm (Music_iterator* r)
-{
-  return element_p_->to_rhythm (r);
-}
-
-Music*
-Music_wrapper::element_l () const
-{
-  return element_p_;
-}
-
-void
-Music_wrapper::compress (Moment m)
+Music_wrapper::start_mom () const
 {
-  element_l ()->compress (m);
+  return element ()->start_mom ();
 }