release: 1.3.19

[lilypond.git] / lily / text-item.cc

diff --git a/lily/text-item.cc b/lily/text-item.cc
index c471fa1453f7c96c82c8ec14a077c1c319d74f06..034173e7c5688a18c6fe3d292b99340a9b91f0cd 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,81 +1,29 @@
-/*
+/*   
   text-item.cc -- implement Text_item
 
   source file of the GNU LilyPond music typesetter
+  
+  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-
-#include "musical-request.hh"
-#include "paper-def.hh"
 #include "text-item.hh"
-#include "stem.hh"
+#include "debug.hh"
 #include "molecule.hh"
+#include "paper-def.hh"
 #include "lookup.hh"
-#include "debug.hh"
 
-Text_item::Text_item (General_script_def* tdef_l, Direction d) 
-{
-  dir_ = d;
-  fat_b_ = false;
-  tdef_p_ = tdef_l->clone ();
-}
-
-Text_item::~Text_item ()
-{
-  delete tdef_p_;
-}
-
-void
-Text_item::do_pre_processing ()
-{
-  if (!dir_)
-    dir_ = DOWN;
-}
-
-Real
-Text_item::get_position_f () const
-{
-  // uhuh, tdef/gdef?
-  if ( (tdef_p_->name () != Text_def::static_name ()) 
-    || ( ( (Text_def*)tdef_p_)->style_str_ != "finger"))
-    return Staff_side::get_position_f ();
-
-  if (!dir_)
-    {
-      warning (_ ("Text_item::get_position_f(): "
-                "somebody forgot to set my vertical direction, returning -20"));
-      return -20;
-    }
-
-  Interval v = support_height ();
-  // add no extra: fingers should be just above note, no?
-  return v[dir_];
-}
-
-Interval
-Text_item::symbol_height () const
-{
-  return tdef_p_->get_atom (paper (), dir_).dim_.y ();
-}
-  
 Molecule*
-Text_item::brew_molecule_p () const
+Text_item::do_brew_molecule_p () const
 {
-  Atom a (tdef_p_->get_atom (paper (), dir_));
-
-
-  if (fat_b_)
-    a.dim_[X_AXIS] = tdef_p_->width (paper ());
-  Molecule* mol_p = new Molecule (a);
-
-  if (dir_<0)          // should do something better anyway.
-    mol_p->translate_axis (-mol_p->extent ().y ().left , Y_AXIS);
-  mol_p->translate_axis (y_, Y_AXIS);
+  SCM style = get_elt_property ("style");
+  String st = gh_string_p (style) ?  ly_scm2string (style) : "";
+  SCM txt = get_elt_property ("text");
+  String t = gh_string_p (txt) ? ly_scm2string (txt) : "";
   
-  return mol_p;
+  Molecule a= paper_l ()->lookup_l(0)->text (st, t, paper_l ());
+
+  return new Molecule (a);
 }
 
 
-IMPLEMENT_IS_TYPE_B1 (Text_item,Item);