X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=c39cee79d35c686ad9c1f3e70168d2feda3ad061;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=23119125aa593db391b513ea0bb0cc827e7532d6;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 23119125aa..c39cee79d3 100644
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -1,7 +1,7 @@
 /*
   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
@@ -27,11 +27,10 @@
 #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)
@@ -41,8 +40,7 @@ All_font_metrics::get_index_to_charcode_map (string filename,
   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;
 
@@ -53,7 +51,7 @@ All_font_metrics::All_font_metrics (string path)
 
   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
@@ -79,8 +77,8 @@ All_font_metrics::All_font_metrics (All_font_metrics const &)
 
 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);
@@ -88,33 +86,30 @@ All_font_metrics::find_pango_font (PangoFontDescription const *description,
   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,
-				       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;
@@ -123,31 +118,29 @@ All_font_metrics::find_otf (string name)
       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 ("\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;
+      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);