X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftrill-spanner-engraver.cc;h=d71743fbce04c44514111e84ad62a75647f8dab0;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=54d3daa96b71eaac338d61630463343dbc515c86;hpb=cc676c5aadd45985251b5d60fa23eed1ed98f6e6;p=lilypond.git

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 54d3daa96b..d71743fbce 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--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2000--2006 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/>.
 */
 
 /*
@@ -17,8 +28,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 +41,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 +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);
@@ -55,49 +68,49 @@ void
 Trill_spanner_engraver::listen_trill_span (Stream_event *ev)
 {
   Direction d = to_dir (ev->get_property ("span-direction"));
-  event_drul_[d] = ev;
+  ASSIGN_EVENT_ONCE (event_drul_[d], 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]))
+    {
+      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 (spans[i])
-	{
-	  Side_position_interface::add_support (spans[i], info.grob ());
-	  add_bound_item (spans[i], dynamic_cast<Item *> (info.grob ()));
-	}
+      current_event_ = event_drul_[START];
+      span_ = make_spanner ("TrillSpanner", event_drul_[START]->self_scm ());
+      Side_position_interface::set_axis (span_, Y_AXIS);
     }
 }
 
@@ -107,10 +120,10 @@ Trill_spanner_engraver::typeset_all ()
   if (finished_)
     {
       if (!finished_->get_bound (RIGHT))
-	{
-	  Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
-	  finished_->set_bound (RIGHT, e);
-	}
+        {
+          Grob *e = Grob::unsmob (get_property ("currentMusicalColumn"));
+          finished_->set_bound (RIGHT, e);
+        }
       finished_ = 0;
     }
 }
@@ -120,13 +133,12 @@ Trill_spanner_engraver::stop_translation_timestep ()
 {
   if (span_ && !span_->get_bound (LEFT))
     {
-      Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
+      Grob *e = Grob::unsmob (get_property ("currentMusicalColumn"));
       span_->set_bound (LEFT, e);
     }
 
   typeset_all ();
-  event_drul_[START] = 0;
-  event_drul_[STOP] = 0;
+  event_drul_.set (0, 0);
 }
 
 void
@@ -135,15 +147,24 @@ Trill_spanner_engraver::finalize ()
   typeset_all ();
   if (span_)
     {
-      finished_ = span_;
-      typeset_all ();
+      Grob *e = Grob::unsmob (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 a Music.",
-		/* create */ "TrillSpanner",
-		/* accept */ "trill-span-event",
-		/* read */ "",
-		/* write */ "");
+                /* doc */
+                "Create trill spanner from an event.",
+
+                /* create */
+                "TrillSpanner ",
+
+                /* read */
+                "currentCommandColumn "
+                "currentMusicalColumn ",
+
+                /* write */
+                ""
+               );