#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;
- fat_b_ = false;
- tdef_p_ = tdef_l->clone();
+ dir_ = d;
+ fat_b_ = false;
+ tdef_p_ = tdef_l->clone();
}
Text_item::~Text_item()
{
- delete tdef_p_;
+ delete tdef_p_;
}
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_).dim_.y ();
}
-
+
Molecule*
Text_item::brew_molecule_p() const
{
- 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 (-mol_p->extent().y ().left , Y_AXIS);
- mol_p->translate (pos_i_ * paper()->internote_f (), Y_AXIS);
-
- 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;
}