(transform_heads): replace

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

diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index d92d9c631703299ef1f8ae76a1492e79f04375fa..829b9c12bab698c03cfa9238d81e2f984e6ee35f 100644 (file)
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -10,16 +10,11 @@
 */
 
 #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 "context.hh"
-
 #include "directional-element-interface.hh"
 #include "note-column.hh"
 #include "warn.hh"
@@ -163,7 +158,7 @@ Piano_pedal_engraver::try_music (Music *m)
       for (Pedal_info*p = info_list_; p->name_; p ++)
        {
          String nm = p->name_ + String ("Event");
-         if (ly_equal_p (m->get_property ("name") ,
+         if (ly_c_equal_p (m->get_property ("name") ,
                          scm_str2symbol(nm.to_str0())))
            {
              Direction d = to_dir (m->get_property ("span-direction"));
@@ -185,12 +180,11 @@ Piano_pedal_engraver::process_music ()
          if (!p->line_spanner_)
            {
              String name  = String (p->name_) + "PedalLineSpanner";
-             p->line_spanner_ = make_spanner (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 ());
+
 
              
-             announce_grob (p->line_spanner_, rq->self_scm ());
            }
       
          /* Choose the appropriate grobs to add to the line spanner
@@ -254,7 +248,7 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed)
            }
          else
            {
-             s = ly_cadr (strings);
+             s = scm_cadr (strings);
            }
          p->start_ev_ = p->event_drul_[START];
        }
@@ -269,7 +263,7 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed)
            }
          else
            {
-             s = ly_caddr (strings);
+             s = scm_caddr (strings);
            }
          p->start_ev_ = 0;
        }
@@ -277,7 +271,7 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed)
   else if (p->event_drul_[START])
     {
       p->start_ev_ = p->event_drul_[START];
-      s = ly_car (strings);
+      s = scm_car (strings);
       if (!mixed)
        {
          /*
@@ -291,20 +285,18 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed)
        }
     }
       
-  if (ly_string_p (s))
+  if (scm_is_string (s))
     {
       String propname = String (p->name_) + "Pedal";
 
-      p->item_ = make_item (propname.to_str0 ());
+      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->event_drul_[START]
-                     ? p->event_drul_[START]
-                     : p->event_drul_[STOP])->self_scm ());
     }
-
+  
   if (!mixed)
     {
       p->event_drul_[START] = 0;
@@ -318,7 +310,7 @@ 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_);
+      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;
     }
@@ -340,7 +332,7 @@ Piano_pedal_engraver::create_bracket_grobs (Pedal_info *p, bool mixed)
       if (!p->event_drul_[START])
        {
          SCM flare = p->bracket_->get_property ("bracket-flare");
-         p->bracket_->set_property ("bracket-flare", scm_cons (ly_car (flare),
+         p->bracket_->set_property ("bracket-flare", scm_cons (scm_car (flare),
                                                                scm_make_real (0)));
        }
 
@@ -354,7 +346,7 @@ Piano_pedal_engraver::create_bracket_grobs (Pedal_info *p, bool mixed)
       p->start_ev_ = p->event_drul_[START];
       p->current_bracket_ev_ = p->event_drul_[START];
 
-      p->bracket_  = make_spanner ("PianoPedalBracket");
+      p->bracket_  = make_spanner ("PianoPedalBracket", p->event_drul_[START]->self_scm ());
 
       /*
        Set properties so that the stencil-creating function will
@@ -364,7 +356,7 @@ Piano_pedal_engraver::create_bracket_grobs (Pedal_info *p, bool mixed)
       if (!p->finished_bracket_)
        {
          SCM flare = p->bracket_->get_property ("bracket-flare");
-         p->bracket_->set_property ("bracket-flare", scm_cons (scm_make_real (0),ly_cdr (flare)));
+         p->bracket_->set_property ("bracket-flare", scm_cons (scm_make_real (0),scm_cdr (flare)));
        }
 
 
@@ -403,7 +395,6 @@ Piano_pedal_engraver::create_bracket_grobs (Pedal_info *p, bool mixed)
        
       */
       Axis_group_interface::add_element (p->line_spanner_, p->bracket_);             
-      announce_grob (p->bracket_, p->event_drul_[START]->self_scm ());
 
       if (!p->event_drul_[STOP])
        {
@@ -433,11 +424,11 @@ Piano_pedal_engraver::finalize ()
        suicide?
       */
       if (p->line_spanner_
-         && !p->line_spanner_->live ())
+         && !p->line_spanner_->is_live ())
        p->line_spanner_ = 0;
       
       if (p->bracket_
-         && !p->bracket_->live ())
+         && !p->bracket_->is_live ())
        p->bracket_ = 0;
       
       if (p->bracket_)
@@ -504,16 +495,15 @@ Piano_pedal_engraver::typeset_all (Pedal_info * p)
     Handle suicide. 
   */
   if (p->finished_line_spanner_
-      && !p->finished_line_spanner_->live ())
+      && !p->finished_line_spanner_->is_live ())
     p->finished_line_spanner_ = 0;
   if (p->finished_bracket_
-      && !p->finished_bracket_->live ())
+      && !p->finished_bracket_->is_live ())
     p->finished_bracket_ = 0;
 
 
   if (p->item_)
     {
-      typeset_grob (p->item_);
       p->item_ = 0;
     }
       
@@ -525,9 +515,7 @@ Piano_pedal_engraver::typeset_all (Pedal_info * p)
          p->finished_bracket_->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn")));
        }
 
-      typeset_grob (p->finished_bracket_);
-         
-      p->finished_bracket_ =0;
+      p->finished_bracket_ = 0;
     }
 
   if (p->finished_line_spanner_)
@@ -545,12 +533,12 @@ Piano_pedal_engraver::typeset_all (Pedal_info * p)
          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;
     }
 }
 
-ENTER_DESCRIPTION (Piano_pedal_engraver,
+ADD_TRANSLATOR (Piano_pedal_engraver,
                   /* descr */       "Engrave piano pedal symbols and brackets.",
                   /* creats*/       "SostenutoPedal SustainPedal UnaCordaPedal SostenutoPedalLineSpanner SustainPedalLineSpanner UnaCordaPedalLineSpanner",
                   /* accepts */     "pedal-event",