release: 1.1.36

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index fd6e971b42e9f12f0a395a01be131a2c3f5091e0..282bd535ec9ac13fdad2f71b848d1e289b6bb2b3 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <ctype.h>
@@ -12,19 +12,16 @@
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "clef-engraver.hh"
-#include "text-item.hh"
+#include "g-text-item.hh"
+#include "p-score.hh"
 
 void
 Clef_item::do_pre_processing()
 {
-  bool b= (break_status_dir() != RIGHT);
-  change_b_ = b;
-
-  if (default_b_)
+  dim_cache_[Y_AXIS].translate (y_position_i_ * staff_line_leading_f () / 2.0);
+  if (break_status_dir() != RIGHT)
     {
-      set_empty(b);
-      transparent_b_ = b;
+      symbol_ += "_change";    
     }
 }
 
@@ -33,48 +30,47 @@ 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;
-  
-  // Ugh: This should be const, I guess.
-  octave_marker_td_p_.set_p (new Text_def());// UGH!
-  octave_marker_td_p_->text_str_ = "8";
-  octave_marker_td_p_->style_str_ = "italic";
 }
 
+void
+Clef_item::do_add_processing ()
+{
+  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_int2scm (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);
+         g->set_elt_property (visibility_lambda_scm_sym,
+                              get_elt_property (visibility_lambda_scm_sym));
+       }
 
+    }
+}
 
 Molecule*
-Clef_item::brew_molecule_p() const
+Clef_item::do_brew_molecule_p() const
 {
-  String t = symbol_;
-  if  (change_b_)
-    t += "_change";
-  Atom s = lookup_l ()->clef (t);
-  Molecule*output = new Molecule (Atom (s));
-  output->translate_axis (paper()->internote_f () * y_position_i_, Y_AXIS);
-  if (octave_dir_) {
-    Molecule octave_marker = Molecule(octave_marker_td_p_->get_atom(paper(),
-                                                               CENTER));
-    Real offset = output->extent()[Y_AXIS][octave_dir_]
-                  - octave_marker.extent()[Y_AXIS][- octave_dir_];
-    if (octave_dir_ == DOWN)
-      offset += octave_marker.extent()[Y_AXIS][UP] * 0.35 ;
-    octave_marker.translate_axis (offset, Y_AXIS);
-    output->add_molecule (octave_marker);
-  }
+  Molecule*output = new Molecule (lookup_l ()->clef (symbol_));
   return output;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Clef_item,Item);
-
-#include "pointer.tcc"
-template class P<Text_def>;    // ugh
-