release: 1.3.147

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 64df471244c0e382e22044c2c403ef914670fd56..d7c323ee609b38d463ecbc5e6de38aa6394c2eee 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,63 +3,73 @@
 
   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>
 */
 
 
-#include "clef-item.hh"
+#include "clef.hh"
 #include "string.hh"
 #include "molecule.hh"
 #include "item.hh"
-
-Clef_item::Clef_item (SCM s)
-  : Item (s)
-{}
-
+#include "font-interface.hh"
 
 /*
-FIXME: should use symbol.
-
-FIXME: this should be schemified.
+ FIXME: should use symbol for #'style.
 */
-void
-Clef_item::before_line_breaking ()
+MAKE_SCHEME_CALLBACK (Clef,before_line_breaking,1);
+SCM
+Clef::before_line_breaking (SCM smob)
 {
-  SCM style_sym =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 = get_elt_property ("glyph");
+  SCM glyph = s->get_grob_property ("glyph-name");
   
   if (gh_string_p (glyph))
     {
-      String s = ly_scm2string (glyph);
+      String str = ly_scm2string (glyph);
 
-      /*
-       FIXME: should use fontsize property to set clef changes.
-       */
-      if (get_elt_property ("non-default") &&
-         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")))
        {
-         s += "_change";
-         set_elt_property ("glyph", ly_str02scm (s.ch_C()));     
+         str += "_change";
+         s->set_grob_property ("glyph-name", ly_str02scm (str.ch_C ()));         
        }
     }
   else
     {
-      suicide ();
-      return;
+      s->suicide ();
+      return SCM_UNSPECIFIED;
     }
 
-  // ugh.
-  /* why not suicide? */
-  if (style == "transparent")  // UGH. JUNKME
-    {
-      set_elt_property ("molecule-callback", SCM_BOOL_T);
-      set_extent_callback (0, X_AXIS);
-    }
+  return SCM_UNSPECIFIED;
 }
 
+bool
+Clef::has_interface (Grob* me)
+{
+  return me->has_interface (ly_symbol2scm ("clef-interface"));
+}
 
 
+void
+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;
+    }
+}