release: 1.3.19

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

diff --git a/lily/include/atom.hh b/lily/include/atom.hh
index b4f656094a0508a9c664c9b8f009981b84d0957b..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--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef ATOM_HH
@@ -15,44 +15,19 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 
-#if 0
-/// a symbol which can be translated, and freely copied
 class Atom {
-  static long smob_tag_;
-
-  static SCM smob_mark (SCM);
-  static scm_sizet smob_free (SCM);
-  static int smob_display (SCM, SCM, scm_print_state*);
-  Atom (SCM s);
-  SCM make_smob () const;
-public:
   Offset off_;
-
-  static SCM make_atom (SCM outputfunc);
-  SCM copy_self () const;
-  static Atom *atom_l (SCM);
-
-  /// Is #obj# a Foo?
-  static bool Atom_b(SCM obj);
-  static void init_smob ();
-  
-  SCM func_;
-  SCM font_;
-};
-
-#else
-
-class Atom {
+  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_;
+  void fontify (Font_metric*);
 };
 
-#endif
 
 #endif