/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--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 (vsize i = 0; i < events_.size (); i++)
{
if (!tab)
- tab = get_property ("drumStyleTable");
+ tab = get_property ("drumStyleTable");
Stream_event *ev = events_[i];
Item *note = make_item ("NoteHead", ev->self_scm ());
SCM defn = SCM_EOL;
- if (scm_hash_table_p (tab) == SCM_BOOL_T)
- defn = scm_hashq_ref (tab, drum_type, SCM_EOL);
+ if (to_boolean (scm_hash_table_p (tab)))
+ defn = scm_hashq_ref (tab, drum_type, SCM_EOL);
if (scm_is_pair (defn))
- {
- SCM pos = scm_caddr (defn);
- SCM style = scm_car (defn);
- SCM script = scm_cadr (defn);
-
- if (scm_integer_p (pos) == SCM_BOOL_T)
- note->set_property ("staff-position", pos);
- if (scm_is_symbol (style))
- note->set_property ("style", style);
-
- if (scm_is_string (script))
- {
- Item *p = make_item ("Script", ev->self_scm ());
- make_script_from_event (p, context (), script,
- 0);
-
- p->set_parent (note, Y_AXIS);
- Side_position_interface::add_support (p, note);
- scripts_.push_back (p);
- }
- }
+ {
+ SCM pos = scm_caddr (defn);
+ SCM style = scm_car (defn);
+ SCM script = scm_cadr (defn);
+
+ if (scm_is_integer (pos))
+ note->set_property ("staff-position", pos);
+ if (scm_is_symbol (style))
+ note->set_property ("style", style);
+
+ if (scm_is_string (script))
+ {
+ Item *p = make_item ("Script", ev->self_scm ());
+ make_script_from_event (p, context (), script,
+ 0);
+
+ p->set_parent (note, Y_AXIS);
+ Side_position_interface::add_support (p, note);
+ scripts_.push_back (p);
+ }
+ }
}
}
Grob *e = scripts_[i];
if (to_dir (e->get_property ("side-relative-direction")))
- e->set_object ("direction-source", inf.grob ()->self_scm ());
+ e->set_object ("direction-source", inf.grob ()->self_scm ());
Side_position_interface::add_support (e, inf.grob ());
}
Grob *e = scripts_[i];
if (!e->get_parent (X_AXIS)
- && Side_position_interface::get_axis (e) == Y_AXIS)
- e->set_parent (inf.grob (), X_AXIS);
+ && Side_position_interface::get_axis (e) == Y_AXIS)
+ e->set_parent (inf.grob (), X_AXIS);
+
+ Side_position_interface::add_support (e, inf.grob ());
}
}
ADD_ACKNOWLEDGER (Drum_notes_engraver, note_column);
ADD_TRANSLATOR (Drum_notes_engraver,
- /* doc */
- "Generate drum note heads.",
+ /* doc */
+ "Generate drum note heads.",
- /* create */
- "NoteHead "
- "Script ",
+ /* create */
+ "NoteHead "
+ "Script ",
- /* read */
- "drumStyleTable ",
+ /* read */
+ "drumStyleTable ",
- /* write */
- ""
- );
+ /* write */
+ ""
+ );