/*
- all-font-metrics.cc -- implement All_font_metrics
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1999--2008 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/>.
*/
#include "all-font-metrics.hh"
#include "scm-hash.hh"
#include "warn.hh"
-
Index_to_charcode_map const *
-All_font_metrics::get_index_to_charcode_map (string filename,
- int face_index,
- FT_Face face)
+All_font_metrics::get_index_to_charcode_map (const string &filename,
+ int face_index,
+ FT_Face face)
{
string key = filename + String_convert::int_string (face_index);
if (filename_charcode_maps_map_.find (key)
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;
#if HAVE_PANGO_FT2
PangoFontMap *pfm = pango_ft2_font_map_new ();
- pango_ft2_fontmap_
- = G_TYPE_CHECK_INSTANCE_CAST (pfm,
- PANGO_TYPE_FT2_FONT_MAP,
- PangoFT2FontMap);
- pango_dpi_ = 1200;
+ pango_ft2_fontmap_ = PANGO_FT2_FONT_MAP (pfm);
+
+ pango_dpi_ = PANGO_RESOLUTION;
pango_ft2_font_map_set_resolution (pango_ft2_fontmap_,
- pango_dpi_, pango_dpi_);
+ pango_dpi_, pango_dpi_);
pango_dict_ = new Scheme_hash_table;
#endif
Pango_font *
All_font_metrics::find_pango_font (PangoFontDescription const *description,
- Real output_scale
- )
+ Real output_scale
+ )
{
gchar *pango_fn = pango_font_description_to_filename (description);
SCM key = ly_symbol2scm (pango_fn);
SCM val;
if (!pango_dict_->try_retrieve (key, &val))
{
- if (be_verbose_global)
- progress_indication ("[" + string (pango_fn));
+ debug_output ("[" + string (pango_fn), true); // start on a new line
Pango_font *pf = new Pango_font (pango_ft2_fontmap_,
- description,
- output_scale
- );
-
+ description,
+ output_scale
+ );
+
val = pf->self_scm ();
pango_dict_->set (key, val);
pf->unprotect ();
- if (be_verbose_global)
- progress_indication ("]");
+ debug_output ("]", false);
pf->description_ = scm_cons (SCM_BOOL_F,
- scm_from_double (1.0));
+ 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;
string file_name;
if (file_name.empty ())
- file_name = search_path_.find (name + ".otf");
+ file_name = search_path_.find (name + ".otf");
if (file_name.empty ())
- return 0;
+ return 0;
- if (be_verbose_global)
- progress_indication ("[" + file_name);
+ debug_output ("[" + file_name, true); // start on a new line
val = Open_type_font::make_otf (file_name);
- if (be_verbose_global)
- progress_indication ("]");
+ 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,
- scm_from_double (1.0));
+ 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);