X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=13542022c33fc6a5f2f9ab7970fad638e11e876f;hb=3e89af67bc6a9e3fd5d9a28db256608ac79510e0;hp=c39cee79d35c686ad9c1f3e70168d2feda3ad061;hpb=c054eb280fd9953596eb164f67b0f9d5555c5a32;p=lilypond.git

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index c39cee79d3..13542022c3 100644
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -27,6 +27,8 @@
 #include "scm-hash.hh"
 #include "warn.hh"
 
+using std::string;
+
 Index_to_charcode_map const *
 All_font_metrics::get_index_to_charcode_map (const string &filename,
                                              int face_index,
@@ -42,9 +44,16 @@ All_font_metrics::get_index_to_charcode_map (const string &filename,
 
 All_font_metrics::All_font_metrics (const string &path)
 {
+#if HAVE_PANGO_FT2
+  pango_dict_ = new Scheme_hash_table;
+#endif
+
   otf_dict_ = new Scheme_hash_table;
+  smobify_self ();
+  otf_dict_->unprotect ();
 
 #if HAVE_PANGO_FT2
+  pango_dict_->unprotect ();
   PangoFontMap *pfm = pango_ft2_font_map_new ();
 
   pango_ft2_fontmap_ = PANGO_FT2_FONT_MAP (pfm);
@@ -52,8 +61,6 @@ All_font_metrics::All_font_metrics (const string &path)
   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);
@@ -61,16 +68,21 @@ All_font_metrics::All_font_metrics (const string &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
@@ -103,7 +115,7 @@ All_font_metrics::find_pango_font (PangoFontDescription const *description,
                                    scm_from_double (1.0));
     }
   g_free (pango_fn);
-  return dynamic_cast<Pango_font *> (Font_metric::unsmob (val));
+  return unsmob<Pango_font> (val);
 }
 
 #endif
@@ -128,15 +140,15 @@ All_font_metrics::find_otf (const string &name)
 
       debug_output ("]", false);
 
-      Font_metric::unsmob (val)->file_name_ = file_name;
+      unsmob<Font_metric> (val)->file_name_ = file_name;
       SCM name_string = ly_string2scm (name);
-      Font_metric::unsmob (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);
-      Font_metric::unsmob (val)->unprotect ();
+      unsmob<Font_metric> (val)->unprotect ();
     }
 
-  return dynamic_cast<Open_type_font *> (Font_metric::unsmob (val));
+  return unsmob<Open_type_font> (val);
 }
 
 Font_metric *
@@ -151,5 +163,3 @@ All_font_metrics::find_font (const string &name)
 
   return f;
 }
-
-All_font_metrics *all_fonts_global;