X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=5551cbc07c6eac64e15f22f47f7060aa96dced9e;hb=05514c83a49dd3dfabd1fa7774c69c3038ecde6b;hp=d387009e712b303c5f49a9fc8e0be41f2d29d011;hpb=91821bd59959b1289f2d711509017a4dacebecd2;p=lilypond.git

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index d387009e71..5551cbc07c 100644
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -1,15 +1,27 @@
 /*
-  clef-engraver.cc -- implement Clef_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Mats Bengtsson <matsb@s3.kth.se>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  Mats Bengtsson <matsb@s3.kth.se>
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <cctype>
+using namespace std;
 
+#include "item.hh"
 #include "context.hh"
 #include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
@@ -24,8 +36,6 @@ class Clef_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Clef_engraver);
 
-  Direction octave_dir_;
-
 protected:
   void stop_translation_timestep ();
   void process_music ();
@@ -55,7 +65,6 @@ Clef_engraver::derived_mark () const
 Clef_engraver::Clef_engraver ()
 {
   clef_ = 0;
-  octave_dir_ = CENTER;
   octavate_ = 0;
 
   /*
@@ -67,13 +76,11 @@ Clef_engraver::Clef_engraver ()
 void
 Clef_engraver::set_glyph ()
 {
-  SCM glyph_sym = ly_symbol2scm ("glyph-name");
-  SCM glyph = get_property ("clefGlyph");
-
+  SCM glyph_sym = ly_symbol2scm ("glyph");
   SCM basic = ly_symbol2scm ("Clef");
 
   execute_pushpop_property (context (), basic, glyph_sym, SCM_UNDEFINED);
-  execute_pushpop_property (context (), basic, glyph_sym, glyph);
+  execute_pushpop_property (context (), basic, glyph_sym, get_property ("clefGlyph"));
 }
 
 /**
@@ -83,11 +90,9 @@ Clef_engraver::set_glyph ()
 void
 Clef_engraver::acknowledge_bar_line (Grob_info info)
 {
-  Item *item = dynamic_cast<Item *> (info.grob ());
+  Item *item = info.item ();
   if (item && scm_is_string (get_property ("clefGlyph")))
-    {
-      create_clef ();
-    }
+    create_clef ();
 }
 
 void
@@ -141,12 +146,16 @@ Clef_engraver::inspect_clef_properties ()
   SCM octavation = get_property ("clefOctavation");
   SCM force_clef = get_property ("forceClef");
 
-  if (clefpos == SCM_EOL 
-       || scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F
-       || scm_equal_p (clefpos, prev_cpos_) == SCM_BOOL_F
-       || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F
-       || to_boolean (force_clef))
+  if (clefpos == SCM_EOL
+      || scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F
+      || scm_equal_p (clefpos, prev_cpos_) == SCM_BOOL_F
+      || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F
+      || to_boolean (force_clef))
     {
+      set_context_property_on_children (context (),
+					ly_symbol2scm ("localKeySignature"),
+					get_property ("keySignature"));
+      
       set_glyph ();
       if (prev_cpos_ != SCM_BOOL_F || to_boolean (get_property ("firstClef")))
 	create_clef ();
@@ -174,18 +183,10 @@ Clef_engraver::stop_translation_timestep ()
     {
       SCM vis = 0;
       if (to_boolean (clef_->get_property ("non-default")))
-	{
-	  vis = get_property ("explicitClefVisibility");
-	}
+	vis = get_property ("explicitClefVisibility");
 
       if (vis)
-	{
-	  clef_->set_property ("break-visibility", vis);
-	  if (octavate_)
-	    {
-	      octavate_->set_property ("break-visibility", vis);
-	    }
-	}
+	clef_->set_property ("break-visibility", vis);
 
       clef_ = 0;
 
@@ -195,8 +196,20 @@ Clef_engraver::stop_translation_timestep ()
 
 ADD_ACKNOWLEDGER (Clef_engraver, bar_line);
 ADD_TRANSLATOR (Clef_engraver,
-		/* doc */ "Determine and set reference point for pitches",
-		/* create */ "Clef OctavateEight",
-		/* accept */ "",
-		/* read */ "clefPosition clefGlyph middleCPosition clefOctavation explicitClefVisibility forceClef",
-		/* write */ "");
+		/* doc */
+		"Determine and set reference point for pitches.",
+
+		/* create */
+		"Clef "
+		"OctavateEight ",
+
+		/* read */
+		"clefGlyph "
+		"clefOctavation "
+		"clefPosition "
+		"explicitClefVisibility "
+		"forceClef ",
+
+		/* write */
+		""
+		);