X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=6bbcdc379479006055ef417679bc7cac439c095c;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=8c2c3924668620a78bd7f63d444daeadf61dc1e2;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 8c2c392466..6bbcdc3794 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,32 +19,33 @@
 
 #include "directional-element-interface.hh"
 #include "engraver.hh"
-#include "rhythmic-head.hh"
+#include "item.hh"
+#include "note-column.hh"
+#include "pointer-group-interface.hh"
 #include "side-position-interface.hh"
-#include "stem.hh"
 #include "stream-event.hh"
 #include "text-interface.hh"
-#include "item.hh"
 
 #include "translator.icc"
 
 /**
    typeset directions that are  plain text.
 */
+
 class Text_engraver : public Engraver
 {
   vector<Stream_event *> evs_;
-  vector<Grob*> texts_;
+  vector<Grob *> scripts_;
 public:
   TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
   void stop_translation_timestep ();
-  void process_acknowledged ();
+  void process_music ();
 
-  DECLARE_TRANSLATOR_LISTENER (text_script);
+  void acknowledge_note_column (Grob_info);
+  void listen_text_script (Stream_event *);
 };
 
-IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script);
 void
 Text_engraver::listen_text_script (Stream_event *ev)
 {
@@ -52,57 +53,81 @@ Text_engraver::listen_text_script (Stream_event *ev)
 }
 
 void
-Text_engraver::process_acknowledged ()
+Text_engraver::process_music ()
 {
-  if (texts_.size ())
-    return;
   for (vsize i = 0; i < evs_.size (); i++)
     {
-      Stream_event *r = evs_[i];
+      Stream_event *ev = evs_[i];
 
-      // URG: Text vs TextScript
-      Item *text = make_item ("TextScript", r->self_scm ());
+      Item *script = make_item ("TextScript", ev->self_scm ());
+      scripts_.push_back (script);
 
-      int priority = robust_scm2int (text->get_property ("script-priority"),
-				     200);
+      int priority = robust_scm2int (script->get_property ("script-priority"),
+                                     200);
 
       /* see script-engraver.cc */
       priority += i;
 
-      text->set_property ("script-priority", scm_from_int (priority));
+      script->set_property ("script-priority", scm_from_int (priority));
 
-      Direction dir = to_dir (r->get_property ("direction"));
+      Direction dir = to_dir (ev->get_property ("direction"));
       if (dir)
-	set_grob_direction (text, dir);
+        set_grob_direction (script, dir);
+
+      SCM mark = ev->get_property ("text");
+
+      script->set_property ("text", mark);
+    }
+}
+
+void
+Text_engraver::acknowledge_note_column (Grob_info info)
+{
+  // Make note column (or rest, if there are no heads) the parent of the script.
+  extract_grob_set (info.grob (), "note-heads", heads);
+  Grob *x_parent = (heads.size ()
+                    ? info.grob ()
+                    : unsmob<Grob> (info.grob ()->get_object ("rest")));
 
-      SCM mark = r->get_property ("text");
+  for (vsize i = 0; i < scripts_.size (); i++)
+    {
+      Grob *el = scripts_[i];
 
-      text->set_property ("text", mark);
-      texts_.push_back (text);
+      if (el && !el->get_parent (X_AXIS) && x_parent)
+        el->set_parent (x_parent, X_AXIS);
     }
 }
 
 void
 Text_engraver::stop_translation_timestep ()
 {
-  texts_.clear ();
   evs_.clear ();
+  scripts_.clear ();
+}
+
+Text_engraver::Text_engraver (Context *c)
+  : Engraver (c)
+{
 }
 
-Text_engraver::Text_engraver ()
+
+void
+Text_engraver::boot ()
 {
+  ADD_LISTENER (Text_engraver, text_script);
+  ADD_ACKNOWLEDGER (Text_engraver, note_column);
 }
 
 ADD_TRANSLATOR (Text_engraver,
-		/* doc */
-		"Create text scripts.",
+                /* doc */
+                "Create text scripts.",
 
-		/* create */
-		"TextScript ",
+                /* create */
+                "TextScript ",
 
-		/* read */
-		"",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );