release: 1.2.13

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 9eb8d1b26120d52119aeefde6f0678136f34b16f..2919255e71d13168fb90e1f93a1679df038a9531 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -12,13 +12,14 @@
 #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);
+  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)
@@ -29,7 +30,7 @@ Clef_item::do_pre_processing()
   if (style == "transparent")
     {
       set_elt_property (transparent_scm_sym, SCM_BOOL_T);
-      dim_cache_[X_AXIS]->set_empty (true);
+      set_empty (true, X_AXIS);
     }
 }
 
@@ -49,19 +50,20 @@ 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)
        {
          Direction d = Direction (gh_scm2int (SCM_CDR(octave_dir)));
-         g = new G_text_item;
+         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 ()[d] - g->extent (Y_AXIS)[-d];