X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=f242fa4db2a9f4412d2630c6a2c593a957036d38;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=6bd2356cab176959cdacb948b425604c0fb2fedd;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 6bd2356cab..f242fa4db2 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--2012 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
@@ -20,6 +20,8 @@
 #include "directional-element-interface.hh"
 #include "engraver.hh"
 #include "item.hh"
+#include "note-column.hh"
+#include "pointer-group-interface.hh"
 #include "side-position-interface.hh"
 #include "stream-event.hh"
 #include "text-interface.hh"
@@ -29,15 +31,18 @@
 /**
    typeset directions that are  plain text.
 */
+
 class Text_engraver : public Engraver
 {
   vector<Stream_event *> evs_;
+  vector<Grob *> scripts_;
 public:
   TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
   void stop_translation_timestep ();
   void process_music ();
 
+  DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_TRANSLATOR_LISTENER (text_script);
 };
 
@@ -53,26 +58,44 @@ Text_engraver::process_music ()
 {
   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"),
+      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);
+    }
+}
 
-      SCM mark = r->get_property ("text");
+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 ()
+                    : Grob::unsmob (info.grob ()->get_object ("rest")));
 
-      text->set_property ("text", mark);
+  for (vsize i = 0; i < scripts_.size (); i++)
+    {
+      Grob *el = scripts_[i];
+
+      if (el && !el->get_parent (X_AXIS) && x_parent)
+        el->set_parent (x_parent, X_AXIS);
     }
 }
 
@@ -80,12 +103,15 @@ void
 Text_engraver::stop_translation_timestep ()
 {
   evs_.clear ();
+  scripts_.clear ();
 }
 
 Text_engraver::Text_engraver ()
 {
 }
 
+ADD_ACKNOWLEDGER (Text_engraver, note_column);
+
 ADD_TRANSLATOR (Text_engraver,
                 /* doc */
                 "Create text scripts.",