X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsystem.hh;h=3fc805a959c1ea6ca6ad1ab16397ef2b3b3b404e;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=18ef76e739c21f78b63381d8c44c8653f3505be9;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git

diff --git a/lily/include/system.hh b/lily/include/system.hh
index 18ef76e739..3fc805a959 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--2009 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,34 +20,42 @@ class System : public Spanner
 {
   int rank_;
   Grob_array *all_elements_;
-  void init_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);
+  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 SCM do_derived_mark () const;
-  virtual Grob *clone (int count) const;
+  virtual void derived_mark () const;
+  virtual Grob *clone () const;
 };
 
 void set_loose_columns (System *which, Column_x_positions const *posns);
+
 #endif /* SYSTEM_HH */