X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner-engraver.cc;h=1b66b68f121139530e98d60b42f32fdc553b7666;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=9c1ebdcf0f0f2a76e565e40c6366c39ca98c63f6;hpb=7f3f0083f89d87c5ed0422858e9648fc759e98a4;p=lilypond.git

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 9c1ebdcf0f..1b66b68f12 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  text-spanner-engraver.cc -- implement Text_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--2008 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/>.
 */
 
 #include "engraver.hh"
@@ -23,8 +34,8 @@ public:
   TRANSLATOR_DECLARATIONS (Text_spanner_engraver);
 protected:
   virtual void finalize ();
-  DECLARE_TRANSLATOR_LISTENER (text_span);
-  DECLARE_ACKNOWLEDGER (note_column);
+  void listen_text_span (Stream_event *);
+  void acknowledge_note_column (Grob_info);
   void stop_translation_timestep ();
   void process_music ();
 
@@ -36,16 +47,15 @@ private:
   void typeset_all ();
 };
 
-Text_spanner_engraver::Text_spanner_engraver ()
+Text_spanner_engraver::Text_spanner_engraver (Context *c)
+  : Engraver (c)
 {
   finished_ = 0;
   current_event_ = 0;
   span_ = 0;
-  event_drul_[START] = 0;
-  event_drul_[STOP] = 0;
+  event_drul_.set (0, 0);
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Text_spanner_engraver, text_span);
 void
 Text_spanner_engraver::listen_text_span (Stream_event *ev)
 {
@@ -59,28 +69,30 @@ Text_spanner_engraver::process_music ()
   if (event_drul_[STOP])
     {
       if (!span_)
-	event_drul_[STOP]->origin ()->warning (_ ("cannot find start of text spanner"));
+        event_drul_[STOP]->origin ()->warning (_ ("cannot find start of text spanner"));
       else
-	{
-	  finished_ = span_;
-	  announce_end_grob (finished_, SCM_EOL);
-	  span_ = 0;
-	  current_event_ = 0;
-	}
+        {
+          finished_ = span_;
+          announce_end_grob (finished_, SCM_EOL);
+          span_ = 0;
+          current_event_ = 0;
+        }
     }
 
   if (event_drul_[START])
     {
       if (current_event_)
-	event_drul_[START]->origin ()->warning (_ ("already have a text spanner"));
+        event_drul_[START]->origin ()->warning (_ ("already have a text spanner"));
       else
-	{
-	  current_event_ = event_drul_[START];
-	  span_ = make_spanner ("TextSpanner", 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 ("TextSpanner", event_drul_[START]->self_scm ());
+          if (Direction d = to_dir (current_event_->get_property ("direction")))
+            span_->set_property ("direction", scm_from_int (d));
+
+          Side_position_interface::set_axis (span_, Y_AXIS);
+          event_drul_[START] = 0;
+        }
     }
 }
 
@@ -90,10 +102,10 @@ Text_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 = unsmob<Grob> (get_property ("currentMusicalColumn"));
+          finished_->set_bound (RIGHT, e);
+        }
       finished_ = 0;
     }
 }
@@ -103,13 +115,12 @@ Text_spanner_engraver::stop_translation_timestep ()
 {
   if (span_ && !span_->get_bound (LEFT))
     {
-      Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
+      Grob *e = unsmob<Grob> (get_property ("currentMusicalColumn"));
       span_->set_bound (LEFT, e);
     }
 
   typeset_all ();
-  event_drul_[START] = 0;
-  event_drul_[STOP] = 0;
+  event_drul_.set (0, 0);
 }
 
 void
@@ -124,34 +135,45 @@ Text_spanner_engraver::finalize ()
     }
 }
 
-
 void
 Text_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 ());
+    }
 }
 
-ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
+
+void
+Text_spanner_engraver::boot ()
+{
+  ADD_LISTENER (Text_spanner_engraver, text_span);
+  ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
+}
 
 ADD_TRANSLATOR (Text_spanner_engraver,
-		/* doc */
-		"Create text spanner from an event.",
+                /* doc */
+                "Create text spanner from an event.",
 
-		/* create */
-		"TextSpanner ",
+                /* create */
+                "TextSpanner ",
 
-		/* read */
-		"",
+                /* read */
+                "currentMusicalColumn ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );