release: 1.2.13

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index f10fbb17b919f7d8ffcebda6f668ef09d184dbaa..2919255e71d13168fb90e1f93a1679df038a9531 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -12,14 +12,26 @@
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "g-text-item.hh"
-#include "p-score.hh"
+#include "text-item.hh"
+#include "paper-score.hh"
+#include "dimension-cache.hh"
 
 void
 Clef_item::do_pre_processing()
 {
-  dim_cache_[Y_AXIS].translate (y_position_i_ * staff_line_leading_f () / 2.0);
-  change_b_ = (break_status_dir() != RIGHT);
+  translate_axis (y_position_i_ * staff_line_leading_f () / 2.0, Y_AXIS);
+  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);
+      set_empty (true, X_AXIS);
+    }
 }
 
 /*
@@ -28,9 +40,7 @@ Clef_item::do_pre_processing()
 Clef_item::Clef_item()
 {
   set_elt_property (breakable_scm_sym, SCM_BOOL_T);
-  default_b_ = false;
-  change_b_ = true;
-  octave_dir_ = CENTER;
+
   symbol_ = "treble";
   y_position_i_ = -2;
 }
@@ -40,43 +50,38 @@ Clef_item::do_add_processing ()
 {
   if (!break_status_dir ())    // broken stuff takes care of their own texts
     {
-      SCM defvis = gh_eval_str ("(lambda (d) (if (= d 1) '(#f . #f) '(#t . #t)))");
-      G_text_item *g =0;
-      if (octave_dir_)
+      Text_item *g =0;
+
+      SCM octave_dir = remove_elt_property (octave_dir_scm_sym);
+      if (octave_dir != SCM_BOOL_F)
        {
-         g = new G_text_item;
+         Direction d = Direction (gh_scm2int (SCM_CDR(octave_dir)));
+         g = new 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];
+         g->set_parent (this, Y_AXIS);
+         g->set_parent (this, X_AXIS);   
+
          add_dependency (g);   // just to be sure.
 
-         Real r = do_height ()[octave_dir_] + g->extent (Y_AXIS)[-octave_dir_];
-         g->dim_cache_[Y_AXIS].set_offset (r);
-       }
-      
-      if (default_b_)
-       {
-         set_elt_property (visibility_lambda_scm_sym,
-                           defvis);
+         Real r = do_height ()[d] - g->extent (Y_AXIS)[-d];
+         g->dim_cache_[Y_AXIS]->set_offset (r);
 
-         if (g)
-           g->set_elt_property (visibility_lambda_scm_sym,
-                                defvis);
+         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::do_brew_molecule_p() const
 {
-  String t = symbol_;
-  if  (change_b_)
-    t += "_change";
-
-  Molecule*output = new Molecule (lookup_l ()->clef (t));
+  Molecule*output = new Molecule (lookup_l ()->clef (symbol_));
   return output;
 }