From: Patrick McCarty <pnorcks@gmail.com>
Date: Thu, 21 Jan 2010 04:00:36 +0000 (-0800)
Subject: Fix Gonville loading in make_trill_line().
X-Git-Tag: release/2.13.12-1~83
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=52bbc0fbc0c94303e2aefb8089d56ee50e7689c8;p=lilypond.git

Fix Gonville loading in make_trill_line().

The call to Font_interface::text_font_alist_chain() is unnecessary,
because trill_element is a glyph in the music font.

Additionally, we want the default music font here too, in case Gonville
is being used.
---

diff --git a/lily/line-interface.cc b/lily/line-interface.cc
index c7bf67a406..bc0336af69 100644
--- a/lily/line-interface.cc
+++ b/lily/line-interface.cc
@@ -49,14 +49,8 @@ Line_interface::make_trill_line (Grob *me,
 				 Offset to)
 {
   Offset dz = (to-from);
-  SCM alist_chain = Font_interface::text_font_alist_chain (me);
-  SCM style_alist = scm_list_n (scm_cons (ly_symbol2scm ("font-encoding"),
-					  ly_symbol2scm ("fetaMusic")),
-				SCM_UNDEFINED);
-
-  Font_metric *fm = select_font (me->layout (),
-				 scm_cons (style_alist,
-					   alist_chain));
+
+  Font_metric *fm = Font_interface::get_default_font (me);
 
   Stencil elt = fm->find_by_name ("scripts.trill_element");
   elt.align_to (Y_AXIS, CENTER);