partial: 1.3.13.jcn

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

diff --git a/lily/music-list.cc b/lily/music-list.cc
index 3d8f965b8b21608a1b2828ea79393849759aec17..2b2fce2fda216187f7917b1cb343cfcba5073df9 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -1,76 +1,128 @@
 /*
-  music-list.cc -- implement Music_list, 
+  music-list.cc -- implement Music_sequence, Simultaneous_music, Sequential_music
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "music-list.hh"
+#include "music-wrapper.hh"
+#include "musical-pitch.hh"
+#include "request.hh"
+#include "musical-request.hh"
+#include "music-iterator.hh"
+#include "main.hh"
+#include "killing-cons.tcc"
+
+Moment
+Simultaneous_music::length_mom () const
+{
+  return maximum_length ();
+}
 
-#include "music.hh"
-#include "debug.hh"
 
-Music_list::Music_list(Music_list const&s)
+void
+Music_sequence::compress (Moment m)
 {
-    for (iter(s.music_p_list_.top(), i); i.ok(); i++)
-       add(i->clone());
+  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
+    i->car_->compress (m);
 }
 
+Simultaneous_music::Simultaneous_music(Music_list *p)
+  : Music_sequence (p)
+{
 
-IMPLEMENT_STATIC_NAME(Music_list);
+}
 
-void
-Music_list::add(Music*mus_p)
+Sequential_music::Sequential_music(Music_list *p)
+  : Music_sequence (p)
 {
-    music_p_list_.bottom().add(mus_p);
 }
 
-void
-Music_list::transpose(Melodic_req const*m)
+Moment
+Sequential_music::length_mom () const
 {
-  for (iter(music_p_list_.top(), i); i.ok(); i++)
-      i->transpose(m);
+  return cumulative_length ();
 }
 
-void
-Music_list::do_print() const
+Musical_pitch
+Simultaneous_music::to_relative_octave (Musical_pitch p)
 {
-    for (iter(music_p_list_.top(), i); i.ok(); i++)
-       i->print();
+  return do_relative_octave (p, true);
 }
 
-IMPLEMENT_STATIC_NAME(Chord);
 
-void
-Chord::translate(Moment dt)
+Musical_pitch
+Music_sequence::do_relative_octave (Musical_pitch p, bool b)
 {
-    for (iter(music_p_list_.top(), i); i.ok(); i++)
-       i->translate(dt);
+  return music_p_list_p_->do_relative_octave (p, b);  
 }
 
-MInterval
-Chord::time_int()const
+
+Musical_pitch 
+Music_list::do_relative_octave (Musical_pitch last, bool ret_first)
 {
-    MInterval m;
-    for (iter(music_p_list_.top(), i); i.ok(); i++)
-       m.unite(i->time_int());
-    return m;
+  Musical_pitch retval;
+  int count=0;
+  for (Cons<Music> *i = head_; i ; i = i->next_)
+    {
+      last = i->car_->to_relative_octave (last);
+      if (!count ++ )
+       retval = last;
+    }
+
+  if (!ret_first)
+    retval = last;
+  
+  return retval;
 }
 
-MInterval
-MVoice::time_int() const
+
+Music_list::Music_list (Music_list const &s)
+  : Cons_list<Music> (s), Input (s)
 {
-    Moment last=0;
-    for (iter(music_p_list_.top(), i); i.ok(); i++)
-       last += i->time_int().length();
-    return MInterval (0,last);
+  Cons_list<Music>::init ();
+  clone_killing_cons_list (*this, s.head_);
 }
 
+
 void
-MVoice::translate(Moment dt)
+Music_list::add_music (Music*m_p)
+{
+  if (!m_p)
+    return;
+
+  append (new Killing_cons<Music> (m_p, 0));
+}
+
+Request_chord::Request_chord()
+  : Simultaneous_music (new Music_list)
+{
+}
+
+
+Musical_pitch
+Request_chord::to_relative_octave (Musical_pitch last)
 {
-    for (iter(music_p_list_.top(), i); i.ok(); i++)
-       i->translate(dt);
+  for (Cons<Music> *i = music_p_list_p_->head_; i ; i = i->next_)
+    {
+      if (Melodic_req *m= dynamic_cast <Melodic_req *> (i->car_))
+       {
+         Musical_pitch &pit = m->pitch_;
+         pit.to_relative_octave (last);
+         return pit;
+       }
+    }
+  return last;
 }
 
-IMPLEMENT_STATIC_NAME(MVoice);
+
+Music_list::Music_list ()
+{
+}
+
+Music_sequence::~Music_sequence ()
+{
+  delete music_p_list_p_;
+}