release: 1.5.13

[lilypond.git] / lily / font-interface.cc

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 25f15ac822f2c80051747db1f49e40c1f0e32f04..ec7fa8ffa7af46a24297c5c74b998819cc93b357 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -38,7 +38,7 @@ Font_interface::font_alist_chain (Grob *me)
   SCM defaults = ly_cdr (scm_assoc (ly_symbol2scm ("font-defaults"),
                                    me->paper_l ()->style_sheet_));
 
-  SCM ch = scm_listify (me->mutable_property_alist_,
+  SCM ch = scm_list_n (me->mutable_property_alist_,
                    me->immutable_property_alist_,
                    defaults,
                    SCM_UNDEFINED);
@@ -200,7 +200,7 @@ Font_interface::properties_to_font_name (SCM fonts, SCM alist_chain)
 
   for (SCM s = fonts ; gh_pair_p (s); s = ly_cdr (s))
     {
-      SCM qlist = gh_caar (s);
+      SCM qlist = ly_caar (s);
 
       if (name != SCM_BOOL_F)
        {
@@ -231,12 +231,12 @@ Font_interface::properties_to_font_name (SCM fonts, SCM alist_chain)
        }
 
       
-      SCM qname = gh_cdar (s);
+      SCM qname = ly_cdar (s);
       return qname;
     }
 
   warning (_ ("couldn't find any font satisfying "));
-  scm_write (scm_listify (name, point_sz, shape, series , family, rel_sz, SCM_UNDEFINED), scm_current_error_port ());
+  scm_write (scm_list_n (name, point_sz, shape, series , family, rel_sz, SCM_UNDEFINED), scm_current_error_port ());
   scm_flush (scm_current_error_port ());
  
   return ly_str02scm ("cmr10");