From 2f71e82a1e5c7c6aaa1ec8901fe7ad7038d40c3b Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on Debian Linux)" <rob@synchro.net>
Date: Thu, 24 Apr 2025 17:42:00 -0700
Subject: [PATCH] Don't load() tdfonts_lib.js into global scope, doesn't work
with ;exec command
Use the lib as recommended.
Don't set the opt.width default value here, allowing for auto-detection.
---
exec/tdfiglet.js | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/exec/tdfiglet.js b/exec/tdfiglet.js
index 9414005ed7..699f6f31b6 100644
--- a/exec/tdfiglet.js
+++ b/exec/tdfiglet.js
@@ -5,12 +5,11 @@
* @format.tab-size 4, @format.use-tabs true
*/
-load("tdfonts_lib.js");
+var tdf = load("tdfonts_lib.js");
// Global options object (using var)
-opt = {
+tdf.opt = {
justify: LEFT_JUSTIFY,
- width: DEFAULT_WIDTH,
random: false,
info: false
};
@@ -51,13 +50,13 @@ for(i = 0; i < argv.length; ++i) {
} else if (arg === "-j" && i + 1 < argv.length) {
switch (argv[i + 1]) {
case "l":
- opt.justify = LEFT_JUSTIFY;
+ tdf.opt.justify = LEFT_JUSTIFY;
break;
case "r":
- opt.justify = RIGHT_JUSTIFY;
+ tdf.opt.justify = RIGHT_JUSTIFY;
break;
case "c":
- opt.justify = CENTER_JUSTIFY;
+ tdf.opt.justify = CENTER_JUSTIFY;
break;
default:
alert("Invalid justification option. Use l, r, or c.");
@@ -65,19 +64,19 @@ for(i = 0; i < argv.length; ++i) {
}
++i;
} else if (arg === "-w" && i + 1 < argv.length) {
- opt.width = parseInt(argv[i + 1], 10);
+ tdf.opt.width = parseInt(argv[i + 1], 10);
++i;
} else if (arg === "-x" && i + 1 < argv.length) {
- opt.index = parseInt(argv[i + 1], 10);
+ tdf.opt.index = parseInt(argv[i + 1], 10);
++i;
} else if (arg === "-a") {
- opt.ansi = true;
+ tdf.opt.ansi = true;
} else if (arg === "-u") {
- opt.utf8 = true;
+ tdf.opt.utf8 = true;
} else if (arg === "-i") {
- opt.info = true;
+ tdf.opt.info = true;
} else if (arg === "-r") {
- opt.random = true;
+ tdf.opt.random = true;
} else if (arg === "-h") {
usage();
} else {
@@ -85,9 +84,9 @@ for(i = 0; i < argv.length; ++i) {
}
}
-if (!fontfile && !opt.random)
+if (!fontfile && !tdf.opt.random)
usage();
writeln("");
-printstr(input_string, fontfile);
+tdf.printstr(input_string, fontfile);
--
GitLab