source file of the GNU LilyPond music typesetter
- (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>,
+ (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>,
Pal Benko <benkop@freestart.hu>
*/
-#include <math.h>
-
#include "mensural-ligature.hh"
-#include "item.hh"
+
#include "font-interface.hh"
+#include "international.hh"
+#include "item.hh"
#include "lookup.hh"
-#include "staff-symbol-referencer.hh"
#include "note-head.hh"
#include "output-def.hh"
+#include "staff-symbol-referencer.hh"
#include "warn.hh"
/*
Real interval,
bool solid,
Real width,
- Real thickness)
+ Real vertical_line_thickness)
{
Real staff_space = Staff_symbol_referencer::staff_space (me);
- Real height = 0.6 * staff_space;
- Stencil stencil;
-
Real slope = (interval / 2.0 * staff_space) / width;
// Compensate optical illusion regarding vertical position of left
Real slope_correction = 0.2 * staff_space * sign (slope);
Real corrected_slope = slope + slope_correction / width;
- if (solid) // this will come handy for colorated flexae
+ Stencil stencil;
+ if (solid) // colorated flexae
{
Stencil solid_head
- = Lookup::beam (corrected_slope, width, height, 0.0);
+ = Lookup::beam (corrected_slope, width, staff_space, 0.0);
stencil.add_stencil (solid_head);
}
else // outline
{
+ /*
+ The thickness of the horizontal lines of the flexa shape
+ should be equal to that of the horizontal lines of the
+ neomensural brevis note head (see mf/parmesan-heads.mf).
+ */
+ Real const horizontal_line_thickness = staff_space * 0.35;
+
+ // URGH! vertical_line_thickness is adjustable (via thickness
+ // property), while horizontal_line_thickness is constant.
+ // Maybe both should be adjustable independently?
+
+ Real height = staff_space - horizontal_line_thickness;
+
Stencil left_edge
- = Lookup::beam (corrected_slope, thickness, height, 0.0);
+ = Lookup::beam (corrected_slope, vertical_line_thickness, height, 0.0);
stencil.add_stencil (left_edge);
Stencil right_edge
- = Lookup::beam (corrected_slope, thickness, height, 0.0);
- right_edge.translate_axis (width - thickness, X_AXIS);
- right_edge.translate_axis (corrected_slope * (width - thickness), Y_AXIS);
+ = Lookup::beam (corrected_slope, vertical_line_thickness, height, 0.0);
+ right_edge.translate_axis (width - vertical_line_thickness, X_AXIS);
+ right_edge.translate_axis ((width - vertical_line_thickness) *
+ corrected_slope, Y_AXIS);
stencil.add_stencil (right_edge);
Stencil bottom_edge
- = Lookup::beam (corrected_slope, width, thickness, 0.0);
+ = Lookup::beam (corrected_slope, width,
+ horizontal_line_thickness, 0.0);
bottom_edge.translate_axis (-0.5 * height, Y_AXIS);
stencil.add_stencil (bottom_edge);
Stencil top_edge
- = Lookup::beam (corrected_slope, width, thickness, 0.0);
+ = Lookup::beam (corrected_slope, width,
+ horizontal_line_thickness, 0.0);
top_edge.translate_axis (+0.5 * height, Y_AXIS);
stencil.add_stencil (top_edge);
}
{
programming_error ("Mensural_ligature: "
"undefined primitive -> ignoring grob");
- return Stencil ();
+ return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
}
int primitive = scm_to_int (primitive_scm);
Real width = 0.0;
Real staff_space = Staff_symbol_referencer::staff_space (me);
if (primitive & MLP_ANY)
- {
- thickness = robust_scm2double (me->get_property ("thickness"), .14);
- }
+ thickness = robust_scm2double (me->get_property ("thickness"), .14);
if (primitive & MLP_FLEXA)
{
- delta_pitch = robust_scm2int (me->get_property ("delta-pitch"),
+ delta_pitch = robust_scm2int (me->get_property ("delta-position"),
0);
width
= robust_scm2double (me->get_property ("flexa-width"), 2.0 * staff_space);
}
if (primitive & MLP_SINGLE_HEAD)
- {
- width = robust_scm2double (me->get_property ("head-width"), staff_space);
- }
+ width = robust_scm2double (me->get_property ("head-width"), staff_space);
switch (primitive & MLP_ANY)
{
case MLP_NONE:
- return Stencil ();
+ 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
- ("noteheads.s-2mensural");
+ ("noteheads.sM2mensural");
break;
case MLP_BREVIS: // mensural brevis head
out = Font_interface::get_default_font (me)->find_by_name
- ("noteheads.s-1mensural");
+ ("noteheads.sM1mensural");
break;
case MLP_MAXIMA: // should be mensural maxima head without stem
out = Font_interface::get_default_font (me)->find_by_name
- ("noteheads.s-1neomensural");
+ ("noteheads.sM1neomensural");
break;
case MLP_FLEXA:
out = brew_flexa (me, delta_pitch, false, width, thickness);
break;
default:
- programming_error (_f ("Mensural_ligature: "
- "unexpected case fall-through"));
- return Stencil ();
+ programming_error (_ ("Mensural_ligature: "
+ "unexpected case fall-through"));
+ return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
}
Real blotdiameter
- = (me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+ = (me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")));
if (primitive & MLP_STEM)
{
SCM join_right_scm = me->get_property ("join-right-amount");
- if (join_right_scm != SCM_EOL)
+ if (scm_is_number (join_right_scm))
{
int join_right = scm_to_int (join_right_scm);
if (join_right)
out.add_stencil (join);
}
else
- {
- programming_error (_f ("Mensural_ligature: (join_right == 0)"));
- }
+ programming_error (_ ("Mensural_ligature: (join_right == 0)"));
}
-#if 0 // what happend with the ledger lines?
+#if 0 /* what happend with the ledger lines? */
int pos = Staff_symbol_referencer::get_rounded_position (me);
if (primitive & MLP_FLEXA)
{
return SCM_EOL;
}
-ADD_INTERFACE (Mensural_ligature, "mensural-ligature-interface",
- "A mensural ligature",
- "delta-pitch flexa-width head-width join-right-amount " // "add-join "
- "ligature-primitive-callback primitive thickness");
+ADD_INTERFACE (Mensural_ligature,
+ "A mensural ligature.",
+
+ /* properties */
+ "delta-position "
+ "flexa-width "
+ "head-width "
+ "join-right-amount "
+ "primitive "
+ "thickness "
+ );
+
projects / lilypond.git / blobdiff