version 1.35, 2010/07/20 10:56:03 |
version 1.36, 2010/07/21 08:24:39 |
|
|
((double)(x) / (1000.0 / (double)(p)->engine.ps.scale)) |
((double)(x) / (1000.0 / (double)(p)->engine.ps.scale)) |
|
|
struct glyph { |
struct glyph { |
size_t wx; /* WX in AFM */ |
unsigned short wx; /* WX in AFM */ |
}; |
}; |
|
|
struct font { |
struct font { |
Line 708 ps_pletter(struct termp *p, int c) |
|
Line 708 ps_pletter(struct termp *p, int c) |
|
|
|
if (c <= 32 || (c - 32 > MAXCHAR)) { |
if (c <= 32 || (c - 32 > MAXCHAR)) { |
ps_putchar(p, ' '); |
ps_putchar(p, ' '); |
p->engine.ps.pscol += fonts[f].gly[0].wx; |
p->engine.ps.pscol += (size_t)fonts[f].gly[0].wx; |
return; |
return; |
} |
} |
|
|
ps_putchar(p, (char)c); |
ps_putchar(p, (char)c); |
c -= 32; |
c -= 32; |
p->engine.ps.pscol += fonts[f].gly[c].wx; |
p->engine.ps.pscol += (size_t)fonts[f].gly[c].wx; |
} |
} |
|
|
|
|
Line 901 ps_width(const struct termp *p, char c) |
|
Line 901 ps_width(const struct termp *p, char c) |
|
{ |
{ |
|
|
if (c <= 32 || c - 32 >= MAXCHAR) |
if (c <= 32 || c - 32 >= MAXCHAR) |
return(fonts[(int)TERMFONT_NONE].gly[0].wx); |
return((size_t)fonts[(int)TERMFONT_NONE].gly[0].wx); |
|
|
c -= 32; |
c -= 32; |
return(fonts[(int)TERMFONT_NONE].gly[(int)c].wx); |
return((size_t)fonts[(int)TERMFONT_NONE].gly[(int)c].wx); |
} |
} |
|
|
|
|
Line 932 ps_hspan(const struct termp *p, const struct roffsu *s |
|
Line 932 ps_hspan(const struct termp *p, const struct roffsu *s |
|
r = PNT2AFM(p, su->scale * 100); |
r = PNT2AFM(p, su->scale * 100); |
break; |
break; |
case (SCALE_EM): |
case (SCALE_EM): |
r = su->scale * |
r = su->scale * |
fonts[(int)TERMFONT_NONE].gly[109 - 32].wx; |
fonts[(int)TERMFONT_NONE].gly[109 - 32].wx; |
break; |
break; |
case (SCALE_MM): |
case (SCALE_MM): |
r = PNT2AFM(p, su->scale * 2.834); |
r = PNT2AFM(p, su->scale * 2.834); |
break; |
break; |
case (SCALE_EN): |
case (SCALE_EN): |
r = su->scale * |
r = su->scale * |
fonts[(int)TERMFONT_NONE].gly[110 - 32].wx; |
fonts[(int)TERMFONT_NONE].gly[110 - 32].wx; |
break; |
break; |
case (SCALE_VS): |
case (SCALE_VS): |