From aac9d755e493726942cc3f01ba0672afdae6fc97 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Tue, 14 Jul 2009 14:51:57 -0700 Subject: [PATCH] Laissez_vibrer_engraver: avoid duplicate self_scm () calls - Also, remove trailing whitespace --- lily/laissez-vibrer-engraver.cc | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lily/laissez-vibrer-engraver.cc b/lily/laissez-vibrer-engraver.cc index 762d56d980..0c4c793679 100644 --- a/lily/laissez-vibrer-engraver.cc +++ b/lily/laissez-vibrer-engraver.cc @@ -7,7 +7,6 @@ */ - #include "engraver.hh" #include "item.hh" #include "pointer-group-interface.hh" @@ -20,8 +19,8 @@ class Laissez_vibrer_engraver : public Engraver Stream_event *event_; Grob *lv_column_; vector lv_ties_; - - void stop_translation_timestep (); + + void stop_translation_timestep (); DECLARE_ACKNOWLEDGER (note_head); protected: DECLARE_TRANSLATOR_LISTENER (laissez_vibrer); @@ -56,34 +55,33 @@ Laissez_vibrer_engraver::acknowledge_note_head (Grob_info inf) if (!event_) return; + SCM cause = event_->self_scm (); + if (!lv_column_) - { - lv_column_ = make_item ("LaissezVibrerTieColumn", event_->self_scm ()); - } + lv_column_ = make_item ("LaissezVibrerTieColumn", cause); - SCM cause = event_->self_scm (); Grob *lv_tie = make_item ("LaissezVibrerTie", cause); lv_tie->set_object ("note-head", inf.grob ()->self_scm ()); - + Pointer_group_interface::add_grob (lv_column_, ly_symbol2scm ("ties"), lv_tie); if (is_direction (unsmob_stream_event (cause)->get_property ("direction"))) { Direction d = to_dir (unsmob_stream_event (cause)->get_property ("direction")); - lv_tie->set_property ("direction", scm_from_int (d)); + lv_tie->set_property ("direction", scm_from_int (d)); } - + lv_tie->set_parent (lv_column_, Y_AXIS); lv_ties_.push_back (lv_tie); } ADD_ACKNOWLEDGER (Laissez_vibrer_engraver, note_head); -ADD_TRANSLATOR (Laissez_vibrer_engraver, +ADD_TRANSLATOR (Laissez_vibrer_engraver, /* doc */ "Create laissez vibrer items.", - + /* create */ "LaissezVibrerTie " "LaissezVibrerTieColumn ", -- 2.39.5