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 9ef6b8fc1a18ea47aae654a3bae9b8b7b37fabe5..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"
@@ -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;
@@ -51,7 +49,7 @@ Base_span_bar_engraver::acknowledge_element (Score_element_info i)
          --hwn
         */
        {
-         spanbar_p_ = get_span_bar_p ();
+         spanbar_p_ = get_span_bar_p();
          spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS);
          String visnam =  String(name()) + "-visibility";
          
@@ -68,25 +66,9 @@ Base_span_bar_engraver::acknowledge_element (Score_element_info i)
            }
          
          announce_element (Score_element_info (spanbar_p_,0));
-
-#if 0
-         
-         // urg, elt-properties are not set until pre_processing (property-engraver)
-         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 ("glyph"));
-#else
-
-         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 ("glyph", spanbar_p_->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"));
-
-#endif
        }
     }
 }
@@ -105,3 +87,6 @@ Base_span_bar_engraver::do_pre_move_processing()
 }
 
 
+
+ADD_THIS_TRANSLATOR(Base_span_bar_engraver);
+