/*
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;
+#if HAVE_PANGO_FT2
+ pango_dict_ = 0;
+#endif
+
+ otf_dict_ = 0;
+ smobify_self ();
+ otf_dict_ = unsmob<Scheme_hash_table> (Scheme_hash_table::make_smob ());
#if HAVE_PANGO_FT2
+ pango_dict_ = unsmob<Scheme_hash_table> (Scheme_hash_table::make_smob ());
PangoFontMap *pfm = pango_ft2_font_map_new ();
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_dict_ = new Scheme_hash_table;
#endif
search_path_.parse_path (path);
All_font_metrics::~All_font_metrics ()
{
- otf_dict_->unprotect ();
-
#if HAVE_PANGO_FT2
- pango_dict_->unprotect ();
g_object_unref (pango_ft2_fontmap_);
#endif
}
-All_font_metrics::All_font_metrics (All_font_metrics const &)
+SCM
+All_font_metrics::mark_smob () const
{
+#if HAVE_PANGO_FT2
+ if (pango_dict_)
+ scm_gc_mark (pango_dict_->self_scm ());
+#endif
+ if (otf_dict_)
+ return otf_dict_->self_scm ();
+ return SCM_UNDEFINED;
}
#if HAVE_PANGO_FT2
SCM val;
if (!pango_dict_->try_retrieve (key, &val))
{
- if (be_verbose_global)
- progress_indication ("\n[" + string (pango_fn));
+ debug_output ("[" + string (pango_fn), true); // start on a new line
Pango_font *pf = new Pango_font (pango_ft2_fontmap_,
description,
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));
}
g_free (pango_fn);
- return dynamic_cast<Pango_font *> (unsmob_metrics (val));
+ return unsmob<Pango_font> (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;
if (file_name.empty ())
return 0;
- if (be_verbose_global)
- progress_indication ("\n[" + 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;
+ unsmob<Font_metric> (val)->file_name_ = file_name;
SCM name_string = ly_string2scm (name);
- unsmob_metrics (val)->description_ = scm_cons (name_string,
+ unsmob<Font_metric> (val)->description_ = scm_cons (name_string,
scm_from_double (1.0));
otf_dict_->set (sname, val);
- unsmob_metrics (val)->unprotect ();
+ unsmob<Font_metric> (val)->unprotect ();
}
- return dynamic_cast<Open_type_font *> (unsmob_metrics (val));
+ return unsmob<Open_type_font> (val);
}
Font_metric *
-All_font_metrics::find_font (string name)
+All_font_metrics::find_font (const string &name)
{
Font_metric *f = find_otf (name);
return f;
}
-
-All_font_metrics *all_fonts_global;