release: 1.1.41

[lilypond.git] / lily / molecule.cc

diff --git a/lily/molecule.cc b/lily/molecule.cc
index 142a7af91cfa6bfbd6b02f3f59243b1a01ba2be5..4e6cd44f62e3b24e8c0a62e1ef12db82c08c8b44 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -14,6 +14,24 @@
 
 #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
 {
@@ -29,32 +47,30 @@ Molecule::extent(Axis a) const
 void
 Molecule::translate (Offset o)
 {
-  for (Cons<Atom> *  ptr = atom_list_; ptr; ptr = ptr->next_)
+  for (CELLTYPE ptr = atom_list_; ptr != MOL_EOL; ptr = NEXT_CELL(ptr))
     {
-      ptr->car_->off_ += o;
+      UNBOX_ATOM(UNBOX_PTR(ptr))->off_ += o;
     }
-  dim_.translate (o);
+  if (!empty_b ())
+    dim_.translate (o);
 }
 
 void
 Molecule::translate_axis (Real x,Axis a)
 {
-  for (Cons<Atom> *  ptr = atom_list_; ptr; ptr = ptr->next_)
-      ptr->car_->off_[a] += x;
+  for (CELLTYPE  ptr = atom_list_; ptr != MOL_EOL; ptr = NEXT_CELL(ptr))
+    UNBOX_ATOM (UNBOX_PTR(ptr))->off_[a] += x;
 
-  dim_[a] += x;
+  if (!dim_[a].empty_b ())
+    dim_[a] += x;
 }
 
 void
 Molecule::add_molecule (Molecule const &m)
 {
-  Cons_list<Atom> al (copy_killing_cons_list (m.atom_list_));
-
-  if (al.head_)
-    {
-      *al.tail_ = atom_list_;
-      atom_list_ = al.head_;
-    }
+  for (CELLTYPE  ptr = m.atom_list_; ptr != MOL_EOL; ptr = NEXT_CELL(ptr))
+    add_atom(UNBOX_ATOM (UNBOX_PTR(ptr)));
+  
   dim_.unite (m.dim_);
 }
 
@@ -63,28 +79,50 @@ Molecule::add_atom (Atom const *al)
 {
   Atom *a = new Atom(*al);
 
-  atom_list_ = new Killing_cons<Atom> (a, atom_list_);
+  atom_list_ = NEWCELL(BOX_ATOM(a), atom_list_);
 }
 
 void
 Molecule::operator=(Molecule const & src)
 {
   if (&src == this) return;
+
+#ifndef ATOM_SMOB
   delete atom_list_;
-  atom_list_ = 0;
+#endif
+
+  atom_list_ = MOL_EOL;
   dim_= src.dim_;
   add_molecule (src);
 }
 
+void
+Molecule::set_empty (bool e)
+{
+  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_ = 0;
+  atom_list_ = MOL_EOL;
+  set_empty (true);
   add_molecule (s);
 }
 
 Molecule::~Molecule ()
 {
+#ifndef ATOM_SMOB
   delete atom_list_;
+#endif
 }
 
 void
@@ -100,26 +138,44 @@ Molecule::print() const
 }
 
 void
-Molecule::do_center (Axis a)
+Molecule::align_to (Axis a, Direction d)
 {
-  Interval i (extent (a));
-  translate_axis (-i.center (), a);
+  if (d == CENTER)
+    {
+      Interval i (extent (a));
+      translate_axis (-i.center (), a);
+    }
+  else
+    {
+      translate_axis (-extent (a)[d], a);
+    }
 }
 
 Molecule::Molecule ()
 {
-  dim_ = Box (Interval(0,0),Interval( 0,0  ));
-  atom_list_ = 0;
+  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)
 {
-  Real my_extent= dim_[a][d];
+  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 offset = my_extent -  m.extent ()[a][-d];
+  Real his_extent = i[-d];
+  Real offset = my_extent -  his_extent;
   Molecule toadd (m);
   toadd.translate_axis (offset + d * padding, a);
   add_molecule (toadd);
 }
+
+bool
+Molecule::empty_b () const
+{
+  return atom_list_ == MOL_EOL;
+}