release: 1.0.1

[lilypond.git] / lily / molecule.cc

diff --git a/lily/molecule.cc b/lily/molecule.cc
index f9cc7bb12a9da38d87b4e51a55c4616fda3d913d..032f0742fb037d0e44f2ee94412f602a26c4628f 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -3,138 +3,95 @@
 
   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++)
-       b.unite(c->extent());
-    return b;
-}
-
-void
-Molecule::translate(Offset o)
-{
-    for (iter_top(ats,c); c.ok(); c++)
-       c->translate(o);
-}
-
-void
-Molecule::translate(Real x,Axis a)
-{
-    for (iter_top(ats,c); c.ok(); c++)
-       c->translate(x,a);
+  Box b;
+  for (iter_top (atoms_,c); c.ok(); c++)
+    b.unite (c->extent());
+  return b;
 }
 
 void
-Molecule::add(Molecule const &m)
+Molecule::translate (Offset o)
 {
-    for (iter_top(m.ats,c); c.ok(); c++) {
-       add(**c);
-    }
+  for (iter_top (atoms_,c); c.ok(); c++)
+    c->translate (o);
 }
 
 void
-Molecule::add_right(Molecule const &m)
+Molecule::translate_axis (Real x,Axis a)
 {
-     if (!ats.size()) {
-       add(m);
-       return;
-    }
-     Real xof=extent().x().right - m.extent().x().left;
- 
-     
-    Molecule toadd(m);
-    toadd.translate(Offset(xof, 0.0));
-    add(toadd);
+  for (iter_top (atoms_,c); c.ok(); c++)
+    c->translate_axis (x,a);
 }
 
 void
-Molecule::add_left(Molecule const &m)
+Molecule::add_molecule (Molecule const &m)
 {
-    if (!ats.size()) {
-       add(m);
-       return;
+  for (iter_top (m.atoms_,c); c.ok(); c++) 
+    {
+      add_atom (**c);
     }
-  Real xof=extent().x().left - m.extent().x().right;
-   
-    Molecule toadd(m);
-    toadd.translate(Offset(xof, 0.0));
-    add(toadd);
 }
 
 
 void
-Molecule::add_top(Molecule const &m)
+Molecule::add_at_edge (Axis a, Direction d, Molecule const &m)
 {
-      if (!ats.size()) {
-       add(m);
-       return;
+  if (!atoms_.size()) 
+    {
+      add_molecule (m);
+      return;
     }
-   Real yof=extent().y().right - m.extent().y().left;
-
-    Molecule toadd(m);
-    toadd.translate(yof, Y_AXIS);
-    add(toadd);
-}
-
-void
-Molecule::add_bottom(Molecule const &m)
-{
-    if (!ats.size()) {
-       add(m);
-       return;
-    }
-     Real yof=extent().y().left- m.extent().y().right;
-    Molecule toadd(m);
-    toadd.translate(yof, Y_AXIS);
-    add(toadd);
+  Real offset = extent ()[a][d] - m.extent ()[a][-d];
+  Molecule toadd (m);
+  toadd.translate_axis (offset, a);
+  add_molecule (toadd);
 }
 
+  
+  
 void
 Molecule::operator = (Molecule const &)
 {
-    assert(false);
+  assert (false);
 }
 
-Molecule::Molecule(Molecule const &s)
+Molecule::Molecule (Molecule const &s)
 {
-    add(s);
+  add_molecule (s);
 }
 
 void
 Molecule::print() const
 {
 #ifndef NPRINT
-    if (! check_debug)
-       return;
-    for (iter_top(ats,c); c.ok(); c++)
-       c->print();
+  if (! check_debug)
+    return;
+  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) ;
 }