patch::: 1.3.33.jcn3

[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 cc873a5a81f5d2ed86d4587b76f6c1d58e68b440..d233d514ca08008f7f69d7b5d44986abb9c8be8e 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"
@@ -12,8 +12,6 @@
 #include "base-span-bar-engraver.hh"
 #include "axis-align-spanner.hh"
 
-ADD_THIS_TRANSLATOR (Base_span_bar_engraver);
-
 Base_span_bar_engraver::Base_span_bar_engraver()
 {
   spanbar_p_ =0;
@@ -30,7 +28,7 @@ Base_span_bar_engraver::get_span_bar_p() const
 void
 Base_span_bar_engraver::acknowledge_element (Score_element_info i)
 {
-  int depth = i.origin_trans_l_arr_.size();
+  int depth = i.origin_trans_l_arr (this).size();
   if (depth > 1
       && dynamic_cast<Bar *> (i.elem_l_)) 
     {
@@ -46,13 +44,18 @@ Base_span_bar_engraver::acknowledge_element (Score_element_info i)
 
        /*
 
-         use a property?  get_property ("singleStaffBracket", 0) ?
+         use a property?  get_property ("singleStaffBracket"); ?
 
          --hwn
         */
        {
-         spanbar_p_ = get_span_bar_p ();
+         spanbar_p_ = get_span_bar_p();
          spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS);
+
+         /*
+           UGH. UGH UUHGK GUHG G
+           (ly_eval_str ??)
+          */
          String visnam =  String(name()) + "-visibility";
          
          spanbar_p_->set_elt_property ("visibility-lambda",
@@ -68,11 +71,9 @@ Base_span_bar_engraver::acknowledge_element (Score_element_info i)
            }
          
          announce_element (Score_element_info (spanbar_p_,0));
-
-         if (!gh_string_p (spanbar_p_->get_elt_property ("glyph"))
-             && !gh_string_p (spanbar_p_->get_elt_property ("default-glyph")))
-           spanbar_p_-> set_elt_property ("default-glyph",
-                                          bar_l_arr_[0]->get_elt_property ("default-glyph"));
+         if (!gh_string_p (spanbar_p_->get_elt_property ("glyph")))
+           spanbar_p_-> set_elt_property ("glyph",
+                                          bar_l_arr_[0]->get_elt_property ("glyph"));
        }
     }
 }
@@ -91,3 +92,6 @@ Base_span_bar_engraver::do_pre_move_processing()
 }
 
 
+
+ADD_THIS_TRANSLATOR(Base_span_bar_engraver);
+