/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
for (SCM s = mins; scm_is_pair (s); s = scm_cdr (s))
{
SCM dist = scm_car (s);
- if (scm_car (dist) == p->self_scm ())
+ if (scm_is_eq (scm_car (dist), p->self_scm ()))
{
scm_set_cdr_x (dist, scm_max (scm_cdr (dist),
newdist));
s = scm_cdr (s))
{
if (scm_is_pair (scm_car (s))
- && unsmob_grob (scm_cdar (s)) == next_col
- && unsmob_spring (scm_caar (s)))
- spring = unsmob_spring (scm_caar (s));
+ && unsmob<Grob> (scm_cdar (s)) == next_col
+ && unsmob<Spring> (scm_caar (s)))
+ spring = unsmob<Spring> (scm_caar (s));
}
if (!spring)
- programming_error (_f ("No spring between column %d and next one",
- Paper_column::get_rank (this_col)));
+ programming_error (to_string ("No spring between column %d and next one",
+ Paper_column::get_rank (this_col)));
return spring ? *spring : Spring ();
}