lilypond-0.0.63

diff --git a/lib/duration.cc b/lib/duration.cc
index 64902fa73ce9e11b3216d967c635f175d6a8496d..8c08c128023e1325dd422f38b71b790d680a8ff7 100644 (file)
--- a/lib/duration.cc
+++ b/lib/duration.cc
@@ -58,6 +58,13 @@ Duration::set_plet(int i, int t)
     plet_.type_i_ = t;
 }
 
+void
+Duration::set_plet(Duration d)
+{
+    plet_.iso_i_ = d.plet_.iso_i_; 
+    plet_.type_i_ = d.plet_.type_i_;
+}
+
 void
 Duration::set_ticks( int ticks_i )
 {

diff --git a/lib/include/duration.hh b/lib/include/duration.hh
index c07dcefc6068eb728af76bff3b6231db1a6a2e6f..c8554f343a3b0620fb42b4359c6833a47fde765d 100644 (file)
--- a/lib/include/duration.hh
+++ b/lib/include/duration.hh
@@ -44,6 +44,7 @@ struct Duration {
     bool plet_b();
     String str()const;
     void set_plet(int,int );
+    void set_plet(Duration );
     static bool duration_type_b(int t);
     void set_ticks( int ticks_i );
     Moment length() const ;    // zo naai mij

diff --git a/lily/parser.y b/lily/parser.y
index d92c97012334f4367fa9798e9a646c49fdb903c1..0eb8d019688baaf3bc42805162b69fdab502d35b 100644 (file)
--- a/lily/parser.y
+++ b/lily/parser.y
@@ -969,8 +969,10 @@ explicit_duration:
                $$ = new Duration;
                if ( !Duration::duration_type_b($1) )
                        THIS->parser_error("Not a duration");
-               else 
+               else {
                        $$->type_i_ = $1;
+                       $$->set_plet(THIS->default_duration_);
+                    }
        }
        | explicit_duration DOTS        {
                $$->dots_i_ = $2;