X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=e9bcbe94d5ffdb3f53bd5b9da14a749e7f067dbb;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=79d054a7cccf09abb3eee81846b1bdd051180d2a;hpb=dbaf1e56e37be0e204231c5bf1adcb14bd8ac3b8;p=lilypond.git diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc index 79d054a7cc..e9bcbe94d5 100644 --- a/lily/ottava-engraver.cc +++ b/lily/ottava-engraver.cc @@ -32,7 +32,7 @@ public: protected: virtual void finalize (); - DECLARE_ACKNOWLEDGER (note_column); + void acknowledge_note_column (Grob_info); void process_music (); void stop_translation_timestep (); @@ -52,7 +52,8 @@ Ottava_spanner_engraver::derived_mark () const scm_gc_mark (last_ottavation_); } -Ottava_spanner_engraver::Ottava_spanner_engraver () +Ottava_spanner_engraver::Ottava_spanner_engraver (Context *c) + : Engraver (c) { finished_ = 0; span_ = 0; @@ -63,7 +64,7 @@ void Ottava_spanner_engraver::process_music () { SCM ott = get_property ("ottavation"); - if (ott != last_ottavation_) + if (!scm_is_eq (ott, last_ottavation_)) { finished_ = span_; span_ = 0;