X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhyphen-engraver.cc;h=27572d852fc5fb0ec82899d2519579bb1b2196e4;hb=d24e58ca5b51877dff138fad2383470707b51a0d;hp=72eb2268fe7974bba01c2b0860a81d3780b797bf;hpb=fbb6d20e9f58d691ffe845284cbb4d8bacf9ca60;p=lilypond.git

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index 72eb2268fe..27572d852f 100644
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -1,105 +1,157 @@
 /*
   hyphen-engraver.cc -- implement Hyphen_engraver
 
-  (c) 1999 Glen Prideaux <glenprideaux@iname.com>
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1999--2006 Glen Prideaux <glenprideaux@iname.com>,
+  Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "proto.hh"
-#include "musical-request.hh"
-#include "hyphen-engraver.hh"
-#include "hyphen-spanner.hh"
-#include "paper-column.hh"
-#include "text-item.hh"
-#include "extender-engraver.hh"
+#include "engraver.hh"
+
+#include "warn.hh"
+#include "item.hh"
+#include "spanner.hh"
+#include "pointer-group-interface.hh"
+
+class Hyphen_engraver : public Engraver
+{
+  Music *ev_;
+  Music *finished_ev_;
+
+  Spanner *hyphen_;
+  Spanner *finished_hyphen_;
+
+public:
+  TRANSLATOR_DECLARATIONS (Hyphen_engraver);
+
+protected:
+
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
+
+  virtual void finalize ();
+  virtual bool try_music (Music *);
 
-ADD_THIS_TRANSLATOR (Hyphen_engraver);
+  void stop_translation_timestep ();
+  void process_music ();
+};
 
 Hyphen_engraver::Hyphen_engraver ()
 {
-  current_lyric_l_ = 0;
-  last_lyric_l_ = 0;
-  hyphen_spanner_p_ = 0;
-  req_l_ = 0;
+  hyphen_ = 0;
+  finished_hyphen_ = 0;
+  finished_ev_ = 0;
+  ev_ = 0;
 }
 
 void
-Hyphen_engraver::acknowledge_element (Score_element_info i)
+Hyphen_engraver::acknowledge_lyric_syllable (Grob_info i)
 {
-  if (Text_item* t = dynamic_cast<Text_item*> (i.elem_l_))
-    {
-      current_lyric_l_ = t;
-      if (hyphen_spanner_p_
-	  && !hyphen_spanner_p_->get_bound (RIGHT)
-	    )
-	  {
-	    hyphen_spanner_p_->set_textitem (RIGHT, t);
-	  }
-    }
-}
+  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::do_try_music (Music* r)
+Hyphen_engraver::try_music (Music *r)
 {
-  if (Hyphen_req* p = dynamic_cast <Hyphen_req *> (r))
-    {
-      if (req_l_)
-	return false;
+  if (ev_)
+    return false;
 
-      req_l_ = p;
-      return true;
-    }
-  return false;
+  ev_ = r;
+  return true;
 }
 
 void
-Hyphen_engraver::do_removal_processing ()
+completize_hyphen (Spanner *sp)
 {
-  if (hyphen_spanner_p_)
+  if (!sp->get_bound (RIGHT))
     {
-      req_l_->warning (_ ("unterminated hyphen"));
-      hyphen_spanner_p_->set_bound(RIGHT, get_staff_info ().command_pcol_l ());
+      extract_item_set (sp, "heads", heads);
+      if (heads.size ())
+	sp->set_bound (RIGHT, heads.top ());
     }
 }
 
 void
-Hyphen_engraver::do_process_music ()
+Hyphen_engraver::finalize ()
 {
-  if (req_l_)
+  if (hyphen_)
     {
-      if (!last_lyric_l_)
+      completize_hyphen (hyphen_);
+
+      if (!hyphen_->get_bound (RIGHT))
 	{
-	  req_l_->warning (_ ("Nothing to connect hyphen to on the left.  Ignoring hyphen request."));
-	  return;
+	  hyphen_->warning (_ ("removing unterminated hyphen"));
+	  hyphen_->suicide ();
 	}
-      
-      hyphen_spanner_p_ = new Hyphen_spanner;
-      hyphen_spanner_p_->set_textitem  (LEFT, last_lyric_l_);
-      announce_element (Score_element_info (hyphen_spanner_p_, req_l_));
+
+      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::do_pre_move_processing ()
+Hyphen_engraver::stop_translation_timestep ()
 {
-  if (hyphen_spanner_p_)
+  if (finished_hyphen_ && finished_hyphen_->get_bound (RIGHT))
+    {
+      finished_hyphen_ = 0;
+      finished_ev_ = 0;
+    }
+  
+  if (finished_hyphen_ && hyphen_)
     {
-      typeset_element (hyphen_spanner_p_);
-      hyphen_spanner_p_ = 0;
+      programming_error ("hyphen not finished yet");
+      finished_hyphen_ = 0;
+      finished_ev_ = 0;
     }
 
-  if (current_lyric_l_)
+  if (hyphen_)
     {
-      last_lyric_l_ = current_lyric_l_;
-      current_lyric_l_ =0;
+      finished_hyphen_ = hyphen_;
+      finished_ev_ = ev_;
     }
+  
+  hyphen_ = 0;
+  ev_ = 0;
 }
 
-void
-Hyphen_engraver::do_post_move_processing ()
-{
-  req_l_ = 0;
-}
+#include "translator.icc"
 
+ADD_ACKNOWLEDGER (Hyphen_engraver, lyric_syllable);
 
+ADD_TRANSLATOR (Hyphen_engraver,
+		/* doc */ "Create lyric hyphens and "
+		"distance constraints between words.",
+		/* create */ "LyricHyphen LyricSpace",
+		/* accept */ "hyphen-event",
+		/* read */ "",
+		/* write */ "");