X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-closure.cc;h=978cbeb76cdd471ef973bfa2a016994aa7f3a2a5;hb=2ce9d3b0ac456df77a73342fdf802f2e198c3b4e;hp=4c63fe3c0c55436c4a608e0747582ff026c6ffd7;hpb=ffd278ab691a1ada9b0ff0f8fd7548ab791f1647;p=lilypond.git

diff --git a/lily/grob-closure.cc b/lily/grob-closure.cc
index 4c63fe3c0c..978cbeb76c 100644
--- a/lily/grob-closure.cc
+++ b/lily/grob-closure.cc
@@ -1,6 +1,7 @@
 #include "grob.hh"
 #include "simple-closure.hh"
 #include "unpure-pure-container.hh"
+#include "lily-imports.hh"
 
 SCM
 axis_offset_symbol (Axis a)
@@ -33,24 +34,22 @@ add_offset_callback (Grob *g, SCM proc, Axis a)
   SCM data = g->get_property_data (axis_offset_symbol (a));
   if (!scm_is_number (data)
       && !ly_is_procedure (data)
-      && !is_simple_closure (data))
+      && !unsmob<Simple_closure> (data))
     {
       g->set_property (axis_offset_symbol (a), proc);
       return;
     }
 
-  if (ly_is_procedure (data) || is_unpure_pure_container (data))
-    data = ly_make_simple_closure (scm_list_1 (data));
-  else if (is_simple_closure (data))
-    data = simple_closure_expression (data);
-
-  SCM plus = ly_lily_module_constant ("+");
+  if (ly_is_procedure (data) || unsmob<Unpure_pure_container> (data))
+    data = Simple_closure::make_smob (scm_list_1 (data));
+  else if (Simple_closure *sc = unsmob<Simple_closure> (data))
+    data = sc->expression ();
 
   if (ly_is_procedure (proc))
-    proc = ly_make_simple_closure (scm_list_1 (proc));
+    proc = Simple_closure::make_smob (scm_list_1 (proc));
 
-  SCM expr = scm_list_3 (plus, proc, data);
-  g->set_property (axis_offset_symbol (a), ly_make_simple_closure (expr));
+  SCM expr = scm_list_3 (Guile_user::plus, proc, data);
+  g->set_property (axis_offset_symbol (a), Simple_closure::make_smob (expr));
 }
 
 /*
@@ -67,10 +66,10 @@ chain_callback (Grob *g, SCM proc, SCM sym)
 {
   SCM data = g->get_property_data (sym);
 
-  if (ly_is_procedure (data) || is_unpure_pure_container (data))
-    data = ly_make_simple_closure (scm_list_1 (data));
-  else if (is_simple_closure (data))
-    data = simple_closure_expression (data);
+  if (ly_is_procedure (data) || unsmob<Unpure_pure_container> (data))
+    data = Simple_closure::make_smob (scm_list_1 (data));
+  else if (Simple_closure *sc = unsmob<Simple_closure> (data))
+    data = sc->expression ();
   else
     /*
       Data may be nonnumber. In that case, it is assumed to be
@@ -84,7 +83,7 @@ chain_callback (Grob *g, SCM proc, SCM sym)
 
                    // twice: one as a wrapper for grob property routines,
                    // once for the actual delayed binding.
-                   ly_make_simple_closure (ly_make_simple_closure (expr)));
+                   Simple_closure::make_smob (Simple_closure::make_smob (expr)));
 }
 
 void