Module Name: xsrc
Committed By: macallan
Date: Tue Mar 25 03:15:32 UTC 2025
Modified Files:
xsrc/local/programs/ttf2wsfont: Makefile main.c
Log Message:
do a better job finding the actual character boundaries
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/local/programs/ttf2wsfont/Makefile
cvs rdiff -u -r1.4 -r1.5 xsrc/local/programs/ttf2wsfont/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/local/programs/ttf2wsfont/Makefile
diff -u xsrc/local/programs/ttf2wsfont/Makefile:1.3 xsrc/local/programs/ttf2wsfont/Makefile:1.4
--- xsrc/local/programs/ttf2wsfont/Makefile:1.3 Wed Mar 21 16:24:34 2018
+++ xsrc/local/programs/ttf2wsfont/Makefile Tue Mar 25 03:15:32 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/03/21 16:24:34 martin Exp $
+# $NetBSD: Makefile,v 1.4 2025/03/25 03:15:32 macallan Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= ttf2wsfont
@@ -8,7 +8,6 @@ WARNS= 3
NOMAN=
CPPFLAGS+= -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2 -D_NETBSD_SOURCE
-
LDADD+= -lfreetype
.include <bsd.x11.mk>
Index: xsrc/local/programs/ttf2wsfont/main.c
diff -u xsrc/local/programs/ttf2wsfont/main.c:1.4 xsrc/local/programs/ttf2wsfont/main.c:1.5
--- xsrc/local/programs/ttf2wsfont/main.c:1.4 Mon Jun 8 15:01:59 2020
+++ xsrc/local/programs/ttf2wsfont/main.c Tue Mar 25 03:15:32 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.4 2020/06/08 15:01:59 rin Exp $ */
+/* $NetBSD: main.c,v 1.5 2025/03/25 03:15:32 macallan Exp $ */
/*
* Copyright (c) 2011 Michael Lorenz
@@ -59,6 +59,8 @@ push_size(int letter)
printf("%d x %d\n", face->glyph->bitmap.width, face->glyph->bitmap.rows);
printf("offset: %d %d\n", face->glyph->bitmap_left, face->glyph->bitmap_top);
new_advance = (int)(face->glyph->advance.x >> 6);
+ if (face->glyph->bitmap.width >= new_advance)
+ new_advance = face->glyph->bitmap.width + 1;
printf("advance: %d\n", new_advance);
new_above = face->glyph->bitmap_top;
new_below = face->glyph->bitmap.rows - face->glyph->bitmap_top;
@@ -104,6 +106,9 @@ main(int argc, char *argv[])
push_size('W');
push_size('g');
+ push_size(']');
+ push_size('[');
+ push_size('^');
push_size(192);
printf("above: %d below: %d advance: %d\n", above, below, advance);
width = advance;
