X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftrill-spanner-engraver.cc;h=94554b790bf1eb90648e17a217bf128f69dc2d3b;hb=3d8089a42af6304edb8dad56220e845c84832bb2;hp=8770ab9cefd97754ac420c82333103d92f433d92;hpb=68f8545bd6a0221ee1100336e4ad49399a7ffaa4;p=lilypond.git

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 8770ab9cef..94554b790b 100644
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 /*
@@ -17,8 +17,10 @@
 
 #include "international.hh"
 #include "note-column.hh"
+#include "pointer-group-interface.hh"
 #include "side-position-interface.hh"
 #include "stream-event.hh"
+#include "spanner.hh"
 
 #include "translator.icc"
 
@@ -28,8 +30,9 @@ public:
   TRANSLATOR_DECLARATIONS (Trill_spanner_engraver);
 protected:
   virtual void finalize ();
-  DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_TRANSLATOR_LISTENER (trill_span);
+  DECLARE_ACKNOWLEDGER (note_column);
+
   void stop_translation_timestep ();
   void process_music ();
 
@@ -46,8 +49,7 @@ Trill_spanner_engraver::Trill_spanner_engraver ()
   finished_ = 0;
   current_event_ = 0;
   span_ = 0;
-  event_drul_[START] = 0;
-  event_drul_[STOP] = 0;
+  event_drul_.set (0, 0);
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Trill_spanner_engraver, trill_span);
@@ -59,45 +61,45 @@ Trill_spanner_engraver::listen_trill_span (Stream_event *ev)
 }
 
 void
-Trill_spanner_engraver::process_music ()
+Trill_spanner_engraver::acknowledge_note_column (Grob_info info)
 {
-  if (event_drul_[STOP])
+  if (span_)
     {
-      if (!span_)
-	event_drul_[STOP]->origin ()->warning (_ ("can't find start of trill spanner"));
-      else
-	{
-	  finished_ = span_;
-	  span_ = 0;
-	  current_event_ = 0;
-	}
+      Pointer_group_interface::add_grob (span_,
+					 ly_symbol2scm ("note-columns"),
+					 info.grob());
+      if (!span_->get_bound (LEFT))
+	add_bound_item (span_, info.grob ());
     }
-
-  if (event_drul_[START])
+  else if (finished_)
     {
-      if (current_event_)
-	event_drul_[START]->origin ()->warning (_ ("already have a trill spanner"));
-      else
-	{
-	  current_event_ = event_drul_[START];
-	  span_ = make_spanner ("TrillSpanner", event_drul_[START]->self_scm ());
-	  Side_position_interface::set_axis (span_, Y_AXIS);
-	  event_drul_[START] = 0;
-	}
+      Pointer_group_interface::add_grob (finished_, ly_symbol2scm ("note-columns"),
+					 info.grob());
+      if (!finished_->get_bound (RIGHT))
+	add_bound_item (finished_, info.grob ());
     }
 }
 
 void
-Trill_spanner_engraver::acknowledge_note_column (Grob_info info)
+Trill_spanner_engraver::process_music ()
 {
-  Spanner *spans[2] ={span_, finished_};
-  for (int i = 0; i < 2; i++)
+  if (span_
+      && (event_drul_[STOP] || event_drul_[START]))
     {
-      if (spans[i])
-	{
-	  Side_position_interface::add_support (spans[i], info.grob ());
-	  add_bound_item (spans[i], dynamic_cast<Item *> (info.grob ()));
-	}
+      Stream_event *ender = event_drul_[STOP];
+      if (!ender)
+	ender = event_drul_[START];
+      finished_ = span_;
+      announce_end_grob (finished_, ender->self_scm ());
+      span_ = 0;
+      current_event_ = 0;
+    }
+
+  if (event_drul_[START])
+    {
+      current_event_ = event_drul_[START];
+      span_ = make_spanner ("TrillSpanner", event_drul_[START]->self_scm ());
+      Side_position_interface::set_axis (span_, Y_AXIS);
     }
 }
 
@@ -125,8 +127,7 @@ Trill_spanner_engraver::stop_translation_timestep ()
     }
 
   typeset_all ();
-  event_drul_[START] = 0;
-  event_drul_[STOP] = 0;
+  event_drul_.set (0, 0);
 }
 
 void
@@ -135,15 +136,24 @@ Trill_spanner_engraver::finalize ()
   typeset_all ();
   if (span_)
     {
-      finished_ = span_;
-      typeset_all ();
+      Grob *e = unsmob_grob (get_property ("currentCommandColumn"));
+      span_->set_bound (RIGHT, e);
     }
 }
 
 ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
+
 ADD_TRANSLATOR (Trill_spanner_engraver,
-		/* doc */ "Create trill spanner from an event.",
-		/* create */ "TrillSpanner",
-		/* accept */ "trill-span-event",
-		/* read */ "",
-		/* write */ "");
+		/* doc */
+		"Create trill spanner from an event.",
+
+		/* create */
+		"TrillSpanner ",
+
+		/* read */
+		"currentCommandColumn "
+		"currentMusicalColumn ",
+
+		/* write */
+		""
+		);