lilypond-0.1.7

diff --git a/lib/duration.cc b/lib/duration.cc
index 8c08c128023e1325dd422f38b71b790d680a8ff7..fab55e756c9a10e786667dc476068517c7b444fa 100644 (file)
--- a/lib/duration.cc
+++ b/lib/duration.cc
@@ -3,9 +3,8 @@
 
   source file of the LilyPond music typesetter
 
-  copyright 1997 Jan Nieuwenhuizen <jan@digicash.com>
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+           Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 #include "proto.hh"
@@ -21,12 +20,10 @@
 int Duration::division_1_i_s = 384 * 4;
 
 
-Duration::Duration( int type_i, int dots_i = 0)
+Duration::Duration()
 {
-// this breaks mi2mu quite effectively
-//    assert(duration_type_b(type_i));
-       type_i_ = type_i;
-       dots_i_ = dots_i;
+       type_i_ = 1;
+       dots_i_ = 0;
        ticks_i_ = 0;
 }
 
@@ -85,12 +82,6 @@ Plet::Plet()
     iso_i_ = 1;
 }
 
-Plet::Plet( int iso_i, int type_i )
-{
-       iso_i_ = iso_i;
-       type_i_ = type_i;
-}
-
 Moment
 Plet::mom()const
 {

diff --git a/lily/music-list.cc b/lily/music-list.cc
index bd1cef64d8f9d8357d1ef76c0e19d6135181609f..97f5a8a9e7b2ce4e3bfab79311c792fb96ae6ec6 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -30,6 +30,7 @@ Chord::time_int()const
     MInterval m;
     for (iter(music_p_list_.top(), i); i.ok(); i++)
        m.unite(i->time_int());
+
     return m;
 }
 
@@ -54,8 +55,15 @@ MInterval
 Voice::time_int() const
 {
     Moment last=0;
-    for (iter(music_p_list_.top(), i); i.ok(); i++)
-       last += i->time_int().length();
+    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);
 }