From a0b072ed070ca6abb36a11e015073b117103e35d Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 19 Jun 2002 19:06:33 +0000 Subject: [PATCH] * lily/engraver-group-engraver.cc (do_announces): rename create_grobs () to process_acknowledged_grobs(). * lily/engraver-group-engraver.cc (do_announces): scary change in calling convention of create_grobs(): no create_grobs() call before acknowledge_grobs(). --- ChangeLog | 3 +++ input/regression/mm-rests2.ly | 2 +- lily/a2-engraver.cc | 4 ++-- lily/accidental-engraver.cc | 4 ++-- lily/auto-beam-engraver.cc | 4 ++-- lily/axis-group-engraver.cc | 4 ++-- lily/bar-engraver.cc | 13 ++++++++++--- lily/breathing-sign-engraver.cc | 4 ++-- lily/chord-name-engraver.cc | 4 ++-- lily/collision-engraver.cc | 4 ++-- lily/custos-engraver.cc | 4 ++-- lily/engraver-group-engraver.cc | 11 ++++++----- lily/hyphen-engraver.cc | 4 ++-- lily/include/engraver-group-engraver.hh | 2 +- lily/include/engraver.hh | 2 +- lily/include/lyric-phrasing-engraver.hh | 2 +- lily/lyric-engraver.cc | 4 ++-- lily/lyric-phrasing-engraver.cc | 2 +- lily/note-head-line-engraver.cc | 4 ++-- lily/note-name-engraver.cc | 4 ++-- lily/phrasing-slur-engraver.cc | 4 ++-- lily/piano-pedal-engraver.cc | 4 ++-- lily/porrectus-engraver.cc | 4 ++-- lily/rest-collision-engraver.cc | 4 ++-- lily/rhythmic-column-engraver.cc | 4 ++-- lily/script-column-engraver.cc | 4 ++-- lily/slur-engraver.cc | 4 ++-- lily/span-arpeggio-engraver.cc | 4 ++-- lily/text-engraver.cc | 4 ++-- lily/text-spanner-engraver.cc | 4 ++-- lily/tie-engraver.cc | 4 ++-- lily/tuplet-engraver.cc | 4 ++-- lily/volta-engraver.cc | 4 ++-- 33 files changed, 74 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bd0c65d24..0ae10583e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2002-06-19 Han-Wen Nienhuys + * lily/engraver-group-engraver.cc (do_announces): rename + create_grobs () to process_acknowledged_grobs(). + * lily/grob.cc (programming_error): add programming_error with origin location. diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly index 372f8e1552..b82ab01918 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -23,7 +23,7 @@ R1*7 | R1*8 | R1*9 | R1*10 | -R1*11 | +R1*11 | } \score { < \context Staff \thenotes diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc index 51d1183ec1..027f4342f1 100644 --- a/lily/a2-engraver.cc +++ b/lily/a2-engraver.cc @@ -23,7 +23,7 @@ class A2_engraver : public Engraver protected: virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); private: Item* text_p_; @@ -39,7 +39,7 @@ A2_engraver::A2_engraver () } void -A2_engraver::create_grobs () +A2_engraver::process_acknowledged_grobs () { if (!to_boolean (get_property ("combineParts"))) return ; diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 1670ba2fa9..5ed5ef9e43 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -55,7 +55,7 @@ protected: virtual void acknowledge_grob (Grob_info); virtual void stop_translation_timestep (); virtual void initialize (); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void finalize (); public: @@ -222,7 +222,7 @@ number_accidentals (Note_req * note_l, Pitch *pitch, Translator_group * origin_l } void -Accidental_engraver::create_grobs () +Accidental_engraver::process_acknowledged_grobs () { if (accidental_arr_.size () && !accidental_arr_.top().done_) { diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 5126db27db..dded92c4e1 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -32,7 +32,7 @@ protected: virtual void start_translation_timestep (); virtual void finalize (); virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); private: bool test_moment (Direction, Moment); @@ -442,7 +442,7 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info) } void -Auto_beam_engraver::create_grobs () +Auto_beam_engraver::process_acknowledged_grobs () { if (!count_i_) { diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 91a581a860..563db5c28c 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -24,7 +24,7 @@ protected: virtual void initialize (); virtual void finalize (); virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual Spanner* get_spanner_p () const; virtual void add_element (Grob*) ; public: @@ -99,7 +99,7 @@ Axis_group_engraver::acknowledge_grob (Grob_info i) cyclic parent relationship if we have two Axis_group_engravers in the context. */ void -Axis_group_engraver::create_grobs () +Axis_group_engraver::process_acknowledged_grobs () { /* UGH UGH UGH */ for (int i=0; i < elts_.size (); i++) diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 864caaa827..71d918dfb2 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -28,7 +28,7 @@ public: protected: virtual void finalize (); virtual void stop_translation_timestep (); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); private: void typeset_bar (); @@ -48,7 +48,6 @@ Bar_engraver::create_bar () if (!bar_p_) { bar_p_ = new Item (get_property ("BarLine")); - SCM gl = get_property ("whichBar"); if (scm_equal_p (gl, bar_p_->get_grob_property ("glyph")) != SCM_BOOL_T) bar_p_->set_grob_property ("glyph", gl); @@ -66,9 +65,17 @@ Bar_engraver::finalize () /* Bar_engraver should come *after* any engravers that modify whichBar + + This is a little hairy : whichBar may be set by + Repeat_acknowledge_engraver::process_music, which is at score + context. This means that grobs could should be created after + process_music. We do stuff process_acknowledged_grobs(), just to be + on the safe side. + */ + void -Bar_engraver::create_grobs () +Bar_engraver::process_acknowledged_grobs () { if (!bar_p_ && gh_string_p (get_property ("whichBar"))) { diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc index 18a7491bb1..0ba27cc05d 100644 --- a/lily/breathing-sign-engraver.cc +++ b/lily/breathing-sign-engraver.cc @@ -28,7 +28,7 @@ public: protected: virtual bool try_music (Music *req_l); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); @@ -56,7 +56,7 @@ Breathing_sign_engraver::try_music (Music*r_l) } void -Breathing_sign_engraver::create_grobs () +Breathing_sign_engraver::process_acknowledged_grobs () { if (breathing_sign_req_l_ && ! breathing_sign_p_) { diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 4064e85a52..5ecf45194e 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -27,7 +27,7 @@ class Chord_name_engraver : public Engraver protected: virtual void stop_translation_timestep (); virtual void acknowledge_grob (Grob_info i); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual bool try_music (Music *); private: @@ -85,7 +85,7 @@ Chord_name_engraver::acknowledge_grob (Grob_info i) } void -Chord_name_engraver::create_grobs () +Chord_name_engraver::process_acknowledged_grobs () { if (!chord_name_p_ && ly_car (chord_) != SCM_EOL) { diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index 8e8c0f4fa0..0841c72fb5 100644 --- a/lily/collision-engraver.cc +++ b/lily/collision-engraver.cc @@ -21,7 +21,7 @@ class Collision_engraver : public Engraver { protected: virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); public: TRANSLATOR_DECLARATIONS(Collision_engraver); @@ -29,7 +29,7 @@ public: void -Collision_engraver::create_grobs () +Collision_engraver::process_acknowledged_grobs () { if (col_p_ || note_column_l_arr_.size () < 2) return ; diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc index aa999d8c6e..4e9d281743 100644 --- a/lily/custos-engraver.cc +++ b/lily/custos-engraver.cc @@ -26,7 +26,7 @@ public: TRANSLATOR_DECLARATIONS( Custos_engraver); virtual void start_translation_timestep (); virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); virtual void finalize (); @@ -93,7 +93,7 @@ Custos_engraver::acknowledge_grob (Grob_info info) } void -Custos_engraver::create_grobs () +Custos_engraver::process_acknowledged_grobs () { if (gh_string_p (get_property ("whichBar"))) custos_permitted = true; diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc index 518d277d59..49b490ea63 100644 --- a/lily/engraver-group-engraver.cc +++ b/lily/engraver-group-engraver.cc @@ -22,14 +22,14 @@ Engraver_group_engraver::announce_grob (Grob_info info) void -Engraver_group_engraver::create_grobs_in_simple_children () +Engraver_group_engraver::process_acknowledged_grobs_in_simple_children () { for (SCM p = simple_trans_list_; gh_pair_p (p); p = ly_cdr (p)) { Translator * t = unsmob_translator (ly_car (p)); Engraver * eng = dynamic_cast (t); if (eng) - eng->create_grobs (); + eng->process_acknowledged_grobs (); } } @@ -125,14 +125,15 @@ Engraver_group_engraver::do_announces () dynamic_cast (t)->do_announces (); } - // create_grobs_in_simple_children (); + process_acknowledged_grobs_in_simple_children (); - while (announce_info_arr_.size ()) + do { acknowledge_grobs (); announce_info_arr_.clear (); - create_grobs_in_simple_children (); + process_acknowledged_grobs_in_simple_children (); } + while (announce_info_arr_.size ()); } diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc index b8eabfe33d..0ab7aa9591 100644 --- a/lily/hyphen-engraver.cc +++ b/lily/hyphen-engraver.cc @@ -35,7 +35,7 @@ protected: virtual bool try_music (Music*); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); private: }; @@ -92,7 +92,7 @@ Hyphen_engraver::finalize () } void -Hyphen_engraver::create_grobs () +Hyphen_engraver::process_acknowledged_grobs () { if (req_l_ &&! hyphen_p_) { diff --git a/lily/include/engraver-group-engraver.hh b/lily/include/engraver-group-engraver.hh index 33d766d7ea..ab0f38543c 100644 --- a/lily/include/engraver-group-engraver.hh +++ b/lily/include/engraver-group-engraver.hh @@ -39,7 +39,7 @@ public: virtual void process_music (); private: virtual void acknowledge_grobs (); - virtual void create_grobs_in_simple_children (); + virtual void process_acknowledged_grobs_in_simple_children (); }; #endif // ENGRAVERGROUP_HH diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh index a4b2f73a46..9f85a293eb 100644 --- a/lily/include/engraver.hh +++ b/lily/include/engraver.hh @@ -41,7 +41,7 @@ protected: be looped with acknowledge_grob. */ - virtual void create_grobs () {} + virtual void process_acknowledged_grobs () {} /** Announce element. Default: pass on to daddy. Utility */ diff --git a/lily/include/lyric-phrasing-engraver.hh b/lily/include/lyric-phrasing-engraver.hh index ef0db36a91..db170135bf 100644 --- a/lily/include/lyric-phrasing-engraver.hh +++ b/lily/include/lyric-phrasing-engraver.hh @@ -64,7 +64,7 @@ class Lyric_phrasing_engraver : public Engraver { protected: virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); virtual void finalize (); private: diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 279fc1f141..dca8de3e89 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -23,7 +23,7 @@ class Lyric_engraver : public Engraver protected: virtual void stop_translation_timestep (); virtual bool try_music (Music *); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void start_translation_timestep (); public: @@ -56,7 +56,7 @@ Lyric_engraver::try_music (Music*r) } void -Lyric_engraver::create_grobs () +Lyric_engraver::process_acknowledged_grobs () { if (req_l_) { diff --git a/lily/lyric-phrasing-engraver.cc b/lily/lyric-phrasing-engraver.cc index 23b8fd4cdc..9966d3362e 100644 --- a/lily/lyric-phrasing-engraver.cc +++ b/lily/lyric-phrasing-engraver.cc @@ -272,7 +272,7 @@ trim_suffix (String &id) void -Lyric_phrasing_engraver::create_grobs () +Lyric_phrasing_engraver::process_acknowledged_grobs () { SCM p = get_property ("automaticPhrasing"); if (!to_boolean (p)) diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc index c8533b8e48..a0c78b518e 100644 --- a/lily/note-head-line-engraver.cc +++ b/lily/note-head-line-engraver.cc @@ -33,7 +33,7 @@ public: protected: virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); virtual bool try_music (Music *); @@ -96,7 +96,7 @@ Note_head_line_engraver::acknowledge_grob (Grob_info info) void -Note_head_line_engraver::create_grobs () +Note_head_line_engraver::process_acknowledged_grobs () { if (!line_ && (follow_ || last_req_) && last_head_ && head_ && (last_head_ != head_)) diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index 90eb585df2..c5c2849a09 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -19,7 +19,7 @@ public: Link_array req_l_arr_; Link_array texts_; virtual bool try_music (Music*m); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); }; @@ -35,7 +35,7 @@ Note_name_engraver::try_music (Music *m) } void -Note_name_engraver::create_grobs () +Note_name_engraver::process_acknowledged_grobs () { if (texts_.size ()) return; diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index dc4b7d624b..e93107c962 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -26,7 +26,7 @@ protected: virtual void stop_translation_timestep (); virtual void start_translation_timestep (); virtual void finalize (); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); public: TRANSLATOR_DECLARATIONS(Phrasing_slur_engraver); @@ -119,7 +119,7 @@ Phrasing_slur_engraver::finalize () } void -Phrasing_slur_engraver::create_grobs () +Phrasing_slur_engraver::process_acknowledged_grobs () { Link_array start_phrasing_slur_l_arr; for (int i=0; i< new_phrasing_slur_req_l_arr_.size (); i++) diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index f754b7481d..113ce60982 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -52,7 +52,7 @@ protected: virtual void stop_translation_timestep (); virtual void start_translation_timestep (); virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); private: @@ -175,7 +175,7 @@ Piano_pedal_engraver::try_music (Music *m) } void -Piano_pedal_engraver::create_grobs () +Piano_pedal_engraver::process_acknowledged_grobs () { for (Pedal_info*p = info_list_; p && p->name_; p ++) { diff --git a/lily/porrectus-engraver.cc b/lily/porrectus-engraver.cc index e900701dbf..3219ebe0be 100644 --- a/lily/porrectus-engraver.cc +++ b/lily/porrectus-engraver.cc @@ -48,7 +48,7 @@ public: protected: virtual bool try_music (Music *req_l); virtual void process_music (); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); virtual void acknowledge_grob (Grob_info); @@ -102,7 +102,7 @@ Porrectus_engraver::acknowledge_grob (Grob_info info_l_) } void -Porrectus_engraver::create_grobs () +Porrectus_engraver::process_acknowledged_grobs () { if (porrectus_req_l_) { diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc index de2985c37c..a1d4d7f0bb 100644 --- a/lily/rest-collision-engraver.cc +++ b/lily/rest-collision-engraver.cc @@ -19,7 +19,7 @@ class Rest_collision_engraver : public Engraver Link_array note_column_l_arr_; protected: virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); public: TRANSLATOR_DECLARATIONS(Rest_collision_engraver); @@ -33,7 +33,7 @@ Rest_collision_engraver::Rest_collision_engraver () } void -Rest_collision_engraver::create_grobs () +Rest_collision_engraver::process_acknowledged_grobs () { if (rest_collision_p_ || note_column_l_arr_.size () < 2) return; diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 80e483dfc6..bb62742443 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -59,7 +59,7 @@ class Rhythmic_column_engraver :public Engraver protected: virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); }; @@ -78,7 +78,7 @@ Rhythmic_column_engraver::Rhythmic_column_engraver () void -Rhythmic_column_engraver::create_grobs () +Rhythmic_column_engraver::process_acknowledged_grobs () { if (rhead_l_arr_.size ()) { diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc index 50cbee9c91..58aa49bcce 100644 --- a/lily/script-column-engraver.cc +++ b/lily/script-column-engraver.cc @@ -24,7 +24,7 @@ public: TRANSLATOR_DECLARATIONS(Script_column_engraver); protected: virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); }; @@ -67,7 +67,7 @@ Script_column_engraver::acknowledge_grob (Grob_info inf) } void -Script_column_engraver::create_grobs () +Script_column_engraver::process_acknowledged_grobs () { if (!scol_p_ && script_l_arr_.size () > 1) { diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 806f5918e0..135082e808 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -28,7 +28,7 @@ protected: virtual void stop_translation_timestep (); virtual void start_translation_timestep (); virtual void finalize (); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); public: TRANSLATOR_DECLARATIONS(Slur_engraver); @@ -126,7 +126,7 @@ Slur_engraver::finalize () } void -Slur_engraver::create_grobs () +Slur_engraver::process_acknowledged_grobs () { Link_array start_slur_l_arr; for (int i=0; i< new_slur_req_l_arr_.size (); i++) diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index 4fd4f1a68e..3797b2efa9 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -26,7 +26,7 @@ public: protected: virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); private: @@ -51,7 +51,7 @@ Span_arpeggio_engraver::acknowledge_grob (Grob_info info) } void -Span_arpeggio_engraver::create_grobs () +Span_arpeggio_engraver::process_acknowledged_grobs () { /* connectArpeggios is slightly brusque; we should really read a elt diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 39b0a973ff..308df0ee55 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -29,7 +29,7 @@ protected: virtual bool try_music (Music* m); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void acknowledge_grob (Grob_info); }; @@ -78,7 +78,7 @@ Text_engraver::acknowledge_grob (Grob_info inf) } void -Text_engraver::create_grobs () +Text_engraver::process_acknowledged_grobs () { if (texts_.size ()) return; diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index f8c520b1cb..ac3f08c7ba 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -29,7 +29,7 @@ protected: virtual bool try_music (Music *); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); private: Spanner *span_; @@ -82,7 +82,7 @@ Text_spanner_engraver::try_music (Music *m) } void -Text_spanner_engraver::create_grobs () +Text_spanner_engraver::process_acknowledged_grobs () { if (req_drul_[STOP]) { diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 16abacdeec..72cb2e06d4 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -47,7 +47,7 @@ protected: virtual void stop_translation_timestep (); virtual void acknowledge_grob (Grob_info); virtual bool try_music (Music*); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); void typeset_tie (Grob*); public: TRANSLATOR_DECLARATIONS(Tie_engraver); @@ -108,7 +108,7 @@ head_pitch_compare (Grob *const&a,Grob *const&b) } void -Tie_engraver::create_grobs () +Tie_engraver::process_acknowledged_grobs () { if (req_l_) { diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 8ace269d13..e0ba3e4d2a 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -36,7 +36,7 @@ protected: virtual void acknowledge_grob (Grob_info); virtual bool try_music (Music*r); virtual void start_translation_timestep (); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); }; bool @@ -63,7 +63,7 @@ Tuplet_engraver::try_music (Music *r) } void -Tuplet_engraver::create_grobs () +Tuplet_engraver::process_acknowledged_grobs () { SCM v = get_property ("tupletInvisible"); if (to_boolean (v)) diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index 6203c86b0a..acf55f371e 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -31,7 +31,7 @@ protected: virtual void finalize (); virtual void stop_translation_timestep (); virtual void process_music (); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); Moment started_mom_; Spanner *volta_span_p_; @@ -133,7 +133,7 @@ Volta_engraver::process_music () this could just as well be done in process_music (), but what the hack. */ void -Volta_engraver::create_grobs () +Volta_engraver::process_acknowledged_grobs () { if (!volta_span_p_ && gh_string_p (start_str_)) { -- 2.39.5