release: 1.1.41

[lilypond.git] / lily / molecule.cc

diff --git a/lily/molecule.cc b/lily/molecule.cc
index 032f0742fb037d0e44f2ee94412f602a26c4628f..4e6cd44f62e3b24e8c0a62e1ef12db82c08c8b44 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -3,95 +3,179 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "interval.hh"
-#include "dimension.hh"
 #include "string.hh"
 #include "molecule.hh"
 #include "atom.hh"
 #include "debug.hh"
-#include "tex.hh"
+
+#include "killing-cons.tcc"
+
+#ifdef ATOM_SMOB
+#define MOL_EOL SCM_EOL
+#define NEXT_CELL(a) SCM_CDR(a)
+#define CELLTYPE SCM
+#define UNBOX_ATOM(a) Atom::atom_l (a)
+#define BOX_ATOM(a) a->make_smob ()
+#define NEWCELL(a,b) gh_cons (a,b)
+#define UNBOX_PTR(a) SCM_CAR(a)
+#else
+#define MOL_EOL 0
+#define NEXT_CELL(a) ptr->next_
+#define CELLTYPE Cons<Atom>*
+#define UNBOX_ATOM(a) a
+#define UNBOX_PTR(a) a->car_
+#define BOX_ATOM(a) a
+#define NEWCELL(a,b) new Killing_cons<Atom>(a,b)
+#endif
 
 Box
 Molecule::extent() const
 {
-  Box b;
-  for (iter_top (atoms_,c); c.ok(); c++)
-    b.unite (c->extent());
-  return b;
+  return dim_;
+}
+
+Interval
+Molecule::extent(Axis a) const
+{
+  return dim_[a];
 }
 
 void
 Molecule::translate (Offset o)
 {
-  for (iter_top (atoms_,c); c.ok(); c++)
-    c->translate (o);
+  for (CELLTYPE ptr = atom_list_; ptr != MOL_EOL; ptr = NEXT_CELL(ptr))
+    {
+      UNBOX_ATOM(UNBOX_PTR(ptr))->off_ += o;
+    }
+  if (!empty_b ())
+    dim_.translate (o);
 }
 
 void
 Molecule::translate_axis (Real x,Axis a)
 {
-  for (iter_top (atoms_,c); c.ok(); c++)
-    c->translate_axis (x,a);
+  for (CELLTYPE  ptr = atom_list_; ptr != MOL_EOL; ptr = NEXT_CELL(ptr))
+    UNBOX_ATOM (UNBOX_PTR(ptr))->off_[a] += x;
+
+  if (!dim_[a].empty_b ())
+    dim_[a] += x;
 }
 
 void
 Molecule::add_molecule (Molecule const &m)
 {
-  for (iter_top (m.atoms_,c); c.ok(); c++) 
-    {
-      add_atom (**c);
-    }
+  for (CELLTYPE  ptr = m.atom_list_; ptr != MOL_EOL; ptr = NEXT_CELL(ptr))
+    add_atom(UNBOX_ATOM (UNBOX_PTR(ptr)));
+  
+  dim_.unite (m.dim_);
 }
 
+void
+Molecule::add_atom (Atom const *al)
+{
+  Atom *a = new Atom(*al);
+
+  atom_list_ = NEWCELL(BOX_ATOM(a), atom_list_);
+}
 
 void
-Molecule::add_at_edge (Axis a, Direction d, Molecule const &m)
+Molecule::operator=(Molecule const & src)
 {
-  if (!atoms_.size()) 
-    {
-      add_molecule (m);
-      return;
-    }
-  Real offset = extent ()[a][d] - m.extent ()[a][-d];
-  Molecule toadd (m);
-  toadd.translate_axis (offset, a);
-  add_molecule (toadd);
+  if (&src == this) return;
+
+#ifndef ATOM_SMOB
+  delete atom_list_;
+#endif
+
+  atom_list_ = MOL_EOL;
+  dim_= src.dim_;
+  add_molecule (src);
 }
 
-  
-  
 void
-Molecule::operator = (Molecule const &)
+Molecule::set_empty (bool e)
 {
-  assert (false);
+  if (e)
+    {
+      dim_[X_AXIS].set_empty ();
+      dim_[Y_AXIS].set_empty ();
+    }
+  else
+    {
+      dim_[X_AXIS] = Interval(0,0);
+      dim_[Y_AXIS] = Interval (0,0);
+    }
 }
 
 Molecule::Molecule (Molecule const &s)
 {
+  atom_list_ = MOL_EOL;
+  set_empty (true);
   add_molecule (s);
 }
 
+Molecule::~Molecule ()
+{
+#ifndef ATOM_SMOB
+  delete atom_list_;
+#endif
+}
+
 void
 Molecule::print() const
 {
 #ifndef NPRINT
   if (! check_debug)
     return;
-  for (iter_top (atoms_,c); c.ok(); c++)
-    c->print();
+  DOUT << "dim:";
+  for (Axis i=X_AXIS; i < NO_AXES; incr (i))
+    DOUT << axis_name_str (i) << " = " << dim_[i].str ();
 #endif
 }
 
 void
-Molecule::add_atom (Atom const &a)
+Molecule::align_to (Axis a, Direction d)
+{
+  if (d == CENTER)
+    {
+      Interval i (extent (a));
+      translate_axis (-i.center (), a);
+    }
+  else
+    {
+      translate_axis (-extent (a)[d], a);
+    }
+}
+
+Molecule::Molecule ()
+{
+  dim_[X_AXIS].set_empty ();
+  dim_[Y_AXIS].set_empty ();
+  atom_list_ = MOL_EOL;
+}
+
+
+void
+Molecule::add_at_edge (Axis a, Direction d, Molecule const &m, Real padding)
 {
-  atoms_.bottom().add (new Atom (a)); 
+  Real my_extent= empty_b () ? 0.0 : dim_[a][d];
+  Interval i (m.extent ()[a]);
+  if (i.empty_b ())
+    programming_error ("Molecule::add_at_edge: adding empty molecule.");
+  
+  Real his_extent = i[-d];
+  Real offset = my_extent -  his_extent;
+  Molecule toadd (m);
+  toadd.translate_axis (offset + d * padding, a);
+  add_molecule (toadd);
 }
 
-Molecule::Molecule (Atom const &a)
+bool
+Molecule::empty_b () const
 {
-  add_atom (a) ;
+  return atom_list_ == MOL_EOL;
 }