If no font object or filename is passed to lib, pick a font file at random

This moves the random file selection into tdfonts_lib.js

We should also pick a font index at random (when opt.random is true), but
that's not happening yet.

Also fixed up some indentation issues (when using 4 space tabstops). The
original commit of this file used spaces for indentation, so it's kind of
a mess now and should be uncrustified.

exec/load/tdfonts_lib.js

@@ -82,23 +82,23 @@ function loadfont(fn_arg) {
 
     try {
 
-	const sequence = "\x55\xaa\x00\xff";
-	if(this.opt && opt.random)
-		opt.index = (map.match(new RegExp(sequence, 'g'))-1);
-
-	var index = -1;
-	var n = 0;
-	if(this.opt && opt.index>0) {
-		while (n < opt.index) {
-	    		index = map.indexOf(sequence, index + 1);
-	    		if (index === -1)
-	       			break;
-	    	n++;
-		}
-		if (index !== -1)
-    			map = map.slice(0, 20) + map.slice(index);
+		const sequence = "\x55\xaa\x00\xff";
+		if(this.opt && opt.random)
+			opt.index = (map.match(new RegExp(sequence, 'g'))-1);
+
+		var index = -1;
+		var n = 0;
+		if(this.opt && opt.index>0) {
+			while (n < opt.index) {
+					index = map.indexOf(sequence, index + 1);
+					if (index === -1)
+						break;
+				n++;
+			}
+			if (index !== -1)
+					map = map.slice(0, 20) + map.slice(index);
 
-	}
+		}
         font.namelen = map.charCodeAt(24);
         font.name = map.substring(25, 25 + font.namelen);
         font.fonttype = map.charCodeAt(41);
@@ -342,6 +342,16 @@ function reset_color()
 }
 
 function output(str, font) {
+	if (!font) { // Random font file selection
+		var fontDir = FONT_DIR;
+		var files = directory(fontDir + "/*.tdf"); // Get all .tdf files
+		if (files.length > 0) {
+			var randomIndex = random((files.length)+1);
+			var filename = file_getname(files[randomIndex]);
+			font = filename.replace(/\.tdf$/i, "");
+		}
+	}
+
 	if (typeof font == "string")
 		font = loadfont(font);
 
@@ -369,7 +379,7 @@ function output(str, font) {
     }
 
     // Calculate padding for justification
-    if (this.top && opt.justify === CENTER_JUSTIFY) {
+    if (this.opt && opt.justify === CENTER_JUSTIFY) {
         padding = Math.floor((opt.width - linewidth) / 2);
     } else if (this.opt && opt.justify === RIGHT_JUSTIFY) {
         padding = opt.width - linewidth;

exec/tdfiglet.js

@@ -48,65 +48,55 @@ for (var i = 0; i < argc; i++)
 var i = 0;
 var input_string = "";
 while (i < args.length) {
-                var arg = args[i];
+	var arg = args[i];
 
-                if (arg === "-f" && i + 1 < args.length) {
-                        fontfile = args[i + 1];
-                        i += 2;
-                } else if (arg === "-j" && i + 1 < args.length) {
-                        switch (args[i + 1]) {
-                                case "l":
-                                        opt.justify = LEFT_JUSTIFY;
-                                        break;
-                                case "r":
-                                        opt.justify = RIGHT_JUSTIFY;
-                                        break;
-                                case "c":
-                                        opt.justify = CENTER_JUSTIFY;
-                                        break;
-                                default:
-                                        log("Invalid justification option. Use l, r, or c.");
-					exit(1);
-                        }
-                        i += 2;
-                } else if (arg === "-w" && i + 1 < args.length) {
-                        opt.width = parseInt(args[i + 1], 10);
-                        i += 2;
-                } else if (arg === "-x" && i + 1 < args.length) {
-                        opt.index = parseInt(args[i + 1], 10);
-                        i += 2;
-                } else if (arg === "-a") {
-					opt.ansi = true;
-					++i;
-				} else if (arg === "-u") {
-					opt.utf8 = true;
-					++i;
-                } else if (arg === "-i") {
-                        opt.info = true;
-                        i += 1;
-                } else if (arg === "-r") {
-                        opt.random = true;
-                        i += 1;
-                } else if (arg === "-h") {
-                        usage();
-                } else {
-                        input_string += (input_string ? " " : "") + arg;
-                        i += 1;
-                }
-        }
-
-
-// Handle random font selection
-if (!fontfile && opt.random) {
-	var fontDir = FONT_DIR;
-	var files = directory(fontDir + "/*.tdf"); // Get all .tdf files
-	if (files.length > 0) {
-		var randomIndex = random((files.length)+1);
-		var filename = file_getname(files[randomIndex]);
-		fontfile = filename.replace(/\.tdf$/i, "");
+	if (arg === "-f" && i + 1 < args.length) {
+		fontfile = args[i + 1];
+		i += 2;
+	} else if (arg === "-j" && i + 1 < args.length) {
+		switch (args[i + 1]) {
+			case "l":
+					opt.justify = LEFT_JUSTIFY;
+					break;
+			case "r":
+					opt.justify = RIGHT_JUSTIFY;
+					break;
+			case "c":
+					opt.justify = CENTER_JUSTIFY;
+					break;
+			default:
+					log("Invalid justification option. Use l, r, or c.");
+			exit(1);
+		}
+		i += 2;
+	} else if (arg === "-w" && i + 1 < args.length) {
+		opt.width = parseInt(args[i + 1], 10);
+		i += 2;
+	} else if (arg === "-x" && i + 1 < args.length) {
+		opt.index = parseInt(args[i + 1], 10);
+		i += 2;
+	} else if (arg === "-a") {
+		opt.ansi = true;
+		++i;
+	} else if (arg === "-u") {
+		opt.utf8 = true;
+		++i;
+	} else if (arg === "-i") {
+		opt.info = true;
+		i += 1;
+	} else if (arg === "-r") {
+		opt.random = true;
+		i += 1;
+	} else if (arg === "-h") {
+		usage();
+	} else {
+		input_string += (input_string ? " " : "") + arg;
+		i += 1;
 	}
 }
-if (!fontfile)
+
+
+if (!fontfile && !opt.random)
 	usage();
 
 writeln("");