X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-select.cc;h=dc536a9c7a04aa1cf33173124e26f8295c8b7a85;hb=bd815715c3aa550810f75529a8c0bfb092856668;hp=571433052d4317e3a169ab10fba1bd06a4446256;hpb=eb72c0f066957c3e71d336db0f72814e34d3964d;p=lilypond.git

diff --git a/lily/font-select.cc b/lily/font-select.cc
index 571433052d..dc536a9c7a 100644
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -1,9 +1,20 @@
 /*
-  font-select.cc -- implement property -> font_metric routines.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2003--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2003--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
@@ -109,21 +120,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"));