/*
- mensural-ligature.cc -- implement Mensural_ligature
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
-
- (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>,
+ Copyright (C) 2002--2011 Juergen Reuter <reuter@ipd.uka.de>,
Pal Benko <benkop@freestart.hu>
+
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "mensural-ligature.hh"
#include "warn.hh"
/*
+ draws one half a flexa, i.e. a portion corresponding to a single note.
+ this way coloration of the two notes building up the flexa can be
+ handled independently.
+
* TODO: divide this function into mensural and neo-mensural style.
*
* TODO: move this function to class Lookup?
*/
Stencil
brew_flexa (Grob *me,
- Real interval,
bool solid,
Real width,
- Real vertical_line_thickness)
+ Real thickness,
+ bool begin)
{
Real staff_space = Staff_symbol_referencer::staff_space (me);
+
+ /*
+ 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 stencil;
+ Real const interval =
+ robust_scm2double (me->get_property ("flexa-interval"), 0.0);
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;
- Stencil stencil;
if (solid) // colorated flexae
{
- Stencil solid_head
- = Lookup::beam (corrected_slope, width, staff_space, 0.0);
- stencil.add_stencil (solid_head);
+ stencil = Lookup::beam (corrected_slope, width * 0.5, staff_space, 0.0);
}
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, vertical_line_thickness, height, 0.0);
- stencil.add_stencil (left_edge);
-
- Stencil right_edge
- = 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,
- horizontal_line_thickness, 0.0);
- bottom_edge.translate_axis (-0.5 * height, Y_AXIS);
+ stencil = Lookup::beam (corrected_slope, thickness, height, 0.0);
+ if (!begin)
+ {
+ stencil.translate_axis (width*0.5 - thickness, X_AXIS);
+ stencil.translate_axis (corrected_slope * (width*0.5 - thickness),
+ Y_AXIS);
+ }
+
+ Stencil bottom_edge =
+ Lookup::beam (corrected_slope, width * 0.5, 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,
- horizontal_line_thickness, 0.0);
- top_edge.translate_axis (+0.5 * height, Y_AXIS);
+ Stencil top_edge =
+ Lookup::beam (corrected_slope, width * 0.5, horizontal_line_thickness,
+ 0.0);
+ top_edge.translate_axis (+0.5*height, Y_AXIS);
stencil.add_stencil (top_edge);
}
- stencil.translate_axis (ypos_correction, Y_AXIS);
+
+ if (begin)
+ stencil.translate_axis (ypos_correction, Y_AXIS);
+ else
+ {
+ stencil.translate_axis (0.5 * thickness, X_AXIS);
+
+ stencil.translate_axis (interval / -4.0 * staff_space, Y_AXIS);
+ }
+
return stencil;
}
SCM primitive_scm = me->get_property ("primitive");
if (primitive_scm == SCM_EOL)
{
- programming_error ("Mensural_ligature: "
- "undefined primitive -> ignoring grob");
+ programming_error ("Mensural_ligature:"
+ " undefined primitive -> ignoring grob");
return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
}
int primitive = scm_to_int (primitive_scm);
Stencil out;
- int delta_pitch = 0;
Real thickness = 0.0;
Real width = 0.0;
+ Real flexa_width = 0.0;
Real staff_space = Staff_symbol_referencer::staff_space (me);
- if (primitive & MLP_ANY)
- thickness = robust_scm2double (me->get_property ("thickness"), .14);
- if (primitive & MLP_FLEXA)
+ bool const color =
+ me->get_property ("style") == ly_symbol2scm ("blackpetrucci");
+ bool const semi =
+ me->get_property ("style") == ly_symbol2scm ("semipetrucci");
+
+ if (primitive & MLP_ANY)
{
- delta_pitch = robust_scm2int (me->get_property ("delta-position"),
- 0);
- width
- = robust_scm2double (me->get_property ("flexa-width"), 2.0 * staff_space);
+ thickness = robust_scm2double (me->get_property ("thickness"), .14);
+ width = robust_scm2double (me->get_property ("head-width"), staff_space);
}
- if (primitive & MLP_SINGLE_HEAD)
- 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;
+
+ int const note_shape = primitive & MLP_ANY;
- switch (primitive & MLP_ANY)
+ 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
- ("noteheads.sM2mensural");
+ (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
- ("noteheads.sM1mensural");
+ (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
- ("noteheads.sM1neomensural");
+ (color ? "noteheads.sM3blackligmensural" :
+ semi ? "noteheads.sM3semiligmensural" : "noteheads.sM3ligmensural");
break;
- case MLP_FLEXA:
- out = brew_flexa (me, delta_pitch, false, width, thickness);
+ case MLP_FLEXA_BEGIN:
+ case MLP_FLEXA_END:
+ out = brew_flexa (me, color, flexa_width, thickness,
+ note_shape == MLP_FLEXA_BEGIN);
break;
default:
- programming_error (_ ("Mensural_ligature: "
- "unexpected case fall-through"));
+ programming_error (_ ("Mensural_ligature:"
+ " unexpected case fall-through"));
return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
}
out.add_stencil (join);
}
- SCM join_right_scm = me->get_property ("join-right-amount");
-
- if (scm_is_number (join_right_scm))
+ if (to_boolean (me->get_property ("add-join")))
{
- int join_right = scm_to_int (join_right_scm);
+ int join_right = scm_to_int (me->get_property ("delta-position"));
if (join_right)
{
Real y_top = join_right * 0.5 * staff_space;
{
y_bottom = y_top;
y_top = 0.0;
+
+ /*
+ if the previous note is longa-shaped,
+ the joining line may hide the stem, so made it longer
+ 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;
}
Interval x_extent (width - thickness, width);
/* properties */
"delta-position "
- "flexa-width "
+ "ligature-flexa "
"head-width "
- "join-right-amount "
+ "add-join "
+ "flexa-interval "
"primitive "
"thickness "
);
-
projects / lilypond.git / blobdiff