Run `make grand-replace'.

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

diff --git a/lily/include/system.hh b/lily/include/system.hh
index ea31faa752100070cbf80eadc5f8b1879e391b43..e44db243cf22b8a69ea08d62799954a980dc0e4b 100644 (file)
--- 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--2008 Han-Wen Nienhuys
 */
 
 #ifndef SYSTEM_HH
@@ -10,6 +9,7 @@
 
 #include "column-x-positions.hh"
 #include "spanner.hh"
+#include "skyline.hh"
 
 /*
   If you keep following offset reference points, you will always end
@@ -18,32 +18,44 @@
 */
 class System : public Spanner
 {
-public:
   int rank_;
+  Grob_array *all_elements_;
+  void init_elements ();
+  friend class Paper_score;    // ugh.
+  Paper_score *pscore_;        // ugh.
+  
+public:
+  Paper_score *paper_score () const;
+  int get_rank () const;
+  void do_break_substitution_and_fixup_refpoints ();
   void post_processing ();
   SCM get_paper_system ();
   SCM get_paper_systems ();
+  SCM get_broken_system_grobs ();
 
-  System (SCM, Object_key const *);
-  System (System const &, int);
-  virtual Grob *clone (int count) const;
+  System (SCM);
+  System (System const &);
 
   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 *);
   void pre_processing ();
 
 protected:
+  virtual void derived_mark () const;
+  virtual Grob *clone () const;
 };
 
 void set_loose_columns (System *which, Column_x_positions const *posns);
+
 #endif /* SYSTEM_HH */