release: 1.5.0

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 013c5dac4b9a17e6da8230fa86cfb370f82b4bc7..d16cb8a20b5db7a4058e5ac061b73c10bc45c429 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -43,7 +43,6 @@ private:
   SCM prev_cpos_;
   SCM prev_octavation_;
   void create_clef ();
-  void set_central_c (SCM, SCM, SCM);
   void set_glyph ();
   void inspect_clef_properties ();
 };
@@ -60,37 +59,6 @@ Clef_engraver::Clef_engraver ()
   prev_cpos_ = prev_glyph_ = SCM_BOOL_F;
 }
 
-void
-Clef_engraver::set_central_c (SCM glyph,SCM clefpos, SCM octavation)
-{
-  prev_cpos_ = clefpos;
-  prev_glyph_ = glyph;
-  prev_octavation_ = octavation;
-
-  SCM p = get_property ("clefPitches");
-  int c0_position =  0;
-  if (gh_list_p (p))
-    {
-      SCM found = scm_assoc (glyph, p);
-      if (found == SCM_BOOL_F)
-       {
-         c0_position =0;
-       }
-      else
-       {
-         c0_position =  gh_scm2int (gh_cdr (found));
-
-         if (gh_number_p (octavation))
-             c0_position -= gh_scm2int (octavation);
-      
-         if (gh_number_p (clefpos))
-           c0_position += gh_scm2int (clefpos);
-       }
-      
-    }
-  daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position));
-}
-
 void
 Clef_engraver::set_glyph ()
 {
@@ -195,11 +163,13 @@ Clef_engraver::inspect_clef_properties ()
 )
     {
       set_glyph ();
-      set_central_c (glyph, clefpos, octavation);
-       
       create_clef ();
 
       clef_p_->set_grob_property ("non-default", SCM_BOOL_T);
+
+      prev_cpos_ = clefpos;
+      prev_glyph_ = glyph;
+      prev_octavation_ = octavation;
     }
 
   if (to_boolean (force_clef))
@@ -209,6 +179,7 @@ Clef_engraver::inspect_clef_properties ()
     }
 }
 
+
 void
 Clef_engraver::stop_translation_timestep ()
 {