X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics-scheme.cc;h=1391b1d8ff816ca7926c82682d0fec0d7796c9a6;hb=51eff44c691a77454e01ffef7a444c42a287e37c;hp=793b4c58757f796f5ff6b07a4123139bf4c8c3dc;hpb=ade2bb7da653fbd9d670590afd67376fe69c59dd;p=lilypond.git diff --git a/lily/all-font-metrics-scheme.cc b/lily/all-font-metrics-scheme.cc index 793b4c5875..1391b1d8ff 100644 --- a/lily/all-font-metrics-scheme.cc +++ b/lily/all-font-metrics-scheme.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2007 Han-Wen Nienhuys + (c) 2007--2009 Han-Wen Nienhuys */ @@ -13,7 +13,7 @@ LY_DEFINE (ly_reset_all_fonts, "ly:reset-all-fonts", 0, 0, 0, (), - "Forget all about previously loaded fonts. ") + "Forget all about previously loaded fonts.") { delete all_fonts_global; all_fonts_global = new All_font_metrics (global_path.to_string ()); @@ -22,15 +22,24 @@ LY_DEFINE (ly_reset_all_fonts, "ly:reset-all-fonts", 0, 0, 0, } -LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0, +LY_DEFINE (ly_system_font_load, "ly:system-font-load", 1, 0, 0, (SCM name), - "Load the font @var{name}. ") + "Load the OpenType system font @file{@var{name}.otf}." + " Fonts loaded with this command must contain three" + " additional SFNT font tables called @code{LILC}," + " @code{LILF}, and @code{LILY}, needed for typesetting" + " musical elements. Currently, only the Emmentaler and" + " the Aybabtu fonts fulfill these requirements.\n" + "\n" + "Note that only @code{ly:font-get-glyph} and derived" + " code (like @code{\\lookup}) can access glyphs from" + " the system fonts; text strings are handled exclusively" + " via the Pango interface.") { LY_ASSERT_TYPE (scm_is_string, name, 1); - Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name)); + string name_str = ly_scm2string (name); + Font_metric *fm = all_fonts_global->find_font (name_str); return fm->self_scm (); } - -