Warn about only one slur at once.

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

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index 94f2ae76cff2121fbb1440d0eb7947f543d958fb..cbd8d1a2a7e0bffd05f3c647bc7520b3ad124be4 100644 (file)
--- 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"
@@ -17,23 +17,19 @@ class Hyphen_engraver : public Engraver
 {
   Music *ev_;
   Spanner *hyphen_;
-  Spanner *finished_hyphen_;  
+  Spanner *finished_hyphen_;
 public:
   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,7 +40,7 @@ Hyphen_engraver::Hyphen_engraver ()
 void
 Hyphen_engraver::acknowledge_grob (Grob_info i)
 {
-  Item * item =  dynamic_cast<Item*> (i.grob_);
+  Item *item = dynamic_cast<Item *> (i.grob_);
   // -> Text_item
   if (item && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     {
@@ -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 (ly_c_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);
        }
     }
 }
 
-  
-
 void
 Hyphen_engraver::finalize ()
 {
@@ -106,10 +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 ();
        }
-      finished_hyphen_ =0;
+      finished_hyphen_ = 0;
     }
 }
 
@@ -118,12 +111,10 @@ Hyphen_engraver::process_music ()
 {
   if (ev_)
     {
-      hyphen_ = make_spanner ("LyricHyphen", ev_->self_scm ()
-);
+      hyphen_ = make_spanner ("LyricHyphen", ev_->self_scm ());
     }
 }
 
-
 void
 Hyphen_engraver::stop_translation_timestep ()
 {
@@ -135,9 +126,9 @@ Hyphen_engraver::stop_translation_timestep ()
   if (finished_hyphen_ && hyphen_)
     {
       programming_error ("Haven't finished hyphen yet.");
-      finished_hyphen_ =0;
+      finished_hyphen_ = 0;
     }
-  
+
   if (hyphen_)
     finished_hyphen_ = hyphen_;
   hyphen_ = 0;
@@ -145,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 */ "");