release: 1.1.62

[lilypond.git] / lily / include / line-of-score.hh

diff --git a/lily/include/line-of-score.hh b/lily/include/line-of-score.hh
index 2d0904f3125fbec18206933bf24b587f28959cfa..6cf5efbfaea3d61dac7d2707d5d2d77726f9f5ec 100644 (file)
--- a/lily/include/line-of-score.hh
+++ b/lily/include/line-of-score.hh
@@ -1,43 +1,38 @@
 /*
   line-of-score.hh -- part of GNU LilyPond
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef SCORELINE_HH
 #define SCORELINE_HH
 
 #include "colhpos.hh"
-#include "spanner.hh"
+#include "axis-group-spanner.hh"
 #include "super-element.hh"
 
 /// the columns of a score that form one line.
-class Line_of_score : public Spanner , public Super_element
+class Line_of_score : public Axis_group_spanner, public Super_element
 {
 public:
-  Link_array<Paper_column> cols;
-  bool error_mark_b_;
+  Link_array<Paper_column> cols_;
 
-  DECLARE_MY_RUNTIME_TYPEINFO;
   Line_of_score();
     
-  void add_element (Score_element *);
-
   /// is #c# contained in #*this#?
   bool contains_b (Paper_column const *c) const;
     
-  Link_array<Line_of_score> get_lines() const;
-  Line_of_score * set_breaking (Array<Column_x_positions> const&, int j) const;
+  Line_of_score * set_breaking (Array<Column_x_positions> const&, int j);
+
 
+  void output_all (bool last_line);
+  void add_column (Paper_column*);
+  
 protected:
+  virtual void do_substitute_element_pointer (Score_element*, Score_element*);
   virtual Link_array<Score_element> get_extra_dependencies () const;
-
-  virtual void do_unlink ();
-  virtual void do_junk_links ();
-
-  virtual Interval do_width() const;
   virtual void do_print() const;
-  SCORE_ELEMENT_CLONE(Line_of_score);
+  VIRTUAL_COPY_CONS(Score_element);
 };
 
 #endif