release: 1.3.107

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

diff --git a/lily/music-list.cc b/lily/music-list.cc
index 5642127ff3995773a2e5491878481154a27a0484..1a1847783e67b73972fc82eaf3ede47c37db9030 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -1,162 +1,76 @@
 /*
-  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--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
-#include <limits.h>
-#include "music.hh"
-#include "debug.hh"
 #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"
+#include "simultaneous-music-iterator.hh"
+#include "sequential-music-iterator.hh"
+#include "request-chord-iterator.hh"
 
-Music_list::Music_list (Music_list const&s)
-  : Music (s)
+Moment
+Simultaneous_music::length_mom () const
 {
-  multi_level_i_ = s.multi_level_i_;   
-  for (iter (s.music_p_list_.top(), i); i.ok (); i++)
-    add (i->clone());
+  return maximum_length ();
 }
 
-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
+Simultaneous_music::Simultaneous_music(SCM head)
+  : Music_sequence (head)
 {
-  MInterval m;
-  for (iter (music_p_list_.top(), i); i.ok (); i++)
-    m.unite (i->time_int());
-
-  return m;
+  set_mus_property ("type",
+                   Simultaneous_music_iterator::constructor_cxx_function);
 }
 
-void
-Chord::translate (Moment m)
+Sequential_music::Sequential_music(SCM head)
+  : Music_sequence (head)
 {
-  for (iter (music_p_list_.top(), i); i.ok (); i++)
-    i->translate (m); 
+  set_mus_property ("type",
+                   Sequential_music_iterator::constructor_cxx_function);
 }
 
-Chord::Chord()
-{
-
-}
 
-Voice::Voice()
+Moment
+Sequential_music::length_mom () const
 {
-  offset_mom_ =0;
-}
-
-MInterval
-Voice::time_int() const
-{
-  Moment last=0;
-  for (iter (music_p_list_.top(), i); i.ok (); i++) 
-    {
-      MInterval interval = i->time_int();
-       
-      /*
-       c4 <> c4
-      */
-      if (!interval.empty_b())
-       last += interval.length();
-    }
-  return  offset_mom_ + MInterval (0,last);
+  return cumulative_length ();
 }
 
 Musical_pitch
-Voice::to_relative_octave (Musical_pitch p)
-{
-  return do_relative_octave (p, false);
-}
-
-Musical_pitch
-Chord::to_relative_octave (Musical_pitch p)
+Simultaneous_music::to_relative_octave (Musical_pitch p)
 {
   return do_relative_octave (p, true);
 }
 
-void
-Voice::translate (Moment dt)
-{
-  offset_mom_ += dt;
-}
-
-
-Music_list::Music_list()
-{
-  multi_level_i_ = 0;
-}
-
-void
-Music_list::add (Music*m_p)
-{
-  if (!m_p)
-    return;
-
-  m_p->parent_music_l_ = this;
-  music_p_list_.bottom().add (m_p);
-}
-
-void
-Music_list::transpose (Musical_pitch rq)
+Request_chord::Request_chord(SCM s)
+  : Simultaneous_music (s)
 {
-  for (iter (music_p_list_.top(),i); i.ok (); i++)
-    i->transpose (rq);    
-}
-
-void
-Music_list::do_print() const
-{
-#ifndef NPRINT
-  for (iter (music_p_list_.top(),i); i.ok (); i++)
-    i->print();
-#endif 
-}
-
-IMPLEMENT_IS_TYPE_B1(Request_chord, Chord);
-
-
-Request_chord::Request_chord()
-{
-  multi_level_i_ =0;
-}
-
-
-Musical_pitch 
-Music_list::do_relative_octave (Musical_pitch last, bool ret_first)
-{
-
-  Musical_pitch retval;
-  int count=0;
-  for (iter (music_p_list_.top(),i); i.ok (); i++)
-    {
-      last = i->to_relative_octave (last);
-      if (!count ++ )
-       retval = last;
-    }
-  if (!ret_first)
-    retval = last;
-  return retval;
+  set_mus_property ("type",
+                   Request_chord_iterator::constructor_cxx_function);
 }
 
 Musical_pitch
 Request_chord::to_relative_octave (Musical_pitch last)
 {
-  for (iter (music_p_list_.top(),i); i.ok (); i++)
+  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
     {
-      Musical_req *m =((Request*)i.ptr ())->access_Musical_req ();
-      if (m && m->access_Melodic_req ())
-       {         
-         Musical_pitch &pit = m->access_Melodic_req ()->pitch_;
+      Music * mus = unsmob_music (gh_car (s));
+      if (Melodic_req *m= dynamic_cast <Melodic_req *> (mus))
+       {
+         Musical_pitch pit = *unsmob_pitch (m->get_mus_property ("pitch"));
+         
          pit.to_relative_octave (last);
+         m->set_mus_property ("pitch", pit.smobbed_copy());
+                 
          return pit;
        }
     }
@@ -164,3 +78,4 @@ Request_chord::to_relative_octave (Musical_pitch last)
 }
 
 
+