Make a pure version of calc_next_staff_spacing.

[lilypond.git] / lily / include / page-layout-problem.hh

diff --git a/lily/include/page-layout-problem.hh b/lily/include/page-layout-problem.hh
index c8da010e381e115868b35a52bf4c9a8b176b1a4e..0502ce86783b35fd3fd2585d579c7a54474417ca 100644 (file)
--- a/lily/include/page-layout-problem.hh
+++ b/lily/include/page-layout-problem.hh
@@ -1,10 +1,20 @@
 /*
-  page-layout-problem.hh -- space systems nicely on a page. If systems can
-  be stretched, do that too.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2009--2010 Joe Neeman <joeneeman@gmail.com>
 
-  (c) 2009 Joe Neeman <joeneeman@gmail.com>
+  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 PAGE_LAYOUT_HH
@@ -24,6 +34,7 @@ public:
   static bool read_spacing_spec (SCM spec, Real* dest, SCM sym);
   static bool is_spaceable (Grob *g);
   static SCM get_details (Grob *g);
+  static SCM get_spacing_spec (Grob *before, Grob *after, bool pure, int start, int end);
 
 protected:
   void append_system (System*, Spring const&, Real padding);
@@ -31,13 +42,10 @@ protected:
 
   void solve_rod_spring_problem (bool ragged);
   SCM find_system_offsets ();
-  void distribute_loose_lines (Grob*, Real, vector<Grob*> const&, vector<Real> const&, Grob*, Real);
-  void add_loose_lines_as_spaceable_lines (vector<Grob*> const&,
-                                          vector<Real> const&,
-                                          vsize start, vsize end);
+  void distribute_loose_lines (vector<Grob*> const&, vector<Real> const&, Real, Real);
 
-  static Grob* find_vertical_alignment (System*);
   static void build_system_skyline (vector<Grob*> const&, vector<Real> const&, Skyline* up, Skyline* down);
+  static vector<Grob*> filter_dead_elements (vector<Grob*> const&);
 
   // This is a union (in spirit).
   // Either staves must be empty or prob must be null.
@@ -74,6 +82,8 @@ protected:
   Real page_height_;
   Real header_height_;
   Real footer_height_;
+  Real header_padding_;
+  Real footer_padding_;
 };
 
 #endif /* PAGE_LAYOUT_HH */