Commit b459882804836557bf6a8ccea45421fd87f36097
2016-05-31T08:39:52
[truetype] Let SHPIX move points in the twilight zone in v40. * src/truetype/ttinterp.c (Ins_SHPIX): Allow SHPIX to move points in the twilight zone. Otherwise, treat SHPIX the same as DELTAP. Unbreaks various fonts such as older versions of Rokkitt and DTL Argo T Light that would glitch severly after calling ALIGNRP after a blocked SHPIX.
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
diff --git a/ChangeLog b/ChangeLog
index b3592bb..332f42e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-05-17 Nikolaus Waxweiler <madigens@gmail.com>
+
+ [truetype] Let SHPIX move points in the twilight zone in v40.
+
+ * src/truetype/ttinterp.c (Ins_SHPIX): Allow SHPIX to move points in
+ the twilight zone. Otherwise, treat SHPIX the same as DELTAP.
+ Unbreaks various fonts such as older versions of Rokkitt and DTL
+ Argo T Light that would glitch severly after calling ALIGNRP after a
+ blocked SHPIX.
+
2016-05-30 Werner Lemberg <wl@gnu.org>
[type42] Support `CharStrings' entry format as created by LilyPond.
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index c6df129..2e3f9ef 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -5548,6 +5548,12 @@
#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
FT_Int B1, B2;
#endif
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+ FT_Bool in_twilight = exc->GS.gep0 == 0 || \
+ exc->GS.gep1 == 0 || \
+ exc->GS.gep2 == 0;
+#endif
+
if ( exc->top < exc->GS.loop + 1 )
@@ -5656,11 +5662,15 @@
if ( SUBPIXEL_HINTING_MINIMAL &&
exc->backwards_compatibility )
{
- /* XXX: breaks Rokkitt < v1.2 */
- /* (glyphs explode vertically on ALIGNRP). */
- if ( !( exc->iupx_called && exc->iupy_called ) &&
- ( ( exc->is_composite && exc->GS.freeVector.y != 0 ) ||
- ( exc->zp2.tags[point] & FT_CURVE_TAG_TOUCH_Y ) ) )
+ /* Special case: allow SHPIX to move points in the twilight zone. */
+ /* Otherwise, treat SHPIX the same as DELTAP. Unbreaks various */
+ /* fonts such as older versions of Rokkitt and DTL Argo T Light */
+ /* that would glitch severly after calling ALIGNRP after a blocked */
+ /* SHPIX. */
+ if ( in_twilight ||
+ ( !( exc->iupx_called && exc->iupy_called ) &&
+ ( ( exc->is_composite && exc->GS.freeVector.y != 0 ) ||
+ ( exc->zp2.tags[point] & FT_CURVE_TAG_TOUCH_Y ) ) ) )
Move_Zp2_Point( exc, point, 0, dy, TRUE );
}
else