/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2006--2012 Joe Neeman <joeneeman@gmail.com>
+ Copyright (C) 2006--2015 Joe Neeman <joeneeman@gmail.com>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
static SCM
min_permission (SCM perm1, SCM perm2)
{
- if (perm1 == ly_symbol2scm ("force"))
+ if (scm_is_eq (perm1, ly_symbol2scm ("force")))
return perm2;
- if (perm1 == ly_symbol2scm ("allow")
- && perm2 != ly_symbol2scm ("force"))
+ if (scm_is_eq (perm1, ly_symbol2scm ("allow"))
+ && !scm_is_eq (perm2, ly_symbol2scm ("force")))
return perm2;
return SCM_EOL;
}
if (scm_is_pair (footnotes))
for (SCM s = footnotes; scm_is_pair (s); s = scm_cdr (s))
{
- Stencil *sten = unsmob_stencil (scm_caddar (s));
+ Stencil *sten = unsmob<Stencil> (scm_caddar (s));
if (!sten)
{
programming_error ("expecting stencil, got empty pointer");
last_column_ = 0;
force_ = 0;
- Stencil *st = unsmob_stencil (pb->get_property ("stencil"));
+ Stencil *st = unsmob<Stencil> (pb->get_property ("stencil"));
Interval stencil_extent = st->is_empty (Y_AXIS) ? Interval (0, 0)
: st->extent (Y_AXIS);
shape_ = Line_shape (stencil_extent, stencil_extent); // pretend it goes all the way across