Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / grob-closure.cc

diff --git a/lily/grob-closure.cc b/lily/grob-closure.cc
index 519055bdb77557cf9794b5c2ee02e730224c58cf..81bd393adb98de880c1a05e26a77dc16b9fe30dc 100644 (file)
--- a/lily/grob-closure.cc
+++ b/lily/grob-closure.cc
@@ -33,22 +33,28 @@ void
 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))
+    {
+      g->internal_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);
-  else if (!scm_is_number (data))
-    g->internal_set_property (axis_offset_symbol (a),
-                             proc);
-  else
-    {
-      SCM plus = ly_lily_module_constant ("+");
-      SCM expr = scm_list_3 (plus,
-                            ly_make_simple_closure (scm_list_1 (proc)),
-                            data);
-      g->internal_set_property (axis_offset_symbol (a),
-                               ly_make_simple_closure (expr));
-    }
+
+  SCM plus = ly_lily_module_constant ("+");
+
+  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));
 }