release: 1.3.73

======

* Robustness fix for minimise_least_squares ()

* cleanups of Slur_bezier_bow, removed Bezier_bow.

* cleanup of Tie. Changed Tie into interface. Made ties flatter by default.

* changed SCM_UNDEFINED to SCM_UNSPECIFIED for return values that go
back into Scheme.

* changed SCM_UNSPECIFIED to SCM_EOL for undefined element
properties. This makes initializing list properties redundant.

* removed idiotic code for including tfm.[1-5] into search path.

* fixed problem with tuplet placement for cross staff tuplets.

1.3

1 files changed, 12 insertions, 24 deletions

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 5676d4cff0..d6e42d2cbc 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -12,64 +12,52 @@
 
 Lyric_combine_music::Lyric_combine_music (Music * m, Music * l)
 {
-  music_p_ = m;
-  lyrics_p_ = l;
+  set_mus_property ("music", m->self_scm_);
+  set_mus_property ("lyrics", l->self_scm_);  
 }
 
-Lyric_combine_music::~Lyric_combine_music ()
-{
-  delete music_p_;
-  delete lyrics_p_;
-}
-
-Lyric_combine_music::Lyric_combine_music (Lyric_combine_music const&s)
-  : Music (s)
-{
-  music_p_ = s.music_p_ ? s.music_p_->clone ():0;
-  lyrics_p_ = s.lyrics_p_ ? s.lyrics_p_->clone ():0;
-}
 
 void
 Lyric_combine_music::transpose (Musical_pitch p)
 {
-  music_p_->transpose (p);
-  lyrics_p_->transpose (p);
+  music_l ()->transpose (p);
+  lyrics_l () ->transpose (p);
 }
 
 void
 Lyric_combine_music::do_print () const  
 {
-  music_p_->print();
-  lyrics_p_->print ();
+  music_l ()->print();
+  lyrics_l () ->print ();
 }
 
 Moment
 Lyric_combine_music::length_mom () const
 {
-  return music_p_->length_mom ();
+  return music_l ()->length_mom ();
 }
 
 Musical_pitch
 Lyric_combine_music::to_relative_octave (  Musical_pitch p )
 {
-  p = music_p_->to_relative_octave (p);
-  return lyrics_p_->to_relative_octave (p);
+  p = music_l ()->to_relative_octave (p);
+  return lyrics_l () ->to_relative_octave (p);
 }
 
 void
 Lyric_combine_music::compress (Moment m)
 {
-  music_p_->compress (m);
+  music_l ()->compress (m);
 }
 
 Music*
 Lyric_combine_music::music_l () const
 {
-  return music_p_;
+  return unsmob_music (get_mus_property ("music"));
 }
 
 Music*
 Lyric_combine_music::lyrics_l () const
 {
-  return lyrics_p_;
+  return unsmob_music (get_mus_property ("lyrics"));
 }