X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=e9bcbe94d5ffdb3f53bd5b9da14a749e7f067dbb;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=a2562b785a1151b90adb4a68e7de4356e68a0a6b;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc index a2562b785a..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; @@ -103,7 +104,7 @@ Ottava_spanner_engraver::typeset_all () { if (!finished_->get_bound (RIGHT)) { - Grob *e = Grob::unsmob (get_property ("currentMusicalColumn")); + Grob *e = unsmob (get_property ("currentMusicalColumn")); finished_->set_bound (d, e); } } @@ -117,7 +118,7 @@ Ottava_spanner_engraver::stop_translation_timestep () { if (span_ && !span_->get_bound (LEFT)) { - Grob *e = Grob::unsmob (get_property ("currentMusicalColumn")); + Grob *e = unsmob (get_property ("currentMusicalColumn")); span_->set_bound (LEFT, e); } @@ -136,7 +137,12 @@ Ottava_spanner_engraver::finalize () #include "translator.icc" -ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column); + +void +Ottava_spanner_engraver::boot () +{ + ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column); +} ADD_TRANSLATOR (Ottava_spanner_engraver, /* doc */