release: 1.1.39

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index a41cb38f27b600b4990c2b2e7ae47e6e435dfff5..a2d300f516a8b37018a3bdf5e3a4e6553354301f 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,23 +12,22 @@
 #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_);
+  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));
   
-  bool b= (break_status_dir() != RIGHT);
-  change_b_ = b;
-
-  if (default_b_)
-    {
-      set_empty(b);
-      transparent_b_ = b;
-    }
+  if (break_status_dir() != RIGHT && style != "fullSizeChanges")
+    symbol_ += "_change";
+  if (style == "transparent")
+    set_elt_property (transparent_scm_sym, SCM_BOOL_T);
 }
 
 /*
@@ -36,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;
 }
@@ -47,38 +44,39 @@ Clef_item::Clef_item()
 void
 Clef_item::do_add_processing ()
 {
-  if (!break_status_dir_       // broken stuff takes care of their own texts
-      && octave_dir_)
+  if (!break_status_dir ())    // broken stuff takes care of their own texts
     {
-      G_text_item *g = new G_text_item;
-      pscore_l_->typeset_element (g);
+      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_scm2int (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 ()[octave_dir_] + g->extent (Y_AXIS)[-octave_dir_];
-      g->dim_cache_[Y_AXIS].set_offset (r);
-    }
-
-}
-
+         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);
 
+         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";
-  //  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;
 }