Run `make grand-replace'.

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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index c5fb70991a30a64da1117ef375c7b7e2992fe841..9c1ebdcf0f0f2a76e565e40c6366c39ca98c63f6 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,119 +3,97 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "engraver.hh"
+
+#include "international.hh"
 #include "note-column.hh"
-#include "item.hh"
+#include "pointer-group-interface.hh"
 #include "side-position-interface.hh"
-#include "engraver.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Text_spanner_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS (Text_spanner_engraver);  
+  TRANSLATOR_DECLARATIONS (Text_spanner_engraver);
 protected:
   virtual void finalize ();
-  virtual void acknowledge_grob (Grob_info);
-  virtual bool try_music (Music *);
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (text_span);
+  DECLARE_ACKNOWLEDGER (note_column);
+  void stop_translation_timestep ();
+  void process_music ();
 
 private:
   Spanner *span_;
   Spanner *finished_;
-  Music *current_req_;
-  Drul_array<Music*> req_drul_;
+  Stream_event *current_event_;
+  Drul_array<Stream_event *> event_drul_;
   void typeset_all ();
 };
 
-
 Text_spanner_engraver::Text_spanner_engraver ()
 {
   finished_ = 0;
-  current_req_ = 0;
-  span_ =0;
-  req_drul_[START] = 0;
-  req_drul_[STOP] = 0;
+  current_event_ = 0;
+  span_ = 0;
+  event_drul_[START] = 0;
+  event_drul_[STOP] = 0;
 }
 
-bool
-Text_spanner_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Text_spanner_engraver, text_span);
+void
+Text_spanner_engraver::listen_text_span (Stream_event *ev)
 {
-  if (m->is_mus_type ("text-span-event"))
-    {
-
-      Direction d = to_dir (m->get_property ("span-direction"));
-      req_drul_[d] = m;
-      return true;
-    }
-
-  return false;
+  Direction d = to_dir (ev->get_property ("span-direction"));
+  ASSIGN_EVENT_ONCE (event_drul_[d], ev);
 }
 
 void
 Text_spanner_engraver::process_music ()
 {
-  if (req_drul_[STOP])
+  if (event_drul_[STOP])
     {
       if (!span_)
-       {
-         req_drul_[STOP]->origin ()->warning
- (_ ("can't 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_req_ = 0;
+         current_event_ = 0;
        }
     }
 
-  if (req_drul_[START])
+  if (event_drul_[START])
     {
-      if (current_req_)
-       {
-         req_drul_[START]->origin ()->warning (_ ("already have a text spanner"));
-       }
+      if (current_event_)
+       event_drul_[START]->origin ()->warning (_ ("already have a text spanner"));
       else
        {
-         current_req_ = req_drul_[START];
-         span_  = make_spanner ("TextSpanner");
+         current_event_ = event_drul_[START];
+         span_ = make_spanner ("TextSpanner", event_drul_[START]->self_scm ());
 
-         
          Side_position_interface::set_axis (span_, Y_AXIS);
-         announce_grob (span_, req_drul_[START]->self_scm ());
-         req_drul_[START] = 0;
-       }
-    }
-}
-
-void
-Text_spanner_engraver::acknowledge_grob (Grob_info info)
-{
-  Spanner * spans[2] ={span_, finished_};
-  for (int i = 0;  i < 2 ; i++)
-    {
-      if (spans[i] && Note_column::has_interface (info.grob_))
-       {
-         Side_position_interface::add_support (spans[i], info.grob_);
-         add_bound_item (spans[i], dynamic_cast<Item*> (info.grob_));
+         event_drul_[START] = 0;
        }
     }
 }
 
 void
 Text_spanner_engraver::typeset_all ()
-{  
+{
   if (finished_)
     {
       if (!finished_->get_bound (RIGHT))
        {
-         Grob* e = unsmob_grob (get_property ("currentMusicalColumn"));
+         Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
          finished_->set_bound (RIGHT, e);
        }
-      typeset_grob (finished_);
       finished_ = 0;
     }
 }
@@ -125,13 +103,13 @@ 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 ();
-  req_drul_[START] = 0;
-  req_drul_[STOP] = 0;
+  event_drul_[START] = 0;
+  event_drul_[STOP] = 0;
 }
 
 void
@@ -140,16 +118,40 @@ Text_spanner_engraver::finalize ()
   typeset_all ();
   if (span_)
     {
-      current_req_->origin ()->warning (_ ("unterminated text spanner"));
+      current_event_->origin ()->warning (_ ("unterminated text spanner"));
       span_->suicide ();
       span_ = 0;
     }
 }
 
-ENTER_DESCRIPTION (Text_spanner_engraver,
-/* descr */       "Create text spanner from a Music.",
-/* creats*/       "TextSpanner",
-/* accepts */     "text-span-event",
-/* acks  */      "note-column-interface",
-/* reads */       "",
-/* write */       "");
+
+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 ());
+  }
+}
+
+ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
+
+ADD_TRANSLATOR (Text_spanner_engraver,
+               /* doc */
+               "Create text spanner from an event.",
+
+               /* create */
+               "TextSpanner ",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );