* Documentation/user/music-glossary.itely: add Finnish author.

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

diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh
index 7b514e46f5922497fc287281fc28680b23069fc7..78aace7bd3f72cd26a2bc876ec24641a6605a3f6 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #ifndef MOLECULE_HH
 #define MOLECULE_HH
@@ -62,16 +62,7 @@ public:
                    Real minimum);
   void add_molecule (Molecule const &m);
   void translate (Offset);
-  
-  /**
-     align D direction in axis A.
-
-     If D == CENTER, then move the dimension (A).center () to (0,0)
-
-     Else, move so dimension (A)[D] == 0.0
-     
-   */
-  void align_to (Axis a, Direction d);
+  void align_to (Axis a, Real x);
   void translate_axis (Real,Axis);
   
   Interval extent (Axis) const;
@@ -80,7 +71,7 @@ public:
      codify THIS into a Scheme expression.
    */
   SCM create_scheme () const;
-  bool empty_b () const;
+  bool is_empty () const;
 
 
   static SCM ly_get_molecule_extent (SCM mol, SCM axis);
@@ -92,7 +83,7 @@ public:
 DECLARE_UNSMOB(Molecule,molecule);
 SCM fontify_atom (Font_metric const*, SCM atom);
 
-Molecule create_molecule (SCM brew_molecule);
+Molecule create_molecule (SCM print);