X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsystem.hh;h=918243d0a0e47e7bc6b40f8f840345e29d57c326;hb=7a32d3103c22d916cec37d1d7bb7e5cd4dc0463a;hp=8a4f40a1ba05db3552d64407b9a937041960b006;hpb=dd8db61d85d5ca9fa0cf9fa02e3fa1593f712a4e;p=lilypond.git

diff --git a/lily/include/system.hh b/lily/include/system.hh
index 8a4f40a1ba..918243d0a0 100644
--- a/lily/include/system.hh
+++ b/lily/include/system.hh
@@ -1,50 +1,61 @@
-
 /*
-  line-of-score.hh -- part of GNU LilyPond
+  system.hh -- part of GNU LilyPond
 
-  (c) 1996--2002 Han-Wen Nienhuys
+  (c) 1996--2007 Han-Wen Nienhuys
 */
 
-#ifndef SCORELINE_HH
-#define SCORELINE_HH
-
+#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
 {
+  int rank_;
+  Grob_array *all_elements_;
+  void init_elements ();
+  friend class Paper_score;	// ugh.
+  Paper_score *pscore_;	// ugh.
+  
 public:
-  int rank_i_;
-  void post_processing (bool);
+  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);
-  /// is #c# contained in #*this#?
-  bool contains_b (Paper_column const *c) const;
+  System (System const &);
+
   int element_count () const;
+  int spanner_count () const;
 
-  void break_into_pieces (Array<Column_x_positions> const&);
-  void output_lines ();
-  static bool has_interface (Grob*);
-  
-  Link_array<Item> broken_col_range (Item const*, Item const*) const;
-  Link_array<Grob> column_l_arr () const;
-  
-  void add_column (Paper_column*);
-  void typeset_grob (Grob*);
-  void output_molecule (SCM, Offset);
-  void output_scheme (SCM);
+  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_COPY_CONS (Grob);
+  virtual void derived_mark () const;
+  virtual Grob *clone () const;
 };
 
-#endif
+void set_loose_columns (System *which, Column_x_positions const *posns);
+
+#endif /* SYSTEM_HH */