MusicXML: Some more broken MusicXML applications (beaming wrong)

[lilypond.git] / lily / font-select.cc

diff --git a/lily/font-select.cc b/lily/font-select.cc
index 571433052d4317e3a169ab10fba1bd06a4446256..2de54e395581d652a43128e9b4eeb9f6711769fe 100644 (file)
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2003--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
@@ -109,21 +109,11 @@ select_encoded_font (Output_def *layout, SCM chain)
     }
 
 #if HAVE_PANGO_FT2
-  if (scm_is_string (name)
-      && is_pango_format_global)
+  if (scm_is_string (name))
     return select_pango_font (layout, chain);
   else
 #endif
-    if (scm_is_string (name))
-      {
-       Real rmag
-         = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-magnification"), chain, SCM_BOOL_F),
-                              1.0);
-       Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name));
-
-       return find_scaled_font (layout, fm, rmag);
-      }
-    else if (scm_instance_p (name))
+    if (scm_instance_p (name))
       {
        SCM base_size = scm_slot_ref (name, ly_symbol2scm ("default-size"));
        SCM vec = scm_slot_ref (name, ly_symbol2scm ("size-vector"));