X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-engraver.cc;h=829b9c12bab698c03cfa9238d81e2f984e6ee35f;hb=55a36d7beef61098884e49d6b853ce3d7a79811a;hp=60c93793217bfe23e146cba8addf4c6f0744cd8a;hpb=ed123b2a3202f356bd2fce4340c2ba682d3b645c;p=lilypond.git

diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index 60c9379321..829b9c12ba 100644
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -1,43 +1,60 @@
 /*   
-  piano-pedal-engraver.cc --  implement Piano_pedal_engraver
+     piano-pedal-engraver.cc --  implement Piano_pedal_engraver
   
-  source file of the GNU LilyPond music typesetter
+     source file of the GNU LilyPond music typesetter
   
- (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+     (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
   
-  Chris Jackson <chris@fluffhouse.org.uk> - extended to support
-  bracketed pedals.
+     Chris Jackson <chris@fluffhouse.org.uk> - extended to support
+     bracketed pedals.
 */
 
 #include "engraver.hh"
-#include "event.hh"
-#include "grob.hh"
-#include "item.hh"
 #include "lily-guile.hh"
 #include "side-position-interface.hh"
 #include "staff-symbol-referencer.hh"
-#include "item.hh"
 #include "axis-group-interface.hh"
-#include "translator-group.hh"
+#include "context.hh"
 #include "directional-element-interface.hh"
 #include "note-column.hh"
 #include "warn.hh"
 
+/*
+  Urgh. This engraver is too complex. rewrite. --hwn
+*/
+
 struct Pedal_info
 {
   char const * name_;
-  Music* start_req_;
-  Drul_array<Music*> req_l_drul_;
+
+  /*
+    Event for currently running pedal.
+  */
+  Music* current_bracket_ev_;
+
+  /*
+    Event for currently starting pedal, (necessary?
+    
+    distinct from current_bracket_ev_, since current_bracket_ev_ only
+    necessary for brackets, not for text style.
+  */
+  Music* start_ev_;
+
+
+  
+  /*
+    Events that were found in this timestep.
+  */
+  Drul_array<Music*> event_drul_;
   Item* item_;
   Spanner* bracket_;     // A single portion of a pedal bracket
   Spanner* finished_bracket_;
 
   /*
     This grob contains all the pedals of the same type on the same staff
-   */
+  */
   Spanner* line_spanner_;
   Spanner* finished_line_spanner_;
-  Music* current_bracket_req_;
 };
 
 
@@ -51,9 +68,8 @@ protected:
   virtual void finalize ();
   virtual bool try_music (Music*);
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
-  virtual void process_acknowledged_grobs ();
+  virtual void process_music ();
 
 private:
 
@@ -65,21 +81,11 @@ private:
   */
   
   Link_array<Spanner> previous_;
+  void del_linespanner (Spanner*);
   
-  int spanner_count_;
-
-  /*
-    Left and right flare widths of a \___/, as specified by the grob
-    property edge-widen.
-
-    UGR. No GC protection.
-    
-   */
-  Drul_array<SCM> edge_width_drul_;
-  
-  void create_text_grobs (Pedal_info *p, SCM pedaltype);
-  void create_bracket_grobs (Pedal_info *p, SCM pedaltype);
-  void typeset_all ();
+  void create_text_grobs (Pedal_info *p, bool);
+  void create_bracket_grobs (Pedal_info *p, bool);
+  void typeset_all (Pedal_info*p);
 };
 
 
