X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmensural-ligature.cc;h=88a11810581abb86de38528c15456d7399803d04;hb=3089416af2cb8f0c4dac3fe2b58e10744100403f;hp=781c5b3cc3ee8360a8eb0ddd48942964d3389df1;hpb=5af8aac76ee3c9934d1721f9ea939820c326b839;p=lilypond.git diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc index 781c5b3cc3..88a1181058 100644 --- a/lily/mensural-ligature.cc +++ b/lily/mensural-ligature.cc @@ -1,22 +1,21 @@ /* mensural-ligature.cc -- implement Mensural_ligature - + source file of the GNU LilyPond music typesetter - - (c) 2002--2005 Juergen Reuter , - Pal Benko + + (c) 2002--2006 Juergen Reuter , + Pal Benko */ #include "mensural-ligature.hh" -#include - -#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" /* @@ -29,46 +28,60 @@ brew_flexa (Grob *me, 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 // and right endings due to slope. - 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 ypos_correction = -0.1 * staff_space * sign (slope); + 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); + Stencil solid_head + = Lookup::beam (corrected_slope, width, staff_space, 0.0); stencil.add_stencil (solid_head); } else // outline { - Stencil left_edge = - Lookup::beam (corrected_slope, thickness, height, 0.0); + /* + 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, thickness, height, 0.0); - right_edge.translate_axis (width-thickness, X_AXIS); - right_edge.translate_axis (corrected_slope * (width-thickness), Y_AXIS); + 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, thickness, 0.0); - bottom_edge.translate_axis (-0.5*height, Y_AXIS); + Stencil bottom_edge + = 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); - top_edge.translate_axis (+0.5*height, Y_AXIS); + Stencil top_edge + = Lookup::beam (corrected_slope, width, + 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); @@ -83,7 +96,7 @@ internal_brew_primitive (Grob *me) { 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); @@ -93,26 +106,22 @@ internal_brew_primitive (Grob *me) 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); + 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"); @@ -131,11 +140,11 @@ internal_brew_primitive (Grob *me) default: programming_error (_f ("Mensural_ligature: " "unexpected case fall-through")); - return Stencil (); + return Lookup::blank (Box (Interval (0, 0), Interval (0, 0))); } - Real blotdiameter = - (me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"))); + Real blotdiameter + = (me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"))); if (primitive & MLP_STEM) { @@ -158,7 +167,7 @@ internal_brew_primitive (Grob *me) 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) @@ -180,17 +189,15 @@ internal_brew_primitive (Grob *me) out.add_stencil (join); } else - { - programming_error (_f ("Mensural_ligature: (join_right == 0)")); - } + programming_error (_f ("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) { pos += delta_pitch; - add_ledger_lines(me, &out, pos, 0.5*delta_pitch, ledger_take_space); + add_ledger_lines (me, &out, pos, 0.5 * delta_pitch, ledger_take_space); } #endif @@ -212,7 +219,14 @@ Mensural_ligature::print (SCM) return SCM_EOL; } -ADD_INTERFACE (Mensural_ligature, "mensural-ligature-interface", +ADD_INTERFACE (Mensural_ligature, "A mensural ligature", - "delta-pitch flexa-width head-width join-right-amount " // "add-join " - "ligature-primitive-callback primitive thickness"); + + "delta-position " + "flexa-width " + "head-width " + "join-right-amount " + "primitive " + "thickness" + ); +