release: 0.0.57

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 2171a81d240a794826872543a04adee6f1e14671..9972a36dc135065a3c0452b1405b8abbad7a6576 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,5 +1,5 @@
 /*
-  textitem.cc -- implement Text_item
+  text-item.cc -- implement Text_item
 
   source file of the LilyPond music typesetter
 
@@ -14,10 +14,13 @@
 #include "molecule.hh"
 #include "lookup.hh"
 
-Text_item::Text_item(Text_def *tdef_l, int staffsize_i)
+Text_item::Text_item(Text_def *tdef_l, int d)
+    : Staff_side(this)
 {
-    dir_i_ =-1;
-    init(tdef_l, staffsize_i);  
+    dir_i_ = d;
+    fat_b_ = false;
+    tdef_p_ = new Text_def(*tdef_l);
+    pos_i_ =0;
 }
 
 Text_def*
@@ -32,41 +35,39 @@ Text_item::~Text_item()
 }
 
 void
-Text_item::init(Text_def *tdef_l, int staffsize_i)
+Text_item::set_default_index()
 {
-    staffsize_i_ = staffsize_i;
-    tdef_p_ = new Text_def (*tdef_l);
+    pos_i_  = get_position_i(tdef_p_->create_atom().extent().y );
 }
 
-Text_item::Text_item(Text_req* treq_l, int staffsize_i)
+void
+Text_item::do_pre_processing()
 {
-    init(treq_l->tdef_p_, staffsize_i);
-    dir_i_ = treq_l->dir_i_;
     if (!dir_i_)
        dir_i_ = -1;
+    tdef_p_->pdef_l_ = paper();
 }
 
 void
-Text_item::set_default_index()
+Text_item::do_post_processing()
 {
-    pos_i_  = (dir_i_ > 0) ? staffsize_i_ + 2: -4;
-}
-
-void
-Text_item::do_pre_processing()
-{
-    set_default_index();
+        set_default_index();
 }
 
     
 Molecule*
 Text_item::brew_molecule_p() const
 {
-    Molecule* mol_p = new Molecule(tdef_p_->create_atom(paper()));
-    mol_p->translate(Offset(0, pos_i_ * paper()->internote()));
+    Atom a(tdef_p_->create_atom());
 
-    if(dir_i_<0)
-       mol_p->translate(Offset(0, -mol_p->extent().y.length() ));
+    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;
 }