/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
#include "lookup.hh"
#include "main.hh"
#include "misc.hh"
-#include "note-column.hh"
#include "note-head.hh"
#include "output-def.hh"
#include "pointer-group-interface.hh"
return m;
}
-//------ for whole note chord tremolos
-
-bool
-Beam::whole_note_close_chord_tremolo (Grob *me)
-{
- if (!scm_is_integer (me->get_property ("gap-count")))
- return false;
-
- extract_grob_set (me, "stems", stems);
- for (vsize i = 0; i < stems.size (); i++)
- if (Stem::duration_log (stems[i]))
- return false;
-
- Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
- if (staff)
- {
- Grob *outside_stems[2] = {Stem::extremal_heads (stems[0])[DOWN],
- Stem::extremal_heads (stems.back ())[DOWN]};
-
- Interval lines = Staff_symbol::line_span (staff);
- for (int i = 0; i < 2; i++)
- {
- Real my_pos = Staff_symbol_referencer::get_position (outside_stems[i]);
- if (my_pos > lines[UP] + 1)
- return false;
- else if (my_pos < lines[DOWN] - 1)
- return false;
- }
- }
-
- return (Staff_symbol_referencer::get_position (Stem::extremal_heads (stems.back ())[DOWN])
- - Staff_symbol_referencer::get_position (Stem::extremal_heads (stems[0])[DOWN]))
- < 2;
-}
-
-MAKE_SCHEME_CALLBACK (Beam, calc_beam_gap, 1);
-SCM
-Beam::calc_beam_gap (SCM smob)
-{
- Spanner *me = unsmob_spanner (smob);
- SCM default_value = scm_cons (scm_from_double (0.8), scm_from_double (0.8));
- if (!whole_note_close_chord_tremolo (me))
- return default_value;
-
- Interval left = Note_column::accidental_width
- (me->get_bound (RIGHT)->get_parent (X_AXIS));
-
- if (left.length () > 0.4)
- return scm_cons (scm_from_double (0.8), scm_from_double (1.3 + left.length ()));
- else
- return default_value;
-}
-
-MAKE_SCHEME_CALLBACK (Beam, calc_springs_and_rods, 1);
-SCM
-Beam::calc_springs_and_rods (SCM smob)
-{
- Grob *me = unsmob_grob (smob);
-
- if (!whole_note_close_chord_tremolo (me))
- return SCM_BOOL_F;
-
- return scm_call_1 (Spanner::set_spacing_rods_proc, smob);
-}
-
-MAKE_SCHEME_CALLBACK (Beam, calc_minimum_length, 1);
-SCM
-Beam::calc_minimum_length (SCM smob)
-{
- Spanner *me = unsmob_spanner (smob);
- SCM default_value = scm_from_double (0.0);
-
- if (!whole_note_close_chord_tremolo (me))
- return SCM_BOOL_F;
-
- Interval left = Note_column::accidental_width
- (me->get_bound (RIGHT)->get_parent (X_AXIS));
-
- if (left.length () > 0.4)
- return scm_from_double (left.length () + 4.0);
- else
- return default_value;
-}
-
-//------ and everything else
-
MAKE_SCHEME_CALLBACK (Beam, calc_normal_stems, 1);
SCM
Beam::calc_normal_stems (SCM smob)
commonx = me->get_bound (d)->common_refpoint (commonx, X_AXIS);
int gap_count = robust_scm2int (me->get_property ("gap-count"), 0);
- Interval gap_lengths = robust_scm2interval (me->get_property ("beam-gap"), Interval (0.0, 0.0));
+ Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0);
Position_stem_segments_map stem_segments;
Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
current.horizontal_[event_dir] += event_dir * seg.width_ / 2;
if (seg.gapped_)
{
- current.horizontal_[event_dir] -= event_dir * gap_lengths[event_dir];
+ current.horizontal_[event_dir] -= event_dir * gap_length;
if (Stem::is_invisible (seg.stem_))
{
for (vsize k = 0; k < heads.size (); k++)
current.horizontal_[event_dir]
= event_dir * min (event_dir * current.horizontal_[event_dir],
- - gap_lengths[event_dir] / 2
+ - gap_length / 2
+ event_dir
* heads[k]->extent (commonx,
X_AXIS)[-event_dir]);
"auto-knee-gap "
"beamed-stem-shorten "
"beaming "
- "beam-gap "
"beam-segments "
"beam-thickness "
"break-overshoot "
"damping "
"details "
"direction "
+ "gap "
"gap-count "
"grow-direction "
"inspect-quants "