X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=96d8667c9dad4c18bf3478960a52b88c95745782;hb=eeec992b7029d0982bf4ed0eb3995e9ca99c10e9;hp=bc100e77bc39b7e967e1c3f880e8c0058a06ee53;hpb=711cf44d0ab28f3159230c84d63c0b19199408b0;p=lilypond.git

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index bc100e77bc..96d8667c9d 100644
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -3,11 +3,12 @@
 
   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"
 
+#include "string-convert.hh"
 #include "international.hh"
 #include "main.hh"
 #include "open-type-font.hh"
@@ -17,13 +18,16 @@
 
 
 Index_to_charcode_map const *
-All_font_metrics::get_index_to_charcode_map (string filename, FT_Face face)
+All_font_metrics::get_index_to_charcode_map (string filename,
+					     int face_index,
+					     FT_Face face)
 {
-  if (filename_charcode_maps_map_.find (filename)
+  string key = filename + String_convert::int_string (face_index);
+  if (filename_charcode_maps_map_.find (key)
       == filename_charcode_maps_map_.end ())
-    filename_charcode_maps_map_[filename] = make_index_to_charcode_map (face);
+    filename_charcode_maps_map_[key] = make_index_to_charcode_map (face);
 
-  return &filename_charcode_maps_map_[filename];
+  return &filename_charcode_maps_map_[key];
 }
 
 
@@ -65,15 +69,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 +108,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 +127,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 +151,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 ();
-}
-
-