release: 1.0.3

[lilypond.git] / lily / include / span-score-bar.hh

diff --git a/lily/include/span-score-bar.hh b/lily/include/span-score-bar.hh
index 675a6ec7a550516c403c899685e7a35eb9b25db7..411c56da5e4d9aa365109756a654daed889eb227 100644 (file)
--- a/lily/include/span-score-bar.hh
+++ b/lily/include/span-score-bar.hh
@@ -3,7 +3,7 @@
 
   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>
 */
 
 
@@ -11,28 +11,19 @@
 #define SPAN_SCORE_BAR_HH
 
 #include "span-bar.hh"
+#include "score-bar.hh"
 
-class Span_score_bar : public Span_bar
+class Span_score_bar : public Span_bar, public Score_bar
 {
 public:
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    SCORE_ELEM_CLONE(Span_score_bar);
-    Span_score_bar();
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  SCORE_ELEMENT_CLONE(Span_score_bar);
+  Span_score_bar();
+
 protected:
-    
-    
-    virtual void do_pre_processing();
+  virtual void do_pre_processing();
 };
 
 
-class Piano_brace : public Span_score_bar
-{
-public:
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    SCORE_ELEM_CLONE(Piano_brace);
-protected:
-    virtual Interval do_width()const;
-    virtual Symbol get_bar_sym(Real) const;
-};
 
 #endif // SPAN_SCORE_BAR_HH