* The grand 2005-2006 replace.

[lilypond.git] / lily / clef.cc

diff --git a/lily/clef.cc b/lily/clef.cc
index 4f08375f2c0509fcdbfa5c621da26c8025672718..a32a623df73298c05a5632b4f1dea021c94a17b8 100644 (file)
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "clef.hh"
@@ -13,19 +13,14 @@
 #include "item.hh"
 #include "font-interface.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);
 
@@ -34,10 +29,12 @@ Clef::before_line_breaking (SCM smob)
          && !to_boolean (s->get_property ("full-size-change")))
        {
          str += "_change";
-         s->set_property ("glyph-name", scm_makfrom0str (str.to_str0 ()));     
        }
+
+      return scm_makfrom0str (str.to_str0 ());
     }
 
+  s->suicide ();
   return SCM_UNSPECIFIED;
 }
 
@@ -59,6 +56,12 @@ Clef::print (SCM smob)
 }
 
 ADD_INTERFACE (Clef, "clef-interface",
-  "A clef sign",
-  "non-default full-size-change glyph-name");
+              "A clef sign",
+
+              /* properties */
+              "full-size-change "
+              "glyph "
+              "glyph-name "
+              "non-default "
+              );