/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1999--2015 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
#include "warn.hh"
Index_to_charcode_map const *
-All_font_metrics::get_index_to_charcode_map (string filename,
+All_font_metrics::get_index_to_charcode_map (const string &filename,
int face_index,
FT_Face face)
{
return &filename_charcode_maps_map_[key];
}
-All_font_metrics::All_font_metrics (string path)
+All_font_metrics::All_font_metrics (const string &path)
{
otf_dict_ = new Scheme_hash_table;
scm_from_double (1.0));
}
g_free (pango_fn);
- return dynamic_cast<Pango_font *> (unsmob_metrics (val));
+ return dynamic_cast<Pango_font *> (Font_metric::unsmob (val));
}
#endif
Open_type_font *
-All_font_metrics::find_otf (string name)
+All_font_metrics::find_otf (const string &name)
{
SCM sname = ly_symbol2scm (name.c_str ());
SCM val;
debug_output ("]", false);
- unsmob_metrics (val)->file_name_ = file_name;
+ Font_metric::unsmob (val)->file_name_ = file_name;
SCM name_string = ly_string2scm (name);
- unsmob_metrics (val)->description_ = scm_cons (name_string,
+ Font_metric::unsmob (val)->description_ = scm_cons (name_string,
scm_from_double (1.0));
otf_dict_->set (sname, val);
- unsmob_metrics (val)->unprotect ();
+ Font_metric::unsmob (val)->unprotect ();
}
- return dynamic_cast<Open_type_font *> (unsmob_metrics (val));
+ return dynamic_cast<Open_type_font *> (Font_metric::unsmob (val));
}
Font_metric *
-All_font_metrics::find_font (string name)
+All_font_metrics::find_font (const string &name)
{
Font_metric *f = find_otf (name);