X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef.cc;h=36427055f525f4522af68132732fba502de4edc5;hb=refs%2Ftags%2Frelease%2F2.11.5-1;hp=bac75e343ff3cac2e6264f473e66bff4c7e0f57e;hpb=610f486ffb83525b92b56c8700cefcbbb0ff5af3;p=lilypond.git

diff --git a/lily/clef.cc b/lily/clef.cc
index bac75e343f..36427055f5 100644
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -3,68 +3,65 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "clef.hh"
-#include "string.hh"
-#include "molecule.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);
+  Item *s = unsmob_item (smob);
+  SCM glyph = s->get_property ("glyph");
 
-  SCM glyph = s->get_grob_property ("glyph-name");
-  
-  if (gh_string_p (glyph))
+  if (scm_is_string (glyph))
     {
-      String str = ly_scm2string (glyph);
+      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", ly_str02scm (str.ch_C ()));	  
 	}
-    }
-  else
-    {
-      s->suicide ();
-      return SCM_UNSPECIFIED;
+
+      return scm_makfrom0str (str.c_str ());
     }
 
+  s->suicide ();
   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 * sc = unsmob_grob (smob);
-  SCM glyph = sc->get_grob_property ("glyph-name");
-  if (gh_string_p (glyph))
-    {
-      return Font_interface::get_default_font (sc)->find_by_name (String (ly_scm2string (glyph))).smobbed_copy ();
-    }
-  else
-    {
-      return SCM_EOL;
-    }
+  Grob *me = unsmob_grob (smob);
+  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);
+  Stencil out = fm->find_by_name (glyph);
+  if (out.is_empty ())
+    me->warning (_f ("clef `%s' not found", glyph.c_str ()));
+  return out.smobbed_copy ();
 }
 
+ADD_INTERFACE (Clef,
+	       "A clef sign",
 
-ADD_INTERFACE (Clef, "clef-interface",
-  "A clef sign",
-  "non-default full-size-change glyph-name");
+	       /* properties */
+	       "full-size-change "
+	       "glyph "
+	       "glyph-name "
+	       "non-default "
+	       );