patch::: 1.3.9.hwn2

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index a41cb38f27b600b4990c2b2e7ae47e6e435dfff5..838d06a808009c198c04437315f1b7422227c49a 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,22 +12,26 @@
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "clef-engraver.hh"
-#include "g-text-item.hh"
-#include "p-score.hh"
+#include "text-item.hh"
+#include "paper-score.hh"
+#include "dimension-cache.hh"
+#include "staff-side.hh"
 
 void
 Clef_item::do_pre_processing()
 {
-  dim_cache_[Y_AXIS].translate (paper()->internote_f () * y_position_i_);
+  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);
   
-  bool b= (break_status_dir() != RIGHT);
-  change_b_ = b;
-
-  if (default_b_)
+  if (break_status_dir() != RIGHT && style != "fullSizeChanges")
+    symbol_ += "_change";
+  if (style == "transparent")
     {
-      set_empty(b);
-      transparent_b_ = b;
+      set_elt_property ("transparent", SCM_BOOL_T);
+      set_empty (X_AXIS);
     }
 }
 
@@ -36,51 +40,52 @@ 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_BOOL_T);
+
   symbol_ = "treble";
-  y_position_i_ = -2;
+  set_position(-2);
 }
 
 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);
+      Text_item *g =0;
+
+      SCM octave_dir = remove_elt_property ("octave-dir");
+      if (isdir_b (octave_dir))
+       {
+         g = new Text_item;
+         Side_position_interface spi (g);
+         spi.set_axis (Y_AXIS);
+         
+         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.
+         g->text_str_ = "8";
+         g->set_elt_property ("style", gh_str02scm ("italic"));
+         g->set_parent (this, Y_AXIS);
+         g->set_parent (this, X_AXIS);   
+         g->set_elt_property ("direction", octave_dir);
+         
+         add_dependency (g);   // just to be sure.
+         SCM my_vis = get_elt_property ("visibility-lambda");
+         if (my_vis != SCM_UNDEFINED)
+           g->set_elt_property ("visibility-lambda", my_vis);
+                       
+       }
 
-      Real r = do_height ()[octave_dir_] + g->extent (Y_AXIS)[-octave_dir_];
-      g->dim_cache_[Y_AXIS].set_offset (r);
     }
-
 }
 
-
-
-
-
 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 ()->afm_find (String ("clefs-" + symbol_)));
+
   return output;
 }
 
 
 
+