Merge remote branch 'origin/master' into master2

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

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 5ecda098a9b40b941a1ba03c4aed9992974629f1..5b987b886b8d2b088a3c0ad83fe9be33b604c250 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -33,11 +33,7 @@
 Stencil
 System_start_delimiter::staff_bracket (Grob *me, Real height)
 {
-  SCM fam = scm_cons (ly_symbol2scm ("font-encoding"),
-                     ly_symbol2scm ("fetaMusic"));
-
-  SCM alist = scm_list_n (fam, SCM_UNDEFINED);
-  Font_metric *fm = select_font (me->layout (), scm_list_n (alist, SCM_UNDEFINED));
+  Font_metric *fm = Font_interface::get_default_font (me);
 
   Drul_array<Stencil> tips (fm->find_by_name ("brackettips.down"),
                            fm->find_by_name ("brackettips.up"));
@@ -163,7 +159,7 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
   do
     {
       int cmp = (lo + hi) / 2;
-      b = fm->get_indexed_char (cmp);
+      b = fm->get_indexed_char_dimensions (cmp);
       if (b[Y_AXIS].is_empty () || b[Y_AXIS].length () > y)
        hi = cmp;
       else