X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhyphen-engraver.cc;h=727a657606f43a50ff33bb3cf879af420f69835c;hb=83c0409957c5ff1f35ef918455a7156fd550fa61;hp=16b79b915face4a6c2b88464a2dc24b4800e132e;hpb=f12ef1c68506b5d8a9ae4d8b5d894109ce8fe17a;p=lilypond.git

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index 16b79b915f..727a657606 100644
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -15,11 +15,11 @@
 
 class Hyphen_engraver : public Engraver
 {
-  Music* ev_;
-  Spanner* hyphen_;
-  Spanner * finished_hyphen_;  
+  Music *ev_;
+  Spanner *hyphen_;
+  Spanner *finished_hyphen_;  
 public:
-  TRANSLATOR_DECLARATIONS(Hyphen_engraver);
+  TRANSLATOR_DECLARATIONS (Hyphen_engraver);
 
 protected:
   virtual void acknowledge_grob (Grob_info);
@@ -73,9 +73,9 @@ completize_hyphen (Spanner* sp)
   if (!sp->get_bound (RIGHT))
     {
       SCM heads = sp->get_property ("heads");
-      if (gh_pair_p (heads))
+      if (ly_c_pair_p (heads))
 	{
-	  Item* it = dynamic_cast<Item*> (unsmob_grob (gh_car (heads)));
+	  Item* it = dynamic_cast<Item*> (unsmob_grob (ly_car (heads)));
 	  if (it)
 	    sp->set_bound (RIGHT, it);
 	}
@@ -93,11 +93,10 @@ Hyphen_engraver::finalize ()
 
       if (!hyphen_->get_bound (RIGHT))
 	{
-	  hyphen_->warning (_ ("unterminated hyphen; removing"));
+	  hyphen_->warning (_ ("removing unterminated hyphen"));
 	  hyphen_->suicide ();
 	}
 
-      typeset_grob (hyphen_);
       hyphen_ = 0;
     }
 
@@ -106,8 +105,10 @@ Hyphen_engraver::finalize ()
       completize_hyphen (finished_hyphen_);
 
       if (!finished_hyphen_->get_bound (RIGHT))
-	  finished_hyphen_->warning (_("unterminated hyphen"));
-      typeset_grob (finished_hyphen_);
+	{
+	  finished_hyphen_->warning (_("unterminated hyphen; removing"));
+	  finished_hyphen_->suicide ();
+	}
       finished_hyphen_ =0;
     }
 }
@@ -117,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 ()
+);
     }
 }
 
@@ -128,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;
     }
   
@@ -149,7 +148,7 @@ Hyphen_engraver::stop_translation_timestep ()
 
 
 
-ENTER_DESCRIPTION(Hyphen_engraver,
+ENTER_DESCRIPTION (Hyphen_engraver,
 /* descr */       "Create lyric hyphens",
 /* creats*/       "LyricHyphen",
 /* accepts */     "hyphen-event",