release: 1.3.40

[lilypond.git] / lily / molecule.cc

diff --git a/lily/molecule.cc b/lily/molecule.cc
index cd4d0482063cfdfabfd6933b8b6bbe431e4688cd..db6472b9e547804ba21e6227505e00a2b6b16505 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -13,11 +13,12 @@
 
 #include <math.h>
 
+#include "font-metric.hh"
 #include "dimensions.hh"
 #include "interval.hh"
 #include "string.hh"
 #include "molecule.hh"
-#include "atom.hh"
+
 #include "debug.hh"
 #include "killing-cons.tcc"
 
@@ -62,7 +63,7 @@ Molecule::translate (Offset o)
     }
 
   expr_ = gh_list (ly_symbol2scm ("translate-molecule"),
-                  to_scm (o),
+                  ly_offset2scm (o),
                   expr_, SCM_UNDEFINED);
   if (!empty_b ())
     dim_.translate (o);
@@ -103,13 +104,6 @@ Molecule::set_empty (bool e)
     }
 }
 
-void
-Molecule::print () const
-{
-#ifndef NPRINT
-  gh_display (expr_);
-#endif
-}
 
 void
 Molecule::align_to (Axis a, Direction d)
@@ -140,3 +134,11 @@ Molecule::empty_b () const
 {
   return expr_ == SCM_EOL;
 }
+
+
+SCM
+fontify_atom(Font_metric * met, SCM f)
+{
+  return  gh_list (ly_symbol2scm ("fontify"),
+                  ly_quote_scm (met->description ()), f, SCM_UNDEFINED);
+}