From: Ben Harris <bjh21@bjh21.me.uk>
Date: Fri, 1 Nov 2024 14:38:39 +0000 (+0000)
Subject: Add support for choosing font size and weight in BDF generation
X-Git-Tag: bedstead-3.246~86
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~bjharris/git?a=commitdiff_plain;h=ca7fa3a80d4a3c15f66df5e74589e1df21ce13bf;p=bedstead-debian.git

Add support for choosing font size and weight in BDF generation
---

diff --git a/bedstead.c b/bedstead.c
index 3e0ff83..68295b4 100644
--- a/bedstead.c
+++ b/bedstead.c
@@ -2768,7 +2768,18 @@ main(int argc, char **argv)
 	}
 
 	if (gen_bdf) {
-		bdf_gen(10);
+		unsigned long u;
+
+		if (argc != 2) {
+			fprintf(stderr, "--bdfgen needs precisely one size\n");
+			return EXIT_FAILURE;
+		}
+		u = strtoul(argv[1], &endptr, 10);
+		if (*endptr != '\0') {
+			fprintf(stderr, "--bdfgen needs a numeric size\n");
+			return EXIT_FAILURE;
+		}
+		bdf_gen(u);
 		return EXIT_SUCCESS;
 	}
 
@@ -3848,7 +3859,8 @@ bdf_gen(int px_height)
 	printf("/d [1 0 0 1 0 0] %d %d <ff 00> makeimagedevice def\n",
 	       (px_width + 7) / 8 * 8, px_height);
 	printf("d setdevice\n");
-	printf("/Bedstead findfont %d scalefont setfont\n", px_height);
+	printf("/%s findfont %d scalefont setfont\n",
+	       fullname_to_fontname(get_fullname()), px_height);
 	printf("/f (%%stdout) (w) file def\n");
 	printf("/buf %d string def\n", (px_width + 7) / 8);
 	printf("(\\\n");