X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftrill-spanner-engraver.cc;h=d00a0978dd3be59b6ddac74e3193dacdf04253bf;hb=ace881437adc0146a62cffa3255ac1ca169bd054;hp=6f5f28beb7006c31601f4808886760fc71e7c352;hpb=ecf2b5e9dcfa7654803fb0050d7127e0ec7fd934;p=lilypond.git

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 6f5f28beb7..d00a0978dd 100644
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  trill-spanner-engraver.cc -- implement Trill_spanner_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2010 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
@@ -49,8 +60,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);
@@ -64,45 +74,43 @@ Trill_spanner_engraver::listen_trill_span (Stream_event *ev)
 void
 Trill_spanner_engraver::acknowledge_note_column (Grob_info info)
 {
-  if (span_) {
-    Pointer_group_interface::add_grob (span_,
-				       ly_symbol2scm ("note-columns"),
-				       info.grob());
-    add_bound_item (span_, info.grob ());
-  } else if (finished_) {
-    Pointer_group_interface::add_grob (finished_, ly_symbol2scm ("note-columns"),
-				       info.grob());
-    add_bound_item (finished_, info.grob ());
-  }
+  if (span_)
+    {
+      Pointer_group_interface::add_grob (span_,
+					 ly_symbol2scm ("note-columns"),
+					 info.grob());
+      if (!span_->get_bound (LEFT))
+	add_bound_item (span_, info.grob ());
+    }
+  else if (finished_)
+    {
+      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::process_music ()
 {
-  if (event_drul_[STOP])
+  if (span_
+      && (event_drul_[STOP] || event_drul_[START]))
     {
-      if (!span_)
-	event_drul_[STOP]->origin ()->warning (_ ("cannot find start of trill spanner"));
-      else
-	{
-	  finished_ = span_;
-	  announce_end_grob (finished_, SCM_EOL);
-	  span_ = 0;
-	  current_event_ = 0;
-	}
+      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])
     {
-      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;
-	}
+      current_event_ = event_drul_[START];
+      span_ = make_spanner ("TrillSpanner", event_drul_[START]->self_scm ());
+      Side_position_interface::set_axis (span_, Y_AXIS);
     }
 }
 
@@ -130,8 +138,7 @@ Trill_spanner_engraver::stop_translation_timestep ()
     }
 
   typeset_all ();
-  event_drul_[START] = 0;
-  event_drul_[STOP] = 0;
+  event_drul_.set (0, 0);
 }
 
 void
@@ -140,8 +147,8 @@ Trill_spanner_engraver::finalize ()
   typeset_all ();
   if (span_)
     {
-      finished_ = span_;
-      typeset_all ();
+      Grob *e = unsmob_grob (get_property ("currentCommandColumn"));
+      span_->set_bound (RIGHT, e);
     }
 }
 
@@ -155,7 +162,8 @@ ADD_TRANSLATOR (Trill_spanner_engraver,
 		"TrillSpanner ",
 
 		/* read */
-		"",
+		"currentCommandColumn "
+		"currentMusicalColumn ",
 
 		/* write */
 		""