patch::: 1.3.33.jcn3

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index e97c7357b3b56e69ed920911b483eb17d6146564..ea0c6f2475aa8efc99a036004c48c2d6c9f313dd 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,77 +1,27 @@
-/*
-  textitem.cc -- implement Text_item
+/*   
+  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)
-    : Staff_side(this)
-{
-    dir_i_ =-1;
-    init(tdef_l);  
-}
-
-Text_def*
-Text_item::tdef_l()
-{
-    return tdef_p_;
-}
-
-Text_item::~Text_item()
-{
-    delete tdef_p_;
-}
-
-void
-Text_item::init(Text_def *tdef_l)
+Molecule 
+Text_item::do_brew_molecule () const
 {
-    tdef_p_ = new Text_def (*tdef_l);
+  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 ());
 }
 
-Text_item::Text_item(Text_req* treq_l)
-    : Staff_side(this)
-{
-    init(treq_l->tdef_p_);
-    dir_i_ = treq_l->dir_i_;
-    if (!dir_i_)
-       dir_i_ = -1;
-}
-
-void
-Text_item::set_default_index()
-{
-    pos_i_  = get_position_i(tdef_p_->create_atom(paper()).extent().y );
-}
-
-void
-Text_item::do_post_processing()
-{
-    if (!dir_i_)
-       dir_i_ = -1;
-    set_default_index();
-}
-
-    
-Molecule*
-Text_item::brew_molecule_p() const
-{
-    Molecule* mol_p = new Molecule(tdef_p_->create_atom(paper()));
-
-    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);