release: 1.3.19

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

diff --git a/lily/base-span-bar-engraver.cc b/lily/base-span-bar-engraver.cc
index 1ffc9be84279338c586c517d2cde3cd47d7c7e3e..7d4365fd1e86131b02be0a83fb50e8efc64250a2 100644 (file)
--- a/lily/base-span-bar-engraver.cc
+++ b/lily/base-span-bar-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "dimension-cache.hh"
@@ -16,7 +16,6 @@ Base_span_bar_engraver::Base_span_bar_engraver()
 {
   spanbar_p_ =0;
   use_priority_b_ = true;
-  break_priority_i_ = 0;
 }
 
 Span_bar*
@@ -52,15 +51,14 @@ Base_span_bar_engraver::acknowledge_element (Score_element_info i)
        {
          spanbar_p_ = get_span_bar_p();
          spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS);
-         String visnam =  String(name()) + "_visibility";
+         String visnam =  String(name()) + "-visibility";
          
-         spanbar_p_->set_elt_property (visibility_lambda_scm_sym,
-                                       ly_ch_C_eval_scm (visnam.ch_C()));
+         spanbar_p_->set_elt_property ("visibility-lambda",
+                                       ly_eval_str (visnam.ch_C()));
 
          if (use_priority_b_)
            {
-             spanbar_p_->set_elt_property (break_priority_scm_sym,
-                                           gh_int2scm (break_priority_i_));
+             spanbar_p_->set_elt_property ("break-aligned", SCM_BOOL_T);
            }
          else
            {
@@ -68,8 +66,9 @@ Base_span_bar_engraver::acknowledge_element (Score_element_info i)
            }
          
          announce_element (Score_element_info (spanbar_p_,0));
-         if (spanbar_p_->type_str_.empty_b ())
-           spanbar_p_-> type_str_ = bar_l_arr_[0]->type_str_;
+         if (!gh_string_p (spanbar_p_->get_elt_property ("glyph")))
+           spanbar_p_-> set_elt_property ("glyph",
+                                          bar_l_arr_[0]->get_elt_property ("glyph"));
        }
     }
 }
@@ -90,3 +89,4 @@ Base_span_bar_engraver::do_pre_move_processing()
 
 
 ADD_THIS_TRANSLATOR(Base_span_bar_engraver);
+