patch::: 1.1.19.jcn5: isb

[lilypond.git] / lily / include / molecule.hh

diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh
index f83eda517b87b5fe50fe00b186181736b604c3a2..7907be0ae440c479d588b73aa08716a397c6a800 100644 (file)
--- a/lily/include/molecule.hh
+++ b/lily/include/molecule.hh
@@ -3,37 +3,35 @@
 
   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>
 */
 #ifndef MOLECULE_HH
 #define MOLECULE_HH
 
 #include "lily-proto.hh"
 #include "plist.hh"
-#include "boxes.hh"
+#include "box.hh"
 #include "axes.hh"
 #include "direction.hh"
 
 /** a group of individually translated symbols. You can add molecules
     to the top, to the right, etc.  */
 struct Molecule {
-  Pointer_list<Atom*> ats;     // change to List<Atom>? 
+  Pointer_list<Atom*> atoms_;  // change to List<Atom>? 
 
-  /* *************** */
     
   Molecule() { }
-  Molecule (Atom const &a) { add (a) ;}
+  Molecule (Atom const &a);
 
   void add_at_edge (Axis a, Direction d, const Molecule &m);
   
-  void add (Molecule const &m);
+  void add_molecule (Molecule const &m);
   void translate (Offset);
-  void translate (Real,Axis);
-  void add (Atom const & a) ;
+  void translate_axis (Real,Axis);
+  void add_atom (Atom const & a) ;
   /// how big is #this#? 
   Box extent() const;
 
-  String TeX_string() const;
 
   Molecule (const Molecule&s);
   void print() const;