release: 1.1.32

[lilypond.git] / lily / bar-script-engraver.cc

diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc
index e22ef34cb25529fc8e30eb60c1d62763f65eba7e..5af8d286ff09243eefeae5e7960191b8eb51319e 100644 (file)
--- a/lily/bar-script-engraver.cc
+++ b/lily/bar-script-engraver.cc
@@ -57,11 +57,7 @@ Bar_script_engraver::cast_to_interesting_item (Score_element *e)
   Item * i =0;
   if (hang_on_clef_b_)
     {
-      Clef_item * c = dynamic_cast<Clef_item*> (e);
-      if (c && c->default_b_)
-       {
-         i = c;
-       }
+      i = dynamic_cast<Clef_item*> (e);
     }
   else
     {
@@ -94,14 +90,12 @@ Bar_script_engraver::do_pre_move_processing ()
 {
   if (text_p_)
     {
-      text_p_->breakable_b_ = true; // ugh
       typeset_element (text_p_);
       text_p_ =0;
     }
   
   if (staff_side_p_) 
     {
-      staff_side_p_->breakable_b_ = true; // ugh
       typeset_element (staff_side_p_);
       staff_side_p_ = 0;
     }
@@ -116,8 +110,11 @@ Bar_script_engraver::create_items (Request *rq)
   
   staff_side_p_ = new G_staff_side_item;
   staff_side_p_->axis_ = axis_;
+  staff_side_p_->breakable_b_ = true; // ugh
+
   
   text_p_ = new G_text_item;
+  text_p_->breakable_b_ = true; // ugh
 
   Scalar prop = get_property (type_ + "Direction", 0);
   if (prop.isnum_b ())