("music.hh"): remove file.

diff --git a/ChangeLog b/ChangeLog
index 4377d06c43e57abf9415212c41915785d22fb1ab..9688d58a84e9bcd371e7b04d1de76258f24b3843 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-01-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/include/lyric-combine-music.hh ("music.hh"): remove file.
+
        * lily/slur-scoring.cc (get_best_curve): only switch on
        DEBUG_SLUR_SCORING for non NDEBUG builds.
 

diff --git a/lily/include/lyric-combine-music.hh b/lily/include/lyric-combine-music.hh
deleted file mode 100644 (file)
index b2489c0..0000000
--- a/lily/include/lyric-combine-music.hh
+++ /dev/null
@@ -1,26 +0,0 @@
-/*   
-  lyric-combine-music.hh -- declare Lyric_combine_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#ifndef LYRIC_COMBINE_MUSIC_HH
-#define LYRIC_COMBINE_MUSIC_HH
-
-#include "music.hh"
-
-class Lyric_combine_music : public Music
-{
-public:
-  Lyric_combine_music (SCM);
-  VIRTUAL_COPY_CONSTRUCTOR (Music, Lyric_combine_music);
-  DECLARE_SCHEME_CALLBACK(length_callback,(SCM));
-
-  Music *get_music () const;
-  Music *get_lyrics () const;
-};
-
-#endif /* LYRIC_COMBINE_MUSIC_HH */

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index c1076cd792534a3d4da7522b546302df3dd45c19..2ed69670201a59425a6786795fd0f7cec7de9edf 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -8,7 +8,6 @@
  */
 
 #include "context.hh"
-#include "lyric-combine-music.hh"
 #include "event.hh"
 #include "note-head.hh"
 #include "grob.hh"
@@ -33,7 +32,10 @@ protected:
 private:
   bool get_busy_status ()const ;
   bool melisma_busy (); 
+  Music* get_combine_lyrics () const;
+  Music* get_combine_music () const;
 
+  
   Music_iterator * music_iter_;
   Music_iterator * lyric_iter_;
 };
@@ -105,13 +107,37 @@ Lyric_combine_music_iterator::derived_substitute (Context *f,Context * t)
     lyric_iter_->substitute_outlet (f,t);
 }
 
+
+
+Music*
+Lyric_combine_music_iterator::get_combine_music () const
+{
+  SCM l = get_music()->get_property ("elements");
+  if (!scm_is_pair (l))
+    return 0;
+  return unsmob_music (scm_car (l));
+}
+
+
+
+Music*
+Lyric_combine_music_iterator::get_combine_lyrics () const
+{
+  SCM l = get_music()->get_property ("elements");
+  if (!scm_is_pair (l))
+    return 0;
+  l = scm_cdr (l);
+  if (!scm_is_pair (l))
+    return 0;
+  return unsmob_music (scm_car (l));
+}
+
+
 void
 Lyric_combine_music_iterator::construct_children ()
 {
-  Lyric_combine_music const * m = dynamic_cast<Lyric_combine_music const*> (get_music ());
-  
-  music_iter_ = unsmob_iterator (get_iterator (m->get_music ()));
-  lyric_iter_ = unsmob_iterator (get_iterator (m->get_lyrics ()));
+  music_iter_ = unsmob_iterator (get_iterator (get_music ()->get_combine_music ()));
+  lyric_iter_ = unsmob_iterator (get_iterator (get_music ()->get_combine_lyrics ()));
 }
 
 bool

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index c4678b60740aef84c256ed56db9df0e097ca97fe..e3fd0e08b2541f6cc8aa0272ae6f67047e9ac33a 100644 (file)
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -7,14 +7,15 @@
   
  */
 
-#include "lyric-combine-music.hh"
-
+#include "music.hh"
 #include "pitch.hh"
 
-Lyric_combine_music::Lyric_combine_music (SCM x)
-  : Music (x)
+struct Lyric_combine_music
 {
-}
+public:
+  DECLARE_SCHEME_CALLBACK(length_callback,(SCM));
+};
+
 
 MAKE_SCHEME_CALLBACK(Lyric_combine_music,length_callback,1);
 SCM
@@ -24,28 +25,3 @@ Lyric_combine_music::length_callback (SCM m)
   Music *melody = unsmob_music (scm_car (me->get_property ("elements")));
   return melody->get_length ().smobbed_copy ();
 }
-
-Music*
-Lyric_combine_music::get_music () const
-{
-  SCM l = get_property ("elements");
-  if (!scm_is_pair (l))
-    return 0;
-  return unsmob_music (scm_car (l));
-}
-
-
-Music*
-Lyric_combine_music::get_lyrics () const
-{
-  SCM l = get_property ("elements");
-  if (!scm_is_pair (l))
-    return 0;
-  l = scm_cdr (l);
-  if (!scm_is_pair (l))
-    return 0;
-  return unsmob_music (scm_car (l));
-}
-
-
-ADD_MUSIC (Lyric_combine_music);

diff --git a/lily/new-lyric-combine-music-iterator.cc b/lily/new-lyric-combine-music-iterator.cc
index 81ecd8172f7010bf91766cd4ca2089ff443fb0d3..dad50415b3dfdd9b74b5bae14c5cc8f6bdaafa0e 100644 (file)
--- a/lily/new-lyric-combine-music-iterator.cc
+++ b/lily/new-lyric-combine-music-iterator.cc
@@ -7,7 +7,6 @@
 */
 
 #include "context.hh"
-#include "lyric-combine-music.hh"
 #include "event.hh"
 #include "grob.hh"
 #include "music-iterator.hh"
@@ -34,8 +33,8 @@ private:
 
   bool music_found_;
   bool made_association_;
-  Context * lyrics_context_;
-  Context * music_context_;
+  Context *lyrics_context_;
+  Context *music_context_;
   SCM lyricsto_voice_name_;
   
   Music_iterator * lyric_iter_;

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index fe790ec6a2ae0a02a1351a846d4a95ee388e28c9..655b3ba215b40765004ad09f3b4328c0da209c9e 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -247,11 +247,12 @@ Syntax: @code{\\key } @var{name} @var{scale}.")
      . (
        (description .  "Align lyrics to the start of notes.
 
+Syntax @var{\\oldaddlyrics }@var{music} @var{lyrics}.")
 
-Syntax @var{\\addlyrics }@var{music} @var{lyrics}.")
-
-       (internal-class-name . "Lyric_combine_music")
+       (internal-class-name . "Music")
        (types . (general-music lyric-combine-music))
+       (length-callback . ,Lyric_combine_music::length_callback)
+       (start-callback . ,Music_sequence::first_start_callback)
        (iterator-ctor . ,Lyric_combine_music_iterator::constructor)
        ))
     
@@ -259,8 +260,7 @@ Syntax @var{\\addlyrics }@var{music} @var{lyrics}.")
      . (
        (description .  "Align lyrics to the start of notes.
 
-
-Syntax @var{\\addlyrics }@var{music} @var{lyrics}.")
+Syntax @var{\\lyricsto }@var{voicename} @var{lyrics}.")
        (internal-class-name . "Music")
        (length . ,(ly:make-moment 0 1))
        (types . (general-music lyric-combine-music))