release: 1.3.131

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

diff --git a/lily/music-list.cc b/lily/music-list.cc
index 49520966975a4796b953688357e7b18d2328a539..f11985ca72c366d6e4c01252124601c2fa6e72a7 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -1,106 +1,81 @@
 /*
-  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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
-#include <limits.h>
-#include "music.hh"
-#include "debug.hh"
 #include "music-list.hh"
-
-Music_list::Music_list(Music_list const&s)
-    : Music(s)
-{
-    multi_level_i_ = s.multi_level_i_;   
-    for (iter(s.music_p_list_.top(), i); i.ok(); i++)
-       add(i->clone());
-}
-
-IMPLEMENT_IS_TYPE_B1(Music_list, Music);
-IMPLEMENT_IS_TYPE_B1(Voice,Music_list);
-IMPLEMENT_IS_TYPE_B1(Chord,Music_list);
-
-MInterval
-Chord::time_int()const
-{
-//    MInterval m( -(Real)INT_MAX, (Real)INT_MAX );
-    MInterval m( 0, 0 );
-    for (iter(music_p_list_.top(), i); i.ok(); i++)
-       m.unite(i->time_int());
-    return m;
-}
-void
-Chord::translate(Moment m)
-{
-    for (iter(music_p_list_.top(), i); i.ok(); i++)
-       i->translate(m); 
-}
-
-Chord::Chord()
+#include "music-wrapper.hh"
+#include "pitch.hh"
+#include "request.hh"
+#include "musical-request.hh"
+#include "music-iterator.hh"
+#include "main.hh"
+#include "killing-cons.tcc"
+#include "simultaneous-music-iterator.hh"
+#include "sequential-music-iterator.hh"
+#include "request-chord-iterator.hh"
+
+Moment
+Simultaneous_music::length_mom () const
 {
-
+  return maximum_length ();
 }
 
-Voice::Voice()
+Simultaneous_music::Simultaneous_music(SCM head)
+  : Music_sequence (head)
 {
-    offset_mom_ =0;
+  set_mus_property ("iterator-ctor",
+                   Simultaneous_music_iterator::constructor_cxx_function);
 }
 
-MInterval
-Voice::time_int() const
+Sequential_music::Sequential_music(SCM head)
+  : Music_sequence (head)
 {
-    Moment last=0;
-    for (iter(music_p_list_.top(), i); i.ok(); i++)
-       last += i->time_int().length();
-    return  offset_mom_ + MInterval(0,last);
+  set_mus_property ("iterator-ctor",
+                   Sequential_music_iterator::constructor_cxx_function);
 }
 
-void
-Voice::translate(Moment dt)
-{
-    offset_mom_ += dt;
-}
 
-
-Music_list::Music_list()
+Moment
+Sequential_music::length_mom () const
 {
-    multi_level_i_ = 0;
+  return cumulative_length ();
 }
 
-void
-Music_list::add(Music*m_p)
+Pitch
+Simultaneous_music::to_relative_octave (Pitch p)
 {
-    if (!m_p)
-       return;
-
-    m_p->parent_music_l_ = this;
-    music_p_list_.bottom().add(m_p);
+  return do_relative_octave (p, true);
 }
 
-void
-Music_list::transpose(Melodic_req const*rq)
+Request_chord::Request_chord(SCM s)
+  : Simultaneous_music (s)
 {
-    for (iter(music_p_list_.top(),i); i.ok(); i++)
-       i->transpose(rq);    
+  set_mus_property ("iterator-ctor",
+                   Request_chord_iterator::constructor_cxx_function);
 }
 
-void
-Music_list::do_print()const
+Pitch
+Request_chord::to_relative_octave (Pitch last)
 {
-#ifndef NPRINT
-    for (iter(music_p_list_.top(),i); i.ok(); i++)
-       i->print();
-#endif 
+  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
+    {
+      Music * mus = unsmob_music (gh_car (s));
+      if (Melodic_req *m= dynamic_cast <Melodic_req *> (mus))
+       {
+         Pitch pit = *unsmob_pitch (m->get_mus_property ("pitch"));
+         
+         pit.to_relative_octave (last);
+         m->set_mus_property ("pitch", pit.smobbed_copy());
+                 
+         return pit;
+       }
+    }
+  return last;
 }
 
-IMPLEMENT_IS_TYPE_B1(Request_chord, Chord);
 
 
-Request_chord::Request_chord()
-{
-    multi_level_i_ =0;
-}