release: 0.1.11

[lilypond.git] / lily / include / scoreline.hh

diff --git a/lily/include/scoreline.hh b/lily/include/scoreline.hh
index 9b9cf7d33f5f275c85c581eb49cd8b4527101f28..fc1cac844e563988edcf04bec2b116a402190867 100644 (file)
--- a/lily/include/scoreline.hh
+++ b/lily/include/scoreline.hh
@@ -8,31 +8,33 @@
 #define SCORELINE_HH
 
 #include "colhpos.hh"
-#include "spanner-elem-group.hh"
+#include "spanner.hh"
 
 /// the columns of a score that form one line.
-class Line_of_score : public Spanner{
+class Line_of_score : public Spanner 
+{
 public:
-    Link_array<PCol> cols;
-    bool error_mark_b_;
-    virtual String TeX_string() const;    
+  Link_array<Paper_column> cols;
+  bool error_mark_b_;
+  virtual String TeX_output_str () const;    
     
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Line_of_score();
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  Line_of_score();
     
-    void add (Score_elem *);
+  void add (Score_elem *);
 
-    /// is #c# contained in #*this#?
-    bool contains_b (PCol const *c)const;
+  /// is #c# contained in #*this#?
+  bool contains_b (Paper_column const *c) const;
     
-    Link_array<Line_of_score> get_lines()const;
-    void set_breaking (Array<Col_hpositions> const&);
+  Link_array<Line_of_score> get_lines() const;
+  void set_breaking (Array<Col_hpositions> const&);
 
 protected:
-    virtual void break_into_pieces (bool);
-    virtual Interval do_width()const;
-    virtual void do_print() const;
-    SCORE_ELEM_CLONE(Line_of_score);
+  virtual void do_breakable_col_processing ();
+  virtual void break_into_pieces (bool);
+  virtual Interval do_width() const;
+  virtual void do_print() const;
+  SCORE_ELEM_CLONE(Line_of_score);
 };
 
 #endif