X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Faccidental-engraver.cc;h=68ea213eb102d66efb30c6aa1c69f7f15571d1ed;hb=f390b03c03489ad550469328fcd50c4490121216;hp=fd26acd16c1c3251243f829c828878f586ade08d;hpb=7ea5c74058200ace4b405de82e1088560aeaacb2;p=lilypond.git diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index fd26acd16c..68ea213eb1 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -2,7 +2,7 @@ accidental-engraver.cc -- implement accidental_engraver (c) 1997--2003 Han-Wen Nienhuys - Modified 2001-2002 by Rune Zedeler + Modified 2001--2002 by Rune Zedeler */ #include "event.hh" @@ -134,7 +134,7 @@ number_accidentals (SCM sig, Music * note, Pitch *pitch, SCM curbarnum, SCM lazy if (ignore_octave_b) prev = ly_assoc_cdr (scm_int2num (n), sig); else - prev = gh_assoc (gh_cons (scm_int2num (o), scm_int2num (n)), sig); + prev = scm_assoc (gh_cons (scm_int2num (o), scm_int2num (n)), sig); /* should really be true unless prev == SCM_BOOL_F */ if (gh_pair_p (prev) && gh_pair_p (ly_cdr (prev))) @@ -146,7 +146,7 @@ number_accidentals (SCM sig, Music * note, Pitch *pitch, SCM curbarnum, SCM lazy /* If an accidental was not found or the accidental was too old */ if (prev == SCM_BOOL_F || (gh_number_p (lazyness) && curbarnum_i > accbarnum_i + gh_scm2int (lazyness))) - prev = gh_assoc (scm_int2num (n), sig); + prev = scm_assoc (scm_int2num (n), sig); SCM prev_acc = (prev == SCM_BOOL_F) ? scm_int2num (0) : ly_cdr (prev);