X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef.cc;h=90b5480087bfa0433de2f57270518b7d17a48e42;hb=10af86c3285db93cf559c3796f9deba981d0f27b;hp=dafb09d4e54debc8b3cd1aa986baaf59d973f61a;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/clef.cc b/lily/clef.cc
index dafb09d4e5..90b5480087 100644
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -3,46 +3,43 @@
 
   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"
 
-/*
-  FIXME: should use symbol for #'style.
-*/
-MAKE_SCHEME_CALLBACK (Clef, before_line_breaking, 1);
+MAKE_SCHEME_CALLBACK (Clef, calc_glyph_name, 1);
 SCM
-Clef::before_line_breaking (SCM smob)
+Clef::calc_glyph_name (SCM smob)
 {
   Item *s = unsmob_item (smob);
-  SCM glyph = s->get_property ("glyph-name");
+  SCM glyph = s->get_property ("glyph");
 
-  if (!scm_is_string (glyph))
-    s->suicide ();
-  else
+  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
 	  && !to_boolean (s->get_property ("full-size-change")))
 	{
 	  str += "_change";
-	  s->set_property ("glyph-name", scm_makfrom0str (str.to_str0 ()));
 	}
+
+      return ly_string2scm (str);
     }
 
+  s->suicide ();
   return SCM_UNSPECIFIED;
 }
 
 MAKE_SCHEME_CALLBACK (Clef, print, 1)
-  SCM
+SCM
 Clef::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
@@ -50,15 +47,21 @@ 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",
-	       "non-default full-size-change glyph-name");
+
+	       /* properties */
+	       "full-size-change "
+	       "glyph "
+	       "glyph-name "
+	       "non-default "
+	       );