X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=2c87802a08d651d3c954b06cbb4f50bebca6268c;hb=feef5e0d897345a88595671e0f54e1127a20d09f;hp=863071cf9cf94b4d88892a3373119e6e6d5479c1;hpb=28976d28a04cfb9abe97af7214d7dce11f732604;p=lilypond.git

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 863071cf9c..2c87802a08 100644
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -114,7 +114,7 @@ Tuplet_bracket::print (SCM smob)
     SCM lp = me->get_property ("left-position");
     SCM rp = me->get_property ("right-position");  
 
-    if (!is_number (rp) || !is_number (lp))
+    if (!ly_c_number_p (rp) || !ly_c_number_p (lp))
       after_line_breaking (smob);
   }
   
@@ -133,7 +133,7 @@ Tuplet_bracket::print (SCM smob)
     Fixme: the type of this prop is sucky.
    */
   SCM bracket = me->get_property ("bracket-visibility");
-  if (is_boolean (bracket))
+  if (ly_c_boolean_p (bracket))
     {
       bracket_visibility = ly_scm2bool (bracket);
     }
@@ -141,7 +141,7 @@ Tuplet_bracket::print (SCM smob)
     bracket_visibility = !par_beam;
 
   SCM numb = me->get_property ("number-visibility");  
-  if (is_boolean (numb))
+  if (ly_c_boolean_p (numb))
     {
       number_visibility = ly_scm2bool (numb);
     }
@@ -170,7 +170,7 @@ Tuplet_bracket::print (SCM smob)
 
   Paper_def *pap = me->get_paper ();
   Stencil num;
- if (is_string (number) && number_visibility)
+ if (ly_c_string_p (number) && number_visibility)
     {
       SCM properties = Font_interface::text_font_alist_chain (me);
       SCM snum = Text_item::interpret_markup (pap->self_scm (), properties, number);
@@ -487,15 +487,15 @@ Tuplet_bracket::after_line_breaking (SCM smob)
   SCM lp =  me->get_property ("left-position");
   SCM rp = me->get_property ("right-position");  
   
-  if (is_number (lp) && !is_number (rp))
+  if (ly_c_number_p (lp) && !ly_c_number_p (rp))
     {
       rp = scm_make_real (ly_scm2double (lp) + dy);
     }
-  else if (is_number (rp) && !is_number (lp))
+  else if (ly_c_number_p (rp) && !ly_c_number_p (lp))
     {
       lp = scm_make_real (ly_scm2double (rp) - dy);
     }
-  else if (!is_number (rp) && !is_number (lp))
+  else if (!ly_c_number_p (rp) && !ly_c_number_p (lp))
     {
       lp = scm_make_real (offset);
       rp = scm_make_real (offset +dy);
@@ -515,7 +515,7 @@ Direction
 Tuplet_bracket::get_default_dir (Grob*me)
 {
   Drul_array<int> dirs (0,0);  
-  for (SCM s = me->get_property ("note-columns"); is_pair (s); s = ly_cdr (s))
+  for (SCM s = me->get_property ("note-columns"); ly_c_pair_p (s); s = ly_cdr (s))
     {
       Grob * nc = unsmob_grob (ly_car (s));
       Direction d = Note_column::dir (nc);