diff options
Diffstat (limited to 'Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf')
-rw-r--r-- | Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf index 520b34e5ec7..fbc9f649751 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf @@ -308,8 +308,7 @@ for sign = 1, -1: beginoperator(plus_size#, 1); "union plus"; draw_subset(a, centre - sign * plus_size/2 * up, centre + sign * plus_size/2 * up, 2radius, line_thickness); - t := 22/10line_thickness; - r := radius - t; + r := 1/6plus_size; draw_line(centre + sign * 1/6plus_size * up + r * right, centre + sign * 1/6plus_size * up + r * left, true); draw_line(centre + (r + sign * 1/6plus_size) * up, centre + (r - sign * 1/6plus_size) * down, true); @@ -370,8 +369,7 @@ for sign = 1, -1: draw_line(z1, z2, false); draw_line(z2, z3, true); - t := 22/10line_thickness; - r := radius - t; + r := 1/6plus_size; draw_line(centre + sign * 1/6plus_size * up + r * right, centre + sign * 1/6plus_size * up + r * left, true); draw_line(centre + (r + sign * 1/6plus_size) * up, centre + (r - sign * 1/6plus_size) * down, true); @@ -624,7 +622,7 @@ endchar; beginoperator(med_op_size#/sqrt(2), 1); "medium square square"; draw_square(centre, radius, 0, line_thickness); - draw_square(centre, 2/5radius, 0, line_thickness); + draw_square(centre, 2/5radius, 0, 4/5line_thickness); endchar; beginoperator(large_op_size#/sqrt(2), 1); "large square"; @@ -696,7 +694,7 @@ endchar; beginoperator(med_op_size#, 1); "medium diamond diamond"; draw_square(centre, radius / sqrt(2), 45, line_thickness); - draw_square(centre, 2/5radius / sqrt(2), 45, line_thickness); + draw_square(centre, 2/5radius / sqrt(2), 45, 4/5line_thickness); endchar; beginoperator(5/6small_op_size#, 8/5); "small lozenge"; @@ -1186,20 +1184,20 @@ beginoperator(plus_size#, 1); "right angle with dot"; penlabels(0,1,2,3,4,5); endchar; -beginsymbol(4u#, 4/5asc_height#, 0); "prime"; +beginsymbol(3u# + line_thickness#, 4/5asc_height#, 0); "prime"; z0 = (w, h); - z1 = z0 + 2u * left; + z1 = z0 + (u + line_thickness) * left; z2 = (1u, 1/9h); - z3 = z2 + 4/3u * right; + z3 = z2 + 4/3line_thickness * right; fill z0 -- z1 -- z2 -- z3 -- cycle; endchar; -beginsymbol(4u#, 4/5asc_height#, 0); "backprime"; +beginsymbol(3u# + line_thickness#, 4/5asc_height#, 0); "backprime"; z0 = (0, h); - z1 = z0 + 2u * right; + z1 = z0 + (u + line_thickness) * right; z2 = (w - 1u, 1/9h); - z3 = z2 + 4/3u * left; + z3 = z2 + 4/3line_thickness * left; fill z0 -- z1 -- z2 -- z3 -- cycle; endchar; @@ -1217,7 +1215,9 @@ beginsymbol(2/5asc_height# + 2side_bearing#, asc_height#, 0); "small integral"; draw_integral(a, 1/2, centre, 4/3line_thickness); endchar; -beginsymbol(13u# + 2side_bearing#, asc_height#, 0); "check mark"; +beginsymbol(11u# + line_thickness# + 2side_bearing#, asc_height#, 0); "check mark"; + thick := line_thickness; + x1l = side_bearing; y1 = math_axis; x2 = side_bearing + 3u; @@ -1244,7 +1244,7 @@ beginsymbol(13u# + 2side_bearing#, asc_height#, 0); "check mark"; penlabels(1,2,3,4,5,6); endchar; -beginsymbol(7u# + 2side_bearing#, 5/4asc_height#, 1/8asc_height#); "lightning"; +beginsymbol(6u# + line_thickness# + 2side_bearing#, 5/4asc_height#, 1/8asc_height#); "lightning"; thick := line_thickness; x3r = w - side_bearing; @@ -1570,7 +1570,7 @@ beginsymbol(7/8order_width# + 2side_bearing#, cap_height#, 0); "complement"; penlabels(0,1,2,3,4,5,6,7); endchar; -beginsymbol(6u# + 2side_bearing#, asc_height#, 1/2line_thickness#); "flat"; +beginsymbol(5u# + line_thickness# + 2side_bearing#, asc_height#, 1/2line_thickness#); "flat"; thick := line_thickness; x0l = x1l = side_bearing; @@ -1586,7 +1586,7 @@ beginsymbol(6u# + 2side_bearing#, asc_height#, 1/2line_thickness#); "flat"; penpos0(thick, 0); penpos1(thick, 0); - penpos2(3/2thick, 0); + penpos2(4/3thick, 0); penpos3(thick, 90); penpos4(thick, 130); @@ -1595,7 +1595,7 @@ beginsymbol(6u# + 2side_bearing#, asc_height#, 1/2line_thickness#); "flat"; penlabels (0,1,2,3,4,5); endchar; -beginsymbol(6u# + 2side_bearing#, asc_height#, desc_depth#); "natural"; +beginsymbol(5u# + line_thickness# + 2side_bearing#, asc_height#, desc_depth#); "natural"; thick := line_thickness; x0l = x1l = w - x2r = w - x3r = side_bearing; @@ -1630,10 +1630,10 @@ beginsymbol(6u# + 2side_bearing#, asc_height#, desc_depth#); "natural"; penlabels(1,2,4,5,6,7); endchar; -beginsymbol(6u# + 2side_bearing#, asc_height#, desc_depth#); "sharp"; +beginsymbol(5u# + line_thickness# + 2side_bearing#, asc_height#, desc_depth#); "sharp"; thick := line_thickness; - x0l = x1l = w - x2r = w - x3r = side_bearing + u; + x0l - x4 = x1l - x5 = x2l - x0r = x3l - x1r = x6 - x2r = x7 - x3r; x4 = x5 = w - x6 = w - x7 = side_bearing; y3 = h; y7r = x_height; @@ -1661,7 +1661,7 @@ beginsymbol(6u# + 2side_bearing#, asc_height#, desc_depth#); "sharp"; penlabels (0,1,2,3,4,5,6,7); endchar; -beginsymbol(10u# + 2side_bearing#, cap_height#, 0); "aleph"; +beginsymbol(9u# + line_thickness# + 2side_bearing#, cap_height#, 0); "aleph"; thick := line_thickness; x0l = x2l = side_bearing; @@ -1692,7 +1692,7 @@ beginsymbol(10u# + 2side_bearing#, cap_height#, 0); "aleph"; penlabels(0,1,2,3,4,5); endchar; -beginsymbol(10u# + 2side_bearing#, cap_height#, 0); "beth"; +beginsymbol(9u# + line_thickness# + 2side_bearing#, cap_height#, 0); "beth"; thick := line_thickness; x0 = u + side_bearing; @@ -1720,7 +1720,7 @@ beginsymbol(10u# + 2side_bearing#, cap_height#, 0); "beth"; penlabels(0,1,2,3,4,5); endchar; -beginsymbol(7u# + 2side_bearing#, cap_height#, 0); "gimel"; +beginsymbol(6u# + line_thickness# + 2side_bearing#, cap_height#, 0); "gimel"; thick := line_thickness; x0 = x2 = side_bearing; @@ -1736,8 +1736,8 @@ beginsymbol(7u# + 2side_bearing#, cap_height#, 0); "gimel"; z5 = z4 + whatever * dir -30; y6 = 2/3h; - penpos2(3/2thick, 80); - penpos2'(3/2thick * sind 80, 90); + penpos2(4/3thick, 80); + penpos2'(4/3thick * sind 80, 90); penpos3(4/3thick, 0); penpos4(3/2thick, 60); penpos5(3/2thick, 60); @@ -1755,10 +1755,10 @@ beginsymbol(7u# + 2side_bearing#, cap_height#, 0); "gimel"; fill stroke z4.e -- z5.e{dir -30} .. {dir -82}z6.e .. {dir -67}z3.e; fill stroke z2.e -- z2'.e{right} ..tension 3/4 and 1.. {dir 60}z8.e -- z7.e; - penlabels(2,3,4,5,6,7,8); + penlabels(2,2',3,4,5,6,7,8); endchar; -beginsymbol(9u# + 2side_bearing#, cap_height#, 0); "daleth"; +beginsymbol(8u# + line_thickness# + 2side_bearing#, cap_height#, 0); "daleth"; thick := line_thickness; x0 = side_bearing; @@ -1786,7 +1786,7 @@ slant := 0.212557; transform currenttransform; currenttransform := identity slanted slant yscaled aspect_ratio scaled granularity shifted (-u,0); -beginsymbol(11u#, x_height#, desc_depth#); "Weierstrass p"; +beginsymbol(9u# + 2line_thickness#, x_height#, desc_depth#); "Weierstrass p"; numeric theta; theta = 90 - angle(8u,h); slope := -h/8u; % angle at middle @@ -1801,8 +1801,8 @@ beginsymbol(11u#, x_height#, desc_depth#); "Weierstrass p"; y2l = h; y7r = -d; y1 = 2/5[-d, h]; - x3l = .5u; - x6r = max(rt x7 + .5, .5w - .25u); + x3l = 1/2u; + x6r = max(x7 + line_thickness, 1/2w - 1/4u); x3r - x3l = x6r - x6l = 5/4line_thickness; ellipse_set(2l,3l,4l,1l); @@ -1813,7 +1813,7 @@ beginsymbol(11u#, x_height#, desc_depth#); "Weierstrass p"; y3 = y3r; y6 = y6r; - fill stroke super_arc.e(2,3) & z3e{down} .. z4e --- z5e .. z6e{down} & super_arc.e(6,7); % flourish + fill stroke super_arc.e(2,3) & z3e{down} .. z4e .. z5e .. z6e{down} & super_arc.e(6,7); % flourish penpos8(line_thickness, 180); penpos9(line_thickness, 90); @@ -1821,13 +1821,13 @@ beginsymbol(11u#, x_height#, desc_depth#); "Weierstrass p"; penpos11(line_thickness, -90); penpos12(line_thickness, -100); - x10r = w - 1.5u + 1/2line_thickness; - x8l = 2.25u; - x9 = x11 = .5w + 1.5u; + x10r = w - 3/2u + 1/2line_thickness; + x8r = u; + x9 = x11 = 1/2w + 3/2u; x12l = max(x6r, .5w + .5u); y8 = y11r = 0; - top y9r = .95h; - y10 = .5[y9,y11]; + y9r = 19/20h; + y10 = 1/2[y9,y11]; y12r = 1/4[y11r,y1l]; fill stroke z7e{left} ... z8e{up} ... pulled_arc.e(9,10) & pulled_arc.e(10,11) .. z12.e; % stem and bowl |