release: 1.3.49

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 152d95163e1f0ba6c7c08b149752f95370662309..de2cb687c75b2e73412a4b44a137886a7ad55ae5 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
 
   Mats Bengtsson <matsb@s3.kth.se>
 */
 
 #include <ctype.h>
+
 #include "staff-symbol-referencer.hh"
 #include "bar.hh"
 #include "clef-item.hh"
@@ -21,15 +22,19 @@
 #include "array.hh"
 #include "engraver.hh"
 #include "direction.hh"
+#include "side-position-interface.hh"
+#include "text-item.hh"
 
 /// where is c-0 in the staff?
 class Clef_engraver : public  Engraver {
   Clef_item * clef_p_;
+  Text_item * octavate_p_;
   Clef_change_req * clef_req_l_;
+  
   void create_clef();
   bool set_type (String);
 protected:
-  virtual void do_process_requests();
+  virtual void do_process_music();
   virtual void do_pre_move_processing();
   virtual void do_creation_processing();
   virtual void do_post_move_processing();
@@ -55,6 +60,7 @@ Clef_engraver::Clef_engraver()
   c0_position_i_ = 0;
   clef_position_i_ = 0;
   octave_dir_ = CENTER;
+  octavate_p_ = 0;
 }
 
 bool
@@ -73,8 +79,8 @@ Clef_engraver::set_type (String s)
   else
     octave_dir_ = CENTER;
 
-  SCM c = get_property ("supportedClefTypes",0);
-  SCM p = get_property ("clefPitches", 0);
+  SCM c = get_property ("supportedClefTypes");
+  SCM p = get_property ("clefPitches");
   
   if (gh_list_p (c))
     {
@@ -124,7 +130,7 @@ Clef_engraver::acknowledge_element (Score_element_info info)
        }
       else if (Key_item *k = dynamic_cast<Key_item*>(it_l))
        {
-         k-> set_c_position (c0_position_i_);
+         k->set_elt_property ("c0-position", gh_int2scm (c0_position_i_));
        }
     } 
 }
@@ -132,7 +138,7 @@ Clef_engraver::acknowledge_element (Score_element_info info)
 void
 Clef_engraver::do_creation_processing()
 {
-  SCM def = get_property ("defaultClef", 0);
+  SCM def = get_property ("defaultClef");
   if (gh_string_p (def))
     {
       set_type (ly_scm2string (def));
@@ -164,7 +170,7 @@ Clef_engraver::create_clef()
     {
       Clef_item *c= new Clef_item;
       c->set_elt_property ("breakable", SCM_BOOL_T);
-      c->set_elt_property ("break-aligned", SCM_BOOL_T);
+      c->set_elt_property ("break-align-symbol", ly_symbol2scm ("Clef_item"));
       announce_element (Score_element_info (c, clef_req_l_));
 
       Staff_symbol_referencer_interface si(c);
@@ -177,13 +183,27 @@ Clef_engraver::create_clef()
   si.set_position (clef_position_i_);
   if (octave_dir_)
     {
-      clef_p_->set_elt_property ("octave-dir", gh_int2scm (octave_dir_));
+      Text_item * g = new Text_item;
+      Side_position_interface spi (g);
+      spi.set_axis (Y_AXIS);
+      spi.add_support (clef_p_);
+      g->set_elt_property ("text", ly_str02scm ( "8"));
+      g->set_elt_property ("style", gh_str02scm ("italic"));
+      g->set_parent (clef_p_, Y_AXIS);
+      g->set_parent (clef_p_, X_AXIS);
+         
+      g->set_elt_property ("self-alignment-X", gh_int2scm (0));
+      g->add_offset_callback (Side_position_interface::aligned_on_self, X_AXIS);
+      g->add_offset_callback (Side_position_interface::centered_on_parent, X_AXIS);
+      g->set_elt_property ("direction", gh_int2scm (octave_dir_));
+      octavate_p_ = g;
+      announce_element (Score_element_info (octavate_p_, clef_req_l_));
     }
 }
 
 
 void
-Clef_engraver::do_process_requests()
+Clef_engraver::do_process_music()
 {
   if (clef_req_l_)
     {
@@ -198,11 +218,27 @@ Clef_engraver::do_pre_move_processing()
   if (clef_p_)
     {
       if(to_boolean (clef_p_->remove_elt_property("non-default")))
-        clef_p_->set_elt_property("visibility-lambda",
-                                  ly_eval_str ("all-visibility"));
-      
+       {
+         SCM all = scm_eval (ly_symbol2scm ("all-visible"));
+         clef_p_->set_elt_property("visibility-lambda", all);
+         if (octavate_p_)
+           octavate_p_->set_elt_property("visibility-lambda", all);
+       }
+      else
+       {
+         SCM beg = scm_eval (ly_symbol2scm ("begin-of-line-visible"));
+
+         clef_p_->set_elt_property ("visibility-lambda", beg);
+         if (octavate_p_)
+           octavate_p_->set_elt_property ("visibility-lambda", beg);
+       }
       typeset_element (clef_p_);
       clef_p_ =0;
+
+      if (octavate_p_)
+       typeset_element(octavate_p_);
+
+      octavate_p_ = 0;
     }
 }
 
@@ -212,8 +248,5 @@ Clef_engraver::do_post_move_processing()
   clef_req_l_ = 0;
 }
 
-
-
-
 ADD_THIS_TRANSLATOR(Clef_engraver);