+2005-12-02 Werner Lemberg <wl@gnu.org>
+
+ * mf/README: Document process for proper mf2pt1 conversion.
+
+ * mf/feta-beugel.mf (draw_brace): Fix path to assure clean
+ overlapping.
+
+ * mf/feta-harmonica.mf: Removed. Unused.
+
2005-12-02 Han-Wen Nienhuys <hanwen@xs4all.nl>
* scripts/lilypond-book.py (do_file): fix thinkos.
This is a font of music symbols. All MF sources are original. Most
-of the doco is in comments in the MF code.
+of the documentation is in comments in the MF code.
+
+Currently, outline fonts are created by using `autotrace', but we are
+already in the process to convert the MF code directly to PostScript code
+with a tool called `mf2pt1', which in turn calls `FontForge' to postprocess
+the output (mainly to remove outline overlaps and to add hints).
+
+The recommended calling sequence of mf2pt1 is
+
+ mf2pt1 --rounding=0.001 <font>
+
+You need mf2pt1 version 2.1 or newer.
+
+Here some guidelines to assure a clean conversion.
+
+. Never use `---'. Replace it with `--' together with explicit path
+ directions (if necessary).
+
+. Don't use self-intersecting outlines in general since it can confuse
+ mf2pt1's algorithm to get the orientation of a closed path. Note that
+ MetaPost's implementation of the `turningnumber' primitive (which would
+ immediately give the orientation of a path) is severely broken and not
+ fixed yet at the time of writing (November 2005), thus some hand-made code
+ in mf2pt1.mp is used to work around this bug.
+
+. If outlines intersect, avoid grazing intersections. In case two outlines
+ intersect in an explicitly defined point, include this point into both
+ intersecting paths to avoid problems due to rounding errors.
+
+. Don't use `draw' with a polygonal pen but for straight lines (consisting
+ of exactly two points). In most cases it is quite easy to emulate `draw'
+ with an explicit definition of the outline or with `penstroke'.
+
+. Don't apply transformations after calling `fill' -- for example, don't
+ mirror `currentpicture'. Instead, transform the path and call `fill'
+ afterwards. This insures that mf2pt1 gets the correct outline directions
+ which is a necessary prerequisite for FontForge's algorithm to remove
+ overlaps.
+
+
+Some design rules:
+
+. Always use smooth curve transitions. Since this is difficult to see in
+ MetaFont proof sheets (which don't show the tangents) I recommend to call
+ mf2pt1 like this
+
+ FONTFORGE=foo mf2pt1 ...
+
+ (`foo' should be a non-existent program; this avoids the default
+ postprocessing). Then call FontForge to inspect the outlines.
+
+. Use rounded corners.
+
+
+Finally, some rules to assure that rasterization at low resolutions give
+good results. Today, this is a minor issue, but in some cases it might show
+design flaws.
+
+. Use `define_whole_pixels' and friends where appropriate.
+
+. Use `hround' and `vround' consistently. A lot of auxiliary macros are
+ defined in feta-macros.mf.
+
+. If a path element is duplicated or shifted, use an integer value for the
+ offset.
+
+. Add `eps' for mirrored paths to assure correct MetaFont rasterization.
+ See the comment and the variables at the end of `feta-params.mf' for
+ details how vertical symmetry should be achieved.
fet_beginchar ("close", "close.11");
- set_char_box (.5 staff_space#, .5 staff_space# ,
+ set_char_box (.5 staff_space#, .5 staff_space#,
1.0 staff_space#, 0.0 staff_space#);
set_arrow_paths (staff_space, 0.5 staff_space, 1.5, blot_diameter);
fill close_path;
fet_beginchar ("close", "close.1M1");
- set_char_box (.5 staff_space#, .5 staff_space# ,
+ set_char_box (.5 staff_space#, .5 staff_space#,
0.0 staff_space#, 1.0 staff_space#);
set_arrow_paths (staff_space, 0.5 staff_space, 1.5, blot_diameter);
fill close_path;
enddef;
-def autometric_output_char=
+def autometric_output_char =
message "@{char@:" & charnamestr
& "@:" & decimal charcode
& "@:" & decimal charbp
enddef;
-def fet_endchar=
+def fet_endchar =
autometric_output_char;
breapth_endchar;
enddef;
-%
+%
% feta-beugel.mf -- Staff braces
-%
+%
% source file of the Feta (not an acronym for Font-En-Tja)
% pretty-but-neat music font
-%
+%
% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
% Jan Nieuwenhuizen <janneke@gnu.org>
input feta-autometric;
input feta-macros;
-staffsize# := 20 pt#; %% arbitrary.
+staffsize# := 20 pt#; %% arbitrary
input feta-params;
+%
+% We must let the design increase for each font to make sure that mftrace
+% doesn't jack up the resolution too highly for the longer braces.
+%
-% we must let the design increase for each
-% font to make sure that mftrace doesn't jack up the resolution too highly
-% for the longer braces.
-fet_beginfont ("feta-braces-" & char (97 + font_count), (font_count + 1) * 20,
- "fetaBraces");
+fet_beginfont ("feta-braces-" & char (97 + font_count),
+ (font_count + 1) * 20, "fetaBraces");
mode_setup;
-
save code, braces_per_font;
code := 64;
braces_per_font := 64;
def draw_brace (expr height_sharp, width_sharp, slt_sharp, brace_number) =
-
- save pendir, height, width, thin, thick, slt;
+ save pendir, height, width, thin, thick, slt, pat;
save penangle;
+ pair pendir;
+ path pat;
+
height# := height_sharp;
width# := width_sharp;
slt# := slt_sharp;
-%% +1 is needed because fet_beginchar increments after dumping the strings.
-fet_beginchar ("brace number " & (decimal (brace_number)),
- "brace" & decimal(brace_number))
+ fet_beginchar ("brace number " & decimal (brace_number),
+ "brace" & decimal (brace_number))
+ set_char_box (width#, 0, height# / 2, height# / 2);
- set_char_box (width#, 0, height#/2, height#/2);
-
- define_pixels (height, width, slt);
- thin = 2 slt;
- thick = .5 width;
+ define_pixels (height, width, slt);
+ thin = 2 slt;
+ thick = .5 width;
- z2 = .5 [z1, z3];
- y3l = y1 + height/2;
- x3 = x1 + width;
- y1 =0;
- x1 = - b;
-
- pair pendir;
- pendir = unitvector(x3 - x1, y3l/6 - y1);
- penangle = angle pendir - 90;
- penpos3(thin, penangle);
- penpos2(thick, angle(z3 -z1) -90 );
- penpos1(2/3 thin, penangle);
+ z2 = .5 [z1, z3];
+ y3l = y1 + height / 2;
+ x3 = x1 + width;
+ y1 = 0;
+ x1 = -b;
+ y0 = y1;
+ x0 = x1 - 2/6 thin;
+
+ pendir = unitvector (x3 - x1, y3l / 6 - y1);
+ penangle = angle pendir - 90;
+ penpos3 (thin, penangle);
+ penpos2 (thick, angle (z3 - z1) - 90);
+ penpos1 (2/3 thin, penangle);
- penlabels(1,2,3);
- fill z2r .. simple_serif (z3r, z3l, 90)
- .. z2l .. simple_serif (z1l, z1r, 90) ..cycle;
-
- addto currentpicture also currentpicture yscaled -1;
-fet_endchar;
+ penlabels (1, 2, 3);
+ labels (0);
+
+ pat = z2r
+ .. simple_serif (z3r, z3l, 90)
+ .. z2l
+ .. z1l{dir (angle (z1r - z1l) - 90)}
+ .. z0{down}
+ -- z1r{-dir (angle (z1l - z1r) + 90)}
+ .. cycle;
+
+ fill pat;
+ fill pat yscaled -1;
+ fet_endchar;
enddef;
-
save stafflinethickness;
save increment;
-linethickness := 0.5pt#;
-increment := 0.5pt#;
-y := 10pt#;
+linethickness := 0.5 pt#;
+increment := 0.5 pt#;
+y := 10 pt#;
for i := 0 step 1 until font_count:
- save number;
-
- number := braces_per_font * i;
-
- for j := 0 step 1 until (braces_per_font -1):
- % message "l: "&decimal l;
- % note: define_pixels (x) multiplies x by hppp,
- % must never get bigger than infinity
- y := y + increment;
- if y > infinity/hppp:
- message "Resolution and/or magnification is too high";
- message "HPP: "& decimal hpp &" Y: " & y;
- error "please report to <bug-lilypond@gnu.org>";
- fi
-
- % x should be about one staff space, taking brace to have
- % default height of 3 staffs, this yields height / 3 / 4 = 12
- % but 15 looks better
- x := y / 15;
-
- increment := x / 10;
- linethickness := min (0.5pt#, y/150);
- if i = font_count:
- draw_brace (y, x, linethickness, number);
- fi
- number := number + 1;
- endfor;
-endfor
-
-fet_endfont("feta-braces");
+ save number;
+
+ number := braces_per_font * i;
+
+ for j := 0 step 1 until (braces_per_font - 1):
+ % message "l: "&decimal l;
+ % note: define_pixels (x) multiplies x by hppp,
+ % must never get bigger than infinity
+ y := y + increment;
+ if y > infinity / hppp:
+ message "Resolution and/or magnification is too high";
+ message "HPP: "& decimal hpp &" Y: " & y;
+ error "please report to <bug-lilypond@gnu.org>";
+ fi;
+
+ % x should be about one staff space, taking brace to have
+ % default height of 3 staffs, this yields height / 3 / 4 = 12
+ % but 15 looks better
+ x := y / 15;
+
+ increment := x / 10;
+ linethickness := min (0.5 pt#, y / 150);
+ if i = font_count:
+ draw_brace (y, x, linethickness, number);
+ fi;
+
+ number := number + 1;
+ endfor;
+endfor;
+
+fet_endfont ("feta-braces");
z6 - z5 = whatever * ne;
z8 - z7 = whatever * ne;
- z5 = z1 + whatever * ne + th * (ne rotated -90);
- z8 = z4 + whatever * ne + th * (ne rotated 90);
+ z5 = z1 + whatever * ne + th * (ne rotated -90);
+ z8 = z4 + whatever * ne + th * (ne rotated 90);
unfill z5
-- z6
%
-% feta-braces0.mf -- 256 smallest braces
+% feta-braces-a.mf -- 256 smallest braces
%
% source file of the Feta (Font-En-Tja) music font
%
%
-% feta-braces1.mf -- next 256 braces
+% feta-braces-b.mf -- next 256 braces
%
% source file of the Feta (Font-En-Tja) music font
%
%
-% feta-braces2.mf -- next 256 braces
+% feta-braces-c.mf -- next 256 braces
%
% source file of the Feta (Font-En-Tja) music font
%
%
-% feta-braces3.mf -- next 256 braces
+% feta-braces-d.mf -- next 256 braces
%
% source file of the Feta (Font-En-Tja) music font
%
%
-% feta-braces4.mf -- next 256 braces
+% feta-braces-e.mf -- next 256 braces
%
% source file of the Feta (Font-En-Tja) music font
%
font_count := 4;
input feta-beugel;
end.
-
-
%
-% feta-braces5.mf -- next 256 braces
+% feta-braces-f.mf -- next 256 braces
%
% source file of the Feta (Font-En-Tja) music font
%
%
-% feta-braces6.mf -- next 256 braces
+% feta-braces-g.mf -- next 256 braces
%
% source file of the Feta (Font-En-Tja) music font
%
%
-% feta-braces6.mf -- next 256 braces
+% feta-braces-h.mf -- next 256 braces
%
% source file of the Feta (Font-En-Tja) music font
%
%
-% feta-braces6.mf -- next 256 braces
+% feta-braces-i.mf -- next 256 braces
%
% source file of the Feta (Font-En-Tja) music font
%
penpos8 (bulb_thick, 160);
x8l = x7l - 1/10 ex;
- z7l = whatever [z8r,z8l];
+ z7l = whatever [z8r, z8l];
penpos9 (bulb_thick, 135);
x9r = 0.1 [x8l, x8r];
code := 111;
-fet_beginchar("dynamic p", "p")
+fet_beginchar ("dynamic p", "p")
% TODO: w really is 13/12 ex
% but should do kerning
cheek_thick = 13/32 ex;
cheek_width = 0.72 ex;
left_serif_protude = 18/60 ex;
- right_serif_protude= 15/60 ex;
+ right_serif_protude = 15/60 ex;
currenttransform := currenttransform slanted slant;
y6l = 23/80 ex + ypart center;
z6l = 1.6 [z3l, z3r] + whatever * idir;
- penpos7 (i_thick ,0);
+ penpos7 (i_thick, 0);
y7 = 0;
z7l = z5l + whatever * idir;
save twiddle_thick, attach_len, overshoot, taille;
pair base_point;
- set_char_box (0, .75 ex#, 0, 1ex#);
+ set_char_box (0, .75 ex#, 0, ex#);
stem_thick =.26 ex;
bulb_diam = .30 ex;
- twiddle_thick= 1.1 serif_thick;
+ twiddle_thick = 1.1 serif_thick;
overshoot = .5 serif_thick;
taille = -0.3 serif_thick;
attach_len + bulb_diam / 2 + stem_thick = w;
%
-% feta-generic.mf -- implement generic stuff: include lots of files, but don't
+% feta-generic.mf -- implement generic stuff: include lots of files, but don't
% set dims.
%
% source file of the Feta (defintively not an abbreviation for Font-En-Tja)
input feta-params;
-font_x_height staff_space#;
+font_x_height staff_space#;
%% this is a fallback so we can run the font without including feta-bolletjes.
black_notehead_width# := 1.0 staff_space#;
-fet_beginfont("feta", design_size, "fetaMusic");
+fet_beginfont ("feta", design_size, "fetaMusic");
+
if test = 0:
input feta-eindelijk;
input feta-toevallig;
input feta-accordion;
else:
input feta-test-generic.mf;
-
fi
-autometric_parameter("staffsize", staffsize#);
-autometric_parameter("stafflinethickness", stafflinethickness#);
-autometric_parameter("staff_space", staff_space#)
-autometric_parameter("linethickness", linethickness#)
-autometric_parameter("black_notehead_width", black_notehead_width#);
-autometric_parameter("ledgerlinethickness", ledgerlinethickness#);
-autometric_parameter("blot_diameter", blot_diameter#);
+autometric_parameter ("staffsize", staffsize#);
+autometric_parameter ("stafflinethickness", stafflinethickness#);
+autometric_parameter ("staff_space", staff_space#);
+autometric_parameter ("linethickness", linethickness#);
+autometric_parameter ("black_notehead_width", black_notehead_width#);
+autometric_parameter ("ledgerlinethickness", ledgerlinethickness#);
+autometric_parameter ("blot_diameter", blot_diameter#);
fet_endfont;
-
fet_begingroup ("brackettips");
-def draw_bracket(expr thick_sharp, width_sharp, updown) =
+def draw_bracket (expr thick_sharp, width_sharp, updown) =
begingroup;
save p, thin, thick, flattening, width, hair, flare;
path p;
define_pixels (thick, width, flare);
if updown = 1:
set_char_box (0, width#,
- .5 thick# , flare#);
+ .5 thick#, flare#);
else:
set_char_box (0, width#,
flare#, .5 thick#);
+++ /dev/null
-
-
-fet_begingroup("balls");
-
-fet_endgroup("balls");
-
labels (1', 2', 3', 4', 5');
before := z3'{dir (turning_dir * 90)}
- .. z4'{-dir(0)}
+ .. z4'{-dir (0)}
..tension 1.1.. z1'{-dir (turning_dir* 90)};
after := z2'{dir (turning_dir * 90)}
.. end_point{dir (end_angle)};
pat := start_point{dir (start_angle)}
.. outer_tangent_point{dir (-turning_dir * 90)}
- ..tension 1.02.. z5'{dir(0)}
+ ..tension 1.02.. z5'{dir (0)}
.. subpath (0, u) of before
.. subpath (v, infinity) of after;
upward_swoosh_angle = 132;
start_angle = -97;
- breapth_factor = 21.0 /14;
+ breapth_factor = 21/14;
inner_thick_end = 45;
inner_start_angle = downstroke_angle - 43;
thickness = .32 reduced_ss + 1.1 linethickness;
penpos10 (.75 [penh, penw], 170);
z10 = pos + .375 vx + vy;
- penpos 11 (.8 [penh, penw], 150);
+ penpos11 (.8 [penh, penw], 150);
z11 = z10 - .5 vy + .04 vx;
penpos12 (penh, 100);
z12l = (xpart .5 [z13, z11], ypart pos);
enddef;
-def del_pen_stack=
+def del_pen_stack =
save save_pen_stack, pen_stack_idx;
enddef;
%
save b, h;
-4h + b = 1.15;
-10h + b = 1;
+4 h + b = 1.15;
+10 h + b = 1;
fatten := number_design_size * h + b;
save b, h;
-4h + b = 1.05;
-10h + b = 1;
+4 h + b = 1.05;
+10 h + b = 1;
widen := number_design_size * h + b;
tense = 0.85;
%
%
% move_away_to = amount left (for 2)
-% turn_to = amount down (for 2 )
+% turn_to = amount down (for 2)
%
def number_flare_path (expr pos, alpha, beta, line, flare,
z3r = 0.5 [z2l, z2r] + 0.5 * flare * dir (alpha + beta);
penpos1 (line, 180 + beta + alpha);
- penpos2 (flare, alpha );
- penpos3 (flare, alpha + beta);
+ penpos2 (flare, alpha);
+ penpos3 (flare, alpha + beta);
penlabels (1, 2, 3, 4, 5);
% should make generic macro?
%
-def draw_foot(expr xpos) =
+def draw_foot (expr xpos) =
begingroup;
clearxy;
centerx := hround (w / 2);
centery := vround ((h - d) / 2);
- z1 = (centerx - hthick/2, -d);
- z2 = (centerx + hthick/2, h);
+ z1 = (centerx - hthick / 2, -d);
+ z2 = (centerx + hthick / 2, h);
labels (1, 2);
draw_rounded_block (z1, z2, hthick);
- draw_rounded_block ((0, centery - vthick/2),
- (w, (centery + vthick/2)),
+ draw_rounded_block ((0, centery - vthick / 2),
+ (w, (centery + vthick / 2)),
vthick);
fet_endchar;
fill subpath (0,3) of pat
.. z0
.. cycle;
- filldraw z1l{dir(alpha)}
+ filldraw z1l{dir (alpha)}
.. {up}z2
-- z0{direction pos of pat}
..tension 0.95.. {dir (180 + alpha)}z1r
code := 47; % 0 = 48
-fet_beginchar("Numeral 0", "zero");
+fet_beginchar ("Numeral 0", "zero");
set_char_box (0, 11/15 height# * widen, 0, height#);
message "w:" & decimal w;
% characters have sharp edges and corners.
% The following variable controls the amount of `roundness'.
%
-% %his is not a meta variable: it is related to absolute sizes.
+% This is not a meta variable: it is related to absolute sizes.
%
% FIXME: According to [Wanske], only outside corners should be round
% I don't think we do this anywhere -- jcn
pickup pencircle scaled penh;
- penpos 1 (bulb, 180);
- penpos 2 (bulb, 0);
- penpos 3 (thin, 0);
+ penpos1 (bulb, 180);
+ penpos2 (bulb, 0);
+ penpos3 (thin, 0);
z1 = z0 + (0, radius);
z2 = z1;
pickup pencircle scaled dot_size;
- x1 - 2x6 = x2;
+ x1 - 2 x6 = x2;
bot y6 = -d;
drawdot z6;
penpos11 (hair_thick, -4);
z11r = z9r;
- z13l = (x9l + r_width, y11 - linethickness);
+ z13l = (x9l + r_width, y11 - linethickness);
penpos13 (r_flare, 180);
z15 = z13r - (bulb_size * r_fatness, 0);
save alpha;
save ne, nw, se, sw;
save x, y;
- pair ne,nw,se,sw;
+ pair ne, nw, se, sw;
alpha := -40;
-% feta-test11
+% feta-test11.mf
% part of LilyPond's pretty-but-neat music font
input feta-autometric;
+
design_size := 11;
-test:=1;
+test := 1;
% smoked cheese
% test := -1;
-
-% dem piksels.
-%test := 1;
-
input feta-generic;
end.
-% feta-test13
+% feta-test13.mf
% part of LilyPond's pretty-but-neat music font
input feta-autometric;
+
design_size := 13;
-test:=1;
+test := 1;
% smoked cheese
% test := -1;
-
-% dem piksels.
-%test := 1;
-
input feta-generic;
-% feta-test16
+% feta-test16.mf
% part of LilyPond's pretty-but-neat music font
input feta-autometric;
+
design_size := 16;
-test:=1;
+test := 1;
% smoked cheese
% test := -1;
-
-% dem piksels.
-%test := 1;
-
input feta-generic;
-% feta-test20
+% feta-test20.mf
% part of LilyPond's pretty-but-neat music font
-
input feta-autometric;
+
design_size := 20;
-test:=1;
+test := 1;
% smoked cheese
% test := -1;
-
-% dem piksels.
-%test := 1;
-
input feta-generic;
-% feta-test23
+% feta-test23.mf
% part of LilyPond's pretty-but-neat music font
-
input feta-autometric;
+
design_size := 23;
-test:=1;
+test := 1;
% smoked cheese
% test := -1;
-
-% dem piksels.
-%test := 1;
-
input feta-generic;
-% feta-test26
+% feta-test26.mf
% part of LilyPond's pretty-but-neat music font
input feta-autometric;
+
design_size := 26;
-test:=1;
+test := 1;
% smoked cheese
% test := -1;
-
-% dem piksels.
-%test := 1;
-
input feta-generic;
end.
-
-% feta16.mf
+% feta11.mf
% part of LilyPond's pretty-but-neat music font
-
input feta-autometric;
-design_size:= 11.22;
-test:=0;
+design_size := 11.22;
+test := 0;
input feta-generic;
-% feta16.mf
+% feta13.mf
% part of LilyPond's pretty-but-neat music font
input feta-autometric;
design_size := 12.60;
-
-test:=0;
+test := 0;
input feta-generic;
-
-% feta16.mf
+% feta14.mf
% part of LilyPond's pretty-but-neat music font
input feta-autometric;
+
design_size := 14.14;
-test:=0;
+test := 0;
input feta-generic;
% part of LilyPond's pretty-but-neat music font
input feta-autometric;
+
design_size := 15.87;
-test:=0;
+test := 0;
input feta-generic;
-% feta23.mf
+% feta18.mf
% part of LilyPond's pretty-but-neat music font
input feta-autometric;
% todo change file name
design_size := 17.82;
-test:=0;
+test := 0;
input feta-generic;
end.
-
% todo change file name
design_size := 22.45;
-test:=0;
+test := 0;
input feta-generic;
% part of LilyPond's pretty-but-neat music font
input feta-autometric;
+
design_size := 25.20;
-test:=0;
+test := 0;
input feta-generic;
projects / lilypond.git / commitdiff