#include <cmath> // rint
using namespace std;
-#include "lookup.hh"
+#include "beam.hh"
#include "directional-element-interface.hh"
+#include "dot-column.hh"
+#include "font-interface.hh"
+#include "international.hh"
+#include "lookup.hh"
+#include "misc.hh"
#include "note-head.hh"
-#include "warn.hh"
#include "output-def.hh"
-#include "rhythmic-head.hh"
-#include "font-interface.hh"
#include "paper-column.hh"
-#include "misc.hh"
-#include "beam.hh"
-#include "rest.hh"
#include "pointer-group-interface.hh"
-#include "staff-symbol-referencer.hh"
+#include "rest.hh"
+#include "rhythmic-head.hh"
#include "side-position-interface.hh"
-#include "dot-column.hh"
+#include "staff-symbol-referencer.hh"
#include "stem-tremolo.hh"
+#include "warn.hh"
void
Stem::set_beaming (Grob *me, int beam_count, Direction d)
}
SCM lst = index_get_cell (pair, d);
- for (int i = 0; i < beam_count; i++)
- lst = scm_cons (scm_from_int (i), lst);
+ if (beam_count)
+ for (int i = 0; i < beam_count; i++)
+ lst = scm_cons (scm_from_int (i), lst);
+ else
+ lst = SCM_BOOL_F;
+
index_set_cell (pair, d, lst);
}
Drul_array<Grob *> exthead (0, 0);
extract_grob_set (me, "note-heads", heads);
- for (int i = heads.size (); i--;)
+ for (vsize i = heads.size (); i--;)
{
Grob *n = heads[i];
int p = Staff_symbol_referencer::get_rounded_position (n);
}
/* The positions, in ascending order. */
-Array<int>
+vector<int>
Stem::note_head_positions (Grob *me)
{
- Array<int> ps;
+ vector<int> ps;
extract_grob_set (me, "note-heads", heads);
- for (int i = heads.size (); i--;)
+ for (vsize i = heads.size (); i--;)
{
Grob *n = heads[i];
int p = Staff_symbol_referencer::get_rounded_position (n);
- ps.push (p);
+ ps.push_back (p);
}
- ps.sort (integer_compare);
+ vector_sort (ps, integer_compare);
return ps;
}
Real ss = Staff_symbol_referencer::staff_space (me);
int durlog = duration_log (me);
- Array<Real> a;
+ vector<Real> a;
/* WARNING: IN HALF SPACES */
Real length = robust_scm2double (me->get_property ("length"), 7);
if (dots)
{
Real dp = Staff_symbol_referencer::get_position (dots);
- Real flagy = flag (me).extent (Y_AXIS)[-dir] * 2 / ss;
+ Interval flag_yext = flag (me).extent (Y_AXIS) * (2 / ss) + stem_end;
/* Very gory: add myself to the X-support of the parent,
which should be a dot-column. */
- if (dir * (stem_end + flagy - dp) < 0.5)
+
+ if (flag_yext.distance (dp) < 0.5)
{
Grob *par = dots->get_parent (X_AXIS);
(Stem_tremolo::raw_stencil () looks at the beam.) --hwn */
Real minlen = 1.0
- + 2 * Stem_tremolo::raw_stencil (t_flag).extent (Y_AXIS).length ()
+ + 2 * t_flag->extent (t_flag, Y_AXIS).length ()
/ ss;
+ /* We don't want to add the whole extent of the flag because the trem
+ and the flag can overlap partly. beam_translation gives a good
+ approximation */
if (durlog >= 3)
- {
- Interval flag_ext = flag (me).extent (Y_AXIS);
- if (!flag_ext.is_empty ())
- minlen += 2 * flag_ext.length () / ss;
-
- /* The clash is smaller for down stems (since the tremolo is
- angled up.) */
- if (dir == DOWN)
- minlen -= 1.0;
- }
+ {
+ Real beam_trans = Stem_tremolo::get_beam_translation (t_flag);
+ /* the obvious choice is (durlog - 2) here, but we need a bit more space. */
+ minlen += 2 * (durlog - 1.5) * beam_trans;
+
+ /* up-stems need even a little more space to avoid collisions. This
+ needs to be in sync with the tremolo positioning code in
+ Stem_tremolo::print */
+ if (dir == UP)
+ minlen += beam_trans;
+ }
length = max (length, minlen + 1.0);
}
return SCM_BOOL_T;
extract_grob_set (me, "note-heads", ro_heads);
- Link_array<Grob> heads (ro_heads);
- heads.sort (compare_position);
+ vector<Grob*> heads (ro_heads);
+ vector_sort (heads, compare_position);
Direction dir = get_grob_direction (me);
if (dir < 0)
- heads.reverse ();
+ reverse (heads);
Real thick = thickness (me);
}
Real w = hed->extent (hed, X_AXIS)[dir];
- for (int i = 0; i < heads.size (); i++)
+ for (vsize i = 0; i < heads.size (); i++)
heads[i]->translate_axis (w - heads[i]->extent (heads[i], X_AXIS)[dir],
X_AXIS);
bool parity = true;
Real lastpos = Real (Staff_symbol_referencer::get_position (heads[0]));
- for (int i = 1; i < heads.size (); i++)
+ for (vsize i = 1; i < heads.size (); i++)
{
Real p = Staff_symbol_referencer::get_position (heads[i]);
Real dy = fabs (lastpos- p);
Grob *beam = get_beam (me);
if (beam)
{
- beam->get_property ("positions");
+ /* trigger set-stem-lengths. */
+ beam->get_property ("quantized-positions");
}
/*
TODO: maybe property stroke-style should take different values,
e.g. "" (i.e. no stroke), "single" and "double" (currently, it's
'() or "grace"). */
- String flag_style;
+ string flag_style;
SCM flag_style_scm = me->get_property ("flag-style");
if (scm_is_symbol (flag_style_scm))
bool adjust = true;
- String staffline_offs;
- if (String::compare (flag_style, "mensural") == 0)
+ string staffline_offs;
+ if (flag_style == "mensural")
/* Mensural notation: For notes on staff lines, use different
flags than for notes between staff lines. The idea is that
flags are always vertically aligned with the staff lines,
staffline_offs = "";
char dir = (get_grob_direction (me) == UP) ? 'u' : 'd';
- String font_char = flag_style
+ string font_char = flag_style
+ to_string (dir) + staffline_offs + to_string (log);
Font_metric *fm = Font_interface::get_default_font (me);
Stencil flag = fm->find_by_name ("flags." + font_char);
SCM stroke_style_scm = me->get_property ("stroke-style");
if (scm_is_string (stroke_style_scm))
{
- String stroke_style = ly_scm2string (stroke_style_scm);
+ string stroke_style = ly_scm2string (stroke_style_scm);
if (!stroke_style.empty ())
{
- String font_char = to_string (dir) + stroke_style;
+ string font_char = to_string (dir) + stroke_style;
Stencil stroke = fm->find_by_name ("flags." + font_char);
if (stroke.is_empty ())
me->warning (_f ("flag stroke `%s' not found", font_char));
// URG
Real stem_width = thickness (me);
Real blot
- = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+ = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
Box b = Box (Interval (-stem_width / 2, stem_width / 2),
Interval (stem_y[DOWN] * half_space, stem_y[UP] * half_space));
{
Direction d = get_grob_direction (me);
Real blot
- = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+ = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
Real stem_width = thickness (me);
Real half_space = Staff_symbol_referencer::staff_space (me) * 0.5;
Real y2 = robust_scm2double (me->get_property ("stem-end-position"), 0.0);
extract_grob_set (me, "rests", rests);
if (rests.size ())
{
- Grob *rest = rests.top ();
+ Grob *rest = rests.back ();
r = rest->extent (rest, X_AXIS).center ();
}
}
return si;
}
-/* TODO: add extra space for tremolos! */
MAKE_SCHEME_CALLBACK(Stem, calc_stem_info, 1);
SCM
Stem::calc_stem_info (SCM smob)
* staff_space
* length_fraction;
+ Real height_of_my_trem = 0.0;
+ Grob *trem = unsmob_grob (me->get_object ("tremolo-flag"));
+ if (trem)
+ height_of_my_trem = trem->extent (trem, Y_AXIS).length ()
+ /* hack a bit of space around the trem. */
+ + beam_translation;
+
/* UGH
It seems that also for ideal minimum length, we must use
the maximum beam count (for this direction):
Real ideal_minimum_length = ideal_minimum_free
+ height_of_my_beams
+ + height_of_my_trem
/* stem only extends to center of beam */
- 0.5 * beam_thickness;
* staff_space
* length_fraction;
- Real minimum_length = minimum_free
+ Real minimum_length = max (minimum_free, height_of_my_trem)
+ height_of_my_beams
/* stem only extends to center of beam */
- 0.5 * beam_thickness;
- if (Grob *tremolo = unsmob_grob (me->get_object ("tremolo-flag")))
- {
- Interval y_ext = tremolo->extent (tremolo, Y_AXIS);
- y_ext.widen (0.5); // FIXME. Should be tunable?
- minimum_length = max (minimum_length, y_ext.length ());
- }
-
ideal_y *= my_dir;
Real minimum_y = note_start + minimum_length;
Real shortest_y = minimum_y * my_dir;
"french-beaming "
"length "
"length-fraction "
+ "max-beam-connect "
"neutral-direction "
"no-stem-extend "
"note-heads "
projects / lilypond.git / blobdiff