X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-item.cc;h=a2d300f516a8b37018a3bdf5e3a4e6553354301f;hb=8f58f4428d70961938e9151097886d861b3faeb3;hp=72328b0954e9617b8280bb59899011ede0aed5b1;hpb=4bdf5f822b18b10b48f619c116641e6aee1968ac;p=lilypond.git

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 72328b0954..a2d300f516 100644
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -1,54 +1,84 @@
 /*
   clef-item.cc -- implement Clef_item
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include <ctype.h>
 #include "clef-item.hh"
 #include "string.hh"
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "clef-reg.hh"
+#include "g-text-item.hh"
+#include "p-score.hh"
 
-
-
-Clef_item::Clef_item()
+void
+Clef_item::do_pre_processing()
 {
-    change = true;
-    read("violin");
+  dim_cache_[Y_AXIS].translate (y_position_i_ * staff_line_leading_f () / 2.0);
+  SCM style_sym =get_elt_property (style_scm_sym);
+  String style;
+  if (style_sym != SCM_BOOL_F)
+    style = ly_scm2string (SCM_CDR(style_sym));
+  
+  if (break_status_dir() != RIGHT && style != "fullSizeChanges")
+    symbol_ += "_change";
+  if (style == "transparent")
+    set_elt_property (transparent_scm_sym, SCM_BOOL_T);
 }
 
-void
-Clef_item::read(String t)
+/*
+  FIXME
+*/
+Clef_item::Clef_item()
 {
-    type = t;
-    if (type == "violin")
-	y_off = 2;
-    if (type == "alto")
-	y_off = 4;
-    if (type == "tenor")
-	y_off = 6;
-    if (type == "bass")
-	y_off = 6;
+  set_elt_property (breakable_scm_sym, SCM_BOOL_T);
+
+  symbol_ = "treble";
+  y_position_i_ = -2;
 }
+
 void
-Clef_item::read(Clef_register const &k)
+Clef_item::do_add_processing ()
 {
-    read(k.clef_type_str_);
+  if (!break_status_dir ())	// broken stuff takes care of their own texts
+    {
+      G_text_item *g =0;
+
+      SCM octave_dir = remove_elt_property (octave_dir_scm_sym);
+      if (octave_dir != SCM_BOOL_F)
+	{
+	  Direction d = Direction (gh_scm2int (SCM_CDR(octave_dir)));
+	  g = new G_text_item;
+	  pscore_l_->typeset_element (g);
+      
+	  g->text_str_ = "8";
+	  g->style_str_ = "italic";
+	  g->dim_cache_[Y_AXIS].parent_l_ = &dim_cache_[Y_AXIS];
+	  g->dim_cache_[X_AXIS].parent_l_ = &dim_cache_[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_scm_sym);
+	  if (my_vis != SCM_BOOL_F)
+	    g->set_elt_property (visibility_lambda_scm_sym, SCM_CDR (my_vis));
+			
+	}
+
+    }
 }
 
 Molecule*
-Clef_item::brew_molecule_p()const
+Clef_item::do_brew_molecule_p() const
 {
-    String t = type;
-    if  (change)
-	t += "_change";
-    Symbol s = paper()->lookup_l()->clef(t);
-    Molecule*output = new Molecule(Atom(s));
-    output->translate(Offset(0, paper()->internote() * y_off));
-    return output;
+  Molecule*output = new Molecule (lookup_l ()->clef (symbol_));
+  return output;
 }
 
+
+