remove file.

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

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index a617993b0e2ec95fc0ff84b82461ace9549dda02..a9bb0f0b2c6e8ed936aff7fc27e0e49e06dcc3b7 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -88,12 +88,12 @@ Chord_tremolo_engraver::try_music (Music * m)
       start_mom_ = now_mom ();
       stop_mom_ = start_mom_ + l;
 
-      Sequential_music * seq = dynamic_cast<Sequential_music*> (rp->body ());
-      sequential_body_b_ = seq;
+      
+      sequential_body_b_ = rp->body()->is_mus_type ("sequential-music");
 
-      int elt_count = seq ? scm_ilength (seq-> music_list ()) : 1;
+      int elt_count = sequential_body_b_ ? scm_ilength (rp->body()->get_property ("elements")) : 1;
 
-      if (seq && elt_count != 2)
+      if (sequential_body_b_ && elt_count != 2)
        {
          rp->origin ()->warning (_f ("Chord tremolo with %d elements. Must have two elements.", elt_count));
        }

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index b16e573476fd9f98049c4eca05ffedbd2b321394..b635f02ccf01bb39c461ffe7b1cbfe98ab836735 100644 (file)
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -34,14 +34,4 @@ public:
   Event_chord (SCM);
 };
 
-/**
-  Sequential_music is a list of music-elements which are placed behind each other.
- */
-class Sequential_music : public Music_sequence
-{
-public:
-  VIRTUAL_COPY_CONSTRUCTOR (Music, Sequential_music);
-  Sequential_music (SCM);
-};
-
 #endif /* MUSIC_LIST_HH */

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 2ed69670201a59425a6786795fd0f7cec7de9edf..767d66bdb466cbb6a4a6ca65a0437bb0e5343261 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -107,23 +107,19 @@ 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");
+  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");
+  SCM l = get_music ()->get_property ("elements");
   if (!scm_is_pair (l))
     return 0;
   l = scm_cdr (l);
@@ -136,8 +132,8 @@ Lyric_combine_music_iterator::get_combine_lyrics () const
 void
 Lyric_combine_music_iterator::construct_children ()
 {
-  music_iter_ = unsmob_iterator (get_iterator (get_music ()->get_combine_music ()));
-  lyric_iter_ = unsmob_iterator (get_iterator (get_music ()->get_combine_lyrics ()));
+  music_iter_ = unsmob_iterator (get_iterator (get_combine_music ()));
+  lyric_iter_ = unsmob_iterator (get_iterator (get_combine_lyrics ()));
 }
 
 bool

diff --git a/lily/parser.yy b/lily/parser.yy
index 15760b48af39728dcc4862a13c62c91f715f263c..6de53f89787e40ba08df7370e0ad489369fa61d2 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -915,16 +915,16 @@ Repeated_music:
                        int dots = ($3 % 3) ? 0 : 1;
                        int shift = -intlog2 ((dots) ? ($3*2/3) : $3);
 
-                       Sequential_music *seq = dynamic_cast<Sequential_music*> ($4);
                        
-                       if (seq) {
-                               int list_len = scm_ilength (seq->music_list ());
+                       if ($4->is_mus_type ("sequential-music"))
+                       {
+                               int list_len = scm_ilength ($4->get_property ("elements"));
                                if (list_len != 2)
                                        seq->origin ()->warning ("Chord tremolo must have 2 elements.");
                                shift -= 1;
                                r->compress (Moment (Rational (1, list_len)));
-                               }
-                       scm_call_3 (func, r->self_scm (), scm_int2num (shift),scm_int2num (dots));
+                       }
+                       scm_call_3 (func, r->self_scm (), scm_int2num (shift), scm_int2num (dots));
 
                }
                r->set_spot (*$4->origin ());

diff --git a/lily/sequential-music.cc b/lily/sequential-music.cc
deleted file mode 100644 (file)
index dee78e2..0000000
--- a/lily/sequential-music.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "music-list.hh"
-#include "sequential-music-iterator.hh"
-
-Sequential_music::Sequential_music (SCM x)
-  : Music_sequence (x)
-{
-}
-
-ADD_MUSIC (Sequential_music);

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 655b3ba215b40765004ad09f3b4328c0da209c9e..5fac2678b56f433de9163a33cbc10867f67aef1c 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -451,7 +451,7 @@ previously added property from a graphical object definition
 
 Syntax \\sequential @{..@} or simply @{..@} .")
 
-       (internal-class-name . "Sequential_music")
+       (internal-class-name . "Music")
        (length-callback . ,Music_sequence::cumulative_length_callback)
        (start-callback . ,Music_sequence::first_start_callback)
        (iterator-ctor . ,Sequential_music_iterator::constructor)
@@ -464,7 +464,7 @@ Syntax \\sequential @{..@} or simply @{..@} .")
 to group start-mmrest, skip, stop-mmrest sequence. 
 
 Syntax @code{R2.*5} for 5 measures in 3/4 time.")
-       (internal-class-name . "Sequential_music")
+       (internal-class-name . "Music")
        (length-callback . ,Music_sequence::cumulative_length_callback)
        (start-callback . ,Music_sequence::first_start_callback)
        (iterator-ctor . ,Sequential_music_iterator::constructor)