release: 1.3.29

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 8d62ea72896dd97d231c54e3b6ef5ff41b2dbc0f..ea0c6f2475aa8efc99a036004c48c2d6c9f313dd 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,61 +1,27 @@
-/*
+/*   
   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"
 
-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;
-}
-
-Interval
-Text_item::symbol_height() const
+Molecule 
+Text_item::do_brew_molecule () const
 {
-  return tdef_p_->get_atom (paper(), dir_).dim_.y ();
-}
-  
-Molecule*
-Text_item::brew_molecule_p() const
-{
-  Atom a (tdef_p_->get_atom (paper(), dir_));
-
-  /*
-    if (fat_b_)
-    a.sym.dim.x = 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 (pos_i_ * paper()->internote_f (), 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;
+  return paper_l ()->lookup_l(0)->text (st, t, paper_l ());
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Text_item,Item);