/*
- music-list.cc -- implement Music_list, Chord, Voice
+ 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--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "music.hh"
-#include "debug.hh"
-#include "music-list.hh"
-Music_list::Music_list(Music_list const&s)
-{
- multi_level_i_ = s.multi_level_i_;
- for (iter(s.music_p_list_.top(), i); i.ok(); i++)
- add(i->clone());
-}
+#include "music-list.hh"
+#include "musical-pitch.hh"
+#include "request.hh"
+#include "musical-request.hh"
+IMPLEMENT_IS_TYPE_B1(Sequential_music,Music_sequence);
+IMPLEMENT_IS_TYPE_B1(Simultaneous_music,Music_sequence);
+Moment
+Simultaneous_music::duration () const
+{
+ Moment dur = 0;
+ for (iter (music_p_list_p_->top(), i); i.ok (); i++)
+ dur = dur >? i->duration ();
-IMPLEMENT_IS_TYPE_B1(Music_list, Music);
-IMPLEMENT_IS_TYPE_B1(Voice,Music_list);
-IMPLEMENT_IS_TYPE_B1(Chord,Music_list);
+ return dur;
+}
-MInterval
-Chord::time_int()const
+void
+Music_sequence::compress (Moment m)
{
- MInterval m;
- for (iter(music_p_list_.top(), i); i.ok(); i++)
- m.unite(i->time_int());
- return m;
+ for (PCursor<Music*> i(music_p_list_p_->top()); i.ok (); i++)
+ i->compress (m);
}
-void
-Chord::translate(Moment m)
+
+Simultaneous_music::Simultaneous_music(Music_list *p)
+ : Music_sequence (p)
{
- for (iter(music_p_list_.top(), i); i.ok(); i++)
- i->translate(m);
+
}
-Chord::Chord()
+Sequential_music::Sequential_music(Music_list *p)
+ : Music_sequence (p)
{
+}
+Moment
+Sequential_music::duration () const
+{
+ Moment last=0;
+ for (iter (music_p_list_p_->top(), i); i.ok (); i++)
+ {
+ last += i->duration ();
+ }
+ return last;
}
-Voice::Voice()
+Musical_pitch
+Sequential_music::to_relative_octave (Musical_pitch p)
{
- offset_mom_ =0;
+ return music_p_list_p_->do_relative_octave (p, false);
}
-MInterval
-Voice::time_int() const
+Musical_pitch
+Simultaneous_music::to_relative_octave (Musical_pitch p)
{
- Moment last=0;
- for (iter(music_p_list_.top(), i); i.ok(); i++)
- last += i->time_int().length();
- return offset_mom_ + MInterval(0,last);
+ return music_p_list_p_->do_relative_octave (p, true);
}
-void
-Voice::translate(Moment dt)
+
+Musical_pitch
+Music_list::do_relative_octave (Musical_pitch last, bool ret_first)
{
- offset_mom_ += dt;
+ Musical_pitch retval;
+ int count=0;
+ for (PCursor<Music*> i (top ()); i.ok (); i++)
+ {
+ last = i->to_relative_octave (last);
+ if (!count ++ )
+ retval = last;
+ }
+ if (!ret_first)
+ retval = last;
+ return retval;
}
-Music_list::Music_list()
+Music_list::Music_list (Music_list const &s)
+ : Pointer_list<Music*> ()
{
- multi_level_i_ = 0;
+ for (PCursor<Music*> i(s.top()); i.ok (); i++)
+ add_music (i->clone());
}
void
-Music_list::add(Music*m_p)
+Music_list::add_music (Music*m_p)
{
- if (!m_p)
- return;
+ if (!m_p)
+ return;
- m_p->parent_music_l_ = this;
- music_p_list_.bottom().add(m_p);
+ bottom().add (m_p);
}
-void
-Music_list::transpose(Melodic_req const*rq)
+
+IMPLEMENT_IS_TYPE_B1(Request_chord, Simultaneous_music);
+
+
+Request_chord::Request_chord()
+ : Simultaneous_music (new Music_list)
{
- for (iter(music_p_list_.top(),i); i.ok(); i++)
- i->transpose(rq);
+ multi_level_i_ =0;
}
-void
-Music_list::do_print()const
+
+Musical_pitch
+Request_chord::to_relative_octave (Musical_pitch last)
{
-#ifndef NPRINT
- for (iter(music_p_list_.top(),i); i.ok(); i++)
- i->print();
-#endif
+ for (iter (music_p_list_p_->top(),i); i.ok (); i++)
+ {
+ Musical_req *m = dynamic_cast<Musical_req*> (i.ptr ());
+ if (m && dynamic_cast <Melodic_req *> (m))
+ {
+ Musical_pitch &pit = dynamic_cast <Melodic_req *> (m)->pitch_;
+ pit.to_relative_octave (last);
+ return pit;
+ }
+ }
+ return last;
}
-IMPLEMENT_IS_TYPE_B1(Request_chord, Chord);
-
-Request_chord::Request_chord()
+Music_list::Music_list ()
+ : Pointer_list<Music*> ()
{
- multi_level_i_ =0;
}