%type <book> book_body
%type <i> bare_unsigned
-%type <i> figured_bass_alteration
+%type <scm> figured_bass_alteration
%type <i> dots
%type <i> exclamations
%type <i> optional_rest
;
figured_bass_alteration:
- '-' { $$ = -2; }
- | '+' { $$ = 2; }
- | '!' { $$ = 0; }
+ '-' { $$ = ly_rational2scm (FLAT_ALTERATION); }
+ | '+' { $$ = ly_rational2scm (SHARP_ALTERATION); }
+ | '!' { $$ = scm_from_int (0); }
;
bass_figure:
}
| bass_figure figured_bass_alteration {
Music *m = unsmob_music ($1);
- if ($2) {
+ if (scm_to_double ($2)) {
SCM salter = m->get_property ("alteration");
- int alter = scm_is_number (salter) ? scm_to_int (salter) : 0;
+ SCM alter = scm_is_number (salter) ? salter : scm_from_int (0);
m->set_property ("alteration",
- scm_from_int (alter + $2));
+ scm_sum (alter, $2));
} else {
m->set_property ("alteration", scm_from_int (0));
}
event = musicexp.RestEvent()
elif n.instrument_name:
event = musicexp.NoteEvent ()
- event.drum_type = instrument_drumtype_dict[n.instrument_name]
-
+ try:
+ event.drum_type = instrument_drumtype_dict[n.instrument_name]
+ except KeyError:
+ n.message ("drum %s type unknow, please add to instrument_drumtype_dict" % n.instrument_name)
+ event.drum_type = 'acousticsnare'
if not event:
n.message ("cannot find suitable event")