release: 1.3.6

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 8a2534b111782dab90037a25b793821db102c259..32a7d932739da3f72ac4ae5478bd42f60fed661a 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,67 +3,89 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include <ctype.h>
 #include "clef-item.hh"
 #include "string.hh"
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "clef-grav.hh"
-
+#include "text-item.hh"
+#include "paper-score.hh"
+#include "dimension-cache.hh"
 
 void
 Clef_item::do_pre_processing()
 {
-  change_b_ = ! (break_status_i() == 1);
-
-  if (default_b_)
+  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);
+  
+  if (break_status_dir() != RIGHT && style != "fullSizeChanges")
+    symbol_ += "_change";
+  if (style == "transparent")
     {
-       empty_b_ = (break_status_i() != 1);
-       transparent_b_ = (break_status_i() != 1);
+      set_elt_property ("transparent", SCM_BOOL_T);
+      set_empty (true, X_AXIS);
     }
 }
 
+/*
+  FIXME
+*/
 Clef_item::Clef_item()
 {
-  breakable_b_ =true;
-  default_b_ = false;
-  change_b_ = true;
-  read ("violin");
-}
+  set_elt_property ("breakable", SCM_BOOL_T);
 
-void
-Clef_item::read (String t)
-{
-  type_= t;
-  if (type_ == "violin")
-       y_off = 2;
-  if (type_ == "alto")
-       y_off = 4;
-  if (type_ == "tenor")
-       y_off = 6;
-  if (type_ == "bass")
-       y_off = 6;
+  symbol_ = "treble";
+  set_position(-2);
 }
+
 void
-Clef_item::read (Clef_engraver const &k)
+Clef_item::do_add_processing ()
 {
-  read (k.clef_type_str_);
+  if (!break_status_dir ())    // broken stuff takes care of their own texts
+    {
+      Text_item *g =0;
+
+      SCM octave_dir = remove_elt_property ("octave-dir");
+      if (octave_dir != SCM_UNDEFINED)
+       {
+         Direction d = Direction (gh_scm2int (octave_dir));
+         g = new Text_item;
+         pscore_l_->typeset_element (g);
+      
+         g->text_str_ = "8";
+         g->set_elt_property ("style", gh_str02scm ("italic"));
+         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];
+         g->dim_cache_[Y_AXIS]->set_offset (r);
+
+         SCM my_vis = get_elt_property ("visibility-lambda");
+         if (my_vis != SCM_UNDEFINED)
+           g->set_elt_property ("visibility-lambda", my_vis);
+                       
+       }
+
+    }
 }
 
 Molecule*
-Clef_item::brew_molecule_p()const
+Clef_item::do_brew_molecule_p() const
 {
-  String t = type_;
-  if  (change_b_)
-       t += "_change";
-  Symbol s = paper()->lookup_l ()->clef (t);
-  Molecule*output = new Molecule (Atom (s));
-  output->translate (paper()->internote_f () * y_off, Y_AXIS);
+  Molecule*output = new Molecule (lookup_l ()->afm_find (String ("clefs-" + symbol_)));
+
   return output;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Clef_item,Item);
+
+