release: 1.1.24

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

diff --git a/lily/include/atom.hh b/lily/include/atom.hh
index 4b76e4018cff2d61b6876d5b905df74a0a5ff1e4..22c5d15a0cf4ca32584431c295d5ecbee805468e 100644 (file)
--- a/lily/include/atom.hh
+++ b/lily/include/atom.hh
@@ -3,24 +3,32 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 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"
 
-
 /// a symbol which can be translated, and freely copied
 class Atom {
   Offset off_;
+
+  
 public:
-  String tex_;
+  Protected_scm lambda_;
+  Score_element * origin_l_;
+
+  // urg, only used as a temp buffer
+  String str_;
+  String font_;
   Box dim_;
 
+  Offset offset () const;
   String str() const;          // for printing.
   Atom (String, Box);
   Atom ();
@@ -28,8 +36,9 @@ public:
   void translate_axis (Real r,Axis a);
   /// how big is #this#?
   Box extent() const;
+  Interval extent (Axis)const;
   void print() const;
-  String TeX_string() const;
   bool check_infinity_b () const;
+  bool empty() const;
 };
 #endif