X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef.cc;h=4f08375f2c0509fcdbfa5c621da26c8025672718;hb=36f6766b9de37adb09d2a27e3f925b356cbc0849;hp=41cf576c15ac9e1557fde91408cf1751188c0b3c;hpb=366ac5a9c6dfb5a32111c8dd6ba40e49334402c3;p=lilypond.git

diff --git a/lily/clef.cc b/lily/clef.cc
index 41cf576c15..4f08375f2c 100644
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -3,70 +3,61 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "clef.hh"
+
 #include "string.hh"
-#include "molecule.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, before_line_breaking, 1);
 SCM
 Clef::before_line_breaking (SCM smob)
 {
   Item *s = unsmob_item (smob);
+  SCM glyph = s->get_property ("glyph-name");
 
-  SCM glyph = s->get_grob_property ("glyph-name");
-  
-  if (gh_string_p (glyph))
+  if (!scm_is_string (glyph))
+    s->suicide ();
+  else
     {
       String str = ly_scm2string (glyph);
 
-      if (to_boolean (s->get_grob_property ("non-default"))
+      if (to_boolean (s->get_property ("non-default"))
 	  && s->break_status_dir () != RIGHT
-	  && !to_boolean (s->get_grob_property ("full-size-change")))
+	  && !to_boolean (s->get_property ("full-size-change")))
 	{
 	  str += "_change";
-	  s->set_grob_property ("glyph-name", scm_makfrom0str (str.to_str0 ()));	  
+	  s->set_property ("glyph-name", scm_makfrom0str (str.to_str0 ()));	
 	}
     }
-  else
-    {
-      s->suicide ();
-      return SCM_UNSPECIFIED;
-    }
 
   return SCM_UNSPECIFIED;
 }
 
-
-
-
-MAKE_SCHEME_CALLBACK (Clef,brew_molecule,1)
+MAKE_SCHEME_CALLBACK (Clef, print, 1)
 SCM
-Clef::brew_molecule (SCM smob) 
+Clef::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  SCM glyph_scm = me->get_grob_property ("glyph-name");
-  if (!gh_string_p (glyph_scm))
+  SCM glyph_scm = me->get_property ("glyph-name");
+  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);
-  Molecule out = fm->find_by_name (glyph);
+  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");