Release: bump version.

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

diff --git a/lily/cue-clef-engraver.cc b/lily/cue-clef-engraver.cc
index be4ddf44f766e75378981e9a60a63985a5e4056b..c597b368e18c93b94a0830facf6eec9edbbe8571 100644 (file)
--- a/lily/cue-clef-engraver.cc
+++ b/lily/cue-clef-engraver.cc
@@ -1,9 +1,9 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
                            Mats Bengtsson <matsb@s3.kth.se>
-  Copyright (C) 2010 Reinhold Kainhofer <reinhold@kainhofer.com>
+  Copyright (C) 2010--2011 Reinhold Kainhofer <reinhold@kainhofer.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -122,12 +122,6 @@ Cue_clef_engraver::create_octavate_eight (SCM oct)
       g->set_parent (clef_, Y_AXIS);
       g->set_parent (clef_, X_AXIS);
       g->set_property ("direction", scm_from_int (dir));
-
-      // Inherit the break-visibility from the clef!
-      SCM vis = clef_->get_property ("break-visibility");
-      if (vis && g)
-       g->set_property ("break-visibility", vis);
-
       octavate_ = g;
     }
 }
@@ -177,8 +171,7 @@ Cue_clef_engraver::inspect_clef_properties ()
 
   if (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))
+      || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F)
     {
       set_glyph ();
       if (scm_is_string (glyph))
@@ -207,11 +200,7 @@ Cue_clef_engraver::stop_translation_timestep ()
        vis = get_property ("explicitCueClefVisibility");
 
       if (vis)
-       {
-         clef_->set_property ("break-visibility", vis);
-         if (octavate_)
-           octavate_->set_property ("break-visibility", vis);
-       }
+       clef_->set_property ("break-visibility", vis);
 
       clef_ = 0;
       octavate_ = 0;