X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fall-font-metrics.hh;h=184e4751d528bf2a06a646a8d22142f116ceea9c;hb=14a83281378f7c0642ffe88870828933b5f206b6;hp=c8c0de2f0a78f748bb61d70b9423c8666e1541c1;hpb=d4d7ebb8199133ee2d0660b6a45d2d89ca73093f;p=lilypond.git diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh index c8c0de2f0a..184e4751d5 100644 --- a/lily/include/all-font-metrics.hh +++ b/lily/include/all-font-metrics.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2006 Han-Wen Nienhuys + (c) 1998--2009 Han-Wen Nienhuys */ #ifndef ALL_FONTS_HH @@ -18,8 +18,10 @@ #include #endif -/** - Interface to all .afm files living in the filesystem. + +/* + Interface to all fonts (both system fonts and fonts loaded + via Pango). */ class All_font_metrics { @@ -32,16 +34,20 @@ class All_font_metrics int pango_dpi_; #endif + map filename_charcode_maps_map_; + All_font_metrics (All_font_metrics const &); public: + + Index_to_charcode_map const *get_index_to_charcode_map (string filename, + int face_index, + FT_Face face); + All_font_metrics (string search_path); ~All_font_metrics (); -#if HAVE_PANGO_FT2 - Pango_font *find_pango_font (PangoFontDescription *description, - Real magnification, + Pango_font *find_pango_font (PangoFontDescription const *description, Real scale); -#endif Font_metric *find_font (string name); Open_type_font *find_otf (string name); @@ -49,6 +55,6 @@ public: }; extern All_font_metrics *all_fonts_global; +SCM ly_reset_all_fonts (); #endif /* ALL_FONTS_HH */ -