X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fall-font-metrics.hh;h=784a337afab3a7b54fef35afd59aaaf62a825136;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=cf0d24d6dee0488a2b895585144397286dbdd18d;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh index cf0d24d6de..784a337afa 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 + Copyright (C) 1998--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -49,18 +49,18 @@ class All_font_metrics All_font_metrics (All_font_metrics const &); public: - Index_to_charcode_map const *get_index_to_charcode_map (string filename, + 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); - 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; };