X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fall-font-metrics.hh;h=a2d090a6dfd71c7567447e5ff75dd87ece76f756;hb=57817ab4e80df96e604b50a766c23ebabf72fc66;hp=d170e818a759f14b9b20a8e79e8b53341c3b8a27;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index d170e818a7..a2d090a6df 100644
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--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
@@ -29,12 +29,11 @@
 #include <pango/pangoft2.h>
 #endif
 
-
 /*
    Interface to all fonts (both system fonts and fonts loaded
    via Pango).
 */
-class All_font_metrics
+class All_font_metrics : public Smob<All_font_metrics>
 {
   Scheme_hash_table *otf_dict_;
   File_path search_path_;
@@ -46,22 +45,23 @@ class All_font_metrics
 #endif
 
   map<string, Index_to_charcode_map > filename_charcode_maps_map_;
-  
+
   All_font_metrics (All_font_metrics const &);
 public:
+  SCM mark_smob () const;
 
-  Index_to_charcode_map const *get_index_to_charcode_map (string filename,
-							  int face_index,
-							  FT_Face face);
+  Index_to_charcode_map const *get_index_to_charcode_map (const string &filename,
+                                                          int face_index,
+                                                          FT_Face face);
 
-  All_font_metrics (string search_path);
+  All_font_metrics (const string &search_path);
   ~All_font_metrics ();
 
   Pango_font *find_pango_font (PangoFontDescription const *description,
-			       Real scale);
+                               Real scale);
 
-  Font_metric *find_font (string name);
-  Open_type_font *find_otf (string name);
+  Font_metric *find_font (const string &name);
+  Open_type_font *find_otf (const string &name);
   SCM font_descriptions () const;
 };