X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fopen-type-font.hh;fp=lily%2Finclude%2Fopen-type-font.hh;h=6ee62823ec4928001b7391d26bf062d5f606d270;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=486606fd95cd2d138e99fc4b3bdc570b21383f45;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh index 486606fd95..6ee62823ec 100644 --- a/lily/include/open-type-font.hh +++ b/lily/include/open-type-font.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2011 Han-Wen Nienhuys + Copyright (C) 2004--2012 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 @@ -20,12 +20,11 @@ #ifndef OPEN_TYPE_FONT_HH #define OPEN_TYPE_FONT_HH - #include "font-metric.hh" Index_to_charcode_map make_index_to_charcode_map (FT_Face face); -void get_unicode_name (char*s, FT_ULong code); -void get_glyph_index_name (char*s, FT_ULong code); +void get_unicode_name (char *s, FT_ULong code); +void get_glyph_index_name (char *s, FT_ULong code); class Open_type_font : public Font_metric { @@ -40,13 +39,13 @@ class Open_type_font : public Font_metric Index_to_charcode_map index_to_charcode_map_; Open_type_font (FT_Face); - DECLARE_CLASSNAME(Open_type_font); + DECLARE_CLASSNAME (Open_type_font); public: SCM get_subfonts () const; SCM get_global_table () const; SCM get_char_table () const; SCM glyph_list () const; - + string get_otf_table (string tag) const; static SCM make_otf (string); string font_name () const; @@ -65,5 +64,4 @@ public: string get_otf_table (FT_Face face, string tag); FT_Face open_ft_face (string str, FT_Long idx); - #endif /* OPEN_TYPE_FONT_HH */