X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmensural-ligature.cc;h=5a3b3e9543a210e1e95e5338bb838f347ada0014;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=f7de22edcf6f5411ce16e248df9980c8906fe1e1;hpb=bb8a0a5387af94dd2702877256334b160575a730;p=lilypond.git diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc index f7de22edcf..5a3b3e9543 100644 --- a/lily/mensural-ligature.cc +++ b/lily/mensural-ligature.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2002--2011 Juergen Reuter , + Copyright (C) 2002--2015 Juergen Reuter , Pal Benko LilyPond is free software: you can redistribute it and/or modify @@ -20,6 +20,7 @@ #include "mensural-ligature.hh" +#include "directional-element-interface.hh" #include "font-interface.hh" #include "international.hh" #include "item.hh" @@ -69,14 +70,17 @@ brew_flexa (Grob *me, 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); @@ -86,13 +90,13 @@ brew_flexa (Grob *me, 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); } @@ -101,7 +105,7 @@ brew_flexa (Grob *me, 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); } @@ -113,7 +117,7 @@ Stencil 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"); @@ -121,65 +125,87 @@ internal_brew_primitive (Grob *me) } 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: - 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))); } - 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) { @@ -214,12 +240,7 @@ internal_brew_primitive (Grob *me) 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); @@ -230,7 +251,7 @@ internal_brew_primitive (Grob *me) out.add_stencil (join); } else - programming_error (_ ("Mensural_ligature: (join_right == 0)")); + programming_error ("Mensural_ligature: (join_right == 0)"); } #if 0 /* what happend with the ledger lines? */ @@ -249,7 +270,7 @@ MAKE_SCHEME_CALLBACK (Mensural_ligature, brew_ligature_primitive, 1); SCM Mensural_ligature::brew_ligature_primitive (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); return internal_brew_primitive (me).smobbed_copy (); }