* The grand 2005-2006 replace.

[lilypond.git] / lily / clef.cc

diff --git a/lily/clef.cc b/lily/clef.cc
index 7774d1920e7e2121991d1b3d40c34c534aa55226..a32a623df73298c05a5632b4f1dea021c94a17b8 100644 (file)
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -3,27 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "clef.hh"
+
 #include "string.hh"
 #include "stencil.hh"
 #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");
 
-  SCM glyph = s->get_property ("glyph-name");
-  
-  if (ly_c_string_p (glyph))
+  if (scm_is_string (glyph))
     {
       String str = ly_scm2string (glyph);
 
@@ -32,42 +29,39 @@ 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 ()));       
        }
-    }
-  else
-    {
-      s->suicide ();
-      return SCM_UNSPECIFIED;
+
+      return scm_makfrom0str (str.to_str0 ());
     }
 
+  s->suicide ();
   return SCM_UNSPECIFIED;
 }
 
-
-
-
-MAKE_SCHEME_CALLBACK (Clef,print,1)
+MAKE_SCHEME_CALLBACK (Clef, print, 1)
 SCM
-Clef::print (SCM smob) 
+Clef::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   SCM glyph_scm = me->get_property ("glyph-name");
-  if (!ly_c_string_p (glyph_scm))
+  if (!scm_is_string (glyph_scm))
     return SCM_EOL;
 
   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.to_str0 ()));
   return out.smobbed_copy ();
 }
 
-
 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 "
+              );