release: 0.1.11

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index db87a8d152c7fc6e6365df5382ab9fa8ee4ff03d..876acfde39f0b0133970dd94aedf4fbb8fbc94fc 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -14,9 +14,9 @@
 #include "molecule.hh"
 #include "lookup.hh"
 
-Text_item::Text_item (General_script_def*tdef_l, int d)
+Text_item::Text_item (General_script_def*tdef_l, Direction d) 
 {
-  dir_i_ = d;
+  dir_ = d;
   fat_b_ = false;
   tdef_p_ = tdef_l->clone();
 }
@@ -29,29 +29,29 @@ Text_item::~Text_item()
 void
 Text_item::do_pre_processing()
 {
-  if (!dir_i_)
-       dir_i_ = -1;
+  if (!dir_)
+    dir_ = DOWN;
 }
 
 Interval
-Text_item::symbol_height()const
+Text_item::symbol_height() const
 {
-  return tdef_p_->get_atom (paper(), dir_i_).sym_.dim.y ();
+  return tdef_p_->get_atom (paper(), dir_).sym_.dim.y ();
 }
   
 Molecule*
 Text_item::brew_molecule_p() const
 {
-  Atom a (tdef_p_->get_atom (paper(), dir_i_));
+  Atom a (tdef_p_->get_atom (paper(), dir_));
 
-/*
-  if ( fat_b_)
-       a.sym.dim.x = tdef_p_->width (paper());
-       */
+  /*
+    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 (-mol_p->extent().y ().left , Y_AXIS);
+  if (dir_<0)          // should do something better anyway.
+    mol_p->translate (-mol_p->extent().y ().left , Y_AXIS);
   mol_p->translate (pos_i_ * paper()->internote_f (), Y_AXIS);
   
   return mol_p;