Run `make grand-replace'.

[lilypond.git] / lily / all-font-metrics.cc

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index bc100e77bc39b7e967e1c3f880e8c0058a06ee53..2deea75cdae8d0bad956c7609b7392c3458c5f27 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "all-font-metrics.hh"
@@ -65,15 +65,10 @@ All_font_metrics::All_font_metrics (All_font_metrics const &)
 #if HAVE_PANGO_FT2
 
 Pango_font *
-All_font_metrics::find_pango_font (PangoFontDescription *description,
-                                  Real magnification,
+All_font_metrics::find_pango_font (PangoFontDescription const *description,
                                   Real output_scale
                                   )
 {
-  pango_font_description_set_size (description,
-                                  gint (magnification *
-                                        pango_font_description_get_size (description)));
-
   gchar *pango_fn = pango_font_description_to_filename (description);
   SCM key = ly_symbol2scm (pango_fn);
 
@@ -109,7 +104,6 @@ Open_type_font *
 All_font_metrics::find_otf (string name)
 {
   SCM sname = ly_symbol2scm (name.c_str ());
-  SCM name_string = ly_string2scm (name);
   SCM val;
   if (!otf_dict_->try_retrieve (sname, &val))
     {
@@ -129,6 +123,7 @@ All_font_metrics::find_otf (string name)
        progress_indication ("]");
 
       unsmob_metrics (val)->file_name_ = file_name;
+      SCM name_string = ly_string2scm (name);
       unsmob_metrics (val)->description_ = scm_cons (name_string,
                                                     scm_from_double (1.0));
       otf_dict_->set (sname, val);
@@ -152,27 +147,3 @@ All_font_metrics::find_font (string name)
 }
 
 All_font_metrics *all_fonts_global;
-
-LY_DEFINE (ly_reset_all_fonts, "ly:reset-all-fonts", 0, 0, 0,
-          (),
-          "Forget all about previously loaded fonts. ")
-{
-  delete all_fonts_global;
-  all_fonts_global = new All_font_metrics (global_path.to_string ());
-
-  return SCM_UNSPECIFIED;
-}
-
-
-LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0,
-          (SCM name),
-          "Load the font @var{name}. ")
-{
-  SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
-
-  Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name));
-
-  return fm->self_scm ();
-}
-
-