@@ -91,13 +97,11 @@ Piano_pedal_engraver::Piano_pedal_engraver ()
 void
 Piano_pedal_engraver::initialize ()
 {
-  info_list_ = new Pedal_info[4];
-  Pedal_info *p = info_list_;
+  char * names [] = { "Sostenuto", "Sustain", "UnaCorda", 0  };
 
-  spanner_count_ = 0;
-  previous_.clear ();
+  info_list_ = new Pedal_info[sizeof (names)/ sizeof (const char*)]; 
+  Pedal_info *p = info_list_;
 
-  char * names [] = { "Sostenuto", "Sustain", "UnaCorda", 0  };
   char **np = names ;
   do
     {
@@ -107,10 +111,10 @@ Piano_pedal_engraver::initialize ()
       p->finished_bracket_ = 0;
       p->line_spanner_ = 0;
       p->finished_line_spanner_ = 0;
-      p->current_bracket_req_ = 0;
-      p->req_l_drul_[START] = 0;
-      p->req_l_drul_[STOP] = 0;
-      p->start_req_ = 0;
+      p->current_bracket_ev_ = 0;
+      p->event_drul_[START] = 0;
+      p->event_drul_[STOP] = 0;
+      p->start_ev_ = 0;
 
       p++;
     }
@@ -123,9 +127,9 @@ Piano_pedal_engraver::~Piano_pedal_engraver ()
 }
 
 /*
-   Urg: Code dup
-   I'm a script
-  */
+  Urg: Code dup
+  I'm a script
+*/
 void
 Piano_pedal_engraver::acknowledge_grob (Grob_info info)
 {
@@ -136,12 +140,12 @@ Piano_pedal_engraver::acknowledge_grob (Grob_info info)
 	  if (p->line_spanner_)
 	    {
 	      Side_position_interface::add_support (p->line_spanner_, info.grob_);
-	      
 	      add_bound_item (p->line_spanner_,info.grob_);
 	    }	  
 	  if (p->bracket_)
-	    add_bound_item (p->bracket_,info.grob_);		  
-	  
+	    add_bound_item (p->bracket_,info.grob_);
+	  if (p->finished_bracket_)
+	    add_bound_item (p->finished_bracket_,info.grob_);		  
 	}
     }
 }
