X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics-scheme.cc;h=354a2b10d85a8e11130b785b2f30c3db2dc92a50;hb=9828eb47c05a7d6446726ef96647e342e7122dc4;hp=0dd78123ea0c3e1325c2ea78a97d5c0d4447dc20;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git diff --git a/lily/all-font-metrics-scheme.cc b/lily/all-font-metrics-scheme.cc index 0dd78123ea..354a2b10d8 100644 --- a/lily/all-font-metrics-scheme.cc +++ b/lily/all-font-metrics-scheme.cc @@ -1,8 +1,8 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2007--2011 Han-Wen Nienhuys - + Copyright (C) 2007--2014 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 @@ -22,8 +22,8 @@ #include "main.hh" 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 ()); @@ -31,23 +31,22 @@ LY_DEFINE (ly_reset_all_fonts, "ly:reset-all-fonts", 0, 0, 0, return SCM_UNSPECIFIED; } - LY_DEFINE (ly_system_font_load, "ly:system-font-load", 1, 0, 0, - (SCM 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 Emmentaler-Brace 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.") + (SCM 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 Emmentaler-Brace 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); - + string name_str = ly_scm2string (name); Font_metric *fm = all_fonts_global->find_font (name_str);