Commit 6037f084741e3e6df8d4526331193b624e610abb
2000-11-27T00:57:13
In function T2_Parse_CharStrings, modified glyph width assignment code to be more robust. The code now takes into account glyphs that 1. have the width given as it is, rather than as a difference against `nominal_width', and 2. have the width operand specified before one of the h/r/vmoveto commands or the endchar command.
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/src/cff/t2gload.c b/src/cff/t2gload.c
index 20944fd..38d550a 100644
--- a/src/cff/t2gload.c
+++ b/src/cff/t2gload.c
@@ -136,11 +136,11 @@
1 | T2_COUNT_CHECK_WIDTH | T2_COUNT_EXACT,
1 | T2_COUNT_CHECK_WIDTH | T2_COUNT_EXACT,
- 0 | T2_COUNT_CLEAR_STACK, /* rlineto */
+ 0 | T2_COUNT_CLEAR_STACK, /* rlineto */
0 | T2_COUNT_CLEAR_STACK,
0 | T2_COUNT_CLEAR_STACK,
- 0 | T2_COUNT_CLEAR_STACK, /* rrcurveto */
+ 0 | T2_COUNT_CLEAR_STACK, /* rrcurveto */
0 | T2_COUNT_CLEAR_STACK,
0 | T2_COUNT_CLEAR_STACK,
0 | T2_COUNT_CLEAR_STACK,
@@ -153,7 +153,7 @@
9,
11,
- 0, /* endchar */
+ 0 | T2_COUNT_CHECK_WIDTH, /* endchar */
2 | T2_COUNT_CHECK_WIDTH, /* hstem */
2 | T2_COUNT_CHECK_WIDTH,
@@ -849,13 +849,25 @@
if ( req_args & T2_COUNT_CHECK_WIDTH )
{
args = stack;
- if ( num_args & 1 && decoder->read_width )
+
+ /* If there is a number here, it is either a difference against */
+ /* `nominal_width', or it is a width itself. */
+
+ if ( num_args > 0 && decoder->read_width )
{
- decoder->glyph_width = decoder->nominal_width +
- ( stack[0] >> 16 );
+ /* If `nominal_width' is non-zero, the number is really a */
+ /* difference against `nominal_width'. */
+ if ( decoder->nominal_width )
+ decoder->glyph_width = decoder->nominal_width +
+ ( stack[0] >> 16 );
+ /* Else, the number here is truly a width, not a difference. */
+ else
+ decoder->glyph_width = stack[0] >> 16;
+
num_args--;
args++;
}
+
decoder->read_width = 0;
req_args = 0;
}