Run grand replace for 2015.

[lilypond.git] / lily / include / constrained-breaking.hh

diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh
index 1887d872732396190d15f1b92aa9c055d0f693d0..e35fcc0bbecf03db6906d6a535f753b85ebcefeb 100644 (file)
--- a/lily/include/constrained-breaking.hh
+++ b/lily/include/constrained-breaking.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2011 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2006--2015 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
@@ -45,9 +45,12 @@ struct Line_details
   Grob *last_column_;
   Real force_;
   Line_shape shape_;
-  vector<Stencil *> footnotes_; /* The footnotes at the bottom of the
+  vector<Real> footnote_heights_; /* The footnotes at the bottom of the
                                    page, where each stencil represents
                                    a different footnote. */
+  vector<Real> in_note_heights_; /* The in-notes under a system,
+                                   where each stencil represents
+                                   a different in-note. */
   Interval refpoint_extent_; /* The refpoints of the first and last
                                 spaceable staff in this line.  min-distance
                                 should be measured from the bottom
@@ -200,6 +203,6 @@ private:
   Real combine_demerits (Real force, Real prev_force);
 
   bool calc_subproblem (vsize start, vsize systems, vsize max_break_index);
-  void fill_line_details (Line_details *const, vsize, vsize);
+  void fill_line_details (Line_details *, vsize, vsize);
 };
 #endif /* CONSTRAINED_BREAKING_HH */