release: 1.1.24

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

diff --git a/lily/include/atom.hh b/lily/include/atom.hh
index fcd434f0ab4f3e0226c2a375edf394f80001f17f..22c5d15a0cf4ca32584431c295d5ecbee805468e 100644 (file)
--- a/lily/include/atom.hh
+++ b/lily/include/atom.hh
@@ -9,7 +9,7 @@
 #ifndef ATOM_HH
 #define ATOM_HH
 
-#include "lily-guile.hh"
+#include "protected-scm.hh"
 #include "string.hh"
 #include "box.hh"
 #include "lily-proto.hh"
@@ -17,10 +17,15 @@
 /// a symbol which can be translated, and freely copied
 class Atom {
   Offset off_;
+
+  
 public:
+  Protected_scm lambda_;
+  Score_element * origin_l_;
+
+  // urg, only used as a temp buffer
   String str_;
   String font_;
-  SCM lambda_;
   Box dim_;
 
   Offset offset () const;
@@ -31,6 +36,7 @@ public:
   void translate_axis (Real r,Axis a);
   /// how big is #this#?
   Box extent() const;
+  Interval extent (Axis)const;
   void print() const;
   bool check_infinity_b () const;
   bool empty() const;