(c) 1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include "atom.hh"
+
#include "box.hh"
#include "debug.hh"
#include "lookup.hh"
template class P<Text_def>; // UGH
-
Volta_spanner::Volta_spanner ()
{
last_b_ = false;
Real internote_f = paper ()->internote_f ();
Real dx = internote_f;
Real w = extent (X_AXIS).length () - dx;
- Atom volta (lookup_l ()->volta (w, last_b_));
+ Molecule volta (lookup_l ()->volta (w, last_b_));
Real h = volta.dim_.y ().length ();
- Atom num (number_p_->get_atom (paper (), LEFT));
+ Molecule num (number_p_->get_molecule (paper (), LEFT));
Real dy = column_arr_.top ()->extent (Y_AXIS) [UP] >
column_arr_[0]->extent (Y_AXIS) [UP];
dy += 2 * h;
Text_def two_text;
two_text.text_str_ = "2";
two_text.style_str_ = number_p_->style_str_;
- Atom two (two_text.get_atom(paper (), LEFT));
+ Molecule two (two_text.get_molecule (paper (), LEFT));
Real gap = two.dim_.x ().length () / 2;
Offset off (num.dim_.x ().length () + gap,
h / internote_f - gap);
num.translate (off);
- mol_p->add_atom (volta);
- mol_p->add_atom (num);
+ mol_p->add_molecule (volta);
+ mol_p->add_molecule (num);
mol_p->translate (Offset (0, dy));
return mol_p;
}
set_bounds (RIGHT, column_arr_.top ());
}
- number_p_->style_str_ = "number-1";
+ number_p_->style_str_ = "number"; // number-1
}
Interval