release: 1.3.6

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 282bd535ec9ac13fdad2f71b848d1e289b6bb2b3..32a7d932739da3f72ac4ae5478bd42f60fed661a 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -12,16 +12,25 @@
 #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);
-  if (break_status_dir() != RIGHT)
+  Staff_symbol_referencer::do_pre_processing();
+  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")
     {
-      symbol_ += "_change";    
+      set_elt_property ("transparent", SCM_BOOL_T);
+      set_empty (true, X_AXIS);
     }
 }
 
@@ -30,10 +39,10 @@ Clef_item::do_pre_processing()
 */
 Clef_item::Clef_item()
 {
-  set_elt_property (breakable_scm_sym, SCM_BOOL_T);
+  set_elt_property ("breakable", SCM_BOOL_T);
 
   symbol_ = "treble";
-  y_position_i_ = -2;
+  set_position(-2);
 }
 
 void
@@ -41,25 +50,29 @@ Clef_item::do_add_processing ()
 {
   if (!break_status_dir ())    // broken stuff takes care of their own texts
     {
-      G_text_item *g =0;
+      Text_item *g =0;
 
-      SCM octave_dir = remove_elt_property (octave_dir_scm_sym);
-      if (octave_dir != SCM_BOOL_F)
+      SCM octave_dir = remove_elt_property ("octave-dir");
+      if (octave_dir != SCM_UNDEFINED)
        {
-         Direction d = Direction (gh_int2scm (SCM_CDR(octave_dir)));
-         g = new G_text_item;
+         Direction d = Direction (gh_scm2int (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_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);
-         g->set_elt_property (visibility_lambda_scm_sym,
-                              get_elt_property (visibility_lambda_scm_sym));
+         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);
+                       
        }
 
     }
@@ -68,9 +81,11 @@ Clef_item::do_add_processing ()
 Molecule*
 Clef_item::do_brew_molecule_p() const
 {
-  Molecule*output = new Molecule (lookup_l ()->clef (symbol_));
+  Molecule*output = new Molecule (lookup_l ()->afm_find (String ("clefs-" + symbol_)));
+
   return output;
 }
 
 
 
+