lilypond-0.1.11

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 1152be157b5320dddd94591407f6917342d4c3f3..44529faaf0fb1c86334120ba09172ee69696a28a 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -9,6 +9,7 @@
 
 #include "lily-proto.hh"
 #include "score-elem.hh"
+#include "drul-array.hh"
 
 /** A symbol which is attached between two columns. A spanner is a
   symbol which spans across several columns, so its final appearance
@@ -30,30 +31,35 @@
   length of stems of notes they encompass.
 
   */
-class Spanner:public virtual Score_elem {
+class Spanner : public virtual Score_elem {
 public:
-    PCol *left_col_l_, *right_col_l_;
-    
-    /* *************** */
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    virtual Spanner* spanner() { return this; }    
-    Spanner();
-    bool broken_b() const;
-    Spanner* find_broken_piece (Line_of_score*)const;
+  
+  Drul_array<Item*> spanned_drul_;
+  void set_bounds(Direction d, Item*);
+
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  virtual Spanner* spanner() { return this; }    
+  Spanner();
+  bool broken_b() const;
+
+  Spanner* find_broken_piece (Line_of_score*) const;
 protected:
-    void set_my_columns();
-    SCORE_ELEM_CLONE(Spanner);
-
-    /**
-      this is virtual; for instance, Line_of_score overrides it.
-     */
-    virtual void break_into_pieces (bool);
-
-    Link_array<Spanner> broken_into_l_arr_;
-       
-    virtual void do_break_processing();
-    virtual Interval do_width()const;
-    virtual void do_print()const;
-    virtual Line_of_score*line_l()const;
+  void set_my_columns();
+  SCORE_ELEM_CLONE(Spanner);
+
+  /**
+    this is virtual; for instance, Line_of_score overrides it.
+    */
+  virtual void break_into_pieces ();
+
+  Link_array<Spanner> broken_into_l_arr_;
+
+  virtual void do_unlink();
+  virtual void do_junk_links();
+  virtual String do_TeX_output_str () const;
+  virtual void do_break_processing();
+  virtual Interval do_width() const;
+  virtual void do_print() const;
+  virtual Line_of_score*line_l() const;
 };
 #endif