X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-select.cc;h=2de54e395581d652a43128e9b4eeb9f6711769fe;hb=731d3cb1ef66145c13864a4cfc762e8245d60fab;hp=61030405fb7786ec9feb535b5fa5d5a901738374;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/font-select.cc b/lily/font-select.cc
index 61030405fb..2de54e3955 100644
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -3,10 +3,9 @@
 
   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>
 */
 
-#include <math.h>
 
 #include "dimensions.hh"
 #include "all-font-metrics.hh"
@@ -110,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"));