From: Keith OHara <k-ohara5a5a@oco.net>
Date: Fri, 30 Dec 2011 03:36:21 +0000 (-0800)
Subject: piano-pedal-engraver: use currentMusicalColumn as bounds; issue 2153
X-Git-Tag: release/2.15.24-1~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e5a7fc9413e847c9ac2a0b8af549428a1f3f8a53;p=lilypond.git

piano-pedal-engraver: use currentMusicalColumn as bounds; issue 2153
---

diff --git a/input/regression/pedal-bracket.ly b/input/regression/pedal-bracket.ly
index 007b840479..b75c1eeddf 100644
--- a/input/regression/pedal-bracket.ly
+++ b/input/regression/pedal-bracket.ly
@@ -6,7 +6,8 @@
  the left side of the main note-column. If a note is shared between
  two brackets, these ends are flared.
 
-At a line-break, there are no vertical endings.  " }
+At a line-break, there are no vertical endings.  Pedal changes can
+be placed at spacer rests." }
 
 \score {
      \relative c'' {
@@ -19,7 +20,9 @@ At a line-break, there are no vertical endings.  " }
         \set Staff.pedalUnaCordaStyle = #'mixed
 
         c4 d \unaCorda e f g
-        b  | \break c b <c e,>\arpeggio \treCorde c
+        b  | \break c b <c e,>\arpeggio \treCorde c |
+        b8\sustainOn g d b <<c2 {s4 s4\sustainOff\sustainOn }>> |
+        g1
     }
     \layout { ragged-right = ##t }
 }
diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index 4cbc7adbd3..2c656b6c5f 100644
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -126,7 +126,6 @@ protected:
   DECLARE_TRANSLATOR_LISTENER (sustain);
   DECLARE_TRANSLATOR_LISTENER (una_corda);
   DECLARE_TRANSLATOR_LISTENER (sostenuto);
-  DECLARE_ACKNOWLEDGER (note_column);
   void stop_translation_timestep ();
   void process_music ();
 
@@ -206,22 +205,6 @@ Piano_pedal_engraver::initialize ()
   info_list_[NUM_PEDAL_TYPES].type_ = 0;
 }
 
-/*
-  Urg: Code dup
-  I'm a script
-*/
-void
-Piano_pedal_engraver::acknowledge_note_column (Grob_info info)
-{
-  for (Pedal_info *p = info_list_; p->type_; p++)
-    {
-      if (p->bracket_)
-        add_bound_item (p->bracket_, info.grob ());
-      if (p->finished_bracket_)
-        add_bound_item (p->finished_bracket_, info.grob ());
-    }
-}
-
 IMPLEMENT_TRANSLATOR_LISTENER (Piano_pedal_engraver, sostenuto);
 void
 Piano_pedal_engraver::listen_sostenuto (Stream_event *ev)
@@ -364,9 +347,7 @@ Piano_pedal_engraver::create_bracket_grobs (Pedal_info *p, bool mixed)
       assert (!p->finished_bracket_);
 
       Grob *cmc = unsmob_grob (get_property ("currentMusicalColumn"));
-
-      if (!p->bracket_->get_bound (RIGHT))
-        p->bracket_->set_bound (RIGHT, cmc);
+      p->bracket_->set_bound (RIGHT, cmc);
 
       /*
         Set properties so that the stencil-creating function will
@@ -464,9 +445,7 @@ Piano_pedal_engraver::stop_translation_timestep ()
       if (p->bracket_ && !p->bracket_->get_bound (LEFT))
         {
           Grob *cmc = unsmob_grob (get_property ("currentMusicalColumn"));
-
-          if (!p->bracket_->get_bound (LEFT))
-            p->bracket_->set_bound (LEFT, cmc);
+          p->bracket_->set_bound (LEFT, cmc);
         }
     }
 
@@ -500,8 +479,6 @@ Piano_pedal_engraver::typeset_all (Pedal_info *p)
     }
 }
 
-ADD_ACKNOWLEDGER (Piano_pedal_engraver, note_column);
-
 ADD_TRANSLATOR (Piano_pedal_engraver,
                 /* doc */
                 "Engrave piano pedal symbols and brackets.",