patch::: 1.3.128.jcn4

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index f0a8b8566f9d8175ae8bd1b423f2a4798ca33873..79444fae9c5127e62ec3af9cea2af7fef636e842 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -7,49 +7,69 @@
 */
 
 
-#include "clef-item.hh"
+#include "clef.hh"
 #include "string.hh"
 #include "molecule.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
-#include "text-item.hh"
-#include "paper-score.hh"
-#include "dimension-cache.hh"
-#include "side-position-interface.hh"
-#include "warn.hh"
-#include "line-of-score.hh"
+#include "item.hh"
+#include "font-interface.hh"
 
-void
-Clef_item::before_line_breaking ()
+/*
+ FIXME: should use symbol for #'style.
+*/
+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);
-       
-      if (break_status_dir() != RIGHT && style != "fullSizeChanges")
+      String str = ly_scm2string (glyph);
+
+      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";
+         str += "_change";
+         s->set_grob_property ("glyph-name", ly_str02scm (str.ch_C()));          
        }
-      s = "clefs-" +  s;
-      set_elt_property ("glyph", ly_str02scm (s.ch_C()));
     }
   else
     {
-      set_elt_property ("transparent", SCM_BOOL_T);
-    }
-  
-  if (style == "transparent")  // UGH. JUNKME
-    {
-      set_elt_property ("transparent", SCM_BOOL_T);
-      set_extent_callback (0, X_AXIS);
+      s->suicide ();
+      return SCM_UNSPECIFIED;
     }
+
+  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;
+    }
+}