From 0a7588f34417f2dbacce7af38868f6c0dc568d38 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 21:48:18 +0000
Subject: [PATCH] lilypond-1.1.36

---
 lily/clef-item.cc          | 34 +++++++++++++---------------------
 lily/include/ly-symbols.hh |  7 +++++++
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index f10fbb17b9..282bd535ec 100644
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -19,7 +19,10 @@ void
 Clef_item::do_pre_processing()
 {
   dim_cache_[Y_AXIS].translate (y_position_i_ * staff_line_leading_f () / 2.0);
-  change_b_ = (break_status_dir() != RIGHT);
+  if (break_status_dir() != RIGHT)
+    {
+      symbol_ += "_change";    
+    }
 }
 
 /*
@@ -28,9 +31,7 @@ Clef_item::do_pre_processing()
 Clef_item::Clef_item()
 {
   set_elt_property (breakable_scm_sym, SCM_BOOL_T);
-  default_b_ = false;
-  change_b_ = true;
-  octave_dir_ = CENTER;
+
   symbol_ = "treble";
   y_position_i_ = -2;
 }
@@ -40,10 +41,12 @@ Clef_item::do_add_processing ()
 {
   if (!break_status_dir ())	// broken stuff takes care of their own texts
     {
-      SCM defvis = gh_eval_str ("(lambda (d) (if (= d 1) '(#f . #f) '(#t . #t)))");
       G_text_item *g =0;
-      if (octave_dir_)
+
+      SCM octave_dir = remove_elt_property (octave_dir_scm_sym);
+      if (octave_dir != SCM_BOOL_F)
 	{
+	  Direction d = Direction (gh_int2scm (SCM_CDR(octave_dir)));
 	  g = new G_text_item;
 	  pscore_l_->typeset_element (g);
       
@@ -53,30 +56,19 @@ Clef_item::do_add_processing ()
 	  g->dim_cache_[X_AXIS].parent_l_ = &dim_cache_[X_AXIS];
 	  add_dependency (g);	// just to be sure.
 
-	  Real r = do_height ()[octave_dir_] + g->extent (Y_AXIS)[-octave_dir_];
+	  Real r = do_height ()[d] + g->extent (Y_AXIS)[-d];
 	  g->dim_cache_[Y_AXIS].set_offset (r);
+	  g->set_elt_property (visibility_lambda_scm_sym,
+			       get_elt_property (visibility_lambda_scm_sym));
 	}
-      
-      if (default_b_)
-	{
-	  set_elt_property (visibility_lambda_scm_sym,
-			    defvis);
 
-	  if (g)
-	    g->set_elt_property (visibility_lambda_scm_sym,
-				 defvis);
-	}
     }
 }
 
 Molecule*
 Clef_item::do_brew_molecule_p() const
 {
-  String t = symbol_;
-  if  (change_b_)
-    t += "_change";
-
-  Molecule*output = new Molecule (lookup_l ()->clef (t));
+  Molecule*output = new Molecule (lookup_l ()->clef (symbol_));
   return output;
 }
 
diff --git a/lily/include/ly-symbols.hh b/lily/include/ly-symbols.hh
index 99ba650faf..3dfe3025d4 100644
--- a/lily/include/ly-symbols.hh
+++ b/lily/include/ly-symbols.hh
@@ -16,11 +16,16 @@
 
 DECLARE_LY_SYMBOL(beam);
 DECLARE_LY_SYMBOL(beam_thickness);
+DECLARE_LY_SYMBOL(beam_dir);
 DECLARE_LY_SYMBOL(bracket);
 DECLARE_LY_SYMBOL(break_helper_only);
 DECLARE_LY_SYMBOL(break_priority);
 DECLARE_LY_SYMBOL(breakable);
 DECLARE_LY_SYMBOL(char);
+DECLARE_LY_SYMBOL(change);
+DECLARE_LY_SYMBOL(damping);
+DECLARE_LY_SYMBOL(dashed);
+DECLARE_LY_SYMBOL(dir_forced);
 DECLARE_LY_SYMBOL(extender_height);
 DECLARE_LY_SYMBOL(filledbox);
 DECLARE_LY_SYMBOL(fontsize);
@@ -31,6 +36,8 @@ DECLARE_LY_SYMBOL(interbeam4);
 DECLARE_LY_SYMBOL(interline);
 DECLARE_LY_SYMBOL(linewidth);
 DECLARE_LY_SYMBOL(notewidth);
+DECLARE_LY_SYMBOL(non_default);
+DECLARE_LY_SYMBOL(octave_dir);
 DECLARE_LY_SYMBOL(output);
 DECLARE_LY_SYMBOL(pianobrace);
 DECLARE_LY_SYMBOL(placebox);
-- 
2.39.5