/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 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
#include "lookup.hh"
#include "dimensions.hh"
#include "output-def.hh"
+#include "paper-column.hh"
#include "warn.hh"
#include "item.hh"
#include "staff-symbol-referencer.hh"
Real t = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
t *= robust_scm2double (me->get_property ("thickness"), 1.0);
- Direction d = LEFT;
- do
+ for (LEFT_and_RIGHT (d))
{
SCM width_scm = me->get_property ("width");
if (d == RIGHT && scm_is_number (width_scm))
{
Item *x = sp->get_bound (d);
- span_points[d] = x->relative_coordinate (common, X_AXIS);
- if (!x->break_status_dir ()
- && !x->extent (x, X_AXIS).is_empty ())
- span_points[d] += x->extent (x, X_AXIS)[d];
+ span_points[d] = ((!x->break_status_dir ()
+ && !x->extent (x, X_AXIS).is_empty ())
+ ? Paper_column::break_align_width (x, ly_symbol2scm ("break-alignment"))[d]
+ : x->relative_coordinate (common, X_AXIS));
}
span_points[d] -= d * t / 2;
}
- while (flip (&d) != LEFT);
Stencil m;
vector<Real> line_positions = Staff_symbol::line_positions (me);
- int line_count = line_positions.size ();
Stencil line
= Lookup::horizontal_line (span_points
t);
Real space = staff_space (me);
- for (int i = 0; i < line_count; i++)
+ for (vector<Real>::const_iterator i = line_positions.begin (),
+ e = line_positions.end ();
+ i != e;
+ ++i)
{
Stencil b (line);
- b.translate_axis (line_positions[i] * 0.5 * space, Y_AXIS);
+ b.translate_axis (*i * 0.5 * space, Y_AXIS);
m.add_stencil (b);
}
return m.smobbed_copy ();
if (line_positions.empty ())
return values;
- int line_count = line_positions.size ();
-
// find the staff line nearest to note position
Real nearest_line = line_positions[0];
Real line_dist = abs (line_positions[0] - pos);
- for (int i = 1; i < line_count; i++)
+ for (vector<Real>::const_iterator i = line_positions.begin (),
+ e = line_positions.end ();
+ i != e;
+ ++i)
{
- if (abs (line_positions[i] - pos) < line_dist)
+ if (abs (*i - pos) < line_dist)
{
- nearest_line = line_positions[i];
- line_dist = abs (line_positions[i] - pos);
+ nearest_line = *i;
+ line_dist = abs (*i - pos);
}
}
Direction dir = (Direction)sign (pos - nearest_line);
if (scm_is_pair (ledger_positions))
+ // custom ledger line positions
{
Real min_pos = HUGE_VAL;
Real max_pos = -HUGE_VAL;
int n = (int) floor ((ledger_fill[DOWN] - min_pos) / cycle);
Real current;
SCM s = scm_cdr (ledger_positions);
+ if (!scm_is_pair (s) || cycle < 0.1)
+ return values;
do
{
s2 = scm_car (s);
while (current <= ledger_fill[UP]);
}
else
+ // normal ledger lines
{
int ledger_count = (int) floor ((abs (nearest_line - pos) + ledger_extra) / 2);
values.resize (ledger_count);
}
bool
-Staff_symbol::on_line (Grob *me, int pos)
+Staff_symbol::on_line (Grob *me, int pos, bool allow_ledger)
{
SCM line_positions = me->get_property ("line-positions");
if (scm_is_pair (line_positions))
min_line = current_line;
}
- if (pos < min_line)
- return (( (int) (rint (pos - min_line)) % 2) == 0);
- if (pos > max_line)
- return (( (int) (rint (pos - max_line)) % 2) == 0);
+
+ if (allow_ledger)
+ {
+ if (pos < min_line)
+ return (( (int) (rint (pos - min_line)) % 2) == 0);
+ if (pos > max_line)
+ return (( (int) (rint (pos - max_line)) % 2) == 0);
+ }
return false;
}
else
- return ((abs (pos + line_count (me)) % 2) == 1);
+ {
+ int const line_cnt = line_count (me);
+ bool result = abs (pos + line_cnt) % 2 == 1;
+ if (result && !allow_ledger)
+ {
+ result = -line_cnt < pos && pos < line_cnt;
+ }
+ return result;
+ }
}
Interval