X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=05c9420623b99047d49451c20528525bf0d32335;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=ebeb71a7cbd912a733536afb879b772541078616;hpb=e8d5061834a5a658c5ffd078237e9cd660069a7d;p=lilypond.git

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index ebeb71a7cb..05c9420623 100644
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -29,6 +29,7 @@ using namespace std;
 #include "side-position-interface.hh"
 
 #include "translator.icc"
+#include "lily-imports.hh"
 
 class Clef_engraver : public Engraver
 {
@@ -38,7 +39,7 @@ public:
 protected:
   void stop_translation_timestep ();
   void process_music ();
-  DECLARE_ACKNOWLEDGER (bar_line);
+  void acknowledge_bar_line (Grob_info);
 
   virtual void derived_mark () const;
 private:
@@ -61,7 +62,8 @@ Clef_engraver::derived_mark () const
   scm_gc_mark (prev_glyph_);
 }
 
-Clef_engraver::Clef_engraver ()
+Clef_engraver::Clef_engraver (Context *c)
+  : Engraver (c)
 {
   clef_ = 0;
   modifier_ = 0;
@@ -145,7 +147,7 @@ static void apply_on_children (Context *context, SCM fun)
   scm_call_1 (fun, context->self_scm ());
   for (SCM s = context->children_contexts ();
        scm_is_pair (s); s = scm_cdr (s))
-    apply_on_children (Context::unsmob (scm_car (s)), fun);
+    apply_on_children (unsmob<Context> (scm_car (s)), fun);
 }
 
 void
@@ -162,8 +164,7 @@ Clef_engraver::inspect_clef_properties ()
       || !ly_is_equal (transposition, prev_transposition_)
       || to_boolean (force_clef))
     {
-      apply_on_children (context (),
-                         ly_lily_module_constant ("invalidate-alterations"));
+      apply_on_children (context (), Lily::invalidate_alterations);
 
       set_glyph ();
       if (scm_is_true (prev_cpos_) || to_boolean (get_property ("firstClef")))
@@ -190,12 +191,13 @@ Clef_engraver::stop_translation_timestep ()
 {
   if (clef_)
     {
-      SCM vis = 0;
       if (to_boolean (clef_->get_property ("non-default")))
-        vis = get_property ("explicitClefVisibility");
+        {
+          SCM vis = get_property ("explicitClefVisibility");
 
-      if (vis)
-        clef_->set_property ("break-visibility", vis);
+          if (scm_is_vector (vis))
+            clef_->set_property ("break-visibility", vis);
+        }
 
       clef_ = 0;
 
@@ -203,7 +205,12 @@ Clef_engraver::stop_translation_timestep ()
     }
 }
 
-ADD_ACKNOWLEDGER (Clef_engraver, bar_line);
+void
+Clef_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Clef_engraver, bar_line);
+}
+
 ADD_TRANSLATOR (Clef_engraver,
                 /* doc */
                 "Determine and set reference point for pitches.",