@@ -149,28 +153,16 @@ Piano_pedal_engraver::acknowledge_grob (Grob_info info)
 bool
 Piano_pedal_engraver::try_music (Music *m)
 {
-  if (m->is_mus_type ("abort-event"))
-    {
-      for (Pedal_info*p = info_list_; p->name_; p ++)
-	{
-	  p->req_l_drul_[START] = 0;
-	  p->req_l_drul_[STOP] = 0;
-	  
-	      if (p->bracket_)
-		p->bracket_->suicide (); /* as in dynamic-engraver.cc */
-	      p->bracket_ = 0;
-	    }
-    }
-  else if  (m->is_mus_type ("pedal-event"))
+  if (m->is_mus_type ("pedal-event"))
     {
       for (Pedal_info*p = info_list_; p->name_; p ++)
 	{
 	  String nm = p->name_ + String ("Event");
-	  if (gh_equal_p (m->get_mus_property ("name") ,
-			  gh_symbol2scm (nm.to_str0())))
+	  if (ly_c_equal_p (m->get_property ("name") ,
+			  scm_str2symbol(nm.to_str0())))
 	    {
-	      Direction d = to_dir (m->get_mus_property ("span-direction"));
-	      p->req_l_drul_[d] = m;
+	      Direction d = to_dir (m->get_property ("span-direction"));
+	      p->event_drul_[d] = m;
 	      return true;
 	    }
 	}
@@ -179,106 +171,109 @@ Piano_pedal_engraver::try_music (Music *m)
 }
 
 void
-Piano_pedal_engraver::process_acknowledged_grobs ()
+Piano_pedal_engraver::process_music ()
 {
   for (Pedal_info*p = info_list_; p && p->name_; p ++)
     {
-      if (p->req_l_drul_[STOP] || p->req_l_drul_[START])
+      if (p->event_drul_[STOP] || p->event_drul_[START])
 	{
 	  if (!p->line_spanner_)
 	    {
 	      String name  = String (p->name_) + "PedalLineSpanner";
-	      p->line_spanner_ = new Spanner (get_property (name.to_str0 ()));
+	      Music * rq = (p->event_drul_[START]  ?  p->event_drul_[START]  :  p->event_drul_[STOP]);
+	      p->line_spanner_ = make_spanner (name.to_str0 (), rq->self_scm ());
+
 
 	      
-	      Music * rq = (p->req_l_drul_[START]  ?  p->req_l_drul_[START]  :  p->req_l_drul_[STOP]);
-	      announce_grob (p->line_spanner_, rq->self_scm ());
 	    }
       
 	  /* Choose the appropriate grobs to add to the line spanner
-	   These can be text items or text-spanners
+	     These can be text items or text-spanners
 	  */
-	  SCM type = ly_cdr (scm_assoc (ly_symbol2scm ("pedal-type"), 
-					get_property ( (String (p->name_) + "Pedal").to_str0 ())));
-	  if (type == ly_symbol2scm ("text") ||      // Ped.     *Ped.  *
-	      type == ly_symbol2scm ("mixed")  )    // Ped. _____/\____|
-	    {
-	      if (! p->item_)
-		create_text_grobs (p, type);
-	    }
-	  if (type == ly_symbol2scm ("bracket") ||   // |_________/\____|
-	      type == ly_symbol2scm ("mixed")  )
-	   {
-	     create_bracket_grobs (p, type);
-	   }
+
+	  /*
+	    ugh, code dup, should read grob to create from other
+	    property.
+
+	    bracket: |_________/\____|
+	    text:    Ped.     *Ped.  *
+	    mixed:   Ped. _____/\____|
+	  */
+
+
+	  String prop = String ("pedal")  + p->name_ + "Style";
+	  SCM style = get_property (prop.to_str0 ());
+
+	  bool mixed = style == ly_symbol2scm ("mixed");
+	  bool bracket = (mixed
+			  || style == ly_symbol2scm ("bracket"));
+	  bool text = (style == ly_symbol2scm ("text")
+		       || mixed);
+	  
+	  if (text && !p->item_)
+	    create_text_grobs (p, mixed);
+	  if (bracket)
+	    create_bracket_grobs (p, mixed);
 	}
     }
 }
 
-
 void
-Piano_pedal_engraver::create_text_grobs (Pedal_info *p, SCM pedaltype)
+Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed)
 {
-  SCM b;
   SCM s = SCM_EOL;
   SCM strings = get_property ( ("pedal" + String (p->name_) + "Strings").to_str0 ());
 
   if (scm_ilength (strings) < 3)
     {
-      Music * m =       p->req_l_drul_[START]; 
-      if (!m) m = p->req_l_drul_ [STOP];
+      Music * m =       p->event_drul_[START]; 
+      if (!m) m = p->event_drul_ [STOP];
 
       String msg = _ ("Need 3 strings for piano pedals. No pedal made. ");
       if (m)
-	m->origin()->warning (msg);
+	m->origin ()->warning (msg);
       else
 	warning (msg);
       
       return ;
     }
-
   
-  if (p->req_l_drul_[STOP] && p->req_l_drul_[START]) 
+  if (p->event_drul_[STOP] && p->event_drul_[START]) 
     {
-      if (pedaltype == ly_symbol2scm ("text")) 
+      if (!mixed)
 	{
-	  if (!p->start_req_)
+	  if (!p->start_ev_)
 	    {
-	      p->req_l_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 = ly_cadr (strings);
+	      s = scm_cadr (strings);
 	    }
-	  p->start_req_ = p->req_l_drul_[START];
+	  p->start_ev_ = p->event_drul_[START];
 	}
     }
-  else if (p->req_l_drul_[STOP])
+  else if (p->event_drul_[STOP])
     { 
-      if (pedaltype == ly_symbol2scm ("text"))
+      if (!mixed)
 	{
-	  if (!p->start_req_)
+	  if (!p->start_ev_)
 	    {
-	      p->req_l_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 = ly_caddr (strings);
-	      spanner_count_ --;
-	      if (previous_.size ())
-		previous_.pop();
+	      s = scm_caddr (strings);
 	    }
-	  p->start_req_ = 0;
+	  p->start_ev_ = 0;
 	}
     }
-  else if (p->req_l_drul_[START])
+  else if (p->event_drul_[START])
     {
-      p->start_req_ = p->req_l_drul_[START];
-      s = ly_car (strings);
-      if (pedaltype == ly_symbol2scm ("text"))
+      p->start_ev_ = p->event_drul_[START];
+      s = scm_car (strings);
+      if (!mixed)
 	{
-	  spanner_count_ ++;
-
 	  /*
 	    Code dup?! see below.
 	  */
@@ -286,137 +281,138 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, SCM pedaltype)
 	    // add extra space below the previous already-occuring pedal
 	    Side_position_interface::add_support (p->line_spanner_,
 						  previous_.top ());
-	  previous_.push ( p->line_spanner_);
+	  previous_.push (p->line_spanner_);
 	}
     }
       
