Run `make grand-replace'.

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

diff --git a/lily/font-select.cc b/lily/font-select.cc
index c91f713b176b6c52719c03f1edc7e8cb3af819c6..81ba1115ce453314ed5807d535afed55d8fac2c9 100644 (file)
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -3,11 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2003--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <cmath>
-using namespace std;
 
 #include "dimensions.hh"
 #include "all-font-metrics.hh"
@@ -116,16 +114,7 @@ select_encoded_font (Output_def *layout, SCM chain)
     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"));