From a9dfbbd17e4bf36bc83ced473e597b5e5564cb4f Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:47:02 +0000 Subject: [PATCH] lilypond-1.1.30 --- lily/molecule.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lily/molecule.cc b/lily/molecule.cc index caffe1a74c..142a7af91c 100644 --- a/lily/molecule.cc +++ b/lily/molecule.cc @@ -11,6 +11,7 @@ #include "molecule.hh" #include "atom.hh" #include "debug.hh" + #include "killing-cons.tcc" Box @@ -39,20 +40,21 @@ void Molecule::translate_axis (Real x,Axis a) { for (Cons * ptr = atom_list_; ptr; ptr = ptr->next_) - { ptr->car_->off_[a] += x; - } + dim_[a] += x; } void Molecule::add_molecule (Molecule const &m) { - for (Cons * ptr = m.atom_list_; ptr; ptr = ptr->next_) + Cons_list al (copy_killing_cons_list (m.atom_list_)); + + if (al.head_) { - add_atom (ptr->car_); + *al.tail_ = atom_list_; + atom_list_ = al.head_; } - dim_.unite (m.dim_); } -- 2.39.5