* lily/include/lily-guile.hh: compatibility glue for 1.6

[lilypond.git] / lily / tuplet-bracket.cc

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 863071cf9cf94b4d88892a3373119e6e6d5479c1..8e2aa1b249761537c30ab3b2472ce803fe4eccfe 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -31,7 +31,7 @@
 #include "warn.hh"
 #include "font-interface.hh"
 #include "stencil.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "text-item.hh"
 #include "tuplet-bracket.hh"
 #include "stem.hh"
@@ -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);
     }
@@ -168,9 +168,9 @@ Tuplet_bracket::print (SCM smob)
   
   SCM number = me->get_property ("text");
 
-  Paper_def *pap = me->get_paper ();
+  Output_def *pap = me->get_paper ();
   Stencil num;
- if (is_string (number) && number_visibility)
+ if (scm_is_string (number) && number_visibility)
     {
       SCM properties = Font_interface::text_font_alist_chain (me);
       SCM snum = Text_item::interpret_markup (pap->self_scm (), properties, number);
@@ -285,10 +285,10 @@ Tuplet_bracket::make_bracket (Grob *me,   // for line properties.
   Stencil m;
   do {
     m.add_stencil (Line_interface::line (me, straight_corners[d],
-                                                gap_corners[d]));
+                                        gap_corners[d]));
     
     m.add_stencil (Line_interface::line (me,  straight_corners[d],
-                                                flare_corners[d]));
+                                        flare_corners[d]));
   } while (flip (&d) != LEFT);
 
   return m;  
@@ -426,7 +426,7 @@ Tuplet_bracket::before_line_breaking (SCM smob)
       if (b)
        me->add_dependency (b);
     }
-  return SCM_UNDEFINED;
+  return SCM_UNSPECIFIED;
 }
 
 MAKE_SCHEME_CALLBACK (Tuplet_bracket,after_line_breaking,1);
@@ -478,7 +478,7 @@ Tuplet_bracket::after_line_breaking (SCM smob)
 
       /*
        duh. magic.
-       */
+<       */
       offset = lp + dir * (0.5 + ly_scm2double (me->get_property ("padding")));
       dy = rp- lp;
     }
@@ -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);