]> git.donarmstrong.com Git - lilypond.git/commitdiff
Fix Gonville loading in make_trill_line().
authorPatrick McCarty <pnorcks@gmail.com>
Thu, 21 Jan 2010 04:00:36 +0000 (20:00 -0800)
committerPatrick McCarty <pnorcks@gmail.com>
Thu, 21 Jan 2010 06:14:48 +0000 (22:14 -0800)
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.

lily/line-interface.cc

index c7bf67a406ce8eed60a02400bb8489bbd6b17498..bc0336af69307aa4eb4bcc8bcd078060954ac12c 100644 (file)
@@ -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);