source file of the GNU LilyPond music typesetter
- (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1999--2009 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"
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];
}
if (!pango_dict_->try_retrieve (key, &val))
{
if (be_verbose_global)
- progress_indication ("[" + string (pango_fn));
+ progress_indication ("\n[" + string (pango_fn));
Pango_font *pf = new Pango_font (pango_ft2_fontmap_,
description,
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))
{
return 0;
if (be_verbose_global)
- progress_indication ("[" + file_name);
+ progress_indication ("\n[" + file_name);
val = Open_type_font::make_otf (file_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);
}
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 ();
-}
-
-