/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2005--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
SCM head = scm_car (expr);
- if (head == ly_symbol2scm ("delay-stencil-evaluation"))
+ if (scm_is_eq (head, ly_symbol2scm ("delay-stencil-evaluation")))
{
interpret_stencil_expression (scm_force (scm_cadr (expr)), func, func_arg, o);
return;
}
- if (head == ly_symbol2scm ("footnote"))
+ if (scm_is_eq (head, ly_symbol2scm ("transparent-stencil")))
return;
- if (head == ly_symbol2scm ("translate-stencil"))
+ if (scm_is_eq (head, ly_symbol2scm ("footnote")))
+ return;
+ if (scm_is_eq (head, ly_symbol2scm ("translate-stencil")))
{
o += ly_scm2offset (scm_cadr (expr));
expr = scm_caddr (expr);
}
- else if (head == ly_symbol2scm ("combine-stencil"))
+ else if (scm_is_eq (head, ly_symbol2scm ("combine-stencil")))
{
for (SCM x = scm_cdr (expr); scm_is_pair (x); x = scm_cdr (x))
interpret_stencil_expression (scm_car (x), func, func_arg, o);
return;
}
- else if (head == ly_symbol2scm ("grob-cause"))
+ else if (scm_is_eq (head, ly_symbol2scm ("grob-cause")))
{
SCM grob = scm_cadr (expr);
(*func) (func_arg, scm_list_1 (ly_symbol2scm ("no-origin")));
return;
}
- else if (head == ly_symbol2scm ("color"))
+ else if (scm_is_eq (head, ly_symbol2scm ("color")))
{
SCM color = scm_cadr (expr);
SCM r = scm_car (color);
return;
}
- else if (head == ly_symbol2scm ("id"))
+ else if (scm_is_eq (head, ly_symbol2scm ("output-attributes")))
{
- SCM id = scm_cadr (expr);
+ SCM attributes = scm_cadr (expr);
- (*func) (func_arg, scm_list_2 (ly_symbol2scm ("start-enclosing-id-node"), id));
+ (*func) (func_arg, scm_list_2 (ly_symbol2scm ("start-group-node"),
+ ly_quote_scm (attributes)));
interpret_stencil_expression (scm_caddr (expr), func, func_arg, o);
- (*func) (func_arg, scm_list_1 (ly_symbol2scm ("end-enclosing-id-node")));
+ (*func) (func_arg, scm_list_1 (ly_symbol2scm ("end-group-node")));
return;
}
- else if (head == ly_symbol2scm ("rotate-stencil"))
+ else if (scm_is_eq (head, ly_symbol2scm ("rotate-stencil")))
{
SCM args = scm_cadr (expr);
SCM angle = scm_car (args);
return;
}
- else if (head == ly_symbol2scm ("scale-stencil"))
+ else if (scm_is_eq (head, ly_symbol2scm ("scale-stencil")))
{
SCM args = scm_cadr (expr);
SCM x_scale = scm_car (args);
return;
}
+ else if (scm_is_eq (head, ly_symbol2scm ("with-outline")))
+ {
+ expr = scm_caddr (expr);
+ }
else
{
(*func) (func_arg,
{
Font_list *me = (Font_list *) fs;
- if (scm_car (x) == ly_symbol2scm ("placebox"))
+ if (scm_is_eq (scm_car (x), ly_symbol2scm ("placebox")))
{
SCM args = scm_cdr (x);
SCM what = scm_caddr (args);
if (scm_is_pair (what))
{
SCM head = scm_car (what);
- if (ly_symbol2scm ("text") == head)
+ if (scm_is_eq (head, ly_symbol2scm ("text")))
me->fonts_ = scm_cons (scm_cadr (what), me->fonts_);
- else if (head == ly_symbol2scm ("char"))
+ else if (scm_is_eq (head, ly_symbol2scm ("char")))
me->fonts_ = scm_cons (scm_cadr (what), me->fonts_);
}
}