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 7fff19244c95730c985489eba934ba9b844bedc0..7aa6e32f0b684a194a25b7a60a3502fe6f01469f 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -49,11 +49,18 @@ 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;
@@ -101,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) 
@@ -116,14 +130,11 @@ 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_);
@@ -142,8 +153,6 @@ Clef_engraver::do_creation_processing()
   if (gh_string_p (def))
     {
       set_type (ly_scm2string (def));
-      create_clef ();
-      clef_p_->set_elt_property ("non-default", SCM_BOOL_T);
     }
 }
 
@@ -168,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-align-symbol", ly_symbol2scm ("Clef_item"));
+      Clef_item *c= new Clef_item ( current_settings_);
       announce_element (Score_element_info (c, clef_req_l_));
 
       Staff_symbol_referencer_interface si(c);
@@ -179,20 +186,16 @@ 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_)
     {
-      Text_item * g = new Text_item;
+      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_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_));
@@ -205,7 +208,7 @@ Clef_engraver::create_clef()
 void
 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);
@@ -217,20 +220,20 @@ Clef_engraver::do_pre_move_processing()
 {
   if (clef_p_)
     {
-      SCM vis;
-      if(to_boolean (clef_p_->remove_elt_property("non-default")))
+      SCM vis = 0; 
+      if(to_boolean (clef_p_->get_elt_property("non-default")))
        {
          vis = ly_symbol2scm ("all-visible");
+         vis = scm_eval (vis);
        }
-      else
-       vis = ly_symbol2scm ("begin-of-line-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);
+       }
       
-      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;
 
@@ -239,6 +242,8 @@ Clef_engraver::do_pre_move_processing()
 
       octavate_p_ = 0;
     }
+
+  first_b_ = 0;
 }
 
 void