Imported Upstream version 2.14.2

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

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 62c2bb52716785070538055b10652297f22bd60c..3f671e3316135f60c593753eab550e545cb1395f 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -1,9 +1,20 @@
 /*
-  system-start-delimiter.cc -- implement System_start_delimiter
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2009 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "system-start-delimiter.hh"
@@ -22,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"));
@@ -137,15 +144,11 @@ Stencil
 System_start_delimiter::staff_brace (Grob *me, Real y)
 {
   Font_metric *fm = 0;
-  /* We go through the style sheet to lookup the font file
-     name.  This is better than using find_font directly,
-     esp. because that triggers mktextfm for non-existent
-     fonts. */
-  SCM fam = scm_cons (ly_symbol2scm ("font-encoding"),
-                     ly_symbol2scm ("fetaBraces"));
 
-  SCM alist = scm_list_n (fam, SCM_UNDEFINED);
-  fm = select_font (me->layout (), scm_list_n (alist, SCM_UNDEFINED));
+  /*
+    Find the default brace font if the user overrides it.
+  */
+  fm = Font_interface::get_default_font (me);
 
   int
     lo = 0;
@@ -156,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