patch::: 1.1.25.jcn1: jcn1

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

diff --git a/lily/span-score-bar.cc b/lily/span-score-bar.cc
index 9ee958ae46056f4a8fb586ffe79584ef6d5ea436..0e80464e42892a82d1e87e5c8dc0854dcd90c0ad 100644 (file)
--- a/lily/span-score-bar.cc
+++ b/lily/span-score-bar.cc
@@ -3,43 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "span-score-bar.hh"
-#include "symbol.hh"
+#include "atom.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
+#include "main.hh"
 
 Span_score_bar::Span_score_bar()
 {
-    type_str_ = "|";
 }
 
+
 void
 Span_score_bar::do_pre_processing()
 {
-    Span_bar::do_pre_processing();
-    
-    if ( break_status_i() != 1) {
-       empty_b_ = transparent_b_ = true;
-    }
+  /*
+    duh.  The order of these two is subtle. 
+   */
+  Score_bar::do_pre_processing ();
+  //  Span_bar::do_pre_processing();
 }
 
 
-Symbol
-Piano_brace::get_bar_sym(Real dy)const
-{
-    return paper()->lookup_l()->vbrace(dy);
-}
-Interval
-Piano_brace::do_width()const
-{
-    return Interval(0,0);
-}
 
-IMPLEMENT_STATIC_NAME(Span_score_bar);
-IMPLEMENT_IS_TYPE_B1(Span_score_bar, Span_bar);
-IMPLEMENT_IS_TYPE_B1(Piano_brace, Span_score_bar);
-IMPLEMENT_STATIC_NAME(Piano_brace);
-    
+