release: 1.1.36

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 5e5fee9cbf1d2e6a1af704c84568d876e3983f05..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,15 +12,17 @@
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "clef-engraver.hh"
 #include "g-text-item.hh"
 #include "p-score.hh"
 
 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);
+  if (break_status_dir() != RIGHT)
+    {
+      symbol_ += "_change";    
+    }
 }
 
 /*
@@ -28,10 +30,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;
 }
@@ -39,12 +39,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_int2scm (SCM_CDR(octave_dir)));
          g = new G_text_item;
          pscore_l_->typeset_element (g);
       
@@ -54,34 +56,19 @@ 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);
+         g->set_elt_property (visibility_lambda_scm_sym,
+                              get_elt_property (visibility_lambda_scm_sym));
        }
-      if (default_b_)
-       {
-         visibility_lambda_ = defvis;
-         if (g)
-           g->visibility_lambda_ = defvis;
-       }
-    }
-
 
+    }
 }
 
-
-
-
-
 Molecule*
 Clef_item::do_brew_molecule_p() const
 {
-  String t = symbol_;
-  if  (change_b_)
-    t += "_change";
-  //  Atom s = lookup_l ()-> text ("roman", to_str (break_status_dir ()));
-    
-  Atom s = lookup_l ()->clef (t);
-  Molecule*output = new Molecule (Atom (s));
+  Molecule*output = new Molecule (lookup_l ()->clef (symbol_));
   return output;
 }