* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh
index a8a342527917d9c539ccb484f0e45e4b0d568790..a1b887066f840c23c0d782e9324bdebc887a0436 100644 (file)
--- a/lily/include/molecule.hh
+++ b/lily/include/molecule.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #ifndef MOLECULE_HH
 #define MOLECULE_HH
@@ -39,10 +39,12 @@
     init the molecule, we assume that
     DIMENSIONS = (Interval (0,0),Interval (0,0)
 */
-class Molecule {
+class Molecule
+{
+  friend SCM ly_set_molecule_extent_x (SCM, SCM, SCM);
+  
   Box dim_;
   SCM expr_;
-
   
   DECLARE_SIMPLE_SMOBS (Molecule,);  
 public:
@@ -86,8 +88,8 @@ public:
 };
 
 
-Molecule *unsmob_molecule (SCM);
-SCM fontify_atom (Font_metric*, SCM atom);
+DECLARE_UNSMOB(Molecule,molecule);
+SCM fontify_atom (Font_metric const*, SCM atom);
 
 Molecule create_molecule (SCM brew_molecule);