* The grand 2005-2006 replace.

[lilypond.git] / lily / piano-pedal-engraver.cc

diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index a557a8dca9ce140b64ccd6f7f3f5f62dcf76ce22..80677d7829df397627c0e494319d59a0cad17a93 100644 (file)
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Chris Jackson <chris@fluffhouse.org.uk> - extended to support
   bracketed pedals.
@@ -233,9 +233,7 @@ 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);
          p->start_ev_ = p->event_drul_[START];
@@ -246,9 +244,7 @@ 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);
          p->start_ev_ = 0;
@@ -481,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,7 +515,10 @@ ADD_TRANSLATOR (Piano_pedal_engraver,
                /* 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 */ "");