/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1999--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
assert (scm_is_pair (s));
SCM key = scm_car (s);
- if (key == ly_symbol2scm ("feta"))
+ if (scm_is_eq (key, ly_symbol2scm ("feta")))
{
SCM name_entry = scm_cdr (s);
SCM str = ((scm_is_pair (name_entry)) ? index_get_cell (name_entry, d)
SCM
Script_interface::calc_positioning_done (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob<Grob> (smob);
if (Grob *par = me->get_parent (X_AXIS))
{
Grob *stem = Note_column::get_stem (par);
relative_dir = to_dir (reldir);
SCM other_elt = me->get_object ("direction-source");
- Grob *e = unsmob_grob (other_elt);
+ Grob *e = unsmob<Grob> (other_elt);
if (e)
return (Direction) (relative_dir * get_grob_direction (e));
SCM
Script_interface::calc_direction (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob<Grob> (smob);
Direction d = Script_interface::get_direction (me);
if (!d)
SCM
Script_interface::calc_cross_staff (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob<Grob> (smob);
Grob *stem = Note_column::get_stem (me->get_parent (X_AXIS));
if (stem && to_boolean (stem->get_property ("cross-staff")))
return SCM_BOOL_T;
- Grob *slur = unsmob_grob (me->get_object ("slur"));
+ Grob *slur = unsmob<Grob> (me->get_object ("slur"));
SCM avoid_slur = me->get_property ("avoid-slur");
if (slur && to_boolean (slur->get_property ("cross-staff"))
- && (avoid_slur == ly_symbol2scm ("outside")
- || avoid_slur == ly_symbol2scm ("around")))
+ && (scm_is_eq (avoid_slur, ly_symbol2scm ("outside"))
+ || scm_is_eq (avoid_slur, ly_symbol2scm ("around"))))
return SCM_BOOL_T;
return SCM_BOOL_F;
SCM
Script_interface::print (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob<Grob> (smob);
Direction dir = get_grob_direction (me);
struct Text_script
{
- DECLARE_GROB_INTERFACE ();
};
ADD_INTERFACE (Text_script,
"An object that is put above or below a note.",
/* properties */
- "add-stem-support "
"avoid-slur "
"script-priority "
"slur "
"An object that is put above or below a note.",
/* properties */
- "add-stem-support "
"avoid-slur "
"direction-source "
"positioning-done "
+ "script-column "
"script-priority "
"script-stencil "
"side-relative-direction "
"slur "
"slur-padding "
"toward-stem-shift "
+ "toward-stem-shift-in-column "
);