-  if (gh_string_p (s))
+  if (scm_is_string (s))
     {
       String propname = String (p->name_) + "Pedal";
-      b = get_property (propname.to_str0 ());
-      p->item_ = new Item (b);
-      p->item_->set_grob_property ("text", s);
+
+      p->item_ = make_item (propname.to_str0 (), (p->event_drul_[START]
+						  ? p->event_drul_[START]
+						  : p->event_drul_[STOP])->self_scm ());
+
+      p->item_->set_property ("text", s);
       Axis_group_interface::add_element (p->line_spanner_, p->item_);
-	  
-      announce_grob (p->item_,
-		     (p->req_l_drul_[START]
-		      ? p->req_l_drul_[START]
-		      : p->req_l_drul_[STOP])->self_scm ());
-	  
     }
-
-  if (pedaltype == ly_symbol2scm ("text")) 
+  
+  if (!mixed)
     {
-      p->req_l_drul_[START] = 0;
-      p->req_l_drul_[STOP] = 0;
+      p->event_drul_[START] = 0;
+      p->event_drul_[STOP] = 0;
     }
 }
 
+
 void
-Piano_pedal_engraver::create_bracket_grobs (Pedal_info *p, SCM pedaltype)
+Piano_pedal_engraver::create_bracket_grobs (Pedal_info *p, bool mixed)
 {
+  if (!p->bracket_ && p->event_drul_[STOP])
+    {
+      String msg = _f ("can't find start of piano pedal bracket: `%s'", p->name_);
+      p->event_drul_[STOP]->origin ()->warning (msg);
+      p->event_drul_[STOP] =  0;
+    }
 
-  if (p->req_l_drul_[STOP])
+  if (p->event_drul_[STOP])
     {
-      if (!p->start_req_)
-	{
-	  p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->name_));
-	}
-      else if (!p->req_l_drul_[START])
-	{
-	  spanner_count_ -- ;
-	  if (previous_.size())
-	    previous_.pop();
-	}
-      
-      assert (!p->finished_bracket_ && p->bracket_);
+      assert (!p->finished_bracket_); 
 
       Grob *cmc = unsmob_grob (get_property ("currentMusicalColumn"));
-      p->bracket_->set_bound (RIGHT, cmc);
+
+      if (!p->bracket_->get_bound (RIGHT))
+	p->bracket_->set_bound (RIGHT, cmc);
 
       /*
-	Set properties so that the molecule-creating function will
+	Set properties so that the stencil-creating function will
 	know whether the right edge should be flared ___/
-       */
-      SCM eleft = ly_car (p->bracket_->get_grob_property ("edge-widen"));
-      SCM eright = (p->req_l_drul_[START]  ? edge_width_drul_[RIGHT] : gh_double2scm (0));
-      p->bracket_->set_grob_property ("edge-widen", gh_cons (eleft, eright));
-      
+      */
+
+      if (!p->event_drul_[START])
+	{
+	  SCM flare = p->bracket_->get_property ("bracket-flare");
+	  p->bracket_->set_property ("bracket-flare", scm_cons (scm_car (flare),
+								scm_make_real (0)));
+	}
+
       p->finished_bracket_ = p->bracket_;
       p->bracket_ = 0;
