release: 0.0.47

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 7cdab7c71fce06d08604e6f7e2d080327ebe046c..817dc6a3b72f36f681469b05c9b91edb0b02d1c6 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -7,28 +7,49 @@
 */
 
 
-  #include "musicalrequest.hh"
+#include "musical-request.hh"
 #include "paper-def.hh"
 #include "text-item.hh"
 #include "stem.hh"
 #include "molecule.hh"
 #include "lookup.hh"
 
+Text_item::Text_item(Text_def *tdef_l, int staffsize_i)
+{
+    dir_i_ =-1;
+    init(tdef_l, staffsize_i);  
+}
+
+Text_def*
+Text_item::tdef_l()
+{
+    return tdef_p_;
+}
 
+Text_item::~Text_item()
+{
+    delete tdef_p_;
+}
 
-Text_item::Text_item(Text_req* treq_l, int staffsize_i)
+void
+Text_item::init(Text_def *tdef_l, int staffsize_i)
 {
     staffsize_i_ = staffsize_i;
+    tdef_p_ = new Text_def (*tdef_l);
+}
+
+Text_item::Text_item(Text_req* treq_l, int staffsize_i)
+{
+    init(treq_l->tdef_p_, staffsize_i);
     dir_i_ = treq_l->dir_i_;
     if (!dir_i_)
        dir_i_ = -1;
-    tdef_l_ = treq_l->tdef_p_;
 }
 
 void
 Text_item::set_default_index()
 {
-    pos_i_  = (dir_i_ > 0) ? staffsize_i_ + 2: -4;
+    pos_i_  = (dir_i_ > 0) ? staffsize_i_ + 4: -4;
 }
 
 void
@@ -41,11 +62,13 @@ Text_item::do_pre_processing()
 Molecule*
 Text_item::brew_molecule_p() const
 {
-    Molecule* mol_p = new Molecule(tdef_l_->create_atom(paper()));
-    mol_p->translate(Offset(0, pos_i_ * paper()->internote()));
+    Molecule* mol_p = new Molecule(tdef_p_->create_atom(paper()));
 
-    if(dir_i_<0)
-       mol_p->translate(Offset(0, -mol_p->extent().y.length() ));
+    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);