Run grand-replace (issue 3765)

[lilypond.git] / lily / text-spanner-engraver.cc

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 2994956a50c01d665a717b92a3c36df6d1837024..52ad7201b1199d123b9ea274785c835a4bc61c20 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -1,15 +1,27 @@
 /*
-  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--2014 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/>.
 */
 
 #include "engraver.hh"
 
 #include "international.hh"
 #include "note-column.hh"
+#include "pointer-group-interface.hh"
 #include "side-position-interface.hh"
 #include "spanner.hh"
 #include "stream-event.hh"
@@ -22,8 +34,8 @@ public:
   TRANSLATOR_DECLARATIONS (Text_spanner_engraver);
 protected:
   virtual void finalize ();
-  DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_TRANSLATOR_LISTENER (text_span);
+  DECLARE_ACKNOWLEDGER (note_column);
   void stop_translation_timestep ();
   void process_music ();
 
@@ -40,8 +52,7 @@ Text_spanner_engraver::Text_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 (Text_spanner_engraver, text_span);
@@ -58,41 +69,28 @@ 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_;
-         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 ());
+        {
+          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;
-       }
-    }
-}
-
-void
-Text_spanner_engraver::acknowledge_note_column (Grob_info info)
-{
-  Spanner *spans[2] ={span_, finished_};
-  for (int i = 0; i < 2; i++)
-    {
-      if (spans[i])
-       {
-         Side_position_interface::add_support (spans[i], info.grob ());
-         add_bound_item (spans[i], info.grob ());
-       }
+          Side_position_interface::set_axis (span_, Y_AXIS);
+          event_drul_[START] = 0;
+        }
     }
 }
 
@@ -102,10 +100,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;
     }
 }
@@ -120,8 +118,7 @@ Text_spanner_engraver::stop_translation_timestep ()
     }
 
   typeset_all ();
-  event_drul_[START] = 0;
-  event_drul_[STOP] = 0;
+  event_drul_.set (0, 0);
 }
 
 void
@@ -136,9 +133,39 @@ 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 ());
+      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);
+
 ADD_TRANSLATOR (Text_spanner_engraver,
-               /* doc */ "Create text spanner from an event.",
-               /* create */ "TextSpanner",
-               /* read */ "",
-               /* write */ "");
+                /* doc */
+                "Create text spanner from an event.",
+
+                /* create */
+                "TextSpanner ",
+
+                /* read */
+                "currentMusicalColumn ",
+
+                /* write */
+                ""
+               );