release: 1.1.32

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

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index 4d0744de011fff6bbe54ebaf0416d8d1e62409c7..aa461fe1c49ae8a580b7a92fc916afd177859260 100644 (file)
--- 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--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,24 +12,27 @@
 
 #include "bar.hh"
 
-class Span_bar : public virtual Bar
+class Span_bar : public Bar
 {
-    Link_array<Score_elem> spanning_l_arr_;
-
+  Link_array<Score_element> spanning_l_arr_;
+  Interval get_spanned_interval () const;
 public:
-    Span_bar();
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    SCORE_ELEM_CLONE(Span_bar);
-    void add (Bar*);
-    void set (Vertical_align_element *);
+  Real extra_x_off_;
+  bool no_width_b_;
+  Span_bar();
+    
+  VIRTUAL_COPY_CONS(Score_element);
+  void add_bar (Bar*);
+  void set_align (Align_element *);
 
 protected:
-    virtual Interval do_width() const;
-    virtual void do_pre_processing();
-    
-    virtual void do_substitute_dependency (Score_elem*,Score_elem*);
-    virtual Molecule * brew_molecule_p() const;
-    virtual Atom get_bar_sym (Real dy) const;
+  void evaluate_empty ();
+  virtual Interval do_width() const;
+  virtual void do_pre_processing();
+  virtual void do_post_processing();
+  virtual Interval do_height () const;
+  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
+  virtual Molecule * do_brew_molecule_p() const;
 };
 
 #endif // SPAN_BAR_HH