* buildscripts/lilypond-words.py (F):

[lilypond.git] / lily / clef.cc

diff --git a/lily/clef.cc b/lily/clef.cc
index 9a2eec2e3a68d043f88f7a34a835b7fb07091e93..dafb09d4e54debc8b3cd1aa986baaf59d973f61a 100644 (file)
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -3,68 +3,62 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 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.
+  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);
+  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)
-SCM
-Clef::brew_molecule (SCM smob) 
+MAKE_SCHEME_CALLBACK (Clef, print, 1)
+  SCM
+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.to_str0 ()));
+  return out.smobbed_copy ();
+}
 
 ADD_INTERFACE (Clef, "clef-interface",
-  "A clef sign",
-  "non-default full-size-change glyph-name");
+              "A clef sign",
+              "non-default full-size-change glyph-name");