release: 0.1.9

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

diff --git a/lily/music-list.cc b/lily/music-list.cc
index 9008ddc27a4d0353510a3c542516a7885de26010..ad10bce46e277864fad7bb445557610a3d89543d 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -7,20 +7,19 @@
 */
 
 
+#include <limits.h>
 #include "music.hh"
 #include "debug.hh"
 #include "music-list.hh"
 
-Music_list::Music_list(Music_list const&s)
+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());
+  multi_level_i_ = s.multi_level_i_;   
+  for (iter (s.music_p_list_.top(), i); i.ok (); i++)
+       add (i->clone());
 }
 
-IMPLEMENT_STATIC_NAME(Music_list);
-IMPLEMENT_STATIC_NAME(Chord);
-IMPLEMENT_STATIC_NAME(Voice);
 IMPLEMENT_IS_TYPE_B1(Music_list, Music);
 IMPLEMENT_IS_TYPE_B1(Voice,Music_list);
 IMPLEMENT_IS_TYPE_B1(Chord,Music_list);
@@ -28,16 +27,18 @@ IMPLEMENT_IS_TYPE_B1(Chord,Music_list);
 MInterval
 Chord::time_int()const
 {
-    MInterval m;
-    for (iter(music_p_list_.top(), i); i.ok(); i++)
-       m.unite(i->time_int());
-    return m;
+  MInterval m;
+  for (iter (music_p_list_.top(), i); i.ok (); i++)
+       m.unite (i->time_int());
+
+  return m;
 }
+
 void
-Chord::translate(Moment m)
+Chord::translate (Moment m)
 {
-    for (iter(music_p_list_.top(), i); i.ok(); i++)
-       i->translate(m); 
+  for (iter (music_p_list_.top(), i); i.ok (); i++)
+       i->translate (m); 
 }
 
 Chord::Chord()
@@ -47,60 +48,68 @@ Chord::Chord()
 
 Voice::Voice()
 {
-    offset_mom_ =0;
+  offset_mom_ =0;
 }
 
 MInterval
 Voice::time_int() const
 {
-    Moment last=0;
-    for (iter(music_p_list_.top(), i); i.ok(); i++)
-       last += i->time_int().length();
-    return  offset_mom_ + MInterval(0,last);
+  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);
 }
 
 void
-Voice::translate(Moment dt)
+Voice::translate (Moment dt)
 {
-    offset_mom_ += dt;
+  offset_mom_ += dt;
 }
 
 
 Music_list::Music_list()
 {
-    multi_level_i_ = 0;
+  multi_level_i_ = 0;
 }
 
 void
-Music_list::add(Music*m_p)
+Music_list::add (Music*m_p)
 {
-    if (!m_p)
+  if (!m_p)
        return;
 
-    m_p->parent_music_l_ = this;
-    music_p_list_.bottom().add(m_p);
+  m_p->parent_music_l_ = this;
+  music_p_list_.bottom().add (m_p);
 }
 
 void
-Music_list::transpose(Melodic_req const*rq)
+Music_list::transpose (Melodic_req const*rq)
 {
-    for (iter(music_p_list_.top(),i); i.ok(); i++)
-       i->transpose(rq);    
+  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++)
+  for (iter (music_p_list_.top(),i); i.ok (); i++)
        i->print();
 #endif 
 }
 
-IMPLEMENT_IS_TYPE_B1(Voice_element, Chord);
-IMPLEMENT_STATIC_NAME(Voice_element);
+IMPLEMENT_IS_TYPE_B1(Request_chord, Chord);
+
 
-Voice_element::Voice_element()
+Request_chord::Request_chord()
 {
-    multi_level_i_ =0;
+  multi_level_i_ =0;
 }