X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsystem.hh;h=a4b5d276bfdaec8b5f32711fa0aebe2c050a4def;hb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;hp=82d942d396dd7574faa5f73af6d4eef003406c06;hpb=c3ff3d74ca155bac9f4676f172a7daa7af0ae5d1;p=lilypond.git

diff --git a/lily/include/system.hh b/lily/include/system.hh
index 82d942d396..a4b5d276bf 100644
--- a/lily/include/system.hh
+++ b/lily/include/system.hh
@@ -1,8 +1,7 @@
-
 /*
-  line-of-score.hh -- part of GNU LilyPond
+  system.hh -- part of GNU LilyPond
 
-  (c) 1996--2005 Han-Wen Nienhuys
+  (c) 1996--2007 Han-Wen Nienhuys
 */
 
 #ifndef SYSTEM_HH
@@ -10,7 +9,7 @@
 
 #include "column-x-positions.hh"
 #include "spanner.hh"
-#include "grob-array.hh"
+#include "skyline.hh"
 
 /*
   If you keep following offset reference points, you will always end
@@ -21,8 +20,14 @@ class System : public Spanner
 {
   int rank_;
   Grob_array *all_elements_;
-  void init_elements ();  
+  Drul_array<Skyline> skylines_;
+  void build_skylines ();
+  void init_elements ();
+  friend class Paper_score;	// ugh.
+  Paper_score *pscore_;	// ugh.
+  
 public:
+  Paper_score *paper_score () const;
   int get_rank () const;
   void post_processing ();
   SCM get_paper_system ();
@@ -34,11 +39,12 @@ public:
   int element_count () const;
   int spanner_count () const;
 
-  void break_into_pieces (Array<Column_x_positions> const &);
-  static bool has_interface (Grob *);
+  void break_into_pieces (vector<Column_x_positions> const &);
+  DECLARE_GROB_INTERFACE();
 
-  Link_array<Item> broken_col_range (Item const *, Item const *) const;
-  Link_array<Grob> columns () const;
+  vector<Item*> broken_col_range (Item const *, Item const *) const;
+  vector<Grob*> used_columns () const;
+  Paper_column *column (vsize i) const;
 
   void add_column (Paper_column *);
   void typeset_grob (Grob *);
@@ -50,5 +56,6 @@ protected:
 };
 
 void set_loose_columns (System *which, Column_x_positions const *posns);
+
 #endif /* SYSTEM_HH */