-      p->current_bracket_req_ = 0;
-      p->start_req_ = p->req_l_drul_[START];
+      p->current_bracket_ev_ = 0;
     }
 
-  if (p->req_l_drul_[START])
+  if (p->event_drul_[START])
     {
-      p->start_req_ = p->req_l_drul_[START];
-      p->current_bracket_req_ = p->req_l_drul_[START];
+      p->start_ev_ = p->event_drul_[START];
+      p->current_bracket_ev_ = p->event_drul_[START];
 
-      p->bracket_  = new Spanner (get_property ("PianoPedalBracket"));
+      p->bracket_  = make_spanner ("PianoPedalBracket", p->event_drul_[START]->self_scm ());
 
       /*
-	Set properties so that the molecule-creating function will
+	Set properties so that the stencil-creating function will
 	know whether the left edge should be flared \___
       */
 
-      SCM ew = p->bracket_->get_grob_property ("edge-widen");
-
-      /*
-	WTF is this doing here?
-
-	This must go to the backend.
+      if (!p->finished_bracket_)
+	{
+	  SCM flare = p->bracket_->get_property ("bracket-flare");
+	  p->bracket_->set_property ("bracket-flare", scm_cons (scm_make_real (0),scm_cdr (flare)));
+	}
 
-	--HWN.
-       */
-      edge_width_drul_[LEFT] =  ly_car (ew);
-      edge_width_drul_[RIGHT] = ly_cdr (ew);
-      
-      SCM eleft = ( (bool) p->req_l_drul_[STOP]  ? 
-		    edge_width_drul_[LEFT]  :
-		    gh_double2scm (0));
-      SCM eright = gh_double2scm (0);
-      p->bracket_->set_grob_property ("edge-widen", gh_cons (eleft, eright));
 
       /* Set this property for 'mixed style' pedals,    Ped._______/\ ,  
-        so the molecule function will shorten the ____ line by the length of the Ped. text.
+	 so the stencil function will shorten the ____ line by the length of the Ped. text.
       */
-      
-      p->bracket_->set_grob_property ("text-start", 
-				       pedaltype == ly_symbol2scm ("mixed") ? 
-				       gh_bool2scm ( (bool) ! p->req_l_drul_[STOP]) :
-				       gh_bool2scm (false));
+
+      if (mixed)
+	{
+	  /*
+	    Mixed style: Store a pointer to the preceding text for use in
+	    calculating the length of the line
+
+
+	    TODO:
+
+	    WTF is pedal-text not the bound of the object? --hwn
+	  */
+	  if (p->item_)
+	    p->bracket_->set_property ("pedal-text", p->item_->self_scm ());
+	}
+
 
       /*
-	Mixed style: Store a pointer to the preceding text for use in
-	calculating the length of the line 
+	We do not use currentMusicalColumn for the left span-point.
+	If the column as accidentals (eg on a different stave), the
+	currentMusicalColumn is too wide, making the bracket too big.
+
+	TODO:
+
+	Hmm. What do we do when there are no notes when the spanner starts?
+
+	TODO:
+
+	what about the right span point?
+	
       */
-      if (p->item_)
-	p->bracket_->set_grob_property ("pedal-text", p->item_->self_scm ());
-      
-      p->bracket_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn")));
       Axis_group_interface::add_element (p->line_spanner_, p->bracket_);	      
 
-      add_bound_item (p->line_spanner_, p->bracket_->get_bound (LEFT));
-      announce_grob (p->bracket_, p->req_l_drul_[START]->self_scm ());
-
-      if (!p->req_l_drul_[STOP])
+      if (!p->event_drul_[STOP])
 	{
 
 	  /*
-	    code dup.
-	   */
-	  spanner_count_ ++;
-	  if (previous_.size()) 
+	    code dup. --hwn.
+
 	    // position new pedal spanner below the current one
-	    Side_position_interface::add_support (p->line_spanner_, previous_.top());
+	    */
+	  if (previous_.size ()) 
+	    Side_position_interface::add_support (p->line_spanner_, previous_.top ());
 
 	  previous_.push (p->line_spanner_);	
 	}
     }
 
