X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-toevallig.mf;h=80e81055409629b58e42386667319ff78caaddc7;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=217d8548309a2b4281c9f7216fbd2584ee911b88;hpb=837300ec80786edfa0767b95f2a5ded7a4f9dec1;p=lilypond.git diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf index 217d854830..80e8105540 100644 --- a/mf/feta-toevallig.mf +++ b/mf/feta-toevallig.mf @@ -1,7 +1,7 @@ % % feta-toevallig.mf -- implement Accidentals % -% (c) 1997--2006 Han-Wen Nienhuys +% (c) 1997--2008 Han-Wen Nienhuys % @@ -11,7 +11,7 @@ def draw_shifted_too = if test > 0: fet_beginchar ("shifted too", ""); - set_char_box (0, 0,0,0); + set_char_box (0, 0, 0, 0); currentpicture := remember_pic; draw_staff (-2, 2, 0.5); @@ -20,7 +20,6 @@ fi; enddef; - % % Accidentals from various sources, notably % @@ -30,16 +29,17 @@ enddef; % -% Naming for microtonal +% Naming for accidentals (including microtonal variants): % -% BASES SLASHES STEMS +% SHARPBASE[.SLASHES.STEMS] +% FLATBASE[.MODIFIER] % -% mirroredflat.flat.slashslash +% Examples: +% +% sharp.slashslash.stem +% mirroredflat.flat +% % - -% standard sharp: -% sharp.slashslash.stemstem -% sharp.slashslash.stem fet_begingroup ("accidentals"); @@ -73,7 +73,7 @@ def draw_meta_sharp (expr width, offset) = pickup pencircle scaled 2 blot_diameter; rt x2 - lft x1 = beamwidth; - y2 - y1 = sharp_beamheight; + z2 = z1 + whatever * (beamwidth, sharp_beamheight); .5 [z1, z3] = (.5 w, offset); x3 = x2; top y2 - bot y3 = sharp_beamheight; @@ -138,8 +138,10 @@ fet_beginchar ("Sharp", "sharp"); draw_staff (-2, 2, 0); fet_endchar; + draw_shifted_too; + fet_beginchar ("1/2 Sharp", "sharp.slashslash.stem"); save stem, stemwidth; save outer_space, interbeam; @@ -176,8 +178,10 @@ fet_beginchar ("1/2 Sharp", "sharp.slashslash.stem"); draw_staff (-2, 2, 0); fet_endchar; + draw_shifted_too; + fet_beginchar ("Sharp (3 beams)", "sharp.slashslashslash.stemstem"); save stem, stemx, stemwidth; save outer_space, interbeam; @@ -185,7 +189,6 @@ fet_beginchar ("Sharp (3 beams)", "sharp.slashslashslash.stemstem"); sharp_beamheight# := 0.22 staff_space# + stafflinethickness#; - stemwidth# := stafflinethickness# + .05 staff_space#; define_whole_blacker_pixels (stemwidth); @@ -202,8 +205,9 @@ fet_beginchar ("Sharp (3 beams)", "sharp.slashslashslash.stemstem"); d := d - feta_space_shift; draw_meta_sharp (.88 w, -.5 interbeam); - draw_meta_sharp (w, 0); draw_meta_sharp (.88 w, -.5 interbeam + vround interbeam); + sharp_beamheight# := 1/.88 sharp_beamheight#; + draw_meta_sharp (w, 0); pickup pencircle scaled stemwidth; @@ -224,8 +228,10 @@ fet_beginchar ("Sharp (3 beams)", "sharp.slashslashslash.stemstem"); draw_staff (-2, 2, 0); fet_endchar; + draw_shifted_too; + fet_beginchar ("1/2 Sharp (3 beams)", "sharp.slashslashslash.stem"); save stem, stemx, stemwidth; save outer_space, interbeam; @@ -243,12 +249,14 @@ fet_beginchar ("1/2 Sharp (3 beams)", "sharp.slashslashslash.stem"); stem := 7 / 16 * w; outer_space := hround ((w - stemwidth) / 2); + w := 2 outer_space + stemwidth; d := d - feta_space_shift; draw_meta_sharp (.8 w, -.5 interbeam); - draw_meta_sharp (w, 0); draw_meta_sharp (.8 w, -.5 interbeam + vround interbeam); + sharp_beamheight# := 1/.8 sharp_beamheight#; + draw_meta_sharp (w, 0); pickup pencircle scaled stemwidth; @@ -257,15 +265,14 @@ fet_beginchar ("1/2 Sharp (3 beams)", "sharp.slashslashslash.stem"); bot y5 = -top y6 + feta_space_shift; labels (5, 6); - draw_gridline (z5, z6, stemwidth); - remember_pic := currentpicture; draw_staff (-2, 2, 0); fet_endchar; + draw_shifted_too; @@ -314,8 +321,8 @@ fet_beginchar ("3/4 Sharp", "sharp.slashslash.stemstemstem"); draw_staff (-2, 2, 0); fet_endchar; -draw_shifted_too; +draw_shifted_too; % @@ -409,6 +416,7 @@ fet_beginchar ("Natural", "natural"); draw_staff (-2, 2, 0); fet_endchar; + draw_shifted_too; @@ -444,7 +452,7 @@ def draw_meta_flat (expr xcenter, w, crook_fatness) = smaller_hole = 0.35 stafflinethickness; else: smaller_hole = 0; - fi + fi; clearing = 1.7 stafflinethickness; crook_thinness = .7 stafflinethickness + .06 staff_space; top_crook_thinness = 1 stafflinethickness + .065 staff_space; @@ -542,73 +550,226 @@ fet_beginchar ("Flat", "flat"); draw_staff (-2, 2, 0); fet_endchar; + draw_shifted_too; + fet_beginchar ("Flat (slashed)", "flat.slash"); - set_char_box (1.2 stafflinethickness#, .8 staff_space#, + set_char_box (.4 staff_space#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#); draw_meta_flat (0, w, 0.31 staff_space); + clearxy; + save slope, slash_width; slope = 0.5; slash_width = w; - z1 = (0, h / 2); - z2 = z1 - (slash_width, slash_width * slope)/2; - z3 = z1 + (slash_width, slash_width * slope)/2; - pickup pencircle scaled 1.5 stafflinethickness; - draw z2 .. z3; - labels (1, 2, 3); + z11 = (0, h / 2); + z12 = z11 - (slash_width, slash_width * slope) / 2; + z13 = z11 + (slash_width, slash_width * slope) / 2; + penpos12 (1.5 stafflinethickness, angle (z13 - z12) - 90); + penpos13 (1.5 stafflinethickness, angle (z13 - z12) - 90); + + z14 = z12 - .75 stafflinethickness * unitvector (z13 - z12); + z15 = z13 + .75 stafflinethickness * unitvector (z13 - z12); + + fill z13r + .. z15 + .. z13l + -- z12l + .. z14 + .. z12r + -- z13r + .. cycle; + + penlabels (12, 13); + labels (14, 15); + remember_pic := currentpicture; draw_staff (-2, 2, 0); fet_endchar; + fet_beginchar ("Flat (slashed twice)", "flat.slashslash"); - set_char_box (1.2 stafflinethickness#, .8 staff_space#, + set_char_box (.4 staff_space#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#); draw_meta_flat (0, w, 0.31 staff_space); + clearxy; - save slope, slash_width; + save slope, slash_width; slope = 0.5; slash_width = w; - pickup pencircle scaled 1.5 stafflinethickness; - - z1 = (0, 5/12 h); - z2 = (0, 2/3 h); - draw z1 - (slash_width, slash_width * slope)/2 - .. z1 + (slash_width, slash_width * slope)/2; - draw z2 - (slash_width, slash_width * slope)/2 - .. z2 + (slash_width, slash_width * slope)/2; - labels (1, 2); + + z11 = (0, 5/12 h); + z12 = z11 - (slash_width, slash_width * slope) / 2; + z13 = z11 + (slash_width, slash_width * slope) / 2; + penpos12 (1.5 stafflinethickness, angle (z13 - z12) - 90); + penpos13 (1.5 stafflinethickness, angle (z13 - z12) - 90); + + z14 = z12 - .75 stafflinethickness * unitvector (z13 - z12); + z15 = z13 + .75 stafflinethickness * unitvector (z13 - z12); + + fill z13r + .. z15 + .. z13l + -- z12l + .. z14 + .. z12r + -- z13r + .. cycle; + + penlabels (12, 13); + labels (14, 15); + + z21 = (0, 2/3 h); + z22 = z21 - (slash_width, slash_width * slope) / 2; + z23 = z21 + (slash_width, slash_width * slope) / 2; + penpos22 (1.5 stafflinethickness, angle (z23 - z22) - 90); + penpos23 (1.5 stafflinethickness, angle (z23 - z22) - 90); + + z24 = z22 - .75 stafflinethickness * unitvector (z23 - z22); + z25 = z23 + .75 stafflinethickness * unitvector (z23 - z22); + + fill z23r + .. z25 + .. z23l + -- z22l + .. z24 + .. z22r + -- z23r + .. cycle; + + penlabels (22, 23); + labels (24, 25); + remember_pic := currentpicture; draw_staff (-2, 2, 0); fet_endchar; + fet_beginchar ("Flatflat (mirrored)", "mirroredflat.flat"); set_char_box (0, 1.6 staff_space#, 0.6 staff_space#, 1.9 staff_space#); - draw_meta_flat (0, w/2, 0.31 staff_space); - currentpicture := currentpicture xscaled -1; - draw_meta_flat (0, w/2, 0.31 staff_space); + % This is a modified version of `draw_meta_flat'. - currentpicture := currentpicture shifted (w/2,0); - penlabels (range 0 thru 11); + save crook_thinness, crook_fatness; + save bottom_overshoot, bot_crook_dir; + save top_stem_thick, bottom_stem_thick, hair, smaller_hole; + save top_crook_thinness; + save zwiep; + save center; + pair center, bot_crook_dir; + save clearing, wid; + save pat; + path pat; + + clearxy; + + wid = w / 2; + + % the stem shouldn't reach the top staff line. + %% TODO: should take from height. + % + % TODO: parameterize this + % + if wid >= 0.75 staff_space: + smaller_hole = 0.35 stafflinethickness; + else: + smaller_hole = 0; + fi; + clearing = 1.7 stafflinethickness; + crook_thinness = .7 stafflinethickness + .06 staff_space; + crook_fatness = 0.31 staff_space; + top_crook_thinness = 1 stafflinethickness + .065 staff_space; + bottom_overshoot = stafflinethickness; + + bottom_stem_thick# = 0.06 staff_space# + 0.6 stafflinethickness#; + top_stem_thick# = 0.1 staff_space# + 1.2 stafflinethickness#; + define_whole_blacker_pixels (bottom_stem_thick, top_stem_thick); + + if odd (top_stem_thick - bottom_stem_thick): + top_stem_thick := top_stem_thick - 1; + fi; + + center = (0, 0); + + x1l = hround (-.5 top_stem_thick); + y1 = vround (2 staff_space - clearing); + x2l = hround (-.5 bottom_stem_thick); + y2 = -.5 staff_space - .5 stafflinethickness; + + penpos1 (top_stem_thick, 0); + penpos2 (bottom_stem_thick, 0); + + y3l = vfloor ((staff_space - stafflinethickness) / 2); + z3l = whatever [z2r, z1r]; + z3r = .3 [z2r, z1r] + (smaller_hole, 0); + x3r := hceiling x3r; + + z10 = whatever [z2r, z1r] + (smaller_hole, 0); + y10 = -1/10 staff_space; + x10 := hceiling x10; + + x11 = bottom_overshoot / 3; + y11 = -vround (.5 (staff_space + stafflinethickness) + + bottom_overshoot); + + penpos4 (whatever, 53); + + y4l - y4r = top_crook_thinness; + y5r = .15 staff_space; + x5l = hround (wid); + y4 = staff_space / 2; + x4r = .45 [x5r, x3r]; + y4l := vround y4l; + + penpos5 (crook_fatness, -175); + + bot_crook_dir = unitvector ((x5l, 0) - z11); + z8 = z11 + whatever * bot_crook_dir; + y8 = -staff_space / 2; + + z7 = z8 + + whatever * bot_crook_dir + + crook_thinness * (bot_crook_dir rotated 90); + x7 = .1 [x3r, x8]; + + pat := z3r{z3r - z10} + .. z4r{right} + .. z5r{down} + .. z7{-bot_crook_dir} + & z7 + .. z10{z3r - z10} + -- cycle; + unfill pat; + unfill pat xscaled -1; + + pat := z11{right} + .. z8{bot_crook_dir} + .. z5l{up} + .. z4l{left} + .. z3l; + fill pat + -- simple_serif (z1r, z1l, 30) + -- reverse pat xscaled -1 shifted (-feta_eps, 0) + -- cycle; + + currentpicture := currentpicture shifted (w/2, 0); remember_pic := currentpicture; draw_staff (-2, 2, 0); fet_endchar; -draw_shifted_too; - - +draw_shifted_too; fet_beginchar ("Semi flat", "mirroredflat"); @@ -619,26 +780,40 @@ fet_beginchar ("Semi flat", "mirroredflat"); currentpicture := currentpicture xscaled -1 shifted (w - b, 0); fet_endchar; + fet_beginchar ("Semi flat", "mirroredflat.backslash"); - set_char_box (1.2 stafflinethickness#, .8 staff_space#, + set_char_box (.4 staff_space#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#); draw_meta_flat (0, w, 0.31 staff_space); + clearxy; save slope, slash_width; slope = 0.5; slash_width = w; - z1 = (0, h / 2); - z2 = z1 - (slash_width, slash_width * slope)/2; - z3 = z1 + (slash_width, slash_width * slope)/2; - pickup pencircle scaled 1.5 stafflinethickness; - draw z2 .. z3; + + z11 = (0, h / 2); + z12 = z11 - (slash_width, slash_width * slope) / 2; + z13 = z11 + (slash_width, slash_width * slope) / 2; + penpos12 (1.5 stafflinethickness, angle (z13 - z12) - 90); + penpos13 (1.5 stafflinethickness, angle (z13 - z12) - 90); + + z14 = z12 - .75 stafflinethickness * unitvector (z13 - z12); + z15 = z13 + .75 stafflinethickness * unitvector (z13 - z12); + + fill z13r + .. z15 + .. z13l + -- z12l + .. z14 + .. z12r + -- z13r + .. cycle; currentpicture := currentpicture xscaled -1 shifted (w - b, 0); labels (1, 2, 3); - fet_endchar; @@ -653,8 +828,8 @@ fet_beginchar ("Double Flat", "flatflat"); (left_wid + right_wid - overlap) * staff_space#, .6 staff_space#, 1.9 staff_space#); draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space); - draw_meta_flat (round ((left_wid - overlap) * staff_space), - right_wid * staff_space, 0.33 staff_space); + draw_meta_flat (hround ((left_wid - overlap) * staff_space), + right_wid * staff_space, 1/3 staff_space); fet_endchar; @@ -669,8 +844,8 @@ fet_beginchar ("3/4 Flat", "flatflat.slash"); (left_wid + right_wid - overlap) * staff_space#, .6 staff_space#, 1.9 staff_space#); draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space); - draw_meta_flat (round ((left_wid - overlap) * staff_space), - right_wid * staff_space, 0.33 staff_space); + draw_meta_flat (hround ((left_wid - overlap) * staff_space), + right_wid * staff_space, 1/3 staff_space); %% maybe we should clip part of the stems? %% or make the 1st flat smaller? @@ -690,7 +865,7 @@ fet_beginchar ("3/4 Flat", "flatflat.slash"); .. z13l -- z12l .. z14 - .. z12 r + .. z12r -- z13r .. cycle; @@ -702,8 +877,10 @@ fet_beginchar ("3/4 Flat", "flatflat.slash"); draw_staff (-2, 2, 0); fet_endchar; + draw_shifted_too; + fet_beginchar ("Double Sharp", "doublesharp"); save klaverblad, klaversteel; save pat; @@ -757,8 +934,10 @@ fet_beginchar ("Double Sharp", "doublesharp"); draw_staff (-2, 2, 0); fet_endchar; + draw_shifted_too; + def draw_paren = save leftindent; @@ -795,6 +974,7 @@ fet_beginchar ("Right Parenthesis", "rightparen"); draw_staff (-2, 2, 0); fet_endchar; + draw_shifted_too;