release: 0.1.30

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 6d3b67d003e0623bb331d72cd8f8923b75146f3c..16a45977f17d9bcf043e97c4fa2a6c3349ea3e77 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,7 +1,7 @@
 /*
   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,62 +14,48 @@
 #include "molecule.hh"
 #include "lookup.hh"
 
-Text_item::Text_item(Text_def *tdef_l, int d)
-    : Staff_side(this)
+Text_item::Text_item (General_script_def*tdef_l, Direction d) 
 {
-    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_;
+  dir_ = d;
+  fat_b_ = false;
+  tdef_p_ = tdef_l->clone();
 }
 
 Text_item::~Text_item()
 {
-    delete tdef_p_;
-}
-
-void
-Text_item::set_default_index()
-{
-    pos_i_  = get_position_i(tdef_p_->create_atom().extent().y );
+  delete tdef_p_;
 }
 
 void
 Text_item::do_pre_processing()
 {
-    if (!dir_i_)
-       dir_i_ = -1;
-    tdef_p_->pdef_l_ = paper();
+  if (!dir_)
+    dir_ = DOWN;
 }
 
-void
-Text_item::do_post_processing()
+Interval
+Text_item::symbol_height() const
 {
-    set_default_index();
+  return tdef_p_->get_atom (paper(), dir_).dim_.y ();
 }
-
-    
+  
 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;
+  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 (y_, Y_AXIS);
+  
+  return mol_p;
 }
 
-IMPLEMENT_STATIC_NAME(Text_item);
+
+IMPLEMENT_IS_TYPE_B1(Text_item,Item);