Fretboards: markup strings in dot positions

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index 7db54d3ed930b334c825faea2f5e6a30738de437..6d8c9a281e480a70d010b3d75498206b6d5a7e5d 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.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>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ Music::internal_is_music_type (SCM k) const
 {
   SCM ifs = get_property ("types");
 
-  return scm_c_memq (k, ifs) != SCM_BOOL_F;
+  return scm_is_true (scm_c_memq (k, ifs));
 }
 
 Music::Music (SCM init)
@@ -90,7 +90,7 @@ Moment
 Music::get_length () const
 {
   SCM lst = get_property ("length");
-  if (Moment::unsmob (lst))
+  if (Moment::is_smob (lst))
     return *Moment::unsmob (lst);
 
   if (ly_is_procedure (length_callback_))
@@ -211,21 +211,21 @@ transpose_mutable (SCM alist, Pitch delta)
         {
           Pitch transposed = p->transposed (delta);
 
-          if (prop == ly_symbol2scm ("tonic"))
+          if (scm_is_eq (prop, ly_symbol2scm ("tonic")))
             transposed = Pitch (-1, transposed.get_notename (),
                                 transposed.get_alteration ());
 
           new_val = transposed.smobbed_copy ();
         }
-      else if (prop == ly_symbol2scm ("element"))
+      else if (scm_is_eq (prop, ly_symbol2scm ("element")))
         {
           if (Music *m = Music::unsmob (val))
             m->transpose (delta);
         }
-      else if (prop == ly_symbol2scm ("elements")
-               || prop == ly_symbol2scm ("articulations"))
+      else if (scm_is_eq (prop, ly_symbol2scm ("elements"))
+               || scm_is_eq (prop, ly_symbol2scm ("articulations")))
         transpose_music_list (val, delta);
-      else if (prop == ly_symbol2scm ("pitch-alist")
+      else if (scm_is_eq (prop, ly_symbol2scm ("pitch-alist"))
                && scm_is_pair (val))
         new_val = ly_transpose_key_alist (val, delta.smobbed_copy ());
 
@@ -329,9 +329,3 @@ Music::duration_length_callback (SCM m)
     mom = d->get_length ();
   return mom.smobbed_copy ();
 }
-
-Music *
-Music::unsmob (SCM m)
-{
-  return dynamic_cast<Music *> (Prob::unsmob (m));
-}