* lily/ledger-line-spanner.cc (print): swap linear_combination

[lilypond.git] / lily / clef.cc

diff --git a/lily/clef.cc b/lily/clef.cc
index 41cf576c15ac9e1557fde91408cf1751188c0b3c..c7e4920a99ee0549b6b0a65e6398c25c6cd136ff 100644 (file)
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 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"
 
@@ -21,18 +21,18 @@ Clef::before_line_breaking (SCM smob)
 {
   Item *s = unsmob_item (smob);
 
-  SCM glyph = s->get_grob_property ("glyph-name");
+  SCM glyph = s->get_property ("glyph-name");
   
-  if (gh_string_p (glyph))
+  if (scm_is_string (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", scm_makfrom0str (str.to_str0 ()));          
+         s->set_property ("glyph-name", scm_makfrom0str (str.to_str0 ()));       
        }
     }
   else
@@ -47,18 +47,18 @@ Clef::before_line_breaking (SCM smob)
 
 
 
-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 ()));