release: 1.5.29

[lilypond.git] / lily / system-start-delimiter.cc

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 56bf35e1b407637fc769436ff45388357d9b0cb8..e2c4f02d87f0f3d7e0714eb5a387a68822b005e8 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <math.h>
@@ -23,7 +23,7 @@ System_start_delimiter::staff_bracket (Grob*me,Real height)
 {
   Real arc_height = gh_scm2double (me->get_grob_property ("arch-height")) ;
   
-  SCM at = gh_list (ly_symbol2scm ("bracket"),
+  SCM at = scm_list_n (ly_symbol2scm ("bracket"),
                    me->get_grob_property ("arch-angle"),
                    me->get_grob_property ("arch-width"),
                    gh_double2scm (arc_height),
@@ -143,14 +143,14 @@ System_start_delimiter::staff_brace (Grob*me, Real y)
             name.  This is better than using find_font directly,
             esp. because that triggers mktextfm for non-existent
             fonts. */
-         SCM alist = gh_list (gh_cons (ly_symbol2scm ("font-family"),
-                                       ly_symbol2scm ("braces")),
-                              gh_cons (ly_symbol2scm ("font-relative-size"),
-                                       gh_int2scm (i)),
-                              SCM_UNDEFINED);
-         fm = Font_interface::get_font (me, gh_list (alist, SCM_UNDEFINED));
+         SCM br = ly_symbol2scm ("braces");
+         SCM fam = gh_cons (ly_symbol2scm ("font-family"), br);
+         SCM sz = gh_cons (ly_symbol2scm ("font-relative-size"), gh_int2scm (i));
+
+         SCM alist = scm_list_n (fam, sz, SCM_UNDEFINED);
+         fm = Font_interface::get_font (me, scm_list_n (alist, SCM_UNDEFINED));
          /* Hmm, if lookup fails, we get cmr10 anyway */
-         if (ly_scm2string (gh_car (fm->description_)) == "cmr10")
+         if (ly_scm2string (ly_car (fm->description_)) == "cmr10")
            break;
        }
       else
@@ -174,7 +174,7 @@ System_start_delimiter::staff_brace (Grob*me, Real y)
     }
   while (hi - lo > 1);
       
-  SCM at = gh_list (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED);
+  SCM at = scm_list_n (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED);
   at = fontify_atom (fm, at);
   
   b = fm->get_char (lo);