X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsystem.hh;h=882f209f9680b052afa354d72a99d5be11c312ef;hb=a1209c204e0d48d1f8cacecc9e928796102ab99a;hp=3a5b39ad4e75104cec0d141affe71dd26c78486b;hpb=2819ba86363def7f615b7fbbf03aecef761296c6;p=lilypond.git

diff --git a/lily/include/system.hh b/lily/include/system.hh
index 3a5b39ad4e..882f209f96 100644
--- a/lily/include/system.hh
+++ b/lily/include/system.hh
@@ -1,7 +1,20 @@
 /*
-  system.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2007 Han-Wen Nienhuys
+  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.
+
+  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
@@ -20,14 +33,16 @@ class System : public Spanner
 {
   int rank_;
   Grob_array *all_elements_;
-  Skyline_pair skylines_;
-  void build_skylines ();
   void init_elements ();
   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_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;
   void do_break_substitution_and_fixup_refpoints ();
   void post_processing ();
@@ -35,6 +50,10 @@ public:
   SCM get_paper_systems ();
   SCM get_broken_system_grobs ();
 
+  DECLARE_SCHEME_CALLBACK (calc_pure_relevant_grobs, (SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_pure_height, (SCM, SCM, SCM));
+
   System (SCM);
   System (System const &);
 
@@ -52,9 +71,17 @@ public:
   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);