release: 1.3.147

[lilypond.git] / lily / clef-item.cc

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index faf226af33a920089606c7f9c850a90ebd43054f..d7c323ee609b38d463ecbc5e6de38aa6394c2eee 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,36 +11,29 @@
 #include "string.hh"
 #include "molecule.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 = dynamic_cast<Item*> (unsmob_element (smob));
-
-  SCM style_sym =s->get_elt_property ("style");
-  String style;
-  if (gh_string_p (style_sym))
-    style = ly_scm2string (style_sym);
+  Item * s = dynamic_cast<Item*> (unsmob_grob (smob));
 
-  SCM glyph = s->get_elt_property ("glyph");
+  SCM glyph = s->get_grob_property ("glyph-name");
   
   if (gh_string_p (glyph))
     {
       String str = ly_scm2string (glyph);
 
-      /*
-       FIXME: should use fontsize property to set clef changes.
-       */
-      if (s->get_elt_property ("non-default") &&
-         s->break_status_dir() != RIGHT && style != "fullSizeChanges")
+      if (to_boolean (s->get_grob_property ("non-default"))
+         && s->break_status_dir () != RIGHT
+         && !to_boolean (s->get_grob_property ("full-size-change")))
        {
          str += "_change";
-         s->set_elt_property ("glyph", ly_str02scm (str.ch_C()));        
+         s->set_grob_property ("glyph-name", ly_str02scm (str.ch_C ()));         
        }
     }
   else
@@ -53,16 +46,30 @@ Clef::before_line_breaking (SCM smob)
 }
 
 bool
-Clef::has_interface (Score_element* me)
+Clef::has_interface (Grob* me)
 {
   return me->has_interface (ly_symbol2scm ("clef-interface"));
 }
 
 
 void
-Clef::set_interface (Score_element* me)
+Clef::set_interface (Grob* me)
 {
   me->set_interface (ly_symbol2scm ("clef-interface"));
 }
 
-
+MAKE_SCHEME_CALLBACK (Clef,brew_molecule,1)
+SCM
+Clef::brew_molecule (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;
+    }
+}