X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-engraver.cc;h=997ce0689512778ad2d99287679e254a9451bce6;hb=207c3df3b77d5ec25d7db3bbc6ba830d12ee9f85;hp=870d6d44d838cce560ea301d52c9916291431dc5;hpb=91821bd59959b1289f2d711509017a4dacebecd2;p=lilypond.git diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index 870d6d44d8..997ce06895 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -152,7 +152,7 @@ Piano_pedal_engraver::try_music (Music *m) { String nm = p->name_ + String ("Event"); if (ly_is_equal (m->get_property ("name"), - scm_str2symbol (nm.to_str0 ()))) + scm_str2symbol (nm.to_str0 ()))) { Direction d = to_dir (m->get_property ("span-direction")); p->event_drul_[d] = m; @@ -233,13 +233,9 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed) if (!mixed) { if (!p->start_ev_) - { - p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->name_)); - } + p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->name_)); else - { - s = scm_cadr (strings); - } + s = scm_cadr (strings); p->start_ev_ = p->event_drul_[START]; } } @@ -248,13 +244,9 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed) if (!mixed) { if (!p->start_ev_) - { - p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->name_)); - } + p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->name_)); else - { - s = scm_caddr (strings); - } + s = scm_caddr (strings); p->start_ev_ = 0; } } @@ -423,9 +415,7 @@ Piano_pedal_engraver::finalize () SCM cc = get_property ("currentCommandColumn"); Item *c = unsmob_item (cc); if (p->line_spanner_) - { - p->line_spanner_->set_bound (RIGHT, c); - } + p->line_spanner_->set_bound (RIGHT, c); p->bracket_->set_bound (RIGHT, c); p->finished_bracket_ = p->bracket_; @@ -487,17 +477,13 @@ Piano_pedal_engraver::typeset_all (Pedal_info *p) p->finished_bracket_ = 0; if (p->item_) - { - p->item_ = 0; - } + p->item_ = 0; if (p->finished_bracket_) { Grob *r = p->finished_bracket_->get_bound (RIGHT); if (!r) - { - p->finished_bracket_->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn"))); - } + p->finished_bracket_->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn"))); p->finished_bracket_ = 0; } @@ -523,13 +509,16 @@ Piano_pedal_engraver::typeset_all (Pedal_info *p) } #include "translator.icc" -ADD_ACKNOWLEDGER (Piano_pedal_engraver,note_column); +ADD_ACKNOWLEDGER (Piano_pedal_engraver, note_column); ADD_TRANSLATOR (Piano_pedal_engraver, /* doc */ "Engrave piano pedal symbols and brackets.", /* create */ "SostenutoPedal SustainPedal UnaCordaPedal SostenutoPedalLineSpanner SustainPedalLineSpanner UnaCordaPedalLineSpanner", /* accept */ "pedal-event", /* read */ "currentCommandColumn " - "pedalSostenutoStrings pedalSustainStrings " - "pedalUnaCordaStrings pedalSostenutoStyle " - "pedalSustainStyle pedalUnaCordaStyle", + "pedalSostenutoStrings " + "pedalSustainStrings " + "pedalUnaCordaStrings " + "pedalSostenutoStyle " + "pedalSustainStyle " + "pedalUnaCordaStyle", /* write */ "");