* lily/text-item.cc (interpret_string): new file, select font with

[lilypond.git] / lily / script-column.cc

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 5942577323ec14a97c6ce668adf7ac5f570697d9..b84c18de3edc5659d71e14bf05d9a577400986f1 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -15,7 +15,7 @@ void
 Script_column::add_staff_sided (Grob *me, Item *i)
 {
   SCM p = i->get_property ("script-priority");
-  if (!ly_number_p (p))
+  if (!is_number (p))
     return;
 
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"),i);
@@ -44,7 +44,7 @@ Script_column::before_line_breaking (SCM smob)
   Drul_array<SCM> scripts (SCM_EOL, SCM_EOL);
   Link_array<Grob> staff_sided;
   
-  for (SCM s = me->get_property ("scripts"); ly_pair_p (s); s = ly_cdr (s))
+  for (SCM s = me->get_property ("scripts"); is_pair (s); s = ly_cdr (s))
     {
       Grob *sc = unsmob_grob (ly_car (s));
 
@@ -74,7 +74,7 @@ Script_column::before_line_breaking (SCM smob)
       ss = scm_stable_sort_x (ss, grob_script_priority_less_proc);
       
       Grob * last = 0;
-      for (SCM s = ss; ly_pair_p (s); s = ly_cdr (s))
+      for (SCM s = ss; is_pair (s); s = ly_cdr (s))
        {
          Grob *g = unsmob_grob (ly_car (s));
          if (last)