X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-closure.cc;h=978cbeb76cdd471ef973bfa2a016994aa7f3a2a5;hb=28417a72cb60cc69ac5a4916d0dfdda9b78079fa;hp=81bd393adb98de880c1a05e26a77dc16b9fe30dc;hpb=2cb28056f4c767e3d0d00e73e53607af00ba38e8;p=lilypond.git

diff --git a/lily/grob-closure.cc b/lily/grob-closure.cc
index 81bd393adb..978cbeb76c 100644
--- a/lily/grob-closure.cc
+++ b/lily/grob-closure.cc
@@ -1,24 +1,24 @@
 #include "grob.hh"
 #include "simple-closure.hh"
+#include "unpure-pure-container.hh"
+#include "lily-imports.hh"
 
 SCM
 axis_offset_symbol (Axis a)
 {
   return a == X_AXIS
-    ? ly_symbol2scm ("X-offset")
-    : ly_symbol2scm ("Y-offset");
+         ? ly_symbol2scm ("X-offset")
+         : ly_symbol2scm ("Y-offset");
 }
 
 SCM
 axis_parent_positioning (Axis a)
 {
   return (a == X_AXIS)
-    ? Grob::x_parent_positioning_proc
-    : Grob::y_parent_positioning_proc;
+         ? Grob::x_parent_positioning_proc
+         : Grob::y_parent_positioning_proc;
 }
 
-
-
 /*
   Replace
 
@@ -27,7 +27,6 @@ axis_parent_positioning (Axis a)
   by
 
   (+ (PROC GROB) (orig-proc GROB))
-  
 */
 void
 add_offset_callback (Grob *g, SCM proc, Axis a)
@@ -35,28 +34,23 @@ 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->internal_set_property (axis_offset_symbol (a),
-				proc);
-      return ;
+      g->set_property (axis_offset_symbol (a), proc);
+      return;
     }
 
-  if (ly_is_procedure (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));
-  
-  SCM expr = scm_list_3 (plus, proc, data);
-  g->internal_set_property (axis_offset_symbol (a),
-			    ly_make_simple_closure (expr));
-}
+    proc = Simple_closure::make_smob (scm_list_1 (proc));
 
+  SCM expr = scm_list_3 (Guile_user::plus, proc, data);
+  g->set_property (axis_offset_symbol (a), Simple_closure::make_smob (expr));
+}
 
 /*
   replace
@@ -65,25 +59,35 @@ add_offset_callback (Grob *g, SCM proc, Axis a)
 
   by
 
-  (PROC GROB (orig-proc GROB)) 
-
+  (PROC GROB (orig-proc GROB))
 */
 void
-chain_offset_callback (Grob *g, SCM proc, Axis a)
+chain_callback (Grob *g, SCM proc, SCM sym)
 {
-  SCM data = g->get_property_data (axis_offset_symbol (a));
+  SCM data = g->get_property_data (sym);
+
+  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
+      undefined.
+    */
+
+    data = SCM_UNDEFINED;
 
-  if (ly_is_procedure (data))
-    data = ly_make_simple_closure (scm_list_1  (data));
-  else if (is_simple_closure (data))
-    data = simple_closure_expression (data);
-  else if (!scm_is_number (data))
-    data = scm_from_int (0);
-  
   SCM expr = scm_list_2 (proc, data);
-  g->internal_set_property (axis_offset_symbol (a),
-			    
-			    // twice: one as a wrapper for grob property routines,
-			    // once for the actual delayed binding. 
-			    ly_make_simple_closure (ly_make_simple_closure (expr)));
+  g->set_property (sym,
+
+                   // twice: one as a wrapper for grob property routines,
+                   // once for the actual delayed binding.
+                   Simple_closure::make_smob (Simple_closure::make_smob (expr)));
+}
+
+void
+chain_offset_callback (Grob *g, SCM proc, Axis a)
+{
+  chain_callback (g, proc, axis_offset_symbol (a));
 }