release: 0.0.75

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index e97c7357b3b56e69ed920911b483eb17d6146564..a8cddcfade0c8b5f59b80aa9dd8ff66269139c6d 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,7 +1,7 @@
 /*
-  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) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -14,17 +14,11 @@
 #include "molecule.hh"
 #include "lookup.hh"
 
-Text_item::Text_item(Text_def *tdef_l)
-    : Staff_side(this)
+Text_item::Text_item(General_script_def*tdef_l, int d)
 {
-    dir_i_ =-1;
-    init(tdef_l);  
-}
-
-Text_def*
-Text_item::tdef_l()
-{
-    return tdef_p_;
+    dir_i_ = d;
+    fat_b_ = false;
+    tdef_p_ = tdef_l->clone();
 }
 
 Text_item::~Text_item()
@@ -33,45 +27,35 @@ Text_item::~Text_item()
 }
 
 void
-Text_item::init(Text_def *tdef_l)
-{
-    tdef_p_ = new Text_def (*tdef_l);
-}
-
-Text_item::Text_item(Text_req* treq_l)
-    : Staff_side(this)
+Text_item::do_pre_processing()
 {
-    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()
+Interval
+Text_item::symbol_height()const
 {
-    if (!dir_i_)
-       dir_i_ = -1;
-    set_default_index();
+    return tdef_p_->get_atom(paper(), dir_i_).sym_.dim.y;
 }
-
     
 Molecule*
 Text_item::brew_molecule_p() const
 {
-    Molecule* mol_p = new Molecule(tdef_p_->create_atom(paper()));
+    Atom a(tdef_p_->get_atom(paper(), dir_i_));
+
+/*
+  if ( fat_b_)
+       a.sym.dim.x = tdef_p_->width(paper());
+       */
+    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()));
+       mol_p->translate_y( -mol_p->extent().y.left );
+    mol_p->translate_y( pos_i_ * paper()->internote_f());
     
     return mol_p;
 }
 
 IMPLEMENT_STATIC_NAME(Text_item);
+IMPLEMENT_IS_TYPE_B1(Text_item,Item);