partial: 1.1.61.jcn

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

diff --git a/lily/include/atom.hh b/lily/include/atom.hh
index b145383d7dc578066fd9c1d310fa34721169dcbb..9f8c4ef0973530709709264d243397b8580f76f3 100644 (file)
--- a/lily/include/atom.hh
+++ b/lily/include/atom.hh
@@ -3,33 +3,33 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef ATOM_HH
 #define ATOM_HH
 
+#include "protected-scm.hh"
 #include "string.hh"
-#include "boxes.hh"
+#include "box.hh"
 #include "lily-proto.hh"
+#include "lily-guile.hh"
 
-
-/// a symbol which can be translated, and freely copied
 class Atom {
-  Offset off_;
 public:
-  String tex_;
-  Box dim_;
-
-  String str() const;          // for printing.
-  Atom (String, Box);
-  Atom ();
-  void translate (Offset o);
-  void translate_axis (Real r,Axis a);
-  /// how big is #this#?
-  Box extent() const;
-  void print() const;
-  String TeX_string() const;
-  bool check_infinity_b () const;
+  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_;
+
+  /*
+    TODO: move this into the font_ field.
+   */
+  Protected_scm magn_;
 };
+
+
 #endif