X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fconstrained-breaking.hh;h=731e20c1e3dca00feab28d8e4ce9ed3af1ffc0fe;hb=c4dc8775b15ddf53c92c123a56a99c9a820541ce;hp=d0e631d901447f3f26cfd6cb5d5fb49dbba291b4;hpb=9cc7f76cb53f6f22844619efff966d13d4790327;p=lilypond.git diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh index d0e631d901..731e20c1e3 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--2011 Joe Neeman + Copyright (C) 2006--2012 Joe Neeman 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,22 +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 footnotes_; /* The footnotes at the bottom of the + vector footnote_heights_; /* The footnotes at the bottom of the page, where each stencil represents a different footnote. */ + vector 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_; @@ -187,7 +191,7 @@ private: vector start_; /* the columns at which we might be asked to start breaking */ vector starting_breakpoints_; /* the corresponding index in breaks_ */ - vector all_; + vector all_; vector breaks_; void initialize ();