release: 1.3.37

[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 cda87205a004418b0a83767274cafc759a5991d9..4e717788a0d0746bae98bc98bc06734f63b77a48 100644 (file)
--- a/lily/span-score-bar-engraver.cc
+++ b/lily/span-score-bar-engraver.cc
@@ -4,7 +4,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 "span-bar.hh"
@@ -12,20 +12,17 @@
 #include "paper-def.hh"
 #include "dimension-cache.hh"
 
-ADD_THIS_TRANSLATOR (Piano_bar_engraver);
-ADD_THIS_TRANSLATOR (Staff_group_bar_engraver);
-ADD_THIS_TRANSLATOR (Span_score_bar_engraver);
-
 Span_bar*
 Span_score_bar_engraver::get_span_bar_p () const
 {
   Span_bar*s =  new Span_bar;
-  s->set_elt_property ("default-glyph",  gh_str02scm ("scorebar"));
+  s->set_elt_property ("glyph",  gh_str02scm ("scorebar"));
   s->set_elt_property ("break-aligned",SCM_BOOL_T);
 
   return s;
 }
 
+
 Span_score_bar_engraver::Span_score_bar_engraver ()
 {
   use_priority_b_ = true;
@@ -36,7 +33,7 @@ Piano_bar_engraver::get_span_bar_p () const
 {
   Span_bar *s= new Span_bar;
   s->set_empty (X_AXIS);
-  s->set_elt_property ("default-glyph", gh_str02scm ("brace"));
+  s->set_elt_property ("glyph", gh_str02scm ("brace"));
   return s;
 }
 
@@ -45,7 +42,14 @@ Staff_group_bar_engraver::get_span_bar_p () const
 {
   Span_bar *s= new Span_bar;
   s->set_empty (X_AXIS);
-  s->set_elt_property ("default-glyph",  gh_str02scm ("bracket"));
+  s->set_elt_property ("glyph",  gh_str02scm ("bracket"));
+
+  SCM collapse = get_property ("bracketCollapseHeight");
+  if (gh_number_p (collapse))
+    s->set_elt_property ("collapse-height", collapse);
+  else
+    s->set_elt_property ("collapse-height", gh_double2scm (1));
+      
   return s;
 }
 
@@ -62,4 +66,8 @@ Staff_group_bar_engraver::acknowledge_element (Score_element_info i)
     }
 }
 
+ADD_THIS_TRANSLATOR (Piano_bar_engraver);
+ADD_THIS_TRANSLATOR (Staff_group_bar_engraver);
+ADD_THIS_TRANSLATOR (Span_score_bar_engraver);
+