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 178c0683436b13a88e972cbb0d2b0e16b5cecd3a..3cbf6eb30d8c6675e4722900410669336f9e78ca 100644 (file)
--- a/lily/include/page-layout-problem.hh
+++ b/lily/include/page-layout-problem.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2009 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2009--2010 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
@@ -34,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);