From c6cad702bcea7f7836153b9b7f6ad847e3bd605e Mon Sep 17 00:00:00 2001
From: Pierre-Yves Rollo <dev@pyrollo.com>
Date: Sun, 8 Jul 2018 20:36:34 +0200
Subject: Creation of Font class and code update accordingly

---
 font_api/tools/make_font_lua.sh      | 19 +++++++++++++++++--
 font_api/tools/make_font_textures.sh |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'font_api/tools')

diff --git a/font_api/tools/make_font_lua.sh b/font_api/tools/make_font_lua.sh
index ae24001..e858360 100755
--- a/font_api/tools/make_font_lua.sh
+++ b/font_api/tools/make_font_lua.sh
@@ -3,6 +3,17 @@
 scriptname=$(basename $0)
 identify="identify"
 
+usage() {
+	echo "Usage: $0 fontname"
+	echo "fontname: The name of the font. Must correspond to existing texture/font_<fontname>_????.png files"
+}
+
+if [ $# -ne 1 ]
+then
+	usage
+	exit 1
+fi
+
 font_name=$1
 
 for f in textures/font_${font_name}_????.png
@@ -41,8 +52,12 @@ $luafile generated by $scriptname $(LANG=en_US date)
 
 font_api.register_font(
 	'$font_name',
-	$font_height,
-	{ $font_widths }
+	{
+		height = $font_height,
+		widths = {
+			$font_widths
+		},
+	}
 );
 " > font_$font_name.lua
 
diff --git a/font_api/tools/make_font_textures.sh b/font_api/tools/make_font_textures.sh
index 6f4959d..4a3191c 100755
--- a/font_api/tools/make_font_textures.sh
+++ b/font_api/tools/make_font_textures.sh
@@ -67,7 +67,7 @@ generate() {
 mkdir textures
 
 # Reads all available code points in the font.
-codepoints=$(ttx -o - $fontfile | grep "<map code=" | cut -d \" -f 2)
+codepoints=$(ttx -o - "$fontfile" | grep "<map code=" | cut -d \" -f 2)
 
 # Mandatory chars
 generate 0020 007f
-- 
cgit v1.2.3