diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2004-04-12 14:35:20 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2004-04-12 14:35:20 +0000 |
| commit | 08da6e274ea516076699e8e9bbdd48e5919cb526 (patch) | |
| tree | e2569e56d264e9bf14689083439169cc16cb5c4d /lily/ambitus.cc | |
| parent | e7020dbb36a9e9c10bda48e5197213e8a3bacef6 (diff) | |
* lily/include/lily-guile.hh: is_x -> ly_c_X_p naming.
* lily/include/context.hh (class Context): make members protected.
(children_contexts): new accessor function.
* lily/include/context.hh (class Context): make daddy_context_
private.
* lily/lyric-engraver.cc (get_voice_to_lyrics): recursively go
higher for finding Voice. (backportme)
* lily/include/context.hh (class Context): remove
find_context_below() as a method.
Diffstat (limited to 'lily/ambitus.cc')
| -rw-r--r-- | lily/ambitus.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lily/ambitus.cc b/lily/ambitus.cc index 30c1a9f281..eb586b3a8f 100644 --- a/lily/ambitus.cc +++ b/lily/ambitus.cc @@ -100,7 +100,7 @@ number_accidentals (SCM key_signature, Pitch *pitch, prev = scm_assoc (scm_int2num (notename), key_signature); SCM prev_acc = (prev == SCM_BOOL_F) ? scm_int2num (0) : ly_cdr (prev); - int sig_alteration = is_number (prev_acc) ? ly_scm2int (prev_acc) : 0; + int sig_alteration = ly_c_number_p (prev_acc) ? ly_scm2int (prev_acc) : 0; if (alteration == sig_alteration) // no accidental at all needed return 0; @@ -195,7 +195,7 @@ Ambitus::print (SCM smob) } SCM c0 = me->get_property ("c0-position"); - if (is_number (c0)) + if (ly_c_number_p (c0)) { p_min += ly_scm2int (c0); p_max += ly_scm2int (c0); |