X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspan-bar.hh;h=825d1d8cbe7a810937d8becaed87495a9e12bf3d;hb=refs%2Ftags%2Frelease%2F1.1.1;hp=a66477ebe82d874eca1fff1795b83801c9c754f0;hpb=6ce61146edb1c36647b514778c29cdc9beedab6a;p=lilypond.git

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index a66477ebe8..825d1d8cbe 100644
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-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>
 */
 
 
@@ -12,24 +12,26 @@
 
 #include "bar.hh"
 
-class Span_bar : public Bar
+class Span_bar : public virtual Bar
 {
-    Link_array<Bar> spanning_l_arr_;
+    Link_array<Score_element> spanning_l_arr_;
 
 public:
-    NAME_MEMBERS();
-    SCORE_ELEM_CLONE(Span_bar);
-    void add(Bar* );
-    void set( Vertical_align_element *);
+    Span_bar();
+    DECLARE_MY_RUNTIME_TYPEINFO;
+    SCORE_ELEMENT_CLONE(Span_bar);
+    void add_bar (Bar*);
+    void set_align (Align_element *);
 
 protected:
-    virtual Interval do_width()const;
+    void evaluate_empty ();
+    virtual Interval do_width() const;
     virtual void do_pre_processing();
-    virtual void translate_y(Real y);
+    virtual void do_post_processing();
     
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
-    virtual Molecule * brew_molecule_p()const;
-    virtual Symbol get_bar_sym(Real dy) const;
+    virtual void do_substitute_dependency (Score_element*,Score_element*);
+    virtual Molecule * brew_molecule_p() const;
+    virtual Atom get_bar_sym (Real dy) const;
 };
 
 #endif // SPAN_BAR_HH