X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhyphen-engraver.cc;h=3a1684491b208f711d75bd491b8cefdbedaaf983;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=1eab3ad6baba1d96d8741c690661c5a9323eefe1;hpb=487ee28c2a58e7bd5cb9e85c7676057c0b32f385;p=lilypond.git

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index 1eab3ad6ba..3a1684491b 100644
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -1,138 +1,162 @@
 /*
   hyphen-engraver.cc -- implement Hyphen_engraver
 
-  (c) 1999 Glen Prideaux <glenprideaux@iname.com>
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1999--2009 Glen Prideaux <glenprideaux@iname.com>,
+  Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "flower-proto.hh"
-#include "event.hh"
-#include "hyphen-spanner.hh"
-#include "paper-column.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"
 
-/**
-  Generate an centred hyphen.  Should make a Hyphen_spanner that
-  typesets a nice centred hyphen of varying length depending on the
-  gap between syllables.
+#include "translator.icc"
 
-  We remember the last Item that come across. When we get a
-  event, we create the spanner, and attach the left point to the
-  last lyrics, and the right point to any lyrics we receive by
-  then.  */
 class Hyphen_engraver : public Engraver
 {
-  Grob *last_lyric_;
-  Grob *current_lyric_;
-  Music* req_;
-  Spanner* hyphen_;
+  Stream_event *ev_;
+  Stream_event *finished_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 void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
-  virtual void process_acknowledged_grobs ();
-private:
 
-};
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
+  DECLARE_TRANSLATOR_LISTENER (hyphen);
 
+  virtual void finalize ();
 
+  void stop_translation_timestep ();
+  void process_music ();
+};
 
 Hyphen_engraver::Hyphen_engraver ()
 {
-  current_lyric_ = 0;
-  last_lyric_ = 0;
   hyphen_ = 0;
-  req_ = 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)
 {
-  // -> text-item
-  if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
-    {
-      current_lyric_ = i.grob_;
-      if (hyphen_
-	  && !hyphen_->get_bound (RIGHT)
-	    )
-	  {
-	    Hyphen_spanner (hyphen_).set_textitem (RIGHT, i.grob_);
-	  }
-    }
-}
+  Item *item = i.item ();
+  
+  if (!hyphen_)
+    hyphen_ = make_spanner ("LyricSpace", item->self_scm ());
 
+  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 (req_)
-	return false;
-
-      req_ = r;
-      return true;
+  ASSIGN_EVENT_ONCE (ev_, ev);
 }
 
 void
-Hyphen_engraver::finalize ()
+completize_hyphen (Spanner *sp)
 {
-  if (hyphen_)
+  if (!sp->get_bound (RIGHT))
     {
-      req_->origin ()->warning (_ ("unterminated hyphen"));
-      hyphen_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+      extract_item_set (sp, "heads", heads);
+      if (heads.size ())
+	sp->set_bound (RIGHT, heads.back ());
     }
 }
 
 void
-Hyphen_engraver::process_acknowledged_grobs ()
+Hyphen_engraver::finalize ()
 {
-  if (req_ &&! hyphen_)
+  if (hyphen_)
     {
-      if (!last_lyric_)
+      completize_hyphen (hyphen_);
+
+      if (!hyphen_->get_bound (RIGHT))
 	{
-	  req_->origin ()->warning (_ ("Nothing to connect hyphen to on the left.  Ignoring hyphen event."));
-	  return;
+	  hyphen_->warning (_ ("removing unterminated hyphen"));
+	  hyphen_->suicide ();
 	}
-      
-      hyphen_ = new Spanner (get_property ("LyricHyphen"));
 
-      Hyphen_spanner (hyphen_).set_textitem (LEFT, last_lyric_);
-      announce_grob(hyphen_, req_->self_scm());
+      hyphen_ = 0;
+    }
+
+  if (finished_hyphen_)
+    {
+      completize_hyphen (finished_hyphen_);
+
+      if (!finished_hyphen_->get_bound (RIGHT))
+	{
+	  if (finished_ev_)
+	    finished_hyphen_->warning (_ ("unterminated hyphen; removing"));
+	  finished_hyphen_->suicide ();
+	}
+      finished_hyphen_ = 0;
     }
 }
 
+void
+Hyphen_engraver::process_music ()
+{
+  if (ev_)
+    hyphen_ = make_spanner ("LyricHyphen", ev_->self_scm ());
+}
 
 void
 Hyphen_engraver::stop_translation_timestep ()
 {
-  if (hyphen_)
+  if (finished_hyphen_ && finished_hyphen_->get_bound (RIGHT))
     {
-      typeset_grob (hyphen_);
-      hyphen_ = 0;
+      finished_hyphen_ = 0;
+      finished_ev_ = 0;
+    }
+  
+  if (finished_hyphen_ && hyphen_)
+    {
+      programming_error ("hyphen not finished yet");
+      finished_hyphen_ = 0;
+      finished_ev_ = 0;
     }
 
-  if (current_lyric_)
+  if (hyphen_)
     {
-      last_lyric_ = current_lyric_;
-      current_lyric_ =0;
+      finished_hyphen_ = hyphen_;
+      finished_ev_ = ev_;
     }
+  
+  hyphen_ = 0;
+  ev_ = 0;
 }
 
-void
-Hyphen_engraver::start_translation_timestep ()
-{
-  req_ = 0;
-}
+ADD_ACKNOWLEDGER (Hyphen_engraver, lyric_syllable);
+
+ADD_TRANSLATOR (Hyphen_engraver,
+		/* doc */
+		"Create lyric hyphens and distance constraints between words.",
+
+		/* create */
+		"LyricHyphen "
+		"LyricSpace ",
 
+		/* read */
+		"",
 
-ENTER_DESCRIPTION(Hyphen_engraver,
-/* descr */       "Create lyric hyphens",
-/* creats*/       "LyricHyphen",
-/* accepts */     "hyphen-event",
-/* acks  */      "lyric-syllable-interface",
-/* reads */       "",
-/* write */       "");
+		/* write */
+		""
+		);