From c5af0423dba8144eb65067029e1f677383096a73 Mon Sep 17 00:00:00 2001 From: "Rob Swindell (on Debian Linux)" <rob@synchro.net> Date: Thu, 24 Apr 2025 16:30:41 -0700 Subject: [PATCH] Support combination use of tdfiglet -x and -r options e.g. to use only the first font (index 0) from a randomly selected font file. --- exec/load/tdfonts_lib.js | 2 +- exec/tdfiglet.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exec/load/tdfonts_lib.js b/exec/load/tdfonts_lib.js index b64a365a74..c78085c8f3 100644 --- a/exec/load/tdfonts_lib.js +++ b/exec/load/tdfonts_lib.js @@ -84,7 +84,7 @@ function loadfont(fn_arg) { try { const sequence = "\x55\xaa\x00\xff"; - if(this.opt && opt.random) + if(this.opt && opt.random && opt.index === undefined) opt.index = random(map.split(sequence).length); if(this.opt && opt.index>0) { diff --git a/exec/tdfiglet.js b/exec/tdfiglet.js index fcbf761e32..92e7a199c3 100644 --- a/exec/tdfiglet.js +++ b/exec/tdfiglet.js @@ -12,8 +12,7 @@ opt = { justify: LEFT_JUSTIFY, width: DEFAULT_WIDTH, random: false, - info: false, - index: 0 + info: false }; // Function declarations (Synchronet JS style) -- GitLab