X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsystem.hh;h=e44db243cf22b8a69ea08d62799954a980dc0e4b;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=bf30fa237643a04a5032f81043ea31a7e0b79a2c;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/include/system.hh b/lily/include/system.hh
index bf30fa2376..e44db243cf 100644
--- a/lily/include/system.hh
+++ b/lily/include/system.hh
@@ -1,51 +1,61 @@
-
 /*
-  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
 #define SYSTEM_HH
 
-
 #include "column-x-positions.hh"
 #include "spanner.hh"
+#include "skyline.hh"
 
 /*
   If you keep following offset reference points, you will always end
-up at the root object. This root object is called @ref{System}, and it
-represents a system (i.e. a line of music).
-
-
- */
+  up at the root object. This root object is called @ref{System}, and it
+  represents a system (i.e. a line of music).
+*/
 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_line ();
-  SCM get_lines ();
+  SCM get_paper_system ();
+  SCM get_paper_systems ();
+  SCM get_broken_system_grobs ();
+
+  System (SCM);
+  System (System const &);
 
-  System (SCM, Object_key const*);
-  System (System const&, int);
-  virtual Grob *clone (int count) const;
-  
   int element_count () const;
   int spanner_count () const;
 
-  void break_into_pieces (Array<Column_x_positions> const&);
-  static bool has_interface (Grob*);
-  
-  Link_array<Item> broken_col_range (Item const*, Item const*) const;
-  Link_array<Grob> columns () const;
-  
-  void add_column (Paper_column*);
-  void typeset_grob (Grob*);
+  void break_into_pieces (vector<Column_x_positions> const &);
+  DECLARE_GROB_INTERFACE();
+
+  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 */