Imported Upstream version 2.14.2

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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 0bdc95efc03c183daf390641d7763d562b460e2e..c18bf098f2e03855dbfa4096b9d29331805abd96 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--2011 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/>.
 */
 
 #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);
@@ -62,6 +73,7 @@ Text_spanner_engraver::process_music ()
       else
        {
          finished_ = span_;
+         announce_end_grob (finished_, SCM_EOL);
          span_ = 0;
          current_event_ = 0;
        }
@@ -82,20 +94,6 @@ Text_spanner_engraver::process_music ()
     }
 }
 
-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 ());
-       }
-    }
-}
-
 void
 Text_spanner_engraver::typeset_all ()
 {
@@ -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,15 +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 */
-               "",
+               "currentMusicalColumn ",
+
                /* write */
                ""
                );