diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2004-09-24 16:59:35 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2004-09-24 16:59:35 +0000 |
| commit | 1e1fa5221ca359326b073626168c6b7cda6453e1 (patch) | |
| tree | a7cfe74eb80f49fea80e38aed6d1dcd539cc13f4 /lily/time-signature.cc | |
| parent | 6e5ead91bf47b6e8b58304db26181355127af63c (diff) | |
* lily/parser.yy (Music_list): add error-found to music with errors.
* lily/lily-parser.cc (LY_DEFINE): ignore scores with errors.
* lily/book.cc (process): ignore books with errors
* lily/drum-note-engraver.cc (try_music): idem.
* lily/part-combine-iterator.cc (Part_combine_iterator): use
BusyPlayingEvent to determine which voice was active last.
(unisono): use last active to where to get unisono information
from. This fixes: partcombine-rest.ly (again).
Diffstat (limited to 'lily/time-signature.cc')
| -rw-r--r-- | lily/time-signature.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 66a57b54a8..40976eb311 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -34,10 +34,10 @@ Time_signature::print (SCM smob) SCM frac = me->get_property ("fraction"); int n = 4; int d = 4; - if (ly_c_pair_p (frac)) + if (scm_is_pair (frac)) { - n = scm_to_int (ly_car (frac)); - d = scm_to_int (ly_cdr (frac)); + n = scm_to_int (scm_car (frac)); + d = scm_to_int (scm_cdr (frac)); } Stencil m; |