X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef.cc;h=90b5480087bfa0433de2f57270518b7d17a48e42;hb=b8514b0fc731eb5a53b83d23cbb175e294c38bee;hp=6743bd4e3beb665b4ecad922b6c6ddf9ffcc7721;hpb=b0720e5b9114fc250f752b10661a63e5437a40ae;p=lilypond.git

diff --git a/lily/clef.cc b/lily/clef.cc
index 6743bd4e3b..90b5480087 100644
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -3,15 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "clef.hh"
 
-#include "string.hh"
-#include "stencil.hh"
-#include "item.hh"
 #include "font-interface.hh"
+#include "international.hh"
+#include "item.hh"
+#include "stencil.hh"
 
 MAKE_SCHEME_CALLBACK (Clef, calc_glyph_name, 1);
 SCM
@@ -22,7 +22,7 @@ Clef::calc_glyph_name (SCM smob)
 
   if (scm_is_string (glyph))
     {
-      String str = ly_scm2string (glyph);
+      string str = ly_scm2string (glyph);
 
       if (to_boolean (s->get_property ("non-default"))
 	  && s->break_status_dir () != RIGHT
@@ -31,7 +31,7 @@ Clef::calc_glyph_name (SCM smob)
 	  str += "_change";
 	}
 
-      return scm_makfrom0str (str.to_str0 ());
+      return ly_string2scm (str);
     }
 
   s->suicide ();
@@ -47,15 +47,15 @@ Clef::print (SCM smob)
   if (!scm_is_string (glyph_scm))
     return SCM_EOL;
 
-  String glyph = String (ly_scm2string (glyph_scm));
+  string glyph = string (ly_scm2string (glyph_scm));
   Font_metric *fm = Font_interface::get_default_font (me);
   Stencil out = fm->find_by_name (glyph);
   if (out.is_empty ())
-    me->warning (_f ("clef `%s' not found", glyph.to_str0 ()));
+    me->warning (_f ("clef `%s' not found", glyph.c_str ()));
   return out.smobbed_copy ();
 }
 
-ADD_INTERFACE (Clef, "clef-interface",
+ADD_INTERFACE (Clef,
 	       "A clef sign",
 
 	       /* properties */