source file of the GNU LilyPond music typesetter
- (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "interval.hh"
-#include "dimen.hh"
+#include "dimension.hh"
#include "string.hh"
#include "molecule.hh"
-#include "symbol.hh"
+#include "atom.hh"
#include "debug.hh"
#include "tex.hh"
-String
-Molecule::TeX_string() const
-{
- String s;
- for (iter_top (ats,c); c.ok(); c++)
- s+=c->TeX_string();
- return s;
-}
-
Box
Molecule::extent() const
{
Box b;
- for (iter_top (ats,c); c.ok(); c++)
+ for (iter_top (atoms_,c); c.ok(); c++)
b.unite (c->extent());
return b;
}
void
Molecule::translate (Offset o)
{
- for (iter_top (ats,c); c.ok(); c++)
+ for (iter_top (atoms_,c); c.ok(); c++)
c->translate (o);
}
void
-Molecule::translate (Real x,Axis a)
+Molecule::translate_axis (Real x,Axis a)
{
- for (iter_top (ats,c); c.ok(); c++)
- c->translate (x,a);
+ for (iter_top (atoms_,c); c.ok(); c++)
+ c->translate_axis (x,a);
}
void
-Molecule::add (Molecule const &m)
+Molecule::add_molecule (Molecule const &m)
{
- for (iter_top (m.ats,c); c.ok(); c++)
+ for (iter_top (m.atoms_,c); c.ok(); c++)
{
- add (**c);
+ add_atom (**c);
}
}
void
Molecule::add_at_edge (Axis a, Direction d, Molecule const &m)
{
- if (!ats.size())
+ if (!atoms_.size())
{
- add (m);
+ add_molecule (m);
return;
}
Real offset = extent ()[a][d] - m.extent ()[a][-d];
Molecule toadd (m);
- toadd.translate (offset, a);
- add (toadd);
+ toadd.translate_axis (offset, a);
+ add_molecule (toadd);
}
Molecule::Molecule (Molecule const &s)
{
- add (s);
+ add_molecule (s);
}
void
#ifndef NPRINT
if (! check_debug)
return;
- for (iter_top (ats,c); c.ok(); c++)
+ for (iter_top (atoms_,c); c.ok(); c++)
c->print();
#endif
}
void
-Molecule::add (Atom const &a)
+Molecule::add_atom (Atom const &a)
+{
+ atoms_.bottom().add (new Atom (a));
+}
+
+Molecule::Molecule (Atom const &a)
{
- ats.bottom().add (new Atom (a));
+ add_atom (a) ;
}