release: 1.3.31

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 6d3b67d003e0623bb331d72cd8f8923b75146f3c..ea0c6f2475aa8efc99a036004c48c2d6c9f313dd 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,75 +1,27 @@
-/*
+/*   
   text-item.cc -- implement Text_item
 
-  source file of the LilyPond music typesetter
+  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(Text_def *tdef_l, int d)
-    : Staff_side(this)
-{
-    dir_i_ = d;
-    fat_b_ = false;
-    tdef_p_ = new Text_def(*tdef_l);
-    pos_i_ =0;
-}
-
-Text_def*
-Text_item::tdef_l()
-{
-    return tdef_p_;
-}
-
-Text_item::~Text_item()
-{
-    delete tdef_p_;
-}
-
-void
-Text_item::set_default_index()
-{
-    pos_i_  = get_position_i(tdef_p_->create_atom().extent().y );
-}
-
-void
-Text_item::do_pre_processing()
-{
-    if (!dir_i_)
-       dir_i_ = -1;
-    tdef_p_->pdef_l_ = paper();
-}
-
-void
-Text_item::do_post_processing()
+Molecule 
+Text_item::do_brew_molecule () const
 {
-    set_default_index();
+  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 paper_l ()->lookup_l(0)->text (st, t, paper_l ());
 }
 
-    
-Molecule*
-Text_item::brew_molecule_p() const
-{
-    Atom a(tdef_p_->create_atom());
-
-    if ( fat_b_)
-       a.sym.dim.x = tdef_p_->width();
-
-    Molecule* mol_p = new Molecule(a);
-
-    if(dir_i_<0 )              // should do something better anyway.
-       mol_p->translate(Offset(0, -mol_p->extent().y.left ));
-    mol_p->translate(Offset(0, pos_i_ * paper()->internote()));
-    
-    return mol_p;
-}
 
-IMPLEMENT_STATIC_NAME(Text_item);