X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsystem.hh;h=84b39bd02fa394fb121b6546b1659b177c51bf91;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=4b56238f367c49f563469bd93b6454a9fdd8c091;hpb=54b02666750062788185bd3f99e644d621e348c2;p=lilypond.git

diff --git a/lily/include/system.hh b/lily/include/system.hh
index 4b56238f36..84b39bd02f 100644
--- a/lily/include/system.hh
+++ b/lily/include/system.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Han-Wen Nienhuys
+  Copyright (C) 1996--2015 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
@@ -34,33 +34,38 @@ class System : public Spanner
   int rank_;
   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
+  friend class Paper_score;     // ugh.
+  Paper_score *pscore_; // ugh.
 
 public:
   Paper_score *paper_score () const;
-  Grob *get_vertical_alignment ();
-  Grob *get_extremal_staff (Direction dir, Interval const&);
+  Grob *get_extremal_staff (Direction dir, Interval const &);
+  Grob *get_neighboring_staff (Direction dir, Grob *vertical_axis_group, Interval_t<int> bounds);
   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<Stencil *> get_footnotes_in_range (vsize st, vsize end);
-  void get_footnote_grobs_in_range (vector<Grob *> &out, vsize st, vsize end);
-  vector<Grob *> *footnote_grobs ();
+  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);
+  vector<Grob *> get_footnote_grobs_in_range (vsize st, vsize end);
   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 (footnotes_before_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (footnotes_after_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (vertical_skyline_elements, (SCM));
   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));
+  DECLARE_SCHEME_CALLBACK (get_vertical_alignment, (SCM));
 
   System (SCM);
   System (System const &);
@@ -69,10 +74,10 @@ public:
   int spanner_count () const;
 
   void break_into_pieces (vector<Column_x_positions> const &);
-  DECLARE_GROB_INTERFACE();
+  DECLARE_GROB_INTERFACE ();
 
-  vector<Item*> broken_col_range (Item const *, Item const *) const;
-  vector<Grob*> used_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 *);