release: 1.1.39

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 456688dc862f8cc9b02e1f4128cb9191c7ad28a7..a2d300f516a8b37018a3bdf5e3a4e6553354301f 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -18,8 +18,16 @@
 void
 Clef_item::do_pre_processing()
 {
-  dim_cache_[Y_AXIS].translate (paper()->internote_f () * y_position_i_);
-  change_b_ = (break_status_dir() != RIGHT);
+  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);
 }
 
 /*
@@ -27,10 +35,8 @@ Clef_item::do_pre_processing()
 */
 Clef_item::Clef_item()
 {
-  breakable_b_ =true;
-  default_b_ = false;
-  change_b_ = true;
-  octave_dir_ = CENTER;
+  set_elt_property (breakable_scm_sym, SCM_BOOL_T);
+
   symbol_ = "treble";
   y_position_i_ = -2;
 }
@@ -38,12 +44,14 @@ Clef_item::Clef_item()
 void
 Clef_item::do_add_processing ()
 {
-  if (!break_status_dir_)      // broken stuff takes care of their own texts
+  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_)
+
+      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);
       
@@ -53,32 +61,22 @@ Clef_item::do_add_processing ()
          g->dim_cache_[X_AXIS].parent_l_ = &dim_cache_[X_AXIS];
          add_dependency (g);   // just to be sure.
 
-         Real r = do_height ()[octave_dir_] + g->extent (Y_AXIS)[-octave_dir_];
+         Real r = do_height ()[d] + g->extent (Y_AXIS)[-d];
          g->dim_cache_[Y_AXIS].set_offset (r);
-       }
-      if (default_b_)
-       {
-         visibility_lambda_ = defvis;
-         if (g)
-           g->visibility_lambda_ = 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;
 }