X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhyphen-engraver.cc;h=2f314f00062b7eef4c0babaee031346903c37765;hb=131f941d10d6c6d587ec1f41f735fd7ba07e7ea3;hp=771db2d90d80b770192b5296257e2f544f2a4705;hpb=46915663d6b4b156d88d095c9003f8ffddbc6680;p=lilypond.git

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index 771db2d90d..2f314f0006 100644
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -2,10 +2,10 @@
   hyphen-engraver.cc -- implement Hyphen_engraver
 
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Glen Prideaux <glenprideaux@iname.com>,
-                  Han-Wen Nienhuys <hanwen@cs.uu.nl>,
-                  Jan Nieuwenhuizen <janneke@gnu.org>
+
+  (c) 1999--2005 Glen Prideaux <glenprideaux@iname.com>,
+  Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "warn.hh"
@@ -15,25 +15,21 @@
 
 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);
   virtual void finalize ();
-  virtual bool try_music (Music*);
+  virtual bool try_music (Music *);
   virtual void stop_translation_timestep ();
   virtual void process_music ();
 private:
-
 };
 
-
-
-
 Hyphen_engraver::Hyphen_engraver ()
 {
   hyphen_ = 0;
@@ -44,8 +40,8 @@ Hyphen_engraver::Hyphen_engraver ()
 void
 Hyphen_engraver::acknowledge_grob (Grob_info i)
 {
-  Item * item =  dynamic_cast<Item*> (i.grob_);
-  // -> text_item
+  Item *item = dynamic_cast<Item *> (i.grob_);
+  // -> Text_item
   if (item && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     {
       if (hyphen_)
@@ -56,9 +52,8 @@ Hyphen_engraver::acknowledge_grob (Grob_info i)
     }
 }
 
-
 bool
-Hyphen_engraver::try_music (Music* r)
+Hyphen_engraver::try_music (Music *r)
 {
   if (ev_)
     return false;
@@ -68,22 +63,20 @@ Hyphen_engraver::try_music (Music* r)
 }
 
 void
-completize_hyphen (Spanner* sp)
+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);
 	}
     }
 }
 
-  
-
 void
 Hyphen_engraver::finalize ()
 {
@@ -93,11 +86,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;
     }
 
@@ -107,11 +99,10 @@ Hyphen_engraver::finalize ()
 
       if (!finished_hyphen_->get_bound (RIGHT))
 	{
-	  finished_hyphen_->warning (_("unterminated hyphen; removing"));
+	  finished_hyphen_->warning (_ ("unterminated hyphen; removing"));
 	  finished_hyphen_->suicide ();
 	}
-      typeset_grob (finished_hyphen_);
-      finished_hyphen_ =0;
+      finished_hyphen_ = 0;
     }
 }
 
@@ -120,28 +111,24 @@ Hyphen_engraver::process_music ()
 {
   if (ev_)
     {
-      hyphen_ = make_spanner ("LyricHyphen");
-      announce_grob (hyphen_, ev_->self_scm());
+      hyphen_ = make_spanner ("LyricHyphen", ev_->self_scm ());
     }
 }
 
-
 void
 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;
+      programming_error ("hyphen not finished yet");
+      finished_hyphen_ = 0;
     }
-  
+
   if (hyphen_)
     finished_hyphen_ = hyphen_;
   hyphen_ = 0;
@@ -149,13 +136,10 @@ Hyphen_engraver::stop_translation_timestep ()
   ev_ = 0;
 }
 
-
-
-
-ENTER_DESCRIPTION(Hyphen_engraver,
-/* descr */       "Create lyric hyphens",
-/* creats*/       "LyricHyphen",
-/* accepts */     "hyphen-event",
-/* acks  */      "lyric-syllable-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Hyphen_engraver,
+		/* descr */ "Create lyric hyphens",
+		/* creats*/ "LyricHyphen",
+		/* accepts */ "hyphen-event",
+		/* acks  */ "lyric-syllable-interface",
+		/* reads */ "",
+		/* write */ "");