X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics-scheme.cc;h=1391b1d8ff816ca7926c82682d0fec0d7796c9a6;hb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;hp=a3b19e468d2bf4ea6ad990bab60d55fa76fde6df;hpb=a667c0fbd789c30b782bae277456bb1f940ddccc;p=lilypond.git

diff --git a/lily/all-font-metrics-scheme.cc b/lily/all-font-metrics-scheme.cc
index a3b19e468d..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 <hanwen@lilypond.org>
+  (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
@@ -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 ();
 }
-
-