From 81bd87dca96e2b3e1c3d954a3f1639341aeddfe9 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:43:08 +0000 Subject: [PATCH] lilypond-0.0.63 --- lib/duration.cc | 7 +++++++ lib/include/duration.hh | 1 + lily/parser.y | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/duration.cc b/lib/duration.cc index 64902fa73c..8c08c12802 100644 --- 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 c07dcefc60..c8554f343a 100644 --- 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 d92c970123..0eb8d01968 100644 --- 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; -- 2.39.5