X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fconstrained-breaking.hh;h=e35fcc0bbecf03db6906d6a535f753b85ebcefeb;hb=28d3a736534f3aa3cd403485770a019bd35114c4;hp=216ecc881f73dc0d9ac20e459437fb7d78ff4950;hpb=bd5233c02b1ba97029810ced58b8ea2c8ea0e759;p=lilypond.git

diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh
index 216ecc881f..e35fcc0bbe 100644
--- 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--2010 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
@@ -40,19 +40,26 @@ struct Line_shape
   Line_shape piggyback (Line_shape mount, Real padding) const;
 };
 
-struct Line_details {
+struct Line_details
+{
   Grob *last_column_;
   Real force_;
   Line_shape shape_;
+  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
-				refpoint_extent of one line to the
-				top refpoint_extent of the next. */
+                                spaceable staff in this line.  min-distance
+                                should be measured from the bottom
+                                refpoint_extent of one line to the
+                                top refpoint_extent of the next. */
   Real tallness_; /* Y-extent, adjusted according to begin/rest-of-line*/
 
   Real padding_;  /* compulsory space after this system (if we're not
-		     last on a page) */
+                     last on a page) */
   Real title_padding_;
   Real min_distance_;
   Real title_min_distance_;
@@ -184,7 +191,7 @@ private:
   vector<vsize> start_;         /* the columns at which we might be asked to start breaking */
   vector<vsize> starting_breakpoints_; /* the corresponding index in breaks_ */
 
-  vector<Grob*> all_;
+  vector<Grob *> all_;
   vector<vsize> breaks_;
 
   void initialize ();
@@ -196,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 */