X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=940a18d2010849e27ecf73b66f99361aa6a3260c;hb=7f1b4934f96cfea964986c29d4048e6e794b9611;hp=684069819ec01b220b74e30fb7d92d5f64abf9a8;hpb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;p=lilypond.git

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 684069819e..940a18d201 100644
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Mats Bengtsson <matsb@s3.kth.se>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@ using namespace std;
 #include "side-position-interface.hh"
 
 #include "translator.icc"
+#include "lily-imports.hh"
 
 class Clef_engraver : public Engraver
 {
@@ -145,7 +146,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
@@ -156,17 +157,16 @@ Clef_engraver::inspect_clef_properties ()
   SCM transposition = get_property ("clefTransposition");
   SCM force_clef = get_property ("forceClef");
 
-  if (clefpos == SCM_EOL
-      || scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F
-      || scm_equal_p (clefpos, prev_cpos_) == SCM_BOOL_F
-      || scm_equal_p (transposition, prev_transposition_) == SCM_BOOL_F
+  if (scm_is_null (clefpos)
+      || !ly_is_equal (glyph, prev_glyph_)
+      || !ly_is_equal (clefpos, prev_cpos_)
+      || !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 (prev_cpos_ != SCM_BOOL_F || to_boolean (get_property ("firstClef")))
+      if (scm_is_true (prev_cpos_) || to_boolean (get_property ("firstClef")))
         create_clef ();
 
       if (clef_)