/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2002--2011 Juergen Reuter <reuter@ipd.uka.de>,
+ Copyright (C) 2002--2015 Juergen Reuter <reuter@ipd.uka.de>,
Pal Benko <benkop@freestart.hu>
LilyPond is free software: you can redistribute it and/or modify
#include "mensural-ligature.hh"
+#include "directional-element-interface.hh"
#include "font-interface.hh"
#include "international.hh"
#include "item.hh"
Real ypos_correction = -0.1 * staff_space * sign (slope);
Real slope_correction = 0.2 * staff_space * sign (slope);
Real corrected_slope = slope + slope_correction / width;
+ Real blotdiameter
+ = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
+ width += 2 * blotdiameter;
if (solid) // colorated flexae
{
- stencil = Lookup::beam (corrected_slope, width * 0.5, staff_space, 0.0);
+ stencil = Lookup::beam (corrected_slope, width * 0.5, staff_space, blotdiameter);
}
else // outline
{
- stencil = Lookup::beam (corrected_slope, thickness, height, 0.0);
+ stencil = Lookup::beam (corrected_slope, thickness, height, blotdiameter);
if (!begin)
{
stencil.translate_axis (width * 0.5 - thickness, X_AXIS);
Stencil bottom_edge
= Lookup::beam (corrected_slope, width * 0.5, horizontal_line_thickness,
- 0.0);
+ blotdiameter);
bottom_edge.translate_axis (-0.5 * height, Y_AXIS);
stencil.add_stencil (bottom_edge);
Stencil top_edge
= Lookup::beam (corrected_slope, width * 0.5, horizontal_line_thickness,
- 0.0);
+ blotdiameter);
top_edge.translate_axis (+0.5 * height, Y_AXIS);
stencil.add_stencil (top_edge);
}
stencil.translate_axis (ypos_correction, Y_AXIS);
else
{
- stencil.translate_axis (0.5 * thickness, X_AXIS);
+ stencil.translate_axis (0.5 * thickness - blotdiameter, X_AXIS);
stencil.translate_axis (interval / -4.0 * staff_space, Y_AXIS);
}
internal_brew_primitive (Grob *me)
{
SCM primitive_scm = me->get_property ("primitive");
- if (primitive_scm == SCM_EOL)
+ if (scm_is_null (primitive_scm))
{
programming_error ("Mensural_ligature:"
" undefined primitive -> ignoring grob");
}
int primitive = scm_to_int (primitive_scm);
- Stencil out;
Real thickness = 0.0;
Real width = 0.0;
Real flexa_width = 0.0;
Real staff_space = Staff_symbol_referencer::staff_space (me);
- bool const color
- = me->get_property ("style") == ly_symbol2scm ("blackpetrucci");
+ SCM style = me->get_property ("style");
+ bool const black
+ = scm_is_eq (style, ly_symbol2scm ("blackpetrucci"));
bool const semi
- = me->get_property ("style") == ly_symbol2scm ("semipetrucci");
+ = scm_is_eq (style, ly_symbol2scm ("semipetrucci"));
if (primitive & MLP_ANY)
{
- thickness = robust_scm2double (me->get_property ("thickness"), .14);
+ thickness = robust_scm2double (me->get_property ("thickness"), .13);
width = robust_scm2double (me->get_property ("head-width"), staff_space);
}
if (primitive & MLP_FLEXA)
flexa_width = robust_scm2double (me->get_property ("flexa-width"), 2.0)
* staff_space;
+ Stencil out;
int const note_shape = primitive & MLP_ANY;
+ int duration_log = 0;
+ Font_metric *fm = Font_interface::get_default_font (me);
+ string prefix = "noteheads.";
+ string index;
+ string suffix;
+ string color = "";
+ if (black)
+ color = "black";
+ if (semi)
+ color = "semi";
switch (note_shape)
{
case MLP_NONE:
return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
- case MLP_LONGA: // mensural brevis head with right cauda
- out = Font_interface::get_default_font (me)->find_by_name
- (color ? "noteheads.sM2blackmensural"
- : semi ? "noteheads.sM2semimensural" : "noteheads.sM2mensural");
- break;
- case MLP_BREVIS: // mensural brevis head
- out = Font_interface::get_default_font (me)->find_by_name
- (color ? "noteheads.sM1blackmensural"
- : semi ? "noteheads.sM1semimensural" : "noteheads.sM1mensural");
- break;
- case MLP_MAXIMA: // should be mensural maxima head without stem
- out = Font_interface::get_default_font (me)->find_by_name
- (color ? "noteheads.sM3blackligmensural"
- : semi ? "noteheads.sM3semiligmensural" : "noteheads.sM3ligmensural");
+ case MLP_MAXIMA:
+ duration_log--;
+ case MLP_LONGA:
+ duration_log--;
+ case MLP_BREVIS:
+ duration_log--;
+ suffix = ::to_string (duration_log) + color
+ + (duration_log < -1 ? "lig" : "") + "mensural";
+ index = prefix + "s";
+ out = fm->find_by_name (index + "r" + suffix);
+ if (!out.is_empty ()
+ && !Staff_symbol_referencer::on_line
+ (me,
+ robust_scm2int (me->get_property ("staff-position"), 0)))
+ index += "r";
+ out = fm->find_by_name (index + suffix);
break;
case MLP_FLEXA_BEGIN:
case MLP_FLEXA_END:
- out = brew_flexa (me, color, flexa_width, thickness,
+ out = brew_flexa (me, black, flexa_width, thickness,
note_shape == MLP_FLEXA_BEGIN);
break;
default:
return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
}
- Real blotdiameter
- = (me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")));
+ /*
+ we use thickness because the stem end of the glyph
+ "noteheads.sM2ligmensural" is round.
+ */
+ Real blotdiameter = thickness;
+ /*
+ instead of 2.5 the length of a longa stem should be used
+ Font_interface::get_default_font (???)->find_by_name
+ ("noteheads.sM2ligmensural").extent (Y_AXIS).length () * 0.5
+ */
+ Real stem_length = 2.5 * staff_space;
if (primitive & MLP_STEM)
{
// assume MLP_UP
- Real y_bottom = 0.0, y_top = 3.0 * staff_space;
+ Real y_bottom = 0.0, y_top = stem_length;
if (primitive & MLP_DOWN)
{
to serve as stem as well
*/
if (primitive & MLP_LONGA)
- /*
- instead of 3.0 the length of a longa stem should be used
- Font_interface::get_default_font (???)->find_by_name
- ("noteheads.s-2mensural").extent (Y_AXIS).length () * 0.5
- */
- y_bottom -= 3.0 * staff_space;
+ y_bottom -= stem_length + 0.25 * blotdiameter;
}
Interval x_extent (width - thickness, width);
SCM
Mensural_ligature::brew_ligature_primitive (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob<Grob> (smob);
return internal_brew_primitive (me).smobbed_copy ();
}
projects / lilypond.git / blobdiff