X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmetronome-engraver.cc;h=e1de3e23e0f48692e536060357856741152f65ee;hb=85e78f77fdceb5b073bb2c5696c3117a5b1c220e;hp=b4cd2ce328b89707ac7497ed0cff6ca18a6ab1ec;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index b4cd2ce328..e1de3e23e0 100644
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -71,8 +71,7 @@ Metronome_mark_engraver::listen_tempo_change (Stream_event *ev)
 static bool
 safe_is_member (SCM scm, SCM lst)
 {
-  return scm_list_p (lst) == SCM_BOOL_T
-         && scm_member (scm, lst) != SCM_BOOL_F;
+  return ly_is_list (lst) && scm_is_true (scm_member (scm, lst));
 }
 
 void
@@ -81,8 +80,8 @@ Metronome_mark_engraver::acknowledge_break_aligned (Grob_info info)
   Grob *g = info.grob ();
 
   if (text_
-      && g->get_property ("break-align-symbol")
-      == ly_symbol2scm ("staff-bar"))
+      && scm_is_eq (g->get_property ("break-align-symbol"),
+                    ly_symbol2scm ("staff-bar")))
     bar_ = g;
   else if (text_
            && !support_
@@ -139,9 +138,9 @@ Metronome_mark_engraver::stop_translation_timestep ()
             first notational element of the measure if no time
             signature is present in that measure).
           */
-          if (Grob *mc = unsmob_grob (get_property ("currentMusicalColumn")))
+          if (Grob *mc = unsmob<Grob> (get_property ("currentMusicalColumn")))
             text_->set_parent (mc, X_AXIS);
-          else if (Grob *cc = unsmob_grob (get_property ("currentCommandColumn")))
+          else if (Grob *cc = unsmob<Grob> (get_property ("currentCommandColumn")))
             text_->set_parent (cc, X_AXIS);
         }
       text_->set_object ("side-support-elements",