source file of the GNU LilyPond music typesetter
- (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include <map>
using namespace std;
-#include "item.hh"
#include "note-head.hh"
#include "staff-symbol-referencer.hh"
#include "staff-symbol.hh"
DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
static Stencil brew_ledger_lines (Grob *me,
int pos,
- int interspaces,
+ Interval,
Real, Real,
Interval x_extent,
Real left_shorten);
- static bool has_interface (Grob *);
+ DECLARE_GROB_INTERFACE ();
};
Stencil
Ledger_line_spanner::brew_ledger_lines (Grob *staff,
int pos,
- int interspaces,
+ Interval staff_extent,
Real halfspace,
Real ledgerlinethickness,
Interval x_extent,
Real left_shorten)
{
- int line_count = ((abs (pos) < interspaces)
+ int line_count = (staff_extent.contains (pos)
? 0
- : (abs (pos) - interspaces) / 2);
+ : sign (pos) * int (rint (pos - staff_extent[Direction (sign (pos))])) / 2);
Stencil stencil;
if (line_count)
{
= Lookup::round_filled_box (Box (x_extent, y_extent), blotdiameter);
Direction dir = (Direction)sign (pos);
- Real offs = (Staff_symbol_referencer::on_staffline (staff, pos))
+ Real offs = (Staff_symbol_referencer::on_line (staff, pos))
? 0.0
: -dir * halfspace;
// find size of note heads.
Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
if (!staff)
- return SCM_EOL;
+ {
+ me->suicide ();
+ return SCM_EOL;
+ }
Real min_length_fraction
= robust_scm2double (me->get_property ("minimum-length-fraction"), 0.15);
Item *previous_column = 0;
Item *current_column = 0;
- int interspaces = Staff_symbol::line_count (staff) - 1;
+ Real halfspace = Staff_symbol::staff_space (staff) / 2;
+ Interval staff_extent = staff->extent (staff, Y_AXIS);
+ staff_extent *= 1 / halfspace;
+
/*
Run through heads using a loop. Since Ledger_line_spanner can
contain a lot of noteheads, superlinear performance is too slow.
*/
extract_item_set (me, "note-heads", heads);
- for (int i = heads.size (); i--;)
+ for (vsize i = heads.size (); i--;)
{
Item *h = heads[i];
int pos = Staff_symbol_referencer::get_rounded_position (h);
- if (abs (pos) <= interspaces)
+ if (staff_extent.contains (pos))
continue;
Item *column = h->get_column ();
extract_grob_set (me, "note-heads", heads);
- if (heads.is_empty ())
+ if (heads.empty ())
return SCM_EOL;
// find size of note heads.
if (!staff)
return SCM_EOL;
+ Real halfspace = Staff_symbol::staff_space (staff) / 2;
+
+ Interval staff_extent = staff->extent (staff, Y_AXIS);
+ staff_extent *= 1 / halfspace;
+
Real length_fraction
= robust_scm2double (me->get_property ("length-fraction"), 0.25);
{
Axis a = Axis (i);
common[a] = common_refpoint_of_array (heads, me, a);
- for (int i = heads.size (); i--;)
+ for (vsize i = heads.size (); i--;)
if (Grob *g = unsmob_grob (me->get_object ("accidental-grob")))
common[a] = common[a]->common_refpoint (g, a);
}
- int interspaces = Staff_symbol::line_count (staff) - 1;
Ledger_requests reqs;
- for (int i = heads.size (); i--;)
+ for (vsize i = heads.size (); i--;)
{
Item *h = dynamic_cast<Item *> (heads[i]);
int pos = Staff_symbol_referencer::get_rounded_position (h);
- if (pos
- && abs (pos) > interspaces)
+ if (pos && !staff_extent.contains (pos))
{
Interval head_extent = h->extent (common[X_AXIS], X_AXIS);
Interval ledger_extent = head_extent;
Direction d = DOWN;
do
{
- if (abs (last->second[d].position_) > interspaces
- && abs (i->second[d].position_) > interspaces)
+ if (!staff_extent.contains (last->second[d].position_)
+ && !staff_extent.contains (i->second[d].position_))
{
Real center
= (last->second[d].head_extent_[RIGHT]
Ledger_request &lr = ((which == LEFT) ? * last : *i).second[d];
// due tilt of quarter note-heads
+ /* FIXME */
bool both
- = (abs (last->second[d].position_) > interspaces + 1
- && abs (i->second[d].position_) > interspaces + 1);
-
+ = (!staff_extent.contains (last->second[d].position_
+ - sign (last->second[d].position_))
+ && !staff_extent.contains (i->second[d].position_
+ - sign (i->second[d].position_)));
Real limit = (center + (both ? which * gap / 2 : 0));
- lr.ledger_extent_.elem_ref (-which)
+ lr.ledger_extent_.at (-which)
= which * max (which * lr.ledger_extent_[-which], which * limit);
}
while (flip (&which) != LEFT);
while (flip (&d) != DOWN);
}
- // create ledgers for note heads
+ // create ledgers for note heads
Real ledgerlinethickness
= Staff_symbol::get_ledger_line_thickness (staff);
- Real halfspace = Staff_symbol::staff_space (staff) / 2;
- for (int i = heads.size (); i--;)
+ for (vsize i = heads.size (); i--;)
{
Item *h = dynamic_cast<Item *> (heads[i]);
int pos = Staff_symbol_referencer::get_rounded_position (h);
- if (abs (pos) > interspaces + 1)
+ if (!staff_extent.contains (pos - sign (pos)))
{
Interval head_size = h->extent (common[X_AXIS], X_AXIS);
Interval ledger_size = head_size;
ledger_size.widen (ledger_size.length () * length_fraction);
- Interval max_size = reqs[h->get_column ()->get_rank ()][Direction (sign (pos))].ledger_extent_;
+ Interval max_size = reqs[h->get_column ()->get_rank ()]
+ [Direction (sign (pos))].ledger_extent_;
ledger_size.intersect (max_size);
Real left_shorten = 0.0;
*/
}
- ledgers.add_stencil (brew_ledger_lines (staff, pos, interspaces,
+ ledgers.add_stencil (brew_ledger_lines (staff, pos, staff_extent,
halfspace,
ledgerlinethickness,
ledger_size,
}
ADD_INTERFACE (Ledger_line_spanner,
- "ledger-line-interface",
-
- "This spanner draws the ledger lines of a staff.\n"
- "This is a separate grob because it has to process\n"
- "all potential collisions between all note heads.",
-
- "note-heads thickness minimum-length-fraction length-fraction gap");
+ "This spanner draws the ledger lines of a staff. This is a"
+ " separate grob because it has to process all potential"
+ " collisions between all note heads.",
+
+ /* properties */
+ "gap "
+ "length-fraction "
+ "minimum-length-fraction "
+ "note-heads "
+ "thickness "
+ );
struct Ledgered_interface
{
- static bool has_interface (Grob *);
+ DECLARE_GROB_INTERFACE ();
};
ADD_INTERFACE (Ledgered_interface,
- "ledgered-interface",
-
- "Objects that need ledger lines, typically "
- "note heads. See also @ref{ledger-line-interface}.",
+ "Objects that need ledger lines, typically note heads. See"
+ " also @ref{ledger-line-spanner-interface}.",
- "no-ledgers");
+ /* properties */
+ "no-ledgers "
+ );
projects / lilypond.git / blobdiff