From 259b718c9f8817dbb041cc6cbc89963499a22d6c Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Fri, 8 Nov 2024 09:34:18 +0000 Subject: [PATCH] Constants for 'OS/2' achVendID and XLFD/BDF FOUNDRY --- bedstead.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bedstead.c b/bedstead.c index 7cb4930..16d8f05 100644 --- a/bedstead.c +++ b/bedstead.c @@ -106,8 +106,11 @@ #include #include +/* Font identity information. */ #define FAMILY_NAME "Bedstead" #define VERSION "002.009" +#define VENDOR_ID "PfEd" /* For the achVendID field in the 'OS/2' table. */ +#define FOUNDRY "bjh21" /* For the XLFD/BDF FOUNDRY property. */ /* Metrics expressed in pixels. */ #define XSIZE 6 @@ -2973,7 +2976,7 @@ main(int argc, char **argv) TTXS("ulUnicodeRange2", "01010010 00000000 11111001 11111011"); TTXS("ulUnicodeRange3", "00000011 00000000 00000000 00110000"); TTXS("ulUnicodeRange4", "00000000 00000000 00000010 00000000"); - TTXS("achVendID", "PfEd"); + TTXS("achVendID", VENDOR_ID); TTXF("fsSelection", "00000001 1%c%c00000", /* Fixed: use typo metrics; WWS */ weight->ttfweight == 500 && width->ttfwidth == 5 ? '1' : '0', @@ -4208,15 +4211,15 @@ bdf_gen(int px_height) printf("/buf %d string def\n", (px_width + 7) / 8); printf("(\\\n"); printf("STARTFONT 2.1\n"); - printf("FONT -bjh21-%s-%s-R-%s--" - "%d-%d-75-75-C-%d-ISO10646-1\n", FAMILY_NAME, + printf("FONT -%s-%s-%s-R-%s--" + "%d-%d-75-75-C-%d-ISO10646-1\n", FOUNDRY, FAMILY_NAME, *weight->suffix ? weight->suffix + 1 : "Medium", *width->suffix ? width->suffix + 1 : "Normal", dpt_height, px_height, px_width * 10); printf("SIZE %d 75 75\n", pt_height); printf("FONTBOUNDINGBOX %d %d 0 %d\n", px_width, px_height, -base); printf("STARTPROPERTIES 23\n"); - printf("FOUNDRY \"bjh21\"\n"); + printf("FOUNDRY \"%s\"\n", FOUNDRY); printf("FAMILY_NAME \"%s\"\n", FAMILY_NAME); printf("WEIGHT_NAME \"%s\"\n", *weight->suffix ? weight->suffix + 1 : "Medium"); -- 2.30.2