X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsystem.hh;h=165b589c378aefe145392657f253c92b7da87473;hb=3cfcd0df1125efe0eddc1f361f9bf24243ed12b7;hp=ea31faa752100070cbf80eadc5f8b1879e391b43;hpb=813ef8712c3026794399ff1425a245ffe075efaf;p=lilypond.git

diff --git a/lily/include/system.hh b/lily/include/system.hh
index ea31faa752..165b589c37 100644
--- a/lily/include/system.hh
+++ b/lily/include/system.hh
@@ -1,8 +1,20 @@
-
 /*
-  line-of-score.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1996--2011 Han-Wen Nienhuys
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  (c) 1996--2005 Han-Wen Nienhuys
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SYSTEM_HH
@@ -10,6 +22,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 +31,76 @@
 */
 class System : public Spanner
 {
-public:
   int rank_;
+  vector<Simple_spacer> simple_spacers_;
+  Grob_array *all_elements_;
+  void init_elements ();
+  friend class Paper_score;     // ugh.
+  Paper_score *pscore_; // ugh.
+  bool checked_footnotes_;
+  vector<Grob *> footnote_grobs_; // TODO: make this a grob array
+
+public:
+  Paper_score *paper_score () const;
+  Grob *get_vertical_alignment ();
+  Grob *get_extremal_staff (Direction dir, Interval const &);
+  Grob *get_pure_bound (Direction dir, int start, int end);
+  Grob *get_maybe_pure_bound (Direction dir, bool pure, int start, int end);
+  int get_rank () const;
+  vector<Simple_spacer> get_simple_spacers (Real line_len, Real indent, bool ragged);
+  void gen_simple_spacers (Real line_len, Real indent, bool ragged);
+  vector<Real> get_footnote_heights_in_range (vsize st, vsize end);
+  vector<Real> get_in_note_heights_in_range (vsize st, vsize end);
+  vector<Real> internal_get_note_heights_in_range (vsize st, vsize end, bool foot);
+  void get_footnote_grobs_in_range (vector<Grob *> &out, vsize st, vsize end);
+  vector<Grob *> *footnote_grobs ();
+  vsize num_footnotes ();
+  void do_break_substitution_and_fixup_refpoints ();
   void post_processing ();
+  void populate_footnote_grob_vector ();
   SCM get_paper_system ();
   SCM get_paper_systems ();
+  SCM get_broken_system_grobs ();
+  SCM get_broken_footnote_stencils ();
+
+  DECLARE_SCHEME_CALLBACK (calc_pure_relevant_grobs, (SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_pure_height, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (get_staves, (SCM));
+  DECLARE_SCHEME_CALLBACK (get_spaceable_staves, (SCM));
+  DECLARE_SCHEME_CALLBACK (get_nonspaceable_staves, (SCM));
 
-  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 ();
 
+  Interval begin_of_line_pure_height (vsize start, vsize end);
+  Interval rest_of_line_pure_height (vsize start, vsize end);
+  Interval pure_refpoint_extent (vsize start, vsize end);
+  void collect_labels (Grob const *, SCM *);
+
 protected:
+  virtual void derived_mark () const;
+  virtual Grob *clone () const;
+
+private:
+  Interval part_of_line_pure_height (vsize start, vsize end, bool begin);
 };
 
 void set_loose_columns (System *which, Column_x_positions const *posns);
+
 #endif /* SYSTEM_HH */