Silences "Not a dir" messages in make website

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

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index bd753f80c6f62fb6202213ed0d36c2b871455347..2771a8001c0bcb82321660e32d763021db72ab45 100644 (file)
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -1,9 +1,20 @@
 /*
-  grob-interface.cc -- implement graphic objects interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "grob-interface.hh"
@@ -11,13 +22,11 @@
 #include "grob.hh"
 #include "international.hh"
 #include "protected-scm.hh"
-#include "std-string.hh"
 #include "string-convert.hh"
 #include "warn.hh"
 #include "misc.hh"
 
-void add_interface (char const *cxx_name,
-                   char const *symbol,
+SCM add_interface (char const *cxx_name,
                    char const *descr,
                    char const *vars)
 {
@@ -27,15 +36,13 @@ void add_interface (char const *cxx_name,
   if (lispy_name.substr (end) != suffix)
     lispy_name += suffix;
 
-  if (lispy_name != string (symbol))
-    programming_error (String_convert::form_string ("%s != %s", lispy_name.c_str (),
-                                                   symbol));
-    
-  SCM s = ly_symbol2scm (symbol);
-  SCM d = scm_makfrom0str (descr);
+  SCM s = ly_symbol2scm (lispy_name.c_str ());
+  SCM d = scm_from_locale_string (descr);
   SCM l = parse_symbol_list (vars);
 
-  ly_add_interface (s, d, l);
+  internal_add_interface (s, d, l);
+
+  return s;
 }
 
 void