X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=6bd2356cab176959cdacb948b425604c0fb2fedd;hb=c31ee4f97786151cdc92d2d45e2b759eb54cd5fd;hp=194b779774f5a24378275894a79aa2fc6a0c0750;hpb=02ad2d3bb642d9228c4ae69efc71a74bd222575f;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 194b779774..6bd2356cab 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,134 +1,101 @@
-/*   
-  text-engraver.cc --  implement Text_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "dimension-cache.hh"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2012 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
+  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 "directional-element-interface.hh"
 #include "engraver.hh"
+#include "item.hh"
 #include "side-position-interface.hh"
-#include "text-item.hh"
-#include "musical-request.hh"
-#include "note-head.hh"
-#include "stem.hh"
-#include "staff-symbol.hh"
+#include "stream-event.hh"
+#include "text-interface.hh"
+
+#include "translator.icc"
 
 /**
    typeset directions that are  plain text.
- */
+*/
 class Text_engraver : public Engraver
 {
-  Link_array<Text_script_req> reqs_;
-  Link_array<Text_item> texts_;
+  vector<Stream_event *> evs_;
 public:
-
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
-  virtual bool do_try_music (Music* m);
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void do_process_requests ();
-  virtual void acknowledge_element (Score_element_info);
-};
-
-
-bool
-Text_engraver::do_try_music (Music *m)
-{
-  if (Text_script_req *r = dynamic_cast<Text_script_req*> (m))
-    {
-      reqs_.push (r);
-      return true;
-    }
-  return false;
-}
+  void stop_translation_timestep ();
+  void process_music ();
 
+  DECLARE_TRANSLATOR_LISTENER (text_script);
+};
 
+IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script);
 void
-Text_engraver::acknowledge_element (Score_element_info i)
+Text_engraver::listen_text_script (Stream_event *ev)
 {
-  if (Note_head *n = dynamic_cast<Note_head*> (i.elem_l_))
-    {
-      for (int i=0; i < texts_.size (); i++)
-	{
-	  Side_position_interface st (texts_[i]);
-	  st.add_support (n);
-	  if (st.get_axis( ) == X_AXIS
-	      && !texts_[i]->parent_l (Y_AXIS))
-	    texts_[i]->set_parent (n, Y_AXIS);
-	}
-    }
-  if (Stem *n = dynamic_cast<Stem*> (i.elem_l_))
-    {
-      for (int i=0; i < texts_.size (); i++)
-	{
-	  Side_position_interface st(texts_[i]);
-	  st.add_support (n);
-	}
-    }
+  evs_.push_back (ev);
 }
 
 void
-Text_engraver::do_process_requests ()
+Text_engraver::process_music ()
 {
-  for (int i=0; i < reqs_.size (); i++)
+  for (vsize i = 0; i < evs_.size (); i++)
     {
-      Text_script_req * r = reqs_[i];
-
-      Text_item *text = new Text_item;
-      Side_position_interface stafy (text);
-
-      SCM axisprop = get_property ("scriptHorizontal");
-      if (to_boolean (axisprop))
-	{
-	  stafy.set_axis (X_AXIS);
-	  //	  text->set_parent (ss, Y_AXIS);
-	}
-      else
-	stafy.set_axis (Y_AXIS);
-      
-      text->set_elt_property ("script-priority",
-			    gh_int2scm (200));
-
-      if (r->get_direction ())
-	stafy.set_direction (r->get_direction ());
-      
-      text->set_elt_property ("text",
-			      ly_str02scm ( r->text_str_.ch_C ()));
-      
-      if (r->style_str_.length_i ())
-	text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C()));
-      
-      SCM empty = get_property ("textEmptyDimension");
-      if (to_boolean (empty))
-	{
-	  text->set_empty (X_AXIS);
-	}
-
-      announce_element (Score_element_info (text, r));
-      texts_.push (text);
+      Stream_event *r = evs_[i];
+
+      // URG: Text vs TextScript
+      Item *text = make_item ("TextScript", r->self_scm ());
+
+      int priority = robust_scm2int (text->get_property ("script-priority"),
+                                     200);
+
+      /* see script-engraver.cc */
+      priority += i;
+
+      text->set_property ("script-priority", scm_from_int (priority));
+
+      Direction dir = to_dir (r->get_property ("direction"));
+      if (dir)
+        set_grob_direction (text, dir);
+
+      SCM mark = r->get_property ("text");
+
+      text->set_property ("text", mark);
     }
 }
 
 void
-Text_engraver::do_pre_move_processing ()
+Text_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < texts_.size (); i++)
-    {
-      side_position (texts_[i]).add_staff_support ();
-      typeset_element (texts_[i]);
-    }
-  texts_.clear ();
+  evs_.clear ();
 }
 
-void
-Text_engraver::do_post_move_processing ()
+Text_engraver::Text_engraver ()
 {
-  reqs_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Text_engraver);
+ADD_TRANSLATOR (Text_engraver,
+                /* doc */
+                "Create text scripts.",
+
+                /* create */
+                "TextScript ",
+
+                /* read */
+                "",
 
+                /* write */
+                ""
+               );