X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental-engraver.cc;h=003b37ff318f56f11638bb099ffbfffe76efb7fc;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=1be735b0ed2dab1d7478370fb38d2daa59bf4be9;hpb=720bdb29cfac44d9469a54d44bb002e1ccab15f9;p=lilypond.git diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 1be735b0ed..003b37ff31 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -103,7 +103,8 @@ public: in grobs should always store ly_deep_copy ()s of those. */ -Accidental_engraver::Accidental_engraver () +Accidental_engraver::Accidental_engraver (Context *c) + : Engraver (c) { accidental_placement_ = 0; last_keysig_ = SCM_EOL; @@ -314,7 +315,7 @@ Accidental_engraver::make_standard_accidental (Stream_event * /* note */, */ for (vsize i = 0; i < left_objects_.size (); i++) { - if (scm_is_eq (left_objects_[i]->get_property ("side-axis"), scm_from_int (X_AXIS))) + if (ly_is_equal (left_objects_[i]->get_property ("side-axis"), scm_from_int (X_AXIS))) Side_position_interface::add_support (left_objects_[i], a); } @@ -507,7 +508,7 @@ void Accidental_engraver::process_music () { SCM sig = get_property ("keyAlterations"); - if (last_keysig_ != sig) + if (!scm_is_eq (last_keysig_, sig)) update_local_key_signature (sig); }