Skip to content
Snippets Groups Projects
Commit c9086f14 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

When random mode is specified and multiple fonts exist in font file...

pick one at random.

Display the font index value when the info mode is requested.
parent 06b2c30f
No related branches found
No related tags found
No related merge requests found
...@@ -85,20 +85,19 @@ function loadfont(fn_arg) { ...@@ -85,20 +85,19 @@ function loadfont(fn_arg) {
const sequence = "\x55\xaa\x00\xff"; const sequence = "\x55\xaa\x00\xff";
if(this.opt && opt.random) if(this.opt && opt.random)
opt.index = (map.match(new RegExp(sequence, 'g'))-1); opt.index = random(map.split(sequence).length);
var index = -1;
var n = 0;
if(this.opt && opt.index>0) { if(this.opt && opt.index>0) {
var index = -1;
var n = 0;
while (n < opt.index) { while (n < opt.index) {
index = map.indexOf(sequence, index + 1); index = map.indexOf(sequence, index + 1);
if (index === -1) if (index === -1)
break; break;
n++; n++;
} }
if (index !== -1) if (index !== -1)
map = map.slice(0, 20) + map.slice(index); map = map.slice(0, 20) + map.slice(index);
} }
font.namelen = map.charCodeAt(24); font.namelen = map.charCodeAt(24);
font.name = map.substring(25, 25 + font.namelen); font.name = map.substring(25, 25 + font.namelen);
...@@ -128,7 +127,9 @@ function loadfont(fn_arg) { ...@@ -128,7 +127,9 @@ function loadfont(fn_arg) {
} }
if (this.opt && opt.info) { if (this.opt && opt.info) {
write("font: " + font.name + "\nchar list: "); writeln("index: " + opt.index);
writeln("font: " + font.name);
writeln("char list: ");
} }
// Determine overall font height and validate glyph addresses // Determine overall font height and validate glyph addresses
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment