source file of the GNU LilyPond music typesetter
- (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include <cstdio>
return scm_list_2 (scm_from_double (0.0), scm_from_double (0.0));
SCM_ASSERT_TYPE (len >= 0, springs, SCM_ARG1, __FUNCTION__, "list of springs");
- SCM_ASSERT_TYPE (scm_ilength (rods) >= 0, rods, SCM_ARG2, __FUNCTION__, "list of rods");
- SCM_ASSERT_TYPE (scm_is_number (length) || length == SCM_BOOL_F,
- length, SCM_ARG3, __FUNCTION__, "number or #f");
+ SCM_ASSERT_TYPE (scm_ilength (rods) > 0, rods, SCM_ARG1, __FUNCTION__, "list of rods");
+ LY_ASSERT_TYPE (scm_is_number, length, 3);
bool is_ragged = ragged == SCM_BOOL_T;
Simple_spacer spacer;
spacer.add_rod (l, r, distance);
}
- spacer.line_len_ = scm_to_double (length);
+ spacer.solve (scm_to_double (length), is_ragged);
- if (is_ragged)
- spacer.my_solve_natural_len ();
- else
- spacer.my_solve_linelen ();
+ vector<Real> posns = spacer.spring_positions ();
- std::vector<Real> posns;
- posns.push_back (0.0);
- for (vsize i = 0; i < spacer.springs_.size (); i++)
- {
- Real l = spacer.springs_[i].length ((is_ragged) ? 0.0 : spacer.force_);
- posns.push_back (posns.back () + l);
- }
-
- SCM force_return = SCM_BOOL_F;
- if (!isinf (spacer.force_)
- && (spacer.is_active () || is_ragged))
- force_return = scm_from_double (spacer.force_);
-
- if (is_ragged
- && posns.back () > spacer.line_len_)
- force_return = SCM_BOOL_F;
+ SCM force_return = spacer.fits () ? scm_from_double (spacer.force ()) : SCM_BOOL_F;
SCM retval = SCM_EOL;
for (vsize i = posns.size (); i--;)