Fix 1385.

[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 74c6ca440f0c49b4cf3d10722b6165dfeee5d254..3cbf6eb30d8c6675e4722900410669336f9e78ca 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,10 +34,11 @@ 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);
+  static SCM get_spacing_spec (Grob *before, Grob *after, bool pure, int start, int end);
+  static Real get_fixed_spacing (Grob *before, Grob *after, int spaceable_index, bool pure, int start, int end);
 
 protected:
-  void append_system (System*, Spring const&, Real padding);
+  void append_system (System*, Spring const&, Real indent, Real padding);
   void append_prob (Prob*, Spring const&, Real padding);
 
   void solve_rod_spring_problem (bool ragged);