Issue 4537/1: Let \addlyrics accept an optional context mod

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

diff --git a/lily/grob-closure.cc b/lily/grob-closure.cc
index 06a947d0de3a169a721ba45c2cc5d04ffe3dd672..978cbeb76cdd471ef973bfa2a016994aa7f3a2a5 100644 (file)
--- 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,23 +34,21 @@ 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)
-      && !Simple_closure::unsmob (data))
+      && !unsmob<Simple_closure> (data))
     {
       g->set_property (axis_offset_symbol (a), proc);
       return;
     }
 
-  if (ly_is_procedure (data) || is_unpure_pure_container (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 = Simple_closure::unsmob (data))
+  else if (Simple_closure *sc = unsmob<Simple_closure> (data))
     data = sc->expression ();
 
-  SCM plus = ly_lily_module_constant ("+");
-
   if (ly_is_procedure (proc))
     proc = Simple_closure::make_smob (scm_list_1 (proc));
 
-  SCM expr = scm_list_3 (plus, proc, data);
+  SCM expr = scm_list_3 (Guile_user::plus, proc, data);
   g->set_property (axis_offset_symbol (a), Simple_closure::make_smob (expr));
 }
 
@@ -67,9 +66,9 @@ 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))
+  if (ly_is_procedure (data) || unsmob<Unpure_pure_container> (data))
     data = Simple_closure::make_smob (scm_list_1 (data));
-  else if (Simple_closure *sc = Simple_closure::unsmob (data))
+  else if (Simple_closure *sc = unsmob<Simple_closure> (data))
     data = sc->expression ();
   else
     /*