patch::: 1.3.56.mb1: Re: LilyPond 1.3.56

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 152d95163e1f0ba6c7c08b149752f95370662309..7aa6e32f0b684a194a25b7a60a3502fe6f01469f 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();
@@ -44,17 +49,25 @@ public:
   SCM clef_glyph_;             // no need for protection. Always referenced somewhere else.
    
   Clef_engraver();
+
+  bool  first_b_;
+  
+  Protected_scm current_settings_;
 };
 
 
 Clef_engraver::Clef_engraver()
 {
+  current_settings_ = SCM_EOL;
+
+  first_b_ = true;
   clef_glyph_ = SCM_EOL;
   clef_p_ = 0;
   clef_req_l_ = 0;
   c0_position_i_ = 0;
   clef_position_i_ = 0;
   octave_dir_ = CENTER;
+  octavate_p_ = 0;
 }
 
 bool
@@ -73,8 +86,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))
     {
@@ -95,10 +108,17 @@ Clef_engraver::set_type (String s)
     }
 
   c0_position_i_ -= (int) octave_dir_ * 7;
+
+  SCM basic = get_property ("basicClefItemProperties");
+  current_settings_ = gh_cons (gh_cons (ly_symbol2scm ("glyph"), clef_glyph_), basic);
+  current_settings_ =
+    gh_cons (gh_cons (ly_symbol2scm ("c0-position"),
+                     gh_int2scm (c0_position_i_)),
+            current_settings_);
+  
   return true;
 }
 
-
 /** 
   Generate a clef at the start of a measure. (when you see a Bar,
   ie. a breakpoint) 
@@ -110,21 +130,18 @@ Clef_engraver::acknowledge_element (Score_element_info info)
       && gh_string_p (clef_glyph_))
     create_clef();
 
-  /* ugh; should make Clef_referenced baseclass */
   Item * it_l =dynamic_cast <Item *> (info.elem_l_);
   if (it_l)
     {
       if (dynamic_cast<Note_head*>(it_l)
-         || dynamic_cast<Local_key_item*> (it_l)
-         )
-         
+         || dynamic_cast<Local_key_item*> (it_l))
        {
          Staff_symbol_referencer_interface si (it_l);
          si.set_position (int (si.position_f ()) + c0_position_i_);
        }
       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,12 +149,10 @@ 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));
-      create_clef ();
-      clef_p_->set_elt_property ("non-default", SCM_BOOL_T);
     }
 }
 
@@ -162,9 +177,7 @@ Clef_engraver::create_clef()
 {
   if (!clef_p_)
     {
-      Clef_item *c= new Clef_item;
-      c->set_elt_property ("breakable", SCM_BOOL_T);
-      c->set_elt_property ("break-aligned", SCM_BOOL_T);
+      Clef_item *c= new Clef_item ( current_settings_);
       announce_element (Score_element_info (c, clef_req_l_));
 
       Staff_symbol_referencer_interface si(c);
@@ -173,19 +186,29 @@ Clef_engraver::create_clef()
       clef_p_ = c;
     }
   Staff_symbol_referencer_interface si(clef_p_);
-  clef_p_->set_elt_property ("glyph", clef_glyph_);
+
   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 (get_property ("basicOctavateEightProperties"));
+      Side_position_interface spi (g);
+      spi.set_axis (Y_AXIS);
+      spi.add_support (clef_p_);
+      g->set_parent (clef_p_, Y_AXIS);
+      g->set_parent (clef_p_, X_AXIS);
+      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_)
+  if (clef_req_l_ || first_b_)
     {
       create_clef();
       clef_p_->set_elt_property ("non-default", SCM_BOOL_T);
@@ -197,13 +220,30 @@ 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 vis = 0; 
+      if(to_boolean (clef_p_->get_elt_property("non-default")))
+       {
+         vis = ly_symbol2scm ("all-visible");
+         vis = scm_eval (vis);
+       }
+
+      if (vis)
+       {
+         clef_p_->set_elt_property("visibility-lambda", vis);
+         if (octavate_p_)
+           octavate_p_->set_elt_property("visibility-lambda", vis);
+       }
       
       typeset_element (clef_p_);
       clef_p_ =0;
+
+      if (octavate_p_)
+       typeset_element(octavate_p_);
+
+      octavate_p_ = 0;
     }
+
+  first_b_ = 0;
 }
 
 void
@@ -212,8 +252,5 @@ Clef_engraver::do_post_move_processing()
   clef_req_l_ = 0;
 }
 
-
-
-
 ADD_THIS_TRANSLATOR(Clef_engraver);