release: 1.3.25

[lilypond.git] / lily / atom.cc

diff --git a/lily/atom.cc b/lily/atom.cc
index eccf3b984351df7181b9ef13405cff5127a504e7..cc2bde40be01f211d289b59360968f200294e2f9 100644 (file)
--- a/lily/atom.cc
+++ b/lily/atom.cc
@@ -6,6 +6,9 @@
   (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include <math.h>
+#include "ly-smobs.icc"
+
 #include "atom.hh"
 #include "interval.hh"
 #include "string.hh"
@@ -19,7 +22,18 @@
 
 Atom::Atom(SCM s)
 {
+  SCM onstack = s;             // protection. just to be sure.
   func_ = s;
+  self_scm_ = SCM_EOL;
+  smobify_self ();
+}
+
+SCM
+Atom::mark_smob (SCM s)
+{
+  Atom*  a = SMOB_TO_TYPE(Atom, s);
+  assert (s == a->self_scm_);
+  return a->func_;
 }
 
 void
@@ -34,5 +48,33 @@ Atom::fontify (Font_metric * met)
   func_ = gh_list (ly_symbol2scm ("string-append"),
                   font_switch , f,
                   SCM_UNDEFINED);
+}
+
+void
+Atom::do_smobify_self ()
+{
+}
 
+Atom::Atom (Atom const &s)
+{
+  off_ = s.off_;
+  func_ = s.func_;
+  self_scm_= SCM_EOL;
+  smobify_self ();
 }
+int
+Atom::print_smob (SCM s, SCM p, scm_print_state*)
+{
+  Atom * a = unsmob_atom (s);
+
+  scm_puts ("#<Atom off ",p);
+  String str(a->off_.str ());
+  scm_puts ((char *)str.ch_C(), p);
+  scm_display (a->func_, p);
+  scm_puts ("> ",p);  
+  return 1;
+}
+  
+IMPLEMENT_UNSMOB(Atom, atom)
+IMPLEMENT_SMOBS(Atom)
+