release: 1.1.1

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

diff --git a/lily/include/atom.hh b/lily/include/atom.hh
index f9621382bc3145370371b23ebe53808b1e53244e..1fd7ef262c91113a61c7eab2eaee858f19eebf2c 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,11 +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;