-  p->req_l_drul_[START] = 0;
-  p->req_l_drul_[STOP] = 0;
+  p->event_drul_[START] = 0;
+  p->event_drul_[STOP] = 0;
 }
 
 void
@@ -426,29 +422,48 @@ Piano_pedal_engraver::finalize ()
     {
       /*
 	suicide?
-       */
+      */
       if (p->line_spanner_
-	  && !p->line_spanner_->live())
+	  && !p->line_spanner_->is_live ())
 	p->line_spanner_ = 0;
       
-      if (p->line_spanner_)
-	{
-	  p->finished_line_spanner_ = p->line_spanner_;
-	  typeset_all ();
-	}
       if (p->bracket_
-	  && !p->bracket_->live())
+	  && !p->bracket_->is_live ())
 	p->bracket_ = 0;
+      
       if (p->bracket_)
 	{
-	  p->current_bracket_req_->origin ()->warning (_ ("unterminated pedal bracket"));
-	  p->bracket_->suicide ();
+	  SCM cc = get_property ("currentCommandColumn");
+	  Item *c = unsmob_item (cc);
+	  if (p->line_spanner_)
+	    {
+	      p->line_spanner_->set_bound (RIGHT, c);
+	    }
+	  p->bracket_ ->set_bound (RIGHT, c);
+
+	  p->finished_bracket_ = p->bracket_;
 	  p->bracket_ = 0;
+	  p->finished_line_spanner_ = p->line_spanner_;
+	  p->line_spanner_ = 0;
+	  typeset_all (p);
+	}
+
+      if (p->line_spanner_)
+	{
+	  p->finished_line_spanner_ = p->line_spanner_;
+	  typeset_all (p);
 	}
     }
 }
 
-  
+void
+Piano_pedal_engraver::del_linespanner (Spanner *g)
+{
+  int idx = previous_.find_index (g);
+  if (idx >= 0)
+    previous_.del (idx);
+}
+
 void
 Piano_pedal_engraver::stop_translation_timestep ()
 {
@@ -458,96 +473,78 @@ Piano_pedal_engraver::stop_translation_timestep ()
 	{
 	  p->finished_line_spanner_ = p->line_spanner_;
 	  p->line_spanner_ = 0;
+	  del_linespanner (p->finished_line_spanner_);
 	}
+      
+      typeset_all (p);
     }
   
-  typeset_all ();
+
+  for (Pedal_info*p = info_list_; p->name_; p ++)
+    {
+      p->event_drul_[STOP] = 0;
+      p->event_drul_[START] = 0;
+    }
 }
 
 
 void
-Piano_pedal_engraver::typeset_all ()
+Piano_pedal_engraver::typeset_all (Pedal_info * p)
 {
-  Item * sustain = 0;
-  for (Pedal_info*p = info_list_; p->name_; p ++)
-    {
-      /*
-	Handle suicide. 
-       */
-      if (p->finished_line_spanner_
-	  && !p->finished_line_spanner_->live ())
-	p->finished_line_spanner_ = 0;
-      if (p->finished_bracket_
-	  && !p->finished_bracket_->live())
-	p->finished_bracket_ = 0;
-
+  /*
+    Handle suicide. 
+  */
+  if (p->finished_line_spanner_
+      && !p->finished_line_spanner_->is_live ())
+    p->finished_line_spanner_ = 0;
+  if (p->finished_bracket_
+      && !p->finished_bracket_->is_live ())
+    p->finished_bracket_ = 0;
 
-      if (p->name_ == String ("Sustain"))
-	sustain = p->item_;
 
-      if (p->item_)
-	{
-	  /*
-	    Hmm.
-	  */
-	  if (p->name_ != String ("Sustain"))
-	    {
-	      if (sustain)
-		{
-		  Side_position_interface::add_support (p->item_,sustain);
-		}
-	    }
-	  typeset_grob (p->item_);
-	  p->item_ = 0;
-	}
+  if (p->item_)
+    {
+      p->item_ = 0;
+    }
       
-      if (p->finished_bracket_)
+  if (p->finished_bracket_)
+    {
+      Grob * r = p->finished_bracket_->get_bound (RIGHT);      
+      if (!r)
 	{
-	  Grob * r = p->finished_bracket_->get_bound (RIGHT);      
-	  if (!r)
-	    {
-	      p->finished_bracket_->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn")));
-	    }
-
-	  typeset_grob (p->finished_bracket_);
-	  p->finished_bracket_ =0;
+	  p->finished_bracket_->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn")));
 	}
 
-      if (p->finished_line_spanner_)
-	{
-	  Side_position_interface::add_staff_support (p->finished_line_spanner_);
-	  Grob * l = p->finished_line_spanner_->get_bound (LEFT);
-	  Grob * r = p->finished_line_spanner_->get_bound (RIGHT);      
-	  if (!r && l)
-	    p->finished_line_spanner_->set_bound (RIGHT, l);
-	  else if (!l && r)
-	    p->finished_line_spanner_->set_bound (LEFT, r);
-	  else if (!r && !l)
-	    {
-	      Grob * cc = unsmob_grob (get_property ("currentMusicalColumn"));
-	      Item * ci = dynamic_cast<Item*> (cc);
-	      p->finished_line_spanner_->set_bound (RIGHT, ci);
-	      p->finished_line_spanner_->set_bound (LEFT, ci);	  
-	    }
-	  typeset_grob (p->finished_line_spanner_);
-	  p->finished_line_spanner_ = 0;
-	}
+      p->finished_bracket_ = 0;
     }
-}
 
-void
-Piano_pedal_engraver::start_translation_timestep ()
-{
-  for (Pedal_info*p = info_list_; p->name_; p ++)
+  if (p->finished_line_spanner_)
     {
-      p->req_l_drul_[STOP] = 0;
-      p->req_l_drul_[START] = 0;
+      Grob * l = p->finished_line_spanner_->get_bound (LEFT);
+      Grob * r = p->finished_line_spanner_->get_bound (RIGHT);      
+      if (!r && l)
+	p->finished_line_spanner_->set_bound (RIGHT, l);
+      else if (!l && r)
+	p->finished_line_spanner_->set_bound (LEFT, r);
+      else if (!r && !l)
+	{
+	  Grob * cc = unsmob_grob (get_property ("currentMusicalColumn"));
+	  Item * ci = dynamic_cast<Item*> (cc);
+	  p->finished_line_spanner_->set_bound (RIGHT, ci);
+	  p->finished_line_spanner_->set_bound (LEFT, ci);	  
+	}
+      
+      p->finished_line_spanner_ = 0;
     }
 }
-ENTER_DESCRIPTION (Piano_pedal_engraver,
-/* descr */       "Engrave piano pedal symbols and brackets.",
-/* creats*/       "SostenutoPedal SustainPedal UnaCordaPedal SostenutoPedalLineSpanner SustainPedalLineSpanner UnaCordaPedalLineSpanner",
-/* accepts */     "pedal-event abort-event",
-/* acks  */      "note-column-interface",
-/* reads */       "pedalSostenutoStrings pedalSustainStrings pedalUnaCordaStrings",
-/* write */       "");
+
+ADD_TRANSLATOR (Piano_pedal_engraver,
+		   /* descr */       "Engrave piano pedal symbols and brackets.",
+		   /* creats*/       "SostenutoPedal SustainPedal UnaCordaPedal SostenutoPedalLineSpanner SustainPedalLineSpanner UnaCordaPedalLineSpanner",
+		   /* accepts */     "pedal-event",
+		   /* acks  */       "note-column-interface",
+		   /* reads */       "currentCommandColumn "
+		   "pedalSostenutoStrings pedalSustainStrings "
+		   "pedalUnaCordaStrings pedalSostenutoStyle "
+		   "pedalSustainStyle pedalUnaCordaStyle",
+		   /* write */       "");