(move_away_from_staffline): new function.

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

diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index a43268aa7729fbf74c2fe3b326ac5ee78939e60c..09c6afce2a99de45f7af3a411099820e0671d7a9 100644 (file)
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -253,7 +253,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];
        }
@@ -268,7 +268,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;
        }
@@ -276,7 +276,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)
        {
          /*
@@ -290,16 +290,17 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed)
        }
     }
       
-  if (ly_c_string_p (s))
+  if (scm_is_string (s))
     {
       String propname = String (p->name_) + "Pedal";
 
       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_);
     }
-  p->item_->set_property ("text", s);
-  Axis_group_interface::add_element (p->line_spanner_, p->item_);
   
   if (!mixed)
     {
@@ -336,7 +337,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)));
        }
 
@@ -360,7 +361,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)));
        }
 
 
@@ -428,11 +429,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_)
@@ -499,16 +500,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;
     }
       
@@ -520,9 +520,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_)
@@ -540,7 +538,7 @@ 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;
     }
 }