release: 1.1.28

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

diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh
index 757a26ac3443b7858f986887bcf7307e3a15ff08..53da1c511a18728b4ab2c2909519f11eb4f8c98c 100644 (file)
--- a/lily/include/molecule.hh
+++ b/lily/include/molecule.hh
@@ -13,29 +13,35 @@
 #include "box.hh"
 #include "axes.hh"
 #include "direction.hh"
+#include "protected-scm.hh"
+#include "cons.hh"
 
 /** a group of individually translated symbols. You can add molecules
     to the top, to the right, etc.  */
-struct Molecule {
-  Pointer_list<Atom*> atoms_;  // change to List<Atom>? 
+class Molecule {
+  //  Protected_scm atom_list_;        // change to List<Atom>?
+  Killing_cons<Atom> *atom_list_;
+  friend class Paper_outputter;
+public:
+  Box dim_;
 
-    
-  Molecule() { }
-  Molecule (Atom const &a);
+  Molecule();
+  ~Molecule();
 
   void add_at_edge (Axis a, Direction d, const Molecule &m, Real padding);
   
   void add_molecule (Molecule const &m);
   void translate (Offset);
+  void do_center (Axis);
   void translate_axis (Real,Axis);
-  void add_atom (Atom const & a) ;
+  
+  void add_atom (Atom const *a);
   /// how big is #this#? 
   Box extent() const;
   Interval extent (Axis) const;
 
   Molecule (const Molecule&s);
   void print() const;
-private:
-  void operator=(const Molecule&);
+  void operator=(const Molecule&);  
 };
 #endif