ref: def6bc8aa2a70c6dd9f7974ca12992efd32b2ebd
parent: c623ba3f4452ad1fcb2f89bdd716b4a8831685ca
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Sun Jul 14 12:58:18 EDT 2024
raster: use ppem for scaling
--- a/otf.c.in
+++ b/otf.c.in
@@ -539,6 +539,10 @@
werrstr("no memory");goto err;
}
+ if(o->td.head == nil){+ werrstr("no head table");+ goto err;
+ }
if(o->td.loca == nil){ werrstr("no loca table");goto err;
@@ -577,6 +581,8 @@
if(read_Glyf(o, g) < 0){free(g);
g = nil;
+ }else{+ g->unitsPerEm = o->td.head->unitsPerEm;
}
otfpoprange(o);
otfpoprange(o);
--- a/otf.h.in
+++ b/otf.h.in
@@ -80,4 +80,4 @@
typedef struct Glyf Glyf;
Glyf *otfglyf(Otf *o, int index);
int otfglyfnum(Otf *o);
-u8int *otfdrawglyf(Glyf *g, int h, int *wo);
+u8int *otfdrawglyf(Glyf *g, int ppem, int *wo, int *ho);
--- a/otf.rkt
+++ b/otf.rkt
@@ -209,7 +209,7 @@
{int16 xMax} {int16 yMax}#:extra
- (list (cons 'field (list (~a "ComponentGlyph *component;") (~a "SimpleGlyph *simple;")))
+ (list (cons 'field (list (~a "ComponentGlyph *component;") (~a "SimpleGlyph *simple;") (~a "u16int unitsPerEm;")))
(cons 'read
(list (~a "if(v->numberOfContours < 0 && read_ComponentGlyph(o, &v->component, 0) < 0)")
(~a " goto err;")
--- a/plan9/otf.c
+++ b/plan9/otf.c
@@ -553,6 +553,10 @@
werrstr("no memory");goto err;
}
+ if(o->td.head == nil){+ werrstr("no head table");+ goto err;
+ }
if(o->td.loca == nil){ werrstr("no loca table");goto err;
@@ -591,6 +595,8 @@
if(read_Glyf(o, g) < 0){free(g);
g = nil;
+ }else{+ g->unitsPerEm = o->td.head->unitsPerEm;
}
otfpoprange(o);
otfpoprange(o);
--- a/plan9/otf.h
+++ b/plan9/otf.h
@@ -80,7 +80,7 @@
typedef struct Glyf Glyf;
Glyf *otfglyf(Otf *o, int index);
int otfglyfnum(Otf *o);
-u8int *otfdrawglyf(Glyf *g, int h, int *wo);
+u8int *otfdrawglyf(Glyf *g, int ppem, int *wo, int *ho);
typedef struct SubHeader SubHeader;
typedef struct MapGroup MapGroup;
@@ -451,6 +451,7 @@
s16int yMax;
ComponentGlyph *component;
SimpleGlyph *simple;
+ u16int unitsPerEm;
};
int read_Glyf(Otf *o, Glyf *v);
--- a/plan9/test.c
+++ b/plan9/test.c
@@ -6,38 +6,43 @@
typedef struct Image Image;
struct Image {+ int h;
int w;
u8int *b;
};
static void
-fit(u8int *b, int bw, int bh, Image *im, int h, int *x, int *y, int gap)
+fit(u8int *b, int bw, int bh, Image *im, int maxh, int *x, int *y, int gap)
{int d;
if((bw-*x) < im->w+gap){- *y += h + gap;
+ *y += maxh + gap;
*x = gap;
}
- if((bh-*y) < h+gap)
+ if((bh-*y) < maxh+gap)
return;
- for(d = 0; d < h; d++)
+ for(d = 0; d < im->h; d++)
memcpy(b + (*y + d)*bw + *x, im->b + d*im->w, im->w);
*x += im->w + gap;
}
static void
-dumpmap(Biobuf *out, Image *im, int n, int h)
+dumpmap(Biobuf *out, Image *im, int n)
{-#define gap 2
- int total, mid, npix, bw, bh, x, y, i;
+#define gap 1
+ int total, mid, npix, bw, bh, x, y, i, maxh;
u8int *b;
total = 0;
- for(i = 0; i < n; i++)
+ maxh = 0;
+ for(i = 0; i < n; i++){+ if(maxh < im[i].h)
+ maxh = im[i].h;
total += im[i].w;
+ }
mid = total / n;
- npix = (mid+gap)*(h+gap)*n;
+ npix = (mid+gap)*(maxh+gap)*n;
bh = sqrt(npix);
bw = npix/bh;
bh *= 1.5;
@@ -48,9 +53,9 @@
memset(b, 0xff, npix);
x = y = gap;
for(i = 0; i < n; i++)
- fit(b, bw, bh, im+i, h, &x, &y, gap);
- Bprint(out, "%11s %11d %11d %11d %11d ", "k8", 0, 0, bw, y+h+gap);
- Bwrite(out, b, bw*(y+h+gap));
+ fit(b, bw, bh, im+i, maxh, &x, &y, gap);
+ Bprint(out, "%11s %11d %11d %11d %11d ", "k8", 0, 0, bw, y+maxh+gap);
+ Bwrite(out, b, bw*(y+maxh+gap));
free(b);
}
@@ -69,10 +74,10 @@
static void
usage(void)
{- fprint(2, "usage: %s [-g GLYPH_ID] [-G] [-i N] [-s PX] font.otf ...\n", argv0);
+ fprint(2, "usage: %s [-g GLYPH_ID] [-G] [-i N] [-p PPM] font.otf ...\n", argv0);
fprint(2, " -g: specifies a single glyph id\n");
fprint(2, " -G: print out glyph ids, only ones that can be drawn atm (no compound yet)\n");
- fprint(2, " -s: draw (of size PX) and write the image to stdout\n");
+ fprint(2, " -p: draw (of size in pixels per em) and write the image to stdout\n");
exits("usage");}
@@ -79,13 +84,13 @@
void
main(int argc, char **argv)
{- int i, gi, G, h;
+ int i, gi, G, ppem;
Otfile in, out;
Otf *o;
gi = -1;
G = 0;
- h = 0;
+ ppem = 0;
ARGBEGIN{case 'g':
gi = strtol(EARGF(usage()), nil, 0);
@@ -93,8 +98,8 @@
case 'G':
G++;
break;
- case 's':
- h = strtol(EARGF(usage()), nil, 0);
+ case 'p':
+ ppem = strtol(EARGF(usage()), nil, 0);
break;
default:
usage();
@@ -110,30 +115,27 @@
fprint(2, "%r\n");
continue;
}
- if(h <= 0)
+ if(ppem <= 0)
Bprint(out.aux, "%s\n", argv[i]);
if(G && gi < 0){int i, n = otfglyfnum(o);
- Image *im = h > 0 ? calloc(n, sizeof(*im)) : nil;
+ Image *im = ppem > 0 ? calloc(n, sizeof(*im)) : nil;
for(i = 0; i < n; i++){Glyf *g = otfglyf(o, i);
if(g == nil)
sysfatal("%r");- if(h > 0 && g->simple != nil && g->numberOfContours > 0){- int w;
- u8int *b = otfdrawglyf(g, h, &w);
- if(b == nil)
+ if(ppem > 0 && g->simple != nil && g->numberOfContours > 0){+ im[i].b = otfdrawglyf(g, ppem, &im[i].w, &im[i].h);
+ if(im[i].b == nil)
sysfatal("%r");- im[i].w = w;
- im[i].b = b;
- }else if(h <= 0){+ }else if(ppem <= 0){Bprint(out.aux, "%d (%s):\n", i, g->simple ? "simple" : "component");
print_Glyf(&out, indentΔ, o, g);
}
free(g);
}
- if(h > 0){- dumpmap(out.aux, im, n, h);
+ if(ppem > 0){+ dumpmap(out.aux, im, n);
for(i = 0; i < n; i++)
free(im[i].b);
free(im);
@@ -149,12 +151,12 @@
Glyf *g = otfglyf(o, gi);
if(g == nil){fprint(2, "%d: %r\n", gi);
- }else if(h > 0){+ }else if(ppem > 0){if(g->component != nil)
fprint(2, "%d: component\n", gi);
else{- int w;
- u8int *b = otfdrawglyf(g, h, &w);
+ int w, h;
+ u8int *b = otfdrawglyf(g, ppem, &w, &h);
if(b == nil)
sysfatal("%r");fprint(1, "%11s %11d %11d %11d %11d ", "k8", 0, 0, w, h);
--- a/rast.c
+++ b/rast.c
@@ -57,6 +57,8 @@
*/
#define QBZR_PIX_SCALE 4.0
+#define GAP 0
+
#define ε 1.0e-10
static int
@@ -450,21 +452,17 @@
}
u8int *
-otfdrawglyf(Glyf *g, int h, int *wo)
+otfdrawglyf(Glyf *g, int ppem, int *wo, int *ho)
{- int w, i, r, k, npts, npx, ns;
+ int w, h, i, r, k, npts, npx, ns;
Point *p₀, *p, *prev;
Spt *pts₀, *pts, *e;
- double scale;
SegQ *s₀, *s;
Sval *fp;
u8int *b;
- /* FIXME those epsilons and ceil is a rather dumb hack for now */
- scale = (double)h / (g->yMax - g->yMin) + ε;
- w = *wo = ceil((g->xMax - g->xMin) * scale + ε);
+#define scale (double)ppem/g->unitsPerEm
- npx = w * h;
ns = 0;
s₀ = nil;
@@ -507,16 +505,19 @@
s = s₀ + ns;
pts = e;
for(e = pts₀; e <= pts-3; e += 2, s++, ns++){- s->v0[0] = (e[0].x - g->xMin) * scale;
- s->v0[1] = (e[0].y - g->yMin) * scale;
- s->v1[0] = (e[1].x - g->xMin) * scale;
- s->v1[1] = (e[1].y - g->yMin) * scale;
- s->v2[0] = (e[2].x - g->xMin) * scale;
- s->v2[1] = (e[2].y - g->yMin) * scale;
+ s->v0[0] = (e[0].x - g->xMin) * scale + GAP;
+ s->v0[1] = (e[0].y - g->yMin) * scale + GAP;
+ s->v1[0] = (e[1].x - g->xMin) * scale + GAP;
+ s->v1[1] = (e[1].y - g->yMin) * scale + GAP;
+ s->v2[0] = (e[2].x - g->xMin) * scale + GAP;
+ s->v2[1] = (e[2].y - g->yMin) * scale + GAP;
}
free(pts₀);
}
+ w = ceil((g->xMax - g->xMin)*scale + 2*GAP);
+ h = ceil((g->yMax - g->yMin)*scale + 2*GAP);
+ npx = w*h;
fp = calloc(1, npx*sizeof(*fp));
r = qbzr(s₀, ns, w, h, fp);
free(s₀);
@@ -526,8 +527,11 @@
b = (u8int*)fp;
for(i = 0; i < npx; i++)
b[i] = 255 - (fp[i] <= 0 ? 0 : (fp[i] >= QBZR_PIX_SCALE ? 255 : fp[i]/QBZR_PIX_SCALE*255));
- if((b = realloc(b, npx)) != nil)
+ if((b = realloc(b, npx)) != nil){+ *wo = w;
+ *ho = h;
fp = nil;
+ }
}
free(fp);
return b;
--- a/unix/test.c
+++ b/unix/test.c
@@ -9,37 +9,42 @@
struct Image {int w;
+ int h;
u8int *b;
};
static void
-fit(u8int *b, int bw, int bh, Image *im, int h, int *x, int *y, int gap)
+fit(u8int *b, int bw, int bh, Image *im, int maxh, int *x, int *y, int gap)
{int d;
if((bw-*x) < im->w+gap){- *y += h + gap;
+ *y += maxh + gap;
*x = gap;
}
- if((bh-*y) < h+gap)
+ if((bh-*y) < maxh+gap)
return;
- for(d = 0; d < h; d++)
+ for(d = 0; d < im->h; d++)
memcpy(b + (*y + d)*bw + *x, im->b + d*im->w, im->w);
*x += im->w + gap;
}
static void
-dumpmap(FILE *out, Image *im, int n, int h)
+dumpmap(FILE *out, Image *im, int n)
{-#define gap 2
- int total, mid, npix, bw, bh, x, y, i;
+#define gap 1
+ int total, mid, npix, bw, bh, x, y, i, maxh;
u8int *b;
total = 0;
- for(i = 0; i < n; i++)
+ maxh = 0;
+ for(i = 0; i < n; i++){+ if(maxh < im[i].h)
+ maxh = im[i].h;
total += im[i].w;
+ }
mid = total / n;
- npix = (mid+gap)*(h+gap)*n;
+ npix = (mid+gap)*(maxh+gap)*n;
bh = sqrt(npix);
bw = npix/bh;
bh *= 1.5;
@@ -51,9 +56,9 @@
memset(b, 0xff, npix);
x = y = gap;
for(i = 0; i < n; i++)
- fit(b, bw, bh, im+i, h, &x, &y, gap);
- fprintf(out, "%11s %11d %11d %11d %11d ", "k8", 0, 0, bw, y+h+gap);
- fwrite(b, 1, bw*(y+h+gap), out);
+ fit(b, bw, bh, im+i, maxh, &x, &y, gap);
+ fprintf(out, "%11s %11d %11d %11d %11d ", "k8", 0, 0, bw, y+maxh+gap);
+ fwrite(b, 1, bw*(y+maxh+gap), out);
free(b);
}
@@ -99,7 +104,7 @@
fprintf(stderr, "usage: %s [-g GLYPH_ID] [-G] [-i N] [-s PX] font.otf ...\n", argv0);
fprintf(stderr, " -g: specifies a single glyph id\n");
fprintf(stderr, " -G: print out glyph ids, only ones that can be drawn atm (no compound yet)\n");
- fprintf(stderr, " -s: draw (of size PX) and write the image to stdout\n");
+ fprintf(stderr, " -p: draw (of size in pixels per em) and write the image to stdout\n");
exit(1);
}
@@ -106,13 +111,13 @@
int
main(int argc, char **argv)
{- int i, gi, G, h;
+ int i, gi, G, ppem;
Otfile in, out;
Otf *o;
gi = -1;
G = 0;
- h = 0;
+ ppem = 0;
ARGBEGIN{case 'g':
gi = strtol(EARGF(usage()), NULL, 0);
@@ -120,8 +125,8 @@
case 'G':
G++;
break;
- case 's':
- h = strtol(EARGF(usage()), NULL, 0);
+ case 'p':
+ ppem = strtol(EARGF(usage()), NULL, 0);
break;
default:
usage();
@@ -137,30 +142,27 @@
err(1, "%s", argv[i]);
if((o = otfopen(&in)) == NULL)
errx(1, "%s: %s", argv[i], otferrstr());
- if(h <= 0)
+ if(ppem <= 0)
fprintf(out.aux, "%s\n", argv[i]);
if(G && gi < 0){int i, n = otfglyfnum(o);
- Image *im = h > 0 ? calloc(n, sizeof(*im)) : NULL;
+ Image *im = ppem > 0 ? calloc(n, sizeof(*im)) : NULL;
for(i = 0; i < n; i++){Glyf *g = otfglyf(o, i);
if(g == NULL)
errx(1, "glyph %d: %s", i, otferrstr());
- if(h > 0 && g->simple != NULL && g->numberOfContours > 0){- int w;
- u8int *b = otfdrawglyf(g, h, &w);
- if(b == NULL)
+ if(ppem > 0 && g->simple != NULL && g->numberOfContours > 0){+ im[i].b = otfdrawglyf(g, ppem, &im[i].w, &im[i].h);
+ if(im[i].b == NULL)
errx(1, "glyph %d: %s", i, otferrstr());
- im[i].w = w;
- im[i].b = b;
- }else if(h <= 0){+ }else if(ppem <= 0){fprintf(out.aux, "%d (%s):\n", i, g->simple ? "simple" : "component");
print_Glyf(&out, indentΔ, o, g);
}
free(g);
}
- if(h > 0){- dumpmap(out.aux, im, n, h);
+ if(ppem > 0){+ dumpmap(out.aux, im, n);
for(i = 0; i < n; i++)
free(im[i].b);
free(im);
@@ -174,17 +176,17 @@
Glyf *g = otfglyf(o, gi);
if(g == NULL){errx(1, "glyph %d: %s", gi, otferrstr());
- }else if(h > 0){+ }else if(ppem > 0){if(g->component != NULL)
errx(1, "glyph %d: component", gi);
else{- int w;
- u8int *b = otfdrawglyf(g, h, &w);
- if(b == NULL)
+ Image im;
+ im.b = otfdrawglyf(g, ppem, &im.w, &im.h);
+ if(im.b == NULL)
errx(1, "glyph %d: %s", gi, otferrstr());
- fprintf(out.aux, "%11s %11d %11d %11d %11d ", "k8", 0, 0, w, h);
- fwrite(b, 1, w*h, out.aux);
- free(b);
+ fprintf(out.aux, "%11s %11d %11d %11d %11d ", "k8", 0, 0, im.w, im.h);
+ fwrite(im.b, 1, im.w*im.h, out.aux);
+ free(im.b);
}
}else{fprintf(out.aux, "\n%d:\n", gi);