release: 1.3.69

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 35f4d46bf377e947cfeb8cc7fc5302d629ebbc1d..9c1179333d1adad3dd1d75b29fd5aff28a0dc83b 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -6,87 +6,63 @@
   (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <ctype.h>
-#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 "item.hh"
 
-void
-Clef_item::do_pre_processing()
+/*
+FIXME: should use symbol.
+
+*/
+MAKE_SCHEME_CALLBACK(Clef,before_line_breaking);
+SCM
+Clef::before_line_breaking (SCM smob)
 {
-  SCM style_sym =get_elt_property ("style");
+  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);
 
-  SCM glyph = get_elt_property ("glyph");
+  SCM glyph = s->get_elt_property ("glyph");
+  
   if (gh_string_p (glyph))
     {
-      String s = ly_scm2string (glyph);
-       
-      if (break_status_dir() != RIGHT && style != "fullSizeChanges")
+      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")
        {
-         s += "_change";
+         str += "_change";
+         s->set_elt_property ("glyph", 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_empty (X_AXIS);
+      s->suicide ();
+      return SCM_UNDEFINED;
     }
-}
 
+  return SCM_UNDEFINED;
+}
 
-void
-Clef_item::do_add_processing ()
+bool
+Clef::has_interface (Score_element* me)
 {
-  if (!break_status_dir ())    // broken stuff takes care of their own texts
-    {
-      Text_item *g =0;
+  return me->has_interface (ly_symbol2scm ("clef-interface"));
+}
 
-      SCM octave_dir = remove_elt_property ("octave-dir");
-      if (isdir_b (octave_dir))
-       {
-         g = new Text_item;
-         Side_position_interface spi (g);
-         spi.set_axis (Y_AXIS);
-         
-         pscore_l_->typeset_element (g);
-      
-         spi.add_support (this);
-         g->set_elt_property ("text", ly_str02scm ( "8"));
-         g->set_elt_property ("style", gh_str02scm ("italic"));
-         g->set_parent (this, Y_AXIS);
-         g->set_parent (this, X_AXIS);
-         
-         g->set_elt_property ("self-alignment-X", gh_int2scm (0));
-         g->dim_cache_[X_AXIS]->off_callbacks_.push (Side_position_interface::aligned_on_self);
-         g->dim_cache_[X_AXIS]->off_callbacks_.push (Side_position_interface::centered_on_parent);
-         
-         g->set_elt_property ("direction", octave_dir);
-         
-         add_dependency (g);   // just to be sure.
-         SCM my_vis = get_elt_property ("visibility-lambda");
-         if (gh_procedure_p (my_vis))
-           g->set_elt_property ("visibility-lambda", my_vis);
-                       
-       }
 
-    }
+void
+Clef::set_interface (Score_element* me)
+{
+  me->set_interface (ly_symbol2scm ("clef-interface"));
 }