X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhyphen-engraver.cc;h=3e03d9b8e04199cd8fb42420ff23740282d081e9;hb=5bbca339abd8ca056f1360a829cc9798bd6ecd8b;hp=99612587295acca798c4e65c2081844e7092ff43;hpb=02c656d3b0cb895cc81b428d699d960746800e45;p=lilypond.git

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index 9961258729..3e03d9b8e0 100644
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -3,63 +3,71 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Glen Prideaux <glenprideaux@iname.com>,
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  (c) 1999--2007 Glen Prideaux <glenprideaux@iname.com>,
+  Han-Wen Nienhuys <hanwen@xs4all.nl>,
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "warn.hh"
-#include "item.hh"
 #include "engraver.hh"
+#include "international.hh"
+#include "item.hh"
+#include "pointer-group-interface.hh"
 #include "spanner.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+
+#include "translator.icc"
 
 class Hyphen_engraver : public Engraver
 {
-  Music *ev_;
+  Stream_event *ev_;
+  Stream_event *finished_ev_;
+
   Spanner *hyphen_;
   Spanner *finished_hyphen_;
+
 public:
   TRANSLATOR_DECLARATIONS (Hyphen_engraver);
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
+
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
+  DECLARE_TRANSLATOR_LISTENER (hyphen);
+
   virtual void finalize ();
-  virtual bool try_music (Music *);
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
-private:
+
+  void stop_translation_timestep ();
+  void process_music ();
 };
 
 Hyphen_engraver::Hyphen_engraver ()
 {
   hyphen_ = 0;
   finished_hyphen_ = 0;
+  finished_ev_ = 0;
   ev_ = 0;
 }
 
 void
-Hyphen_engraver::acknowledge_grob (Grob_info i)
+Hyphen_engraver::acknowledge_lyric_syllable (Grob_info i)
 {
-  Item *item = dynamic_cast<Item *> (i.grob ());
-  // -> Text_item
-  if (item && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
-    {
-      if (hyphen_)
-	hyphen_->set_bound (LEFT, item);
+  Item *item = i.item ();
+  
+  if (!hyphen_)
+    hyphen_ = make_spanner ("LyricSpace", item->self_scm ());
 
-      if (finished_hyphen_)
-	finished_hyphen_->set_bound (RIGHT, item);
-    }
+  if (hyphen_)
+    hyphen_->set_bound (LEFT, item);
+      
+  if (finished_hyphen_)
+    finished_hyphen_->set_bound (RIGHT, item);
 }
 
-bool
-Hyphen_engraver::try_music (Music *r)
+IMPLEMENT_TRANSLATOR_LISTENER (Hyphen_engraver, hyphen);
+void
+Hyphen_engraver::listen_hyphen (Stream_event *ev)
 {
-  if (ev_)
-    return false;
-
-  ev_ = r;
-  return true;
+  ASSIGN_EVENT_ONCE (ev_, ev);
 }
 
 void
@@ -67,13 +75,9 @@ completize_hyphen (Spanner *sp)
 {
   if (!sp->get_bound (RIGHT))
     {
-      SCM heads = sp->get_property ("heads");
-      if (scm_is_pair (heads))
-	{
-	  Item *it = dynamic_cast<Item *> (unsmob_grob (scm_car (heads)));
-	  if (it)
-	    sp->set_bound (RIGHT, it);
-	}
+      extract_item_set (sp, "heads", heads);
+      if (heads.size ())
+	sp->set_bound (RIGHT, heads.back ());
     }
 }
 
@@ -99,7 +103,8 @@ Hyphen_engraver::finalize ()
 
       if (!finished_hyphen_->get_bound (RIGHT))
 	{
-	  finished_hyphen_->warning (_ ("unterminated hyphen; removing"));
+	  if (finished_ev_)
+	    finished_hyphen_->warning (_ ("unterminated hyphen; removing"));
 	  finished_hyphen_->suicide ();
 	}
       finished_hyphen_ = 0;
@@ -110,9 +115,7 @@ void
 Hyphen_engraver::process_music ()
 {
   if (ev_)
-    {
-      hyphen_ = make_spanner ("LyricHyphen", ev_->self_scm ());
-    }
+    hyphen_ = make_spanner ("LyricHyphen", ev_->self_scm ());
 }
 
 void
@@ -121,25 +124,31 @@ Hyphen_engraver::stop_translation_timestep ()
   if (finished_hyphen_ && finished_hyphen_->get_bound (RIGHT))
     {
       finished_hyphen_ = 0;
+      finished_ev_ = 0;
     }
-
+  
   if (finished_hyphen_ && hyphen_)
     {
       programming_error ("hyphen not finished yet");
       finished_hyphen_ = 0;
+      finished_ev_ = 0;
     }
 
   if (hyphen_)
-    finished_hyphen_ = hyphen_;
+    {
+      finished_hyphen_ = hyphen_;
+      finished_ev_ = ev_;
+    }
+  
   hyphen_ = 0;
-
   ev_ = 0;
 }
 
+ADD_ACKNOWLEDGER (Hyphen_engraver, lyric_syllable);
+
 ADD_TRANSLATOR (Hyphen_engraver,
-		/* descr */ "Create lyric hyphens",
-		/* creats*/ "LyricHyphen",
-		/* accepts */ "hyphen-event",
-		/* acks  */ "lyric-syllable-interface",
-		/* reads */ "",
+		/* doc */ "Create lyric hyphens and "
+		"distance constraints between words.",
+		/* create */ "LyricHyphen LyricSpace",
+		/* read */ "",
 		/* write */ "");