X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimple-spacer.hh;h=675e3baf543882362218e19348f15822a99d3fd7;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=895fbcf8d866dcfe2f687ad0239b750d6fe26e2c;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh index 895fbcf8d8..675e3baf54 100644 --- a/lily/include/simple-spacer.hh +++ b/lily/include/simple-spacer.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2011 Han-Wen Nienhuys + Copyright (C) 1999--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,12 +32,13 @@ public: void solve (Real line_len, bool ragged); void add_rod (int l, int r, Real dist); - void add_spring (Spring const&); + void add_spring (Spring const &); Real range_ideal_len (int l, int r) const; Real range_stiffness (int l, int r, bool stretch) const; Real configuration_length (Real) const; vector spring_positions () const; + void set_force (Real force); Real force () const; Real force_penalty (bool ragged) const; bool fits () const; @@ -57,15 +58,15 @@ private: }; /* returns a vector of dimensions breaks.size () * breaks.size () */ -vector get_line_forces (vector const &columns, - Real line_len, - Real indent, - bool ragged); - -Column_x_positions get_line_configuration (vector const &columns, - Real line_len, - Real indent, - bool ragged); +vector get_line_forces (vector const &columns, + Real line_len, + Real indent, + bool ragged); + +Column_x_positions get_line_configuration (vector const &columns, + Real line_len, + Real indent, + bool ragged); #endif /* SIMPLE_SPACER_HH */