scheme lists. Backportme.
+2006-09-19 Han-Wen Nienhuys <hanwen@lilypond.org>
+
+ * lily/*.cc: idem.
+
+ * lily/slur.cc (get_curve): always use scm_is_pair() looping
+ scheme lists. Backportme.
+
2006-09-18 Graham Percival <gpermus@gmail.com>
* Documentation/user/basic-notation.itely: add bug
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=9
-PATCH_LEVEL=18
+PATCH_LEVEL=19
MY_PATCH_LEVEL=
if (!scm_is_pair (axes))
programming_error ("axes should be nonempty");
- for (SCM ax = axes; ax != SCM_EOL; ax = scm_cdr (ax))
+ for (SCM ax = axes; scm_is_pair (ax); ax = scm_cdr (ax))
{
Axis a = (Axis) scm_to_int (scm_car (ax));
Book::process (Output_def *default_paper,
Output_def *default_layout)
{
- for (SCM s = scores_; s != SCM_EOL; s = scm_cdr (s))
+ for (SCM s = scores_; scm_is_pair (s); s = scm_cdr (s))
if (Score *score = unsmob_score (scm_car (s)))
if (score->error_found_)
return 0;
paper_book->header_ = header_;
/* Render in order of parsing. */
- for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s))
+ for (SCM s = scm_reverse (scores_); scm_is_pair (s); s = scm_cdr (s))
{
if (Score *score = unsmob_score (scm_car (s)))
{
SCM_ASSERT_TYPE (l, list, SCM_ARG1, __FUNCTION__, "listener");
SCM_ASSERT_TYPE (d, disp, SCM_ARG2, __FUNCTION__, "dispatcher");
- for (int arg=SCM_ARG3; cl != SCM_EOL; cl = scm_cdr (cl), arg++)
+ for (int arg=SCM_ARG3; scm_is_pair (cl); cl = scm_cdr (cl), arg++)
{
SCM_ASSERT_TYPE (scm_symbol_p (cl), cl, arg, __FUNCTION__, "symbol");
d->add_listener (*l, scm_car (cl));
else if (!scm_is_pair (list))
{
/* Unregister with all dispatchers. */
- for (SCM disp = dispatchers_; disp != SCM_EOL; disp = scm_cdr (disp))
+ for (SCM disp = dispatchers_; scm_is_pair (disp); disp = scm_cdr (disp))
{
Dispatcher *d = unsmob_dispatcher (scm_caar (disp));
d->remove_listener (GET_LISTENER (dispatch), ev_class);
dispatchers_ = scm_acons (disp->self_scm (), scm_int2num (priority), dispatchers_);
Listener list = GET_LISTENER (dispatch);
- for (SCM cl = listen_classes_; cl != SCM_EOL; cl = scm_cdr (cl))
+ for (SCM cl = listen_classes_; scm_is_pair (cl); cl = scm_cdr (cl))
{
disp->internal_add_listener (list, scm_car (cl), priority);
}
bool
Grob::is_live () const
{
- return immutable_property_alist_ != SCM_EOL;
+ return scm_is_pair (immutable_property_alist_);
}
/* color support... see interpret_stencil_expression () for more... */
SCM color = get_property ("color");
- if (color != SCM_EOL)
+ if (scm_is_pair (color))
{
SCM expr = scm_list_3 (ly_symbol2scm ("color"),
color,
if (ligature_)
{
primitives_.push_back (info);
- if (info.grob () && (brew_ligature_primitive_proc != SCM_EOL))
+ if (info.grob () && brew_ligature_primitive_proc != SCM_EOL)
{
info.grob ()->set_property ("stencil", brew_ligature_primitive_proc);
}
SCM join_right_scm = me->get_property ("join-right-amount");
- if (join_right_scm != SCM_EOL)
+ if (scm_is_pair (join_right_scm))
{
int join_right = scm_to_int (join_right_scm);
if (join_right)
Page_breaking::create_system_list ()
{
SCM specs = book_->get_system_specs ();
- for (SCM s = specs; s != SCM_EOL; s = scm_cdr (s))
+ for (SCM s = specs; scm_is_pair (s); s = scm_cdr (s))
{
if (Paper_score *ps = dynamic_cast<Paper_score*> (unsmob_music_output (scm_car (s))))
{
paper_->self_scm ());
SCM header = SCM_EOL;
- for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s))
+ for (SCM s = scm_reverse (scores_); scm_is_pair (s); s = scm_cdr (s))
{
if (ly_is_module (scm_car (s)))
{
int i = 0;
Prob *last = 0;
- for (SCM s = systems_; s != SCM_EOL; s = scm_cdr (s))
+ for (SCM s = systems_; scm_is_pair (s); s = scm_cdr (s))
{
Prob *ps = unsmob_prob (scm_car (s));
ps->set_property ("number", scm_from_int (++i));
if (systems_ == SCM_BOOL_F)
{
systems_ = SCM_EOL;
- for (SCM p = pages_; p != SCM_EOL; p = scm_cdr (p))
+ for (SCM p = pages_; scm_is_pair (p); p = scm_cdr (p))
{
Prob *page = unsmob_prob (scm_car (p));
SCM systems = page->get_property ("lines");
{
Bezier b;
int i = 0;
- for (SCM s = me->get_property ("control-points"); s != SCM_EOL;
+ for (SCM s = me->get_property ("control-points"); scm_is_pair (s);
s = scm_cdr (s))
b.control_[i++] = ly_scm2offset (scm_car (s));
Bezier b;
int i = 0;
- for (SCM s = cp; s != SCM_EOL; s = scm_cdr (s))
+ for (SCM s = cp; scm_is_pair (s); s = scm_cdr (s))
{
b.control_[i] = ly_scm2offset (scm_car (s));
i++;