X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef.cc;h=80e480751d66ea44ee87a9d9f5e6776c6b78f140;hb=1f8f8075de6d90783386aea28af67755ed57da16;hp=59d9375c007829534bb90f98869fc396708ef2cf;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/clef.cc b/lily/clef.cc
index 59d9375c00..80e480751d 100644
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "clef.hh"
@@ -11,7 +11,6 @@
 #include "font-interface.hh"
 #include "international.hh"
 #include "item.hh"
-#include "std-string.hh"
 #include "stencil.hh"
 
 MAKE_SCHEME_CALLBACK (Clef, calc_glyph_name, 1);
@@ -23,7 +22,7 @@ Clef::calc_glyph_name (SCM smob)
 
   if (scm_is_string (glyph))
     {
-      std::string str = ly_scm2string (glyph);
+      string str = ly_scm2string (glyph);
 
       if (to_boolean (s->get_property ("non-default"))
 	  && s->break_status_dir () != RIGHT
@@ -32,7 +31,7 @@ Clef::calc_glyph_name (SCM smob)
 	  str += "_change";
 	}
 
-      return scm_makfrom0str (str.c_str ());
+      return ly_string2scm (str);
     }
 
   s->suicide ();
@@ -48,7 +47,7 @@ Clef::print (SCM smob)
   if (!scm_is_string (glyph_scm))
     return SCM_EOL;
 
-  std::string glyph = std::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 ())
@@ -56,8 +55,8 @@ Clef::print (SCM smob)
   return out.smobbed_copy ();
 }
 
-ADD_INTERFACE (Clef, "clef-interface",
-	       "A clef sign",
+ADD_INTERFACE (Clef,
+	       "A clef sign.",
 
 	       /* properties */
 	       "full-size-change "