1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
index d5cbb7f..b25c4bc 100644
--- a/mf/feta-autometric.mf
+++ b/mf/feta-autometric.mf
@@ -149,7 +149,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
& to_bp (w) & " "
& to_bp (h);
special "% MF2PT1: font_size " & decimal designsize;
- special "% MF2PT1: font_slant " & decimal font_slant_;
for fvar = "font_identifier",
"font_coding_scheme",
@@ -175,9 +174,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
fi;
endfor;
- special "% MF2PT1: font_fixed_pitch "
- & (if font_fixed_pitch_: "1" else: "0" fi);
-
% this must come after the `font_size' special
special "% MF2PT1: charwd " & decimal charwd;
fi;
diff --git a/mf/mf2pt1.mp b/mf/mf2pt1.mp
index a8b45aa..c935628 100644
--- a/mf/mf2pt1.mp
+++ b/mf/mf2pt1.mp
@@ -61,7 +61,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) =
def to_bp (expr num) = decimal (ceiling (num*bp_per_pixel)) enddef;
special "% MF2PT1: glyph_dimensions 0 " & to_bp (-d) & " " & to_bp(w) & " " & to_bp(h);
special "% MF2PT1: font_size " & decimal designsize;
- special "% MF2PT1: font_slant " & decimal font_slant_;
special "% MF2PT1: charwd " & decimal charwd; % Must come after the |font_size| |special|
for fvar = "font_identifier", "font_coding_scheme", "font_version",
"font_comment", "font_family", "font_weight", "font_unique_id",
@@ -76,8 +75,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) =
scantokens ("decimal " & fvar & "_");
fi;
endfor;
- special "% MF2PT1: font_fixed_pitch " &
- (if font_fixed_pitch_: "1" else: "0" fi);
enddef;
@@ -91,19 +88,6 @@ enddef;
%% \begin{explaincode}
-%% Store the value of \mfcomment
-% |font_slant_|, so we can recall it at each |beginchar|.
-%% \end{explaincode}
-
-font_slant_ := 0;
-
-def font_slant expr x =
- font_slant_ := x;
- fontdimen 1: x
-enddef;
-
-
-%% \begin{explaincode}
%% Redefine \mfcomment
% |bpppix_|, the number of ``big'' points per pixel. \mfcomment
% This in turn redefines |mm|, |in|, |pt|, and other derived units.
@@ -141,11 +125,6 @@ forsuffixes fvar = font_underline_position, font_underline_thickness:
scantokens ("def " & str fvar & " expr x = " & str fvar & "_ := x enddef;");
endfor;
-boolean font_fixed_pitch_;
-font_fixed_pitch_ := false;
-def font_fixed_pitch expr x = font_fixed_pitch_ := x enddef;
-
-
%% \begin{explaincode}
%% We'd like to be able to use calligraphic pens. Normally, MetaPost's
%% output routine does all the work for us of converting these to filled
diff --git a/scripts/build/mf2pt1.pl b/scripts/build/mf2pt1.pl
index 95df0f8..20f410b 100644
--- a/scripts/build/mf2pt1.pl
+++ b/scripts/build/mf2pt1.pl
@@ -427,7 +427,7 @@ ENDHEADER
sub get_bboxes ($)
{
execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost",
- "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile");
+ "\\mode:=localfont; mag:=$mag; bpppix:=$bpppix; input $mffile");
opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n";
@charfiles = sort
{ ($a=~ /\.(\d+)$/)[0] <=> ($b=~ /\.(\d+)$/)[0] }
|
