* lily/ledger-line-spanner.cc (print): swap linear_combination

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

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index dbf70c7414ebe4ad045edbefd7a42ef3c7e0144d..8f7193fad165216a7652d21f9d99534ef0a693dc 100644 (file)
--- 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);
@@ -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 (gh_pair_p (heads))
+      if (scm_is_pair (heads))
        {
-         Item* it = dynamic_cast<Item*> (unsmob_grob (gh_car (heads)));
+         Item* it = dynamic_cast<Item*> (unsmob_grob (scm_car (heads)));
          if (it)
            sp->set_bound (RIGHT, it);
        }
@@ -92,8 +92,11 @@ Hyphen_engraver::finalize ()
       completize_hyphen (hyphen_);
 
       if (!hyphen_->get_bound (RIGHT))
-       hyphen_->warning (_ ("unterminated hyphen"));
-      typeset_grob (hyphen_);
+       {
+         hyphen_->warning (_ ("removing unterminated hyphen"));
+         hyphen_->suicide ();
+       }
+
       hyphen_ = 0;
     }
 
@@ -102,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;
     }
 }
@@ -113,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 ()
+);
     }
 }
 
@@ -124,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;
     }
   
@@ -145,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",