release: 1.3.4

[lilypond.git] / lily / span-score-bar-engraver.cc

diff --git a/lily/span-score-bar-engraver.cc b/lily/span-score-bar-engraver.cc
index 1efa242c6a753991ef6f1e8b0e34ed92e2ff5157..1c6a21541c791c3b3bfdb80ee15518ea240abfab 100644 (file)
--- a/lily/span-score-bar-engraver.cc
+++ b/lily/span-score-bar-engraver.cc
@@ -10,15 +10,16 @@
 #include "span-bar.hh"
 #include "span-score-bar-engraver.hh"
 #include "paper-def.hh"
+#include "dimension-cache.hh"
 
 Span_bar*
 Span_score_bar_engraver::get_span_bar_p () const
 {
   Span_bar*s =  new Span_bar;
-  s->visibility_lambda_
-    = gh_eval_str ("Span_score_bar_visibility");
   s->type_str_ = "scorebar";
-    
+  s->set_elt_property ("break-priority",
+                      gh_int2scm (-4));
+
   return s;
 }
 
@@ -33,10 +34,8 @@ Span_bar*
 Piano_bar_engraver::get_span_bar_p () const
 {
   Span_bar *s= new Span_bar;
-  s->visibility_lambda_
-    = gh_eval_str ("Piano_bar_visibility");
-  s->no_width_b_ =true;
-  s->type_str_ = "{";
+  s->set_empty (true, X_AXIS);
+  s->type_str_ = "brace";
   return s;
 }
 
@@ -44,10 +43,8 @@ Span_bar*
 Staff_group_bar_engraver::get_span_bar_p () const
 {
   Span_bar *s= new Span_bar;
-  s->visibility_lambda_
-    = gh_eval_str ("Staff_group_bar_visibility");
-  s->no_width_b_ =true;
-  s->type_str_ = "[";
+  s->set_empty (true, X_AXIS);
+  s->type_str_ = "bracket";
   return s;
 }
 
@@ -57,8 +54,9 @@ Staff_group_bar_engraver::acknowledge_element (Score_element_info i)
   Base_span_bar_engraver::acknowledge_element (i);
   if (Span_bar * b = dynamic_cast<Span_bar *> (i.elem_l_))
     {
-      if (b->type_str_ == "{")
-       b->extra_x_off_ -=  paper ()->interline_f (); // ugh
+      if (b->type_str_ == "brace")
+       b->translate_axis ( -paper_l ()->get_var ("interline"),
+                           X_AXIS); // ugh
     }
 }
 
@@ -66,3 +64,4 @@ ADD_THIS_TRANSLATOR (Piano_bar_engraver);
 ADD_THIS_TRANSLATOR (Staff_group_bar_engraver);
 ADD_THIS_TRANSLATOR (Span_score_bar_engraver);
 
+