X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-item.cc;h=1b3adc4d4cd03aa9e2f2b39c850b7a686eb9ef77;hb=027f1aab2ec8fbbc8a20cf421510f8b9a259d6d2;hp=168a1e45e9b58d7ab1b378a2fc1273cb53f73b29;hpb=2873636a53f0011f837aaf6e2072de602730d957;p=lilypond.git

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 168a1e45e9..1b3adc4d4c 100644
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,88 +3,66 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (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"
-
-void
-Clef_item::do_pre_processing()
-{
-  translate_axis (y_position_i_ * staff_line_leading_f () / 2.0, Y_AXIS);
-  SCM style_sym =get_elt_property ("style");
-  String style;
-  if (style_sym != SCM_UNDEFINED)
-    style = ly_scm2string (style_sym);
-  
-  if (break_status_dir() != RIGHT && style != "fullSizeChanges")
-    symbol_ += "_change";
-  if (style == "transparent")
-    {
-      set_elt_property ("transparent", SCM_BOOL_T);
-      set_empty (true, X_AXIS);
-    }
-}
+#include "item.hh"
 
 /*
-  FIXME
+FIXME: should use symbol.
+
 */
-Clef_item::Clef_item()
+MAKE_SCHEME_CALLBACK(Clef,before_line_breaking);
+SCM
+Clef::before_line_breaking (SCM smob)
 {
-  set_elt_property ("breakable", SCM_BOOL_T);
+  Item * s = dynamic_cast<Item*> (unsmob_element (smob));
 
-  symbol_ = "treble";
-  y_position_i_ = -2;
-}
+  SCM style_sym =s->get_elt_property ("style");
+  String style;
+  if (gh_string_p (style_sym))
+    style = ly_scm2string (style_sym);
 
-void
-Clef_item::do_add_processing ()
-{
-  if (!break_status_dir ())	// broken stuff takes care of their own texts
+  SCM glyph = s->get_elt_property ("glyph");
+  
+  if (gh_string_p (glyph))
     {
-      Text_item *g =0;
+      String str = ly_scm2string (glyph);
 
-      SCM octave_dir = remove_elt_property ("octave-dir");
-      if (octave_dir != SCM_UNDEFINED)
+      /*
+	FIXME: should use fontsize property to set clef changes.
+       */
+      if (s->get_elt_property ("non-default") &&
+	  s->break_status_dir() != RIGHT && style != "fullSizeChanges")
 	{
-	  Direction d = Direction (gh_scm2int (octave_dir));
-	  g = new Text_item;
-	  pscore_l_->typeset_element (g);
-      
-	  g->text_str_ = "8";
-	  g->set_elt_property ("style", gh_str02scm ("italic"));
-	  g->set_parent (this, Y_AXIS);
-	  g->set_parent (this, X_AXIS);	  
-
-	  add_dependency (g);	// just to be sure.
-
-	  Real r = do_height ()[d] - g->extent (Y_AXIS)[-d];
-	  g->dim_cache_[Y_AXIS]->set_offset (r);
-
-	  SCM my_vis = get_elt_property ("visibility-lambda");
-	  if (my_vis != SCM_UNDEFINED)
-	    g->set_elt_property ("visibility-lambda", my_vis);
-			
+	  str += "_change";
+	  s->set_elt_property ("glyph", ly_str02scm (str.ch_C()));	  
 	}
-
     }
+  else
+    {
+      s->suicide ();
+      return SCM_UNSPECIFIED;
+    }
+
+  return SCM_UNSPECIFIED;
 }
 
-Molecule*
-Clef_item::do_brew_molecule_p() const
+bool
+Clef::has_interface (Score_element* me)
 {
-  Molecule*output = new Molecule (lookup_l ()->clef (symbol_));
-  return output;
+  return me->has_interface (ly_symbol2scm ("clef-interface"));
 }
 
 
+void
+Clef::set_interface (Score_element* me)
+{
+  me->set_interface (ly_symbol2scm ("clef-interface"));
+}