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
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
|
diff --git a/src/base/ftinf_sh.c b/src/base/ftinf_sh.c
index 87d2ff8bd..5a350f8f2 100644
--- a/src/base/ftinf_sh.c
+++ b/src/base/ftinf_sh.c
@@ -250,7 +250,8 @@ _settings_get (register const char *str, register unsigned int len)
.stem_alignment_strength=15,
.stem_fitting_strength=15,
.use_various_tweaks=true,
- .windows_style_sharpening_strength=25
+ .windows_style_sharpening_strength=25,
+ .stem_darkening_cff=true
},
#line 197 "ftinf_sh.gperf"
{ .name="windows7",
@@ -300,7 +301,8 @@ _settings_get (register const char *str, register unsigned int len)
.stem_alignment_strength=15,
.stem_fitting_strength=15,
.use_various_tweaks=true,
- .windows_style_sharpening_strength=25
+ .windows_style_sharpening_strength=25,
+ .stem_darkening_cff=true
},
#line 87 "ftinf_sh.gperf"
{ .name="push",
@@ -324,7 +326,8 @@ _settings_get (register const char *str, register unsigned int len)
.stem_alignment_strength=15,
.stem_fitting_strength=15,
.use_various_tweaks=true,
- .windows_style_sharpening_strength=25
+ .windows_style_sharpening_strength=25,
+ .stem_darkening_cff=true
},
#line 162 "ftinf_sh.gperf"
{ .name="ultimate4",
@@ -334,7 +337,8 @@ _settings_get (register const char *str, register unsigned int len)
.stem_alignment_strength=15,
.stem_fitting_strength=15,
.use_various_tweaks=true,
- .windows_style_sharpening_strength=25
+ .windows_style_sharpening_strength=25,
+ .stem_darkening_cff=true
},
#line 153 "ftinf_sh.gperf"
{ .name="ultimate3",
@@ -344,7 +348,8 @@ _settings_get (register const char *str, register unsigned int len)
.stem_alignment_strength=15,
.stem_fitting_strength=15,
.use_various_tweaks=true,
- .windows_style_sharpening_strength=25
+ .windows_style_sharpening_strength=25,
+ .stem_darkening_cff=true
}
};
diff --git a/src/base/ftinf_sh.gperf b/src/base/ftinf_sh.gperf
index 5f6e0ae62..f694fb374 100644
--- a/src/base/ftinf_sh.gperf
+++ b/src/base/ftinf_sh.gperf
@@ -139,7 +139,8 @@ struct ftinf_s;
.stem_alignment_strength=15,
.stem_fitting_strength=15,
.use_various_tweaks=true,
- .windows_style_sharpening_strength=25
+ .windows_style_sharpening_strength=25,
+ .stem_darkening_cff=true
},
{ .name="ultimate2",
.filter_params={on, 6, 22, 36, 22, 6},
@@ -148,7 +149,8 @@ struct ftinf_s;
.stem_alignment_strength=15,
.stem_fitting_strength=15,
.use_various_tweaks=true,
- .windows_style_sharpening_strength=25
+ .windows_style_sharpening_strength=25,
+ .stem_darkening_cff=true
},
{ .name="ultimate3",
.filter_params={on, 8, 24, 36, 24, 8},
@@ -157,7 +159,8 @@ struct ftinf_s;
.stem_alignment_strength=15,
.stem_fitting_strength=15,
.use_various_tweaks=true,
- .windows_style_sharpening_strength=25
+ .windows_style_sharpening_strength=25,
+ .stem_darkening_cff=true
},
{ .name="ultimate4",
.filter_params={on, 10, 25, 37, 25, 10},
@@ -166,7 +169,8 @@ struct ftinf_s;
.stem_alignment_strength=15,
.stem_fitting_strength=15,
.use_various_tweaks=true,
- .windows_style_sharpening_strength=25
+ .windows_style_sharpening_strength=25,
+ .stem_darkening_cff=true
},
{ .name="ultimate5",
.filter_params={on, 12, 28, 42, 28, 12},
@@ -175,7 +179,8 @@ struct ftinf_s;
.stem_alignment_strength=15,
.stem_fitting_strength=15,
.use_various_tweaks=true,
- .windows_style_sharpening_strength=25
+ .windows_style_sharpening_strength=25,
+ .stem_darkening_cff=true
},
{ .name="vanilla",
.filter_params={on, 6, 25, 38, 25, 6},
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index d8fd36c81..ef10506d0 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -938,6 +938,13 @@
ttface->cvt_program_size == 0 ) )
autohint = TRUE;
}
+
+#ifdef FT_CONFIG_OPTION_INFINALITY_PATCHSET
+ if ( use_various_tweaks )
+ {
+ autohint = TRUE;
+ }
+#endif
}
if ( autohint )
diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c
index e82c15c25..99df34a3c 100644
--- a/src/smooth/ftsmooth.c
+++ b/src/smooth/ftsmooth.c
@@ -42,6 +42,8 @@
static FT_Error
ft_smooth_init( FT_Renderer render )
{
+ FT_Library_SetLcdFilter( render->root.library, FT_LCD_FILTER_DEFAULT );
+
render->clazz->raster_class->raster_reset( render->raster, NULL, 0 );
return 0;
|