Merge with master

[lilypond.git] / lily / font-interface.cc

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 67eb3b2af82b91fd40b92acfeaded7147fc693dc..5dc2129c147696a34ea86738624ebf427167f0a7 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "font-interface.hh"
@@ -49,8 +49,15 @@ Font_interface::text_font_alist_chain (Grob *g)
   return g->get_property_alist_chain (defaults);
 }
 
-ADD_INTERFACE (Font_interface, "font-interface",
+ADD_INTERFACE (Font_interface,
               "Any symbol that is typeset through fixed sets of glyphs, "
               " (ie. fonts)",
-              "font-magnification font font-series font-shape "
-              "font-family font-encoding font-name font-size");
+
+              "font "
+              "font-encoding "
+              "font-family "
+              "font-name "
+              "font-series "
+              "font-shape "
+              "font-size "
+              );