(move_away_from_staffline): new function.

[lilypond.git] / lily / hyphen-engraver.cc

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index f0d349a5fe2393c60fabd583e98859044dde00b9..8f7193fad165216a7652d21f9d99534ef0a693dc 100644 (file)
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -45,7 +45,7 @@ void
 Hyphen_engraver::acknowledge_grob (Grob_info i)
 {
   Item * item =  dynamic_cast<Item*> (i.grob_);
-  // -> text_item
+  // -> Text_item
   if (item && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     {
       if (hyphen_)
@@ -73,9 +73,9 @@ completize_hyphen (Spanner* sp)
   if (!sp->get_bound (RIGHT))
     {
       SCM heads = sp->get_property ("heads");
-      if (ly_pair_p (heads))
+      if (scm_is_pair (heads))
        {
-         Item* it = dynamic_cast<Item*> (unsmob_grob (ly_car (heads)));
+         Item* it = dynamic_cast<Item*> (unsmob_grob (scm_car (heads)));
          if (it)
            sp->set_bound (RIGHT, it);
        }
@@ -97,7 +97,6 @@ Hyphen_engraver::finalize ()
          hyphen_->suicide ();
        }
 
-      typeset_grob (hyphen_);
       hyphen_ = 0;
     }
 
@@ -110,7 +109,6 @@ Hyphen_engraver::finalize ()
          finished_hyphen_->warning (_("unterminated hyphen; removing"));
          finished_hyphen_->suicide ();
        }
-      typeset_grob (finished_hyphen_);
       finished_hyphen_ =0;
     }
 }
@@ -120,8 +118,8 @@ Hyphen_engraver::process_music ()
 {
   if (ev_)
     {
-      hyphen_ = make_spanner ("LyricHyphen");
-      announce_grob (hyphen_, ev_->self_scm ());
+      hyphen_ = make_spanner ("LyricHyphen", ev_->self_scm ()
+);
     }
 }
 
@@ -131,14 +129,12 @@ Hyphen_engraver::stop_translation_timestep ()
 {
   if (finished_hyphen_ && finished_hyphen_->get_bound (RIGHT))
     {
-      typeset_grob (finished_hyphen_);
       finished_hyphen_ = 0;
     }
 
   if (finished_hyphen_ && hyphen_)
     {
       programming_error ("Haven't finished hyphen yet.");
-      typeset_grob (finished_hyphen_);
       finished_hyphen_ =0;
     }