release: 1.3.19

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

diff --git a/lily/include/atom.hh b/lily/include/atom.hh
index ab67d0881d309b994746ad25406051b8abdac8aa..931d43f64bf518f00d0a96d3510f64430ee1e8e4 100644 (file)
--- a/lily/include/atom.hh
+++ b/lily/include/atom.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef ATOM_HH
@@ -16,15 +16,17 @@
 #include "lily-guile.hh"
 
 class Atom {
+  Offset off_;
+  friend class Molecule;
+  friend class Paper_outputter;
 public:
   Atom (SCM s);
-  Offset off_;
+
   /*
     SCM expression that (when evaluated) gives a TeX string
 representing a musical notation symbol.  */
   Protected_scm func_;
-  Protected_scm font_;
-  Protected_scm magn_;
+  void fontify (Font_metric*);
 };