X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fligature-bracket-engraver.cc;h=34218968316a2bd2131034949779348576cb10af;hb=333128cf1f0f657692e90b2dffc852147b2528b1;hp=175f8d12698cd97ec487bfb72e03b8df07b2cba4;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index 175f8d1269..3421896831 100644
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -3,59 +3,124 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
+#include "international.hh"
+
 #include "ligature-engraver.hh"
 #include "note-column.hh"
 #include "tuplet-bracket.hh"
 #include "spanner.hh"
+#include "stream-event.hh"
+#include "spanner.hh"
+#include "item.hh"
 
-/*
- * This engraver marks ligatures of any kind by just printing a
- * horizontal square bracket on top of each ligature.  See class
- * Ligature_engraver for more information on the interaction between
- * this class and its superclass.
- */
-class Ligature_bracket_engraver : public Ligature_engraver
+#include "translator.icc"
+
+class Ligature_bracket_engraver : public Engraver
 {
 protected:
-  virtual Spanner *create_ligature_spanner ();
-  virtual void acknowledge_grob (Grob_info);
+  virtual void process_music ();
+  virtual void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (rest);
+  DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_TRANSLATOR_LISTENER (ligature);
 public:
   TRANSLATOR_DECLARATIONS (Ligature_bracket_engraver);
+
+private:
+  Drul_array<Stream_event *> events_drul_;
+  Spanner *finished_ligature_;
+  Spanner *ligature_;
+  Stream_event *previous_start_event_;
 };
 
-Ligature_bracket_engraver::Ligature_bracket_engraver ()
+IMPLEMENT_TRANSLATOR_LISTENER (Ligature_bracket_engraver, ligature);
+void
+Ligature_bracket_engraver::listen_ligature (Stream_event *ev)
 {
+  Direction d = to_dir (ev->get_property ("span-direction"));
+  ASSIGN_EVENT_ONCE (events_drul_[d], ev);
 }
 
-Spanner *
-Ligature_bracket_engraver::create_ligature_spanner ()
+Ligature_bracket_engraver::Ligature_bracket_engraver ()
 {
-  return make_spanner ("LigatureBracket", SCM_EOL);
+  ligature_ = 0;
+  finished_ligature_ = 0;
+  events_drul_[LEFT] = events_drul_[RIGHT] = 0;
+  previous_start_event_ = 0;
 }
 
 void
-Ligature_bracket_engraver::acknowledge_grob (Grob_info info)
+Ligature_bracket_engraver::process_music()
 {
-  if (current_ligature ())
+  if (events_drul_[STOP])
     {
-      if (Note_column::has_interface (info.grob ()))
+      if (!ligature_)
 	{
-	  Tuplet_bracket::add_column (current_ligature (),
-				      dynamic_cast<Item *> (info.grob ()));
+	  events_drul_[STOP]->origin ()->warning (_ ("cannot find start of ligature"));
+	  return;
 	}
-      else Ligature_engraver::acknowledge_grob (info);
+
+      finished_ligature_ = ligature_;
+      ligature_ = 0;
+      previous_start_event_ = 0;
+    }
+
+  if (events_drul_[START])
+    {
+      if (ligature_)
+	{
+	  events_drul_[START]->origin ()->warning (_ ("already have a ligature"));
+	  return;
+	}
+
+      previous_start_event_ = events_drul_[START];
+      ligature_ = make_spanner ("LigatureBracket", events_drul_[START]->self_scm ());
     }
 }
 
-#include "translator.icc"
+void
+Ligature_bracket_engraver::acknowledge_note_column (Grob_info info)
+{
+  if (ligature_)
+    {
+      Tuplet_bracket::add_column (ligature_,
+				  info.item ());
+      add_bound_item (ligature_, info.item());
+    }
+}
+
+void
+Ligature_bracket_engraver::acknowledge_rest (Grob_info info)
+{
+  acknowledge_note_column(info);
+}
+
+
+void
+Ligature_bracket_engraver::stop_translation_timestep ()
+{
+  events_drul_[LEFT] =  
+    events_drul_[RIGHT] = 0;
+  finished_ligature_ = 0;
+}
+
+ADD_ACKNOWLEDGER (Ligature_bracket_engraver, rest);
+ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column);
 
 ADD_TRANSLATOR (Ligature_bracket_engraver,
-		/* descr */ "Handles Ligature_events by engraving Ligature brackets.",
-		/* creats*/ "TupletBracket",
-		/* accepts */ "ligature-event",
-		/* acks  */ "rest-interface note-column-interface",
-		/* reads */ "",
-		/* write */ "");
+		/* doc */
+		"Handle @code{Ligature_events} by engraving @code{Ligature}"
+		" brackets.",
+
+		/* create */
+		"LigatureBracket ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);