aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Yves Rollo <dev@pyrollo.com>2018-01-13 12:38:55 +0100
committerPierre-Yves Rollo <dev@pyrollo.com>2018-01-13 12:38:55 +0100
commita71ae8e01314d0653f785a022a898636cdf54424 (patch)
treeaecda4d91903f4b983c5c86feb442d19608fc66a
parent5cf61f9e23a2057d6ce0c4213b3095820fc6920e (diff)
downloaddisplay_modpack-a71ae8e01314d0653f785a022a898636cdf54424.tar.gz
display_modpack-a71ae8e01314d0653f785a022a898636cdf54424.tar.bz2
display_modpack-a71ae8e01314d0653f785a022a898636cdf54424.zip
Version 1.0
-rw-r--r--README.md14
-rw-r--r--display_lib/README.md2
-rw-r--r--font_lib/API.md80
-rw-r--r--font_lib/font_default.lua12
-rw-r--r--font_lib/init.lua244
-rw-r--r--font_lib/textures/font_default_0000.pngbin145 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0020.pngbin281 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0021.pngbin299 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0022.pngbin290 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0023.pngbin304 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0024.pngbin314 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0025.pngbin312 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0026.pngbin319 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0027.pngbin290 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0028.pngbin303 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0029.pngbin301 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_002a.pngbin289 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_002b.pngbin297 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_002c.pngbin290 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_002d.pngbin287 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_002e.pngbin289 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_002f.pngbin299 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0030.pngbin302 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0031.pngbin300 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0032.pngbin312 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0033.pngbin313 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0034.pngbin314 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0035.pngbin317 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0036.pngbin312 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0037.pngbin308 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0038.pngbin300 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0039.pngbin315 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_003a.pngbin289 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_003b.pngbin292 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_003c.pngbin290 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_003d.pngbin290 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_003e.pngbin289 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_003f.pngbin310 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0040.pngbin323 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0041.pngbin313 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0042.pngbin302 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0043.pngbin320 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0044.pngbin308 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0045.pngbin302 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0046.pngbin305 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0047.pngbin327 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0048.pngbin304 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0049.pngbin292 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_004a.pngbin304 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_004b.pngbin320 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_004c.pngbin298 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_004d.pngbin317 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_004e.pngbin315 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_004f.pngbin314 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0050.pngbin309 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0051.pngbin322 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0052.pngbin303 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0053.pngbin316 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0054.pngbin301 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0055.pngbin299 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0056.pngbin306 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0057.pngbin313 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0058.pngbin308 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0059.pngbin306 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_005a.pngbin307 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_005b.pngbin297 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_005c.pngbin297 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_005d.pngbin298 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_005e.pngbin303 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_005f.pngbin286 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0060.pngbin284 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0061.pngbin316 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0062.pngbin307 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0063.pngbin307 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0064.pngbin314 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0065.pngbin313 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0066.pngbin306 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0067.pngbin314 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0068.pngbin305 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0069.pngbin292 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_006a.pngbin293 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_006b.pngbin311 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_006c.pngbin292 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_006d.pngbin306 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_006e.pngbin308 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_006f.pngbin302 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0070.pngbin315 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0071.pngbin314 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0072.pngbin303 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0073.pngbin306 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0074.pngbin304 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0075.pngbin295 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0076.pngbin300 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0077.pngbin304 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0078.pngbin302 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_0079.pngbin306 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_007a.pngbin296 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_007b.pngbin297 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_007c.pngbin134 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_007d.pngbin297 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_007e.pngbin294 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_008a.pngbin316 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_008d.pngbin302 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00a1.pngbin139 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00b1.pngbin139 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00bf.pngbin144 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00c0.pngbin160 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00c1.pngbin160 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00c2.pngbin158 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00c3.pngbin161 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00c4.pngbin158 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00c5.pngbin165 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00c6.pngbin162 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00c7.pngbin327 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00c8.pngbin152 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00c9.pngbin150 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00ca.pngbin151 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00cb.pngbin147 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00cc.pngbin137 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00cd.pngbin138 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00ce.pngbin142 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00cf.pngbin140 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00d0.pngbin158 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00d1.pngbin160 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00d2.pngbin160 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00d3.pngbin161 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00d4.pngbin163 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00d5.pngbin163 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00d6.pngbin160 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00d7.pngbin136 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00d8.pngbin162 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00d9.pngbin146 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00da.pngbin145 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00db.pngbin150 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00dc.pngbin150 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00dd.pngbin155 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00e0.pngbin317 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00e1.pngbin314 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00e2.pngbin316 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00e3.pngbin319 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00e4.pngbin317 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00e5.pngbin318 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00e6.pngbin323 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00e7.pngbin311 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00e8.pngbin319 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00e9.pngbin312 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00ea.pngbin318 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00eb.pngbin316 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00ec.pngbin302 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00ed.pngbin292 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00ee.pngbin298 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00ef.pngbin300 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00f2.pngbin307 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00f4.pngbin312 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00f5.pngbin311 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00f6.pngbin305 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00f7.pngbin134 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00f9.pngbin298 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00fa.pngbin298 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00fb.pngbin307 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00fc.pngbin297 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00fd.pngbin306 -> 0 bytes
-rw-r--r--font_lib/textures/font_default_00ff.pngbin305 -> 0 bytes
-rwxr-xr-xfont_lib/tools/make_font_lua.sh12
-rw-r--r--ontime_clocks/README.md2
-rw-r--r--signs/README.md2
-rw-r--r--signs/nodes.lua6
-rw-r--r--signs_road/README.md2
-rw-r--r--signs_road/nodes.lua28
-rw-r--r--steles/README.md2
-rw-r--r--steles/nodes.lua2
171 files changed, 251 insertions, 157 deletions
diff --git a/README.md b/README.md
index 80fe3f3..def1949 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,20 @@ For more information, see the [forum topic](https://forum.minetest.net/viewtopic
## Changelog
+### 2018-01-13 (Version 1.0)
+
+- Switch to Epilepsy font by KREATIVE SOFTWARE
+
+- Add settings "default_font"
+
+- Add horizontal alignment
+
+- Add tool for creating font textures from .ttf font files
+
+- Fix UTF 8 to Unicode decoding
+
+- Updated forum thread link in README.md
+
### 2017-12-19
This change is a preparation to merge Andrzej Pieńkowski fork (apienk) : new font and support of UTF chars.
diff --git a/display_lib/README.md b/display_lib/README.md
index 3f8571a..88a39ee 100644
--- a/display_lib/README.md
+++ b/display_lib/README.md
@@ -10,5 +10,5 @@ This library's purpose is to ease creation of nodes with one or more displays on
**API**: See [API.md](https://github.com/pyrollo/display_modpack/blob/master/display_lib/API.md) document please.
-For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?f=11&t=13563) at the Minetest forums.
+For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?t=19365) at the Minetest forums.
diff --git a/font_lib/API.md b/font_lib/API.md
index b8bc97a..1b79b55 100644
--- a/font_lib/API.md
+++ b/font_lib/API.md
@@ -1,6 +1,11 @@
# Font Lib API
This document describes Font Lib API. Font Lib creates textures for font display on entities.
+## Settings
+### default_font
+Name of the font to be used when no font is given. The font should be registered.
+If no default\_font given or if default\_font given but not registered, the first registered font will be used as default.
+
## Provided methods
### get\_text\_size
**font\_lib.get\_text\_size(font\_name, text)**
@@ -8,9 +13,7 @@ This document describes Font Lib API. Font Lib creates textures for font display
Computes size for a given font and text
**font\_name**: Font name of registered font to use
-
**text**: Text to be rendered
-
**Returns**: rendered text width, height
### make\_line\_texture
@@ -19,36 +22,25 @@ Computes size for a given font and text
Builds texture part for a text line
**font\_name**: Font name of registered font to use
-
**text**: Text to be rendered
-
**texturew**: Width of the texture (extra text is not rendered)
-
**x**: Starting x position in texture
-
**y**: Vertical position of the line in texture
-
**Returns**: Texture string
### make\_multiline\_texture
-**font\_lib.make\_multiline\_texture(font\_name, text, width, height, maxlines, valign, color)**
+**font\_lib.make\_multiline\_texture(font\_name, text, width, height, maxlines, halign, valign, color)**
Builds texture for a multiline colored text
**font\_name**: Font name of registered font to use
-
**text**: Text to be rendered
-
**texturew**: Width of the texture (extra text will be truncated)
-
**textureh**: Height of the texture
-
**maxlines**: Maximum number of lines
-
-**valign**: Vertical text align ("top", "bottom" or "center")
-
-**color**: Color of the text
-
+**halign**: Horizontal text align ("left", "right" or "center") (optional)
+**valign**: Vertical text align ("top", "bottom" or "center") (optional)
+**color**: Color of the text (optional)
**Returns**: Texture string
### register\_font
@@ -57,34 +49,62 @@ Builds texture for a multiline colored text
Registers a new font in font_lib.
**font\_name**: Name of the font to register (this name will be used to address the font later)
+If registering different sizes of the same font, add size in the font name (e.g. times\_10, times\_12...).
+**height**: Font height in pixels (all font textures should have the same height)
+**widths** : Array of character widths in pixels, indexed by UTF codepoints
-**height**: Height of the font in pixels (all font textures should have the same height)
-
-**widths** : An array containing the width of each font texture, indexed by its UTF code
+Font must have a char 0 which will be used to display any unknown char.
All textures corresponding to the indexes in **widths** array should be present in textures directory with a name matching the pattern :
**font\_<font\_name>_<utf\_code>.png**
-<font\_name>: Name of the font as given in the first argument
-
-<utf\_code>: UTF code of the char in 4 hexadecimal digits
+**<font\_name>**: Name of the font as given in the first argument
+**<utf\_code>**: UTF code of the char in 4 hexadecimal digits
To ease that declaration, a shell is provided to build a <font\_name>.lua file from the texture files (see provided tools).
-### set\_fallback\_font
-**function font\_lib.set\_fallback\_font(font\_name)**
+## Provided tools
+
+Still in early stage of development, these tools are helpers to create font mods.
-Defines the fallback font to be used instead of given font if not registered.
+### make_font_texture.sh
-**font\_name**: Name of the font to be used as fallback font (has to be registered)
+This scripts takes a .ttf file as input and create one .png file per char, that can be used as font texture. Launch it from your future font mod directory.
-## Provided tools
+__Advice__
+
+This script works much better with pixels font, providing the correct height. There is no antialiasing at all, vector fonts and bad heights gives very ugly results.
+
+__Syntax__
+
+**make\_font\_texture.sh <fontfile> <fontname> <fontsize>**
+
+**<fontfile>**: A TTF font file to use to create textures.
+**<fontname>**: The font name to be used in font_lib (should be simple, with no spaces).
+**<fontsize>**: Font height to be rendered.
### make_font_lua.sh
-Still in early stage of development.
+This script analyses textures in textures directory and creates a font\_<font\_name>.lua files with a call to register_font with images information. Launch it from your future font mod directory.
+
+Once the font\_<font\_name>.lua created, it can be included by a init.lua file or directly renamed to init.lua if you are creating a simple font mod.
+
+__Syntax__
+
+**make\_font_lua.sh <fontname>**
+
+**<fontname>**: The font name to be used in font_lib (same as given to make\_font\_texture.sh)
+
+### An exemple generating a font mod
+
+ mkdir font_myfont
+ cd font_myfont
+ /<path_to_font_lib>/tools/make_font_texture.sh myfont.ttf myfont 12
+ /<path_to_font_lib>/tools/make_font_lua.sh myfont
+ mv font_myfont.lua init.lua
+
+
-This script analyses textures in textures directory and creates a font\_<font\_name>.lua files with a call to register_font with images information.
diff --git a/font_lib/font_default.lua b/font_lib/font_default.lua
deleted file mode 100644
index 2bd8093..0000000
--- a/font_lib/font_default.lua
+++ /dev/null
@@ -1,12 +0,0 @@
---[[
-
- generated by tools/make_font_lua.sh Thu Dec 21 21:45:53 CET 2017
-
---]]
-
-font_lib.register_font(
- 'default',
- 12,
- { [0]=6, [32]=4, [33]=3, [34]=4, [35]=7, [36]=6, [37]=8, [38]=8, [39]=3, [40]=4, [41]=4, [42]=4, [43]=7, [44]=3, [45]=5, [46]=3, [47]=5, [48]=6, [49]=4, [50]=6, [51]=6, [52]=7, [53]=6, [54]=6, [55]=6, [56]=6, [57]=6, [58]=3, [59]=3, [60]=5, [61]=6, [62]=5, [63]=6, [64]=11, [65]=8, [66]=7, [67]=8, [68]=7, [69]=6, [70]=6, [71]=8, [72]=7, [73]=3, [74]=6, [75]=8, [76]=6, [77]=10, [78]=8, [79]=8, [80]=7, [81]=8, [82]=7, [83]=7, [84]=7, [85]=7, [86]=8, [87]=11, [88]=8, [89]=9, [90]=7, [91]=4, [92]=5, [93]=4, [94]=5, [95]=7, [96]=3, [97]=7, [98]=6, [99]=5, [100]=6, [101]=6, [102]=5, [103]=6, [104]=6, [105]=3, [106]=3, [107]=7, [108]=3, [109]=9, [110]=6, [111]=6, [112]=6, [113]=6, [114]=5, [115]=6, [116]=4, [117]=6, [118]=6, [119]=8, [120]=7, [121]=6, [122]=6, [123]=5, [124]=3, [125]=5, [126]=6, [138]=6, [141]=3, [161]=3, [177]=6, [191]=6, [192]=8, [193]=8, [194]=8, [195]=8, [196]=8, [197]=8, [198]=10, [199]=8, [200]=6, [201]=6, [202]=6, [203]=6, [204]=3, [205]=3, [206]=3, [207]=3, [208]=8, [209]=8, [210]=8, [211]=8, [212]=8, [213]=8, [214]=8, [215]=6, [216]=8, [217]=7, [218]=7, [219]=7, [220]=7, [221]=9, [224]=7, [225]=7, [226]=7, [227]=7, [228]=7, [229]=7, [230]=9, [231]=5, [232]=6, [233]=6, [234]=6, [235]=6, [236]=3, [237]=3, [238]=3, [239]=3, [242]=6, [244]=6, [245]=6, [246]=6, [247]=6, [249]=6, [250]=6, [251]=6, [252]=6, [253]=6, [255]=6 }
-);
-
diff --git a/font_lib/init.lua b/font_lib/init.lua
index 9b10e76..76a6b38 100644
--- a/font_lib/init.lua
+++ b/font_lib/init.lua
@@ -18,11 +18,18 @@
--]]
-- Global variables
+-------------------
font_lib = {}
-font_lib.path = minetest.get_modpath("font_lib")
+font_lib.name = minetest.get_current_modname()
+font_lib.path = minetest.get_modpath(font_lib.name)
font_lib.registered_fonts = {}
+-- Local variables
+------------------
+
+local default_font = false
+
-- Local functions
------------------
@@ -41,38 +48,41 @@ local function split_lines(text, maxlines)
end
end
--- Returns next char, managing ascii and unicode plane 0 (0000-FFFF).
+-- Gets a default (settings or fist font)
-local function get_next_char(text, pos)
- pos = pos + 1
- local char = text:sub(pos, pos):byte()
+local function get_default_font()
+ -- First call
+ if default_font == false then
+ default_font = nil
- -- 1 byte char
- if char < 0x80 then
- return char, pos
- end
+ -- First, try with settings
+ local settings_font = minetest.settings:get("default_font")
- -- 4 bytes char not managed
- if char >= 0xF0 then
- pos = pos + 3
- return 0, pos
- end
-
- -- 3 bytes char not managed
- if char >= 0xE0 then
- pos = pos + 2
- return 0, pos
- end
-
- -- 2 bytes char (little endian)
- if char >= 0xC2 then
- pos = pos + 1
- return (char - 0xC2) * 0x40 + text:sub(pos, pos):byte(), pos
- end
+ if settings_font ~= nil and settings_font ~= "" then
+ default_font = font_lib.registered_fonts[settings_font]
- -- Not an UTF char
- return 0, pos
+ if default_font == nil then
+ minetest.log("warning", "Default font in settings (\""..
+ settings_font.."\") is not registered.")
+ end
+ end
+
+ -- If failed, choose first font
+ if default_font == nil then
+ for _, font in pairs(font_lib.registered_fonts) do
+ default_font = font
+ break
+ end
+ end
+ -- Error, no font registered
+ if default_font == nil then
+ minetest.log("error",
+ "No font registred, unable to choose a default font.")
+ end
+ end
+
+ return default_font
end
-- Returns font properties to be used according to font_name
@@ -81,7 +91,7 @@ local function get_font(font_name)
local font = font_lib.registered_fonts[font_name]
if font == nil then
- local message
+ local message
if font_name == nil then
message = "No font given"
@@ -89,17 +99,49 @@ local function get_font(font_name)
message = "Font \""..font_name.."\" unregistered"
end
- if font_lib.fallback_font == nil then
- minetest.log("error", message.." and no other font registered.")
- else
- minetest.log("info", message..", using font \""..font_lib.fallback_font.."\".")
- font = font_lib.registered_fonts[font_lib.fallback_font]
+ font = get_default_font()
+
+ if font ~= nil then
+ minetest.log("info", message..", using font \""..font.name.."\".")
end
end
return font
end
+-- Returns next char, managing ascii and unicode plane 0 (0000-FFFF).
+
+local function get_next_char(text, pos)
+
+ local msb = text:byte(pos)
+ -- 1 byte char, ascii equivalent codepoints
+ if msb < 0x80 then
+ return msb, pos + 1
+ end
+
+ -- 4 bytes char not managed (Only 16 bits codepoints are managed)
+ if msb >= 0xF0 then
+ return 0, pos + 4
+ end
+
+ -- 3 bytes char
+ if msb >= 0xE0 then
+ return (msb - 0xE0) * 0x1000
+ + text:byte(pos + 1) % 0x40 * 0x40
+ + text:byte(pos + 2) % 0x40,
+ pos + 3
+ end
+
+ -- 2 bytes char (little endian)
+ if msb >= 0xC2 then
+ return (msb - 0xC2) * 0x40 + text:byte(pos + 1),
+ pos + 2
+ end
+
+ -- Not an UTF char
+ return 0, pos + 1
+end
+
-- API functions
----------------
@@ -111,21 +153,23 @@ end
function font_lib.get_text_size(font_name, text)
local char
local width = 0
- local pos = 0
+ local pos = 1
local font = get_font(font_name)
if font == nil then
return 0, 0
else
- while pos < #text do
+ while pos <= #text do
char, pos = get_next_char(text, pos)
- -- Ignore chars with no texture
+ -- Replace chars with no texture by the NULL(0) char
if font.widths[char] ~= nil then
width = width + font.widths[char]
+ else
+ width = width + font.widths[0]
end
end
end
-
+
return width, font.height
end
@@ -137,32 +181,33 @@ end
-- @param y Vertical position of the line in texture
-- @return Texture string
---> ADD ALIGN
function font_lib.make_line_texture(font_name, text, width, x, y)
local texture = ""
local char
- local pos = 0
+ local pos = 1
local font = get_font(font_name)
if font ~= nil then
- while pos < #text do
+ while pos <= #text do
char, pos = get_next_char(text, pos)
-
- -- Ignore chars with no texture
- if font.widths[char] ~= nil then
- -- Add image only if it is visible (at least partly)
- if x + font.widths[char] >= 0 and x <= width then
- texture = texture..
- string.format(":%d,%d=font_%s_%04x.png",
- x, y, font.name, char)
- end
- x = x + font.widths[char]
- else
- print(string.format("Missing char %d (%04x)",char,char))
+
+ -- Replace chars with no texture by the NULL(0) char
+ if font.widths[char] == nil then
+ print(string.format("["..font_lib.name
+ .."] Missing char %d (%04x)",char,char))
+ char = 0
end
+
+ -- Add image only if it is visible (at least partly)
+ if x + font.widths[char] >= 0 and x <= width then
+ texture = texture..
+ string.format(":%d,%d=font_%s_%04x.png",
+ x, y, font.name, char)
+ end
+ x = x + font.widths[char]
end
end
-
+
return texture
end
@@ -172,43 +217,53 @@ end
-- @param texturew Width of the texture (extra text will be truncated)
-- @param textureh Height of the texture
-- @param maxlines Maximum number of lines
--- @param valign Vertical text align ("top" or "center")
--- @param color Color of the text
+-- @param halign Horizontal text align ("left"/"center"/"right") (optional)
+-- @param valign Vertical text align ("top"/"center"/"bottom") (optional)
+-- @param color Color of the text (optional)
-- @return Texture string
function font_lib.make_multiline_texture(font_name, text, width, height,
- maxlines, valign, color)
+ maxlines, halign, valign, color)
local texture = ""
local lines = {}
local textheight = 0
local y, w, h
-
+
for num, line in pairs(split_lines(text, maxlines)) do
w, h = font_lib.get_text_size(font_name, line)
lines[num] = { text = line, width = w, height = h, }
textheight = textheight + h
end
-
+
if #lines then
if valign == "top" then
y = 0
elseif valign == "bottom" then
y = height - textheight
- else
+ else
y = (height - textheight) / 2
end
end
-
+
for _, line in pairs(lines) do
- texture = texture..
- font_lib.make_line_texture(font_name, line.text, width,
- (width - line.width) / 2, y)
+ if halign == "left" then
+ texture = texture..
+ font_lib.make_line_texture(font_name, line.text, width,
+ 0, y)
+ elseif halign == "right" then
+ texture = texture..
+ font_lib.make_line_texture(font_name, line.text, width,
+ width - line.width, y)
+ else
+ texture = texture..
+ font_lib.make_line_texture(font_name, line.text, width,
+ (width - line.width) / 2, y)
+ end
y = y + line.height
end
texture = string.format("[combine:%dx%d", width, height)..texture
if color then texture = texture.."^[colorize:"..color end
-
return texture
end
@@ -217,40 +272,48 @@ end
-- font_<name>_<code>.png
-- <name> : name of the font
-- <code> : 4 digit hexadecimal unicode of the char
--- If registering different sizes, add size in the font name (e.g. times_10, times_12...)
+-- @param font_name Name of the font to register
+-- If registering different sizes of the same font, add size in the font name
+-- (e.g. times_10, times_12...).
-- @param height Font height in pixels
--- @param widths Array of character widths in pixel, indexed by unicode number.
+-- @param widths Array of character widths in pixels, indexed by UTF codepoints
function font_lib.register_font(font_name, height, widths)
+
if font_lib.registered_fonts[font_name] ~= nil then
minetest.log("error", "Font \""..font_name.."\" already registered.")
return
end
-
- font_lib.registered_fonts[font_name] =
- { name = font_name, height = height, widths = widths }
-
- -- If no fallback font, set it (so, first font registered will be the default fallback font)
- if font_lib.fallback_font == nil then
- font_lib.fallback_font = font_name
- end
-end
---- Define the fallback font
--- This font will be used instead of given font if not registered.
--- @param font_name Name of the font to be used as fallback font (has to be registered).
+ if height == nil or height <= 0 then
+ minetest.log("error", "Font \""..font_name..
+ "\" must have a positive height.")
+ return
+ end
-function font_lib.set_fallback_font(font_name)
- if font_lib.registered_fonts[font_name] == nil then
- minetest.log("error", "Fallback font \""..font_name.."\" not registered.")
- else
- font_lib.fallback_font = font_name
+ if type(widths) ~= "table" then
+ minetest.log("error", "Font \""..font_name..
+ "\" must have a widths array.")
+ return
end
+
+ if widths[0] == nil then
+ minetest.log("error", "Font \""..font_name..
+ "\" must have a char with codepoint 0 (=unknown char).")
+ return
+ end
+
+ font_lib.registered_fonts[font_name] =
+ { name = font_name, height = height, widths = widths }
+
+ -- Force to choose again default font
+ -- (allows use of fonts registered after start)
+ default_font = false
end
--- Standard on_display_update entity callback.
--- Node should have a corresponding display_entity with size, resolution and maxlines fields and
--- optionally valign and color fields
+-- Node should have a corresponding display_entity with size, resolution and
+-- maxlines fields and optionally halign, valign and color fields
-- @param pos Node position
-- @param objref Object reference of entity
@@ -262,15 +325,16 @@ function font_lib.on_display_update(pos, objref)
if entity and ndef.display_entities[entity.name] then
local def = ndef.display_entities[entity.name]
+ local font = get_font(def.font_name)
objref:set_properties({
textures={font_lib.make_multiline_texture(
- def.font_name, text, def.size.x*def.resolution.x, def.size.y*def.resolution.y,
- def.maxlines, def.valign, def.color)},
+ def.font_name, text,
+ def.size.x * def.resolution.x * font.height,
+ def.size.y * def.resolution.y * font.height,
+ def.maxlines, def.halign, def.valign, def.color)},
visual_size = def.size
})
end
end
-dofile(font_lib.path.."/font_default.lua")
-
diff --git a/font_lib/textures/font_default_0000.png b/font_lib/textures/font_default_0000.png
deleted file mode 100644
index 65e43a7..0000000
--- a/font_lib/textures/font_default_0000.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0020.png b/font_lib/textures/font_default_0020.png
deleted file mode 100644
index 049fd14..0000000
--- a/font_lib/textures/font_default_0020.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0021.png b/font_lib/textures/font_default_0021.png
deleted file mode 100644
index 7691a14..0000000
--- a/font_lib/textures/font_default_0021.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0022.png b/font_lib/textures/font_default_0022.png
deleted file mode 100644
index 91f4c5f..0000000
--- a/font_lib/textures/font_default_0022.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0023.png b/font_lib/textures/font_default_0023.png
deleted file mode 100644
index 9290dc1..0000000
--- a/font_lib/textures/font_default_0023.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0024.png b/font_lib/textures/font_default_0024.png
deleted file mode 100644
index cde69d4..0000000
--- a/font_lib/textures/font_default_0024.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0025.png b/font_lib/textures/font_default_0025.png
deleted file mode 100644
index 703ab16..0000000
--- a/font_lib/textures/font_default_0025.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0026.png b/font_lib/textures/font_default_0026.png
deleted file mode 100644
index 6f98d49..0000000
--- a/font_lib/textures/font_default_0026.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0027.png b/font_lib/textures/font_default_0027.png
deleted file mode 100644
index df31d75..0000000
--- a/font_lib/textures/font_default_0027.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0028.png b/font_lib/textures/font_default_0028.png
deleted file mode 100644
index 478c2c4..0000000
--- a/font_lib/textures/font_default_0028.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0029.png b/font_lib/textures/font_default_0029.png
deleted file mode 100644
index 8973488..0000000
--- a/font_lib/textures/font_default_0029.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_002a.png b/font_lib/textures/font_default_002a.png
deleted file mode 100644
index 2b83a5c..0000000
--- a/font_lib/textures/font_default_002a.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_002b.png b/font_lib/textures/font_default_002b.png
deleted file mode 100644
index abce910..0000000
--- a/font_lib/textures/font_default_002b.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_002c.png b/font_lib/textures/font_default_002c.png
deleted file mode 100644
index 8a624c7..0000000
--- a/font_lib/textures/font_default_002c.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_002d.png b/font_lib/textures/font_default_002d.png
deleted file mode 100644
index f0ff962..0000000
--- a/font_lib/textures/font_default_002d.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_002e.png b/font_lib/textures/font_default_002e.png
deleted file mode 100644
index aff49bc..0000000
--- a/font_lib/textures/font_default_002e.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_002f.png b/font_lib/textures/font_default_002f.png
deleted file mode 100644
index 4667bf7..0000000
--- a/font_lib/textures/font_default_002f.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0030.png b/font_lib/textures/font_default_0030.png
deleted file mode 100644
index 470f0b0..0000000
--- a/font_lib/textures/font_default_0030.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0031.png b/font_lib/textures/font_default_0031.png
deleted file mode 100644
index e84a9d3..0000000
--- a/font_lib/textures/font_default_0031.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0032.png b/font_lib/textures/font_default_0032.png
deleted file mode 100644
index 1ef3e84..0000000
--- a/font_lib/textures/font_default_0032.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0033.png b/font_lib/textures/font_default_0033.png
deleted file mode 100644
index ec9f518..0000000
--- a/font_lib/textures/font_default_0033.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0034.png b/font_lib/textures/font_default_0034.png
deleted file mode 100644
index bc82823..0000000
--- a/font_lib/textures/font_default_0034.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0035.png b/font_lib/textures/font_default_0035.png
deleted file mode 100644
index 3ed26c5..0000000
--- a/font_lib/textures/font_default_0035.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0036.png b/font_lib/textures/font_default_0036.png
deleted file mode 100644
index 6e706a4..0000000
--- a/font_lib/textures/font_default_0036.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0037.png b/font_lib/textures/font_default_0037.png
deleted file mode 100644
index 884b48a..0000000
--- a/font_lib/textures/font_default_0037.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0038.png b/font_lib/textures/font_default_0038.png
deleted file mode 100644
index a1e05bf..0000000
--- a/font_lib/textures/font_default_0038.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0039.png b/font_lib/textures/font_default_0039.png
deleted file mode 100644
index 6443be9..0000000
--- a/font_lib/textures/font_default_0039.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_003a.png b/font_lib/textures/font_default_003a.png
deleted file mode 100644
index 752e9de..0000000
--- a/font_lib/textures/font_default_003a.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_003b.png b/font_lib/textures/font_default_003b.png
deleted file mode 100644
index 77878e8..0000000
--- a/font_lib/textures/font_default_003b.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_003c.png b/font_lib/textures/font_default_003c.png
deleted file mode 100644
index 0252ab9..0000000
--- a/font_lib/textures/font_default_003c.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_003d.png b/font_lib/textures/font_default_003d.png
deleted file mode 100644
index af0325a..0000000
--- a/font_lib/textures/font_default_003d.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_003e.png b/font_lib/textures/font_default_003e.png
deleted file mode 100644
index 77fe954..0000000
--- a/font_lib/textures/font_default_003e.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_003f.png b/font_lib/textures/font_default_003f.png
deleted file mode 100644
index e94177c..0000000
--- a/font_lib/textures/font_default_003f.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0040.png b/font_lib/textures/font_default_0040.png
deleted file mode 100644
index c7a11d2..0000000
--- a/font_lib/textures/font_default_0040.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0041.png b/font_lib/textures/font_default_0041.png
deleted file mode 100644
index 5917cc0..0000000
--- a/font_lib/textures/font_default_0041.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0042.png b/font_lib/textures/font_default_0042.png
deleted file mode 100644
index 69a92b3..0000000
--- a/font_lib/textures/font_default_0042.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0043.png b/font_lib/textures/font_default_0043.png
deleted file mode 100644
index 6f68703..0000000
--- a/font_lib/textures/font_default_0043.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0044.png b/font_lib/textures/font_default_0044.png
deleted file mode 100644
index 94c0a30..0000000
--- a/font_lib/textures/font_default_0044.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0045.png b/font_lib/textures/font_default_0045.png
deleted file mode 100644
index b6732c3..0000000
--- a/font_lib/textures/font_default_0045.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0046.png b/font_lib/textures/font_default_0046.png
deleted file mode 100644
index 992bdc1..0000000
--- a/font_lib/textures/font_default_0046.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0047.png b/font_lib/textures/font_default_0047.png
deleted file mode 100644
index 12340e7..0000000
--- a/font_lib/textures/font_default_0047.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0048.png b/font_lib/textures/font_default_0048.png
deleted file mode 100644
index f315c03..0000000
--- a/font_lib/textures/font_default_0048.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0049.png b/font_lib/textures/font_default_0049.png
deleted file mode 100644
index 53ef0bc..0000000
--- a/font_lib/textures/font_default_0049.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_004a.png b/font_lib/textures/font_default_004a.png
deleted file mode 100644
index 32cd569..0000000
--- a/font_lib/textures/font_default_004a.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_004b.png b/font_lib/textures/font_default_004b.png
deleted file mode 100644
index 1f770e7..0000000
--- a/font_lib/textures/font_default_004b.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_004c.png b/font_lib/textures/font_default_004c.png
deleted file mode 100644
index 313ecfe..0000000
--- a/font_lib/textures/font_default_004c.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_004d.png b/font_lib/textures/font_default_004d.png
deleted file mode 100644
index f6676fb..0000000
--- a/font_lib/textures/font_default_004d.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_004e.png b/font_lib/textures/font_default_004e.png
deleted file mode 100644
index 4e28110..0000000
--- a/font_lib/textures/font_default_004e.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_004f.png b/font_lib/textures/font_default_004f.png
deleted file mode 100644
index 1b27777..0000000
--- a/font_lib/textures/font_default_004f.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0050.png b/font_lib/textures/font_default_0050.png
deleted file mode 100644
index ddfff40..0000000
--- a/font_lib/textures/font_default_0050.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0051.png b/font_lib/textures/font_default_0051.png
deleted file mode 100644
index c3df8ec..0000000
--- a/font_lib/textures/font_default_0051.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0052.png b/font_lib/textures/font_default_0052.png
deleted file mode 100644
index f93ff7c..0000000
--- a/font_lib/textures/font_default_0052.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0053.png b/font_lib/textures/font_default_0053.png
deleted file mode 100644
index 389a62b..0000000
--- a/font_lib/textures/font_default_0053.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0054.png b/font_lib/textures/font_default_0054.png
deleted file mode 100644
index 11ec544..0000000
--- a/font_lib/textures/font_default_0054.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0055.png b/font_lib/textures/font_default_0055.png
deleted file mode 100644
index 5d15704..0000000
--- a/font_lib/textures/font_default_0055.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0056.png b/font_lib/textures/font_default_0056.png
deleted file mode 100644
index 3e6f48a..0000000
--- a/font_lib/textures/font_default_0056.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0057.png b/font_lib/textures/font_default_0057.png
deleted file mode 100644
index cc140d0..0000000
--- a/font_lib/textures/font_default_0057.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0058.png b/font_lib/textures/font_default_0058.png
deleted file mode 100644
index fe71fb9..0000000
--- a/font_lib/textures/font_default_0058.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0059.png b/font_lib/textures/font_default_0059.png
deleted file mode 100644
index 1d1db03..0000000
--- a/font_lib/textures/font_default_0059.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_005a.png b/font_lib/textures/font_default_005a.png
deleted file mode 100644
index e89b0eb..0000000
--- a/font_lib/textures/font_default_005a.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_005b.png b/font_lib/textures/font_default_005b.png
deleted file mode 100644
index e547c51..0000000
--- a/font_lib/textures/font_default_005b.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_005c.png b/font_lib/textures/font_default_005c.png
deleted file mode 100644
index 35fc222..0000000
--- a/font_lib/textures/font_default_005c.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_005d.png b/font_lib/textures/font_default_005d.png
deleted file mode 100644
index 040ebe0..0000000
--- a/font_lib/textures/font_default_005d.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_005e.png b/font_lib/textures/font_default_005e.png
deleted file mode 100644
index be3bbb1..0000000
--- a/font_lib/textures/font_default_005e.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_005f.png b/font_lib/textures/font_default_005f.png
deleted file mode 100644
index 3cc8d3d..0000000
--- a/font_lib/textures/font_default_005f.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0060.png b/font_lib/textures/font_default_0060.png
deleted file mode 100644
index 58500d2..0000000
--- a/font_lib/textures/font_default_0060.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0061.png b/font_lib/textures/font_default_0061.png
deleted file mode 100644
index 2121aa8..0000000
--- a/font_lib/textures/font_default_0061.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0062.png b/font_lib/textures/font_default_0062.png
deleted file mode 100644
index ba3feeb..0000000
--- a/font_lib/textures/font_default_0062.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0063.png b/font_lib/textures/font_default_0063.png
deleted file mode 100644
index cee372c..0000000
--- a/font_lib/textures/font_default_0063.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0064.png b/font_lib/textures/font_default_0064.png
deleted file mode 100644
index c5989c1..0000000
--- a/font_lib/textures/font_default_0064.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0065.png b/font_lib/textures/font_default_0065.png
deleted file mode 100644
index 7cd370a..0000000
--- a/font_lib/textures/font_default_0065.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0066.png b/font_lib/textures/font_default_0066.png
deleted file mode 100644
index a63276c..0000000
--- a/font_lib/textures/font_default_0066.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0067.png b/font_lib/textures/font_default_0067.png
deleted file mode 100644
index baf3e88..0000000
--- a/font_lib/textures/font_default_0067.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0068.png b/font_lib/textures/font_default_0068.png
deleted file mode 100644
index 1c9e9b4..0000000
--- a/font_lib/textures/font_default_0068.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0069.png b/font_lib/textures/font_default_0069.png
deleted file mode 100644
index 785cdb5..0000000
--- a/font_lib/textures/font_default_0069.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_006a.png b/font_lib/textures/font_default_006a.png
deleted file mode 100644
index a7abd8e..0000000
--- a/font_lib/textures/font_default_006a.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_006b.png b/font_lib/textures/font_default_006b.png
deleted file mode 100644
index ff5f32a..0000000
--- a/font_lib/textures/font_default_006b.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_006c.png b/font_lib/textures/font_default_006c.png
deleted file mode 100644
index 53ef0bc..0000000
--- a/font_lib/textures/font_default_006c.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_006d.png b/font_lib/textures/font_default_006d.png
deleted file mode 100644
index 351aeef..0000000
--- a/font_lib/textures/font_default_006d.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_006e.png b/font_lib/textures/font_default_006e.png
deleted file mode 100644
index 60e089d..0000000
--- a/font_lib/textures/font_default_006e.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_006f.png b/font_lib/textures/font_default_006f.png
deleted file mode 100644
index dd48b6c..0000000
--- a/font_lib/textures/font_default_006f.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0070.png b/font_lib/textures/font_default_0070.png
deleted file mode 100644
index 0fdb26f..0000000
--- a/font_lib/textures/font_default_0070.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0071.png b/font_lib/textures/font_default_0071.png
deleted file mode 100644
index 787418e..0000000
--- a/font_lib/textures/font_default_0071.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0072.png b/font_lib/textures/font_default_0072.png
deleted file mode 100644
index 7d2bf4c..0000000
--- a/font_lib/textures/font_default_0072.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0073.png b/font_lib/textures/font_default_0073.png
deleted file mode 100644
index b2b2ed2..0000000
--- a/font_lib/textures/font_default_0073.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0074.png b/font_lib/textures/font_default_0074.png
deleted file mode 100644
index dcdbd37..0000000
--- a/font_lib/textures/font_default_0074.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0075.png b/font_lib/textures/font_default_0075.png
deleted file mode 100644
index 5ef59c7..0000000
--- a/font_lib/textures/font_default_0075.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0076.png b/font_lib/textures/font_default_0076.png
deleted file mode 100644
index 710703f..0000000
--- a/font_lib/textures/font_default_0076.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0077.png b/font_lib/textures/font_default_0077.png
deleted file mode 100644
index 373ecb0..0000000
--- a/font_lib/textures/font_default_0077.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0078.png b/font_lib/textures/font_default_0078.png
deleted file mode 100644
index 23541ff..0000000
--- a/font_lib/textures/font_default_0078.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_0079.png b/font_lib/textures/font_default_0079.png
deleted file mode 100644
index e3fddb2..0000000
--- a/font_lib/textures/font_default_0079.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_007a.png b/font_lib/textures/font_default_007a.png
deleted file mode 100644
index 2a92823..0000000
--- a/font_lib/textures/font_default_007a.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_007b.png b/font_lib/textures/font_default_007b.png
deleted file mode 100644
index 7606697..0000000
--- a/font_lib/textures/font_default_007b.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_007c.png b/font_lib/textures/font_default_007c.png
deleted file mode 100644
index 777f1e4..0000000
--- a/font_lib/textures/font_default_007c.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_007d.png b/font_lib/textures/font_default_007d.png
deleted file mode 100644
index b9ee397..0000000
--- a/font_lib/textures/font_default_007d.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_007e.png b/font_lib/textures/font_default_007e.png
deleted file mode 100644
index 759b56e..0000000
--- a/font_lib/textures/font_default_007e.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_008a.png b/font_lib/textures/font_default_008a.png
deleted file mode 100644
index e4f3236..0000000
--- a/font_lib/textures/font_default_008a.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_008d.png b/font_lib/textures/font_default_008d.png
deleted file mode 100644
index fcc3b38..0000000
--- a/font_lib/textures/font_default_008d.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00a1.png b/font_lib/textures/font_default_00a1.png
deleted file mode 100644
index df91ae3..0000000
--- a/font_lib/textures/font_default_00a1.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00b1.png b/font_lib/textures/font_default_00b1.png
deleted file mode 100644
index 2413844..0000000
--- a/font_lib/textures/font_default_00b1.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00bf.png b/font_lib/textures/font_default_00bf.png
deleted file mode 100644
index fec3deb..0000000
--- a/font_lib/textures/font_default_00bf.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00c0.png b/font_lib/textures/font_default_00c0.png
deleted file mode 100644
index 4652acf..0000000
--- a/font_lib/textures/font_default_00c0.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00c1.png b/font_lib/textures/font_default_00c1.png
deleted file mode 100644
index f2d7464..0000000
--- a/font_lib/textures/font_default_00c1.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00c2.png b/font_lib/textures/font_default_00c2.png
deleted file mode 100644
index c759ac9..0000000
--- a/font_lib/textures/font_default_00c2.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00c3.png b/font_lib/textures/font_default_00c3.png
deleted file mode 100644
index 6239ee6..0000000
--- a/font_lib/textures/font_default_00c3.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00c4.png b/font_lib/textures/font_default_00c4.png
deleted file mode 100644
index 1178423..0000000
--- a/font_lib/textures/font_default_00c4.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00c5.png b/font_lib/textures/font_default_00c5.png
deleted file mode 100644
index 64e5efc..0000000
--- a/font_lib/textures/font_default_00c5.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00c6.png b/font_lib/textures/font_default_00c6.png
deleted file mode 100644
index 7eaf588..0000000
--- a/font_lib/textures/font_default_00c6.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00c7.png b/font_lib/textures/font_default_00c7.png
deleted file mode 100644
index 247fbc4..0000000
--- a/font_lib/textures/font_default_00c7.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00c8.png b/font_lib/textures/font_default_00c8.png
deleted file mode 100644
index 517b63d..0000000
--- a/font_lib/textures/font_default_00c8.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00c9.png b/font_lib/textures/font_default_00c9.png
deleted file mode 100644
index cd4f8d8..0000000
--- a/font_lib/textures/font_default_00c9.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00ca.png b/font_lib/textures/font_default_00ca.png
deleted file mode 100644
index 39aa1aa..0000000
--- a/font_lib/textures/font_default_00ca.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00cb.png b/font_lib/textures/font_default_00cb.png
deleted file mode 100644
index 7058b5a..0000000
--- a/font_lib/textures/font_default_00cb.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00cc.png b/font_lib/textures/font_default_00cc.png
deleted file mode 100644
index a382d73..0000000
--- a/font_lib/textures/font_default_00cc.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00cd.png b/font_lib/textures/font_default_00cd.png
deleted file mode 100644
index 86339a1..0000000
--- a/font_lib/textures/font_default_00cd.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00ce.png b/font_lib/textures/font_default_00ce.png
deleted file mode 100644
index 78583df..0000000
--- a/font_lib/textures/font_default_00ce.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00cf.png b/font_lib/textures/font_default_00cf.png
deleted file mode 100644
index b680e2e..0000000
--- a/font_lib/textures/font_default_00cf.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00d0.png b/font_lib/textures/font_default_00d0.png
deleted file mode 100644
index 50db9f9..0000000
--- a/font_lib/textures/font_default_00d0.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00d1.png b/font_lib/textures/font_default_00d1.png
deleted file mode 100644
index 912524f..0000000
--- a/font_lib/textures/font_default_00d1.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00d2.png b/font_lib/textures/font_default_00d2.png
deleted file mode 100644
index d7e635f..0000000
--- a/font_lib/textures/font_default_00d2.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00d3.png b/font_lib/textures/font_default_00d3.png
deleted file mode 100644
index 27ae016..0000000
--- a/font_lib/textures/font_default_00d3.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00d4.png b/font_lib/textures/font_default_00d4.png
deleted file mode 100644
index a62a3ed..0000000
--- a/font_lib/textures/font_default_00d4.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00d5.png b/font_lib/textures/font_default_00d5.png
deleted file mode 100644
index 3740df7..0000000
--- a/font_lib/textures/font_default_00d5.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00d6.png b/font_lib/textures/font_default_00d6.png
deleted file mode 100644
index 9b3cd62..0000000
--- a/font_lib/textures/font_default_00d6.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00d7.png b/font_lib/textures/font_default_00d7.png
deleted file mode 100644
index a92ac66..0000000
--- a/font_lib/textures/font_default_00d7.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00d8.png b/font_lib/textures/font_default_00d8.png
deleted file mode 100644
index 0453191..0000000
--- a/font_lib/textures/font_default_00d8.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00d9.png b/font_lib/textures/font_default_00d9.png
deleted file mode 100644
index 607ac14..0000000
--- a/font_lib/textures/font_default_00d9.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00da.png b/font_lib/textures/font_default_00da.png
deleted file mode 100644
index 91e5781..0000000
--- a/font_lib/textures/font_default_00da.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00db.png b/font_lib/textures/font_default_00db.png
deleted file mode 100644
index f63177d..0000000
--- a/font_lib/textures/font_default_00db.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00dc.png b/font_lib/textures/font_default_00dc.png
deleted file mode 100644
index eeaa7c6..0000000
--- a/font_lib/textures/font_default_00dc.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00dd.png b/font_lib/textures/font_default_00dd.png
deleted file mode 100644
index f194136..0000000
--- a/font_lib/textures/font_default_00dd.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00e0.png b/font_lib/textures/font_default_00e0.png
deleted file mode 100644
index b9779fe..0000000
--- a/font_lib/textures/font_default_00e0.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00e1.png b/font_lib/textures/font_default_00e1.png
deleted file mode 100644
index aeaeaf5..0000000
--- a/font_lib/textures/font_default_00e1.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00e2.png b/font_lib/textures/font_default_00e2.png
deleted file mode 100644
index 8ca07ed..0000000
--- a/font_lib/textures/font_default_00e2.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00e3.png b/font_lib/textures/font_default_00e3.png
deleted file mode 100644
index e2f00bb..0000000
--- a/font_lib/textures/font_default_00e3.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00e4.png b/font_lib/textures/font_default_00e4.png
deleted file mode 100644
index 6bcf6fb..0000000
--- a/font_lib/textures/font_default_00e4.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00e5.png b/font_lib/textures/font_default_00e5.png
deleted file mode 100644
index 698094e..0000000
--- a/font_lib/textures/font_default_00e5.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00e6.png b/font_lib/textures/font_default_00e6.png
deleted file mode 100644
index 70ac70a..0000000
--- a/font_lib/textures/font_default_00e6.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00e7.png b/font_lib/textures/font_default_00e7.png
deleted file mode 100644
index f0462bd..0000000
--- a/font_lib/textures/font_default_00e7.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00e8.png b/font_lib/textures/font_default_00e8.png
deleted file mode 100644
index 841363e..0000000
--- a/font_lib/textures/font_default_00e8.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00e9.png b/font_lib/textures/font_default_00e9.png
deleted file mode 100644
index 7752df4..0000000
--- a/font_lib/textures/font_default_00e9.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00ea.png b/font_lib/textures/font_default_00ea.png
deleted file mode 100644
index b549be6..0000000
--- a/font_lib/textures/font_default_00ea.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00eb.png b/font_lib/textures/font_default_00eb.png
deleted file mode 100644
index f9c4dbc..0000000
--- a/font_lib/textures/font_default_00eb.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00ec.png b/font_lib/textures/font_default_00ec.png
deleted file mode 100644
index e86f3a7..0000000
--- a/font_lib/textures/font_default_00ec.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00ed.png b/font_lib/textures/font_default_00ed.png
deleted file mode 100644
index 94f12e8..0000000
--- a/font_lib/textures/font_default_00ed.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00ee.png b/font_lib/textures/font_default_00ee.png
deleted file mode 100644
index e8a743d..0000000
--- a/font_lib/textures/font_default_00ee.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00ef.png b/font_lib/textures/font_default_00ef.png
deleted file mode 100644
index d2c744f..0000000
--- a/font_lib/textures/font_default_00ef.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00f2.png b/font_lib/textures/font_default_00f2.png
deleted file mode 100644
index f7d1127..0000000
--- a/font_lib/textures/font_default_00f2.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00f4.png b/font_lib/textures/font_default_00f4.png
deleted file mode 100644
index 4b0cce6..0000000
--- a/font_lib/textures/font_default_00f4.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00f5.png b/font_lib/textures/font_default_00f5.png
deleted file mode 100644
index ec7cec1..0000000
--- a/font_lib/textures/font_default_00f5.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00f6.png b/font_lib/textures/font_default_00f6.png
deleted file mode 100644
index 7213c8a..0000000
--- a/font_lib/textures/font_default_00f6.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00f7.png b/font_lib/textures/font_default_00f7.png
deleted file mode 100644
index 408687d..0000000
--- a/font_lib/textures/font_default_00f7.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00f9.png b/font_lib/textures/font_default_00f9.png
deleted file mode 100644
index 67d16b5..0000000
--- a/font_lib/textures/font_default_00f9.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00fa.png b/font_lib/textures/font_default_00fa.png
deleted file mode 100644
index 97de7e1..0000000
--- a/font_lib/textures/font_default_00fa.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00fb.png b/font_lib/textures/font_default_00fb.png
deleted file mode 100644
index 2861e15..0000000
--- a/font_lib/textures/font_default_00fb.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00fc.png b/font_lib/textures/font_default_00fc.png
deleted file mode 100644
index c7deddd..0000000
--- a/font_lib/textures/font_default_00fc.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00fd.png b/font_lib/textures/font_default_00fd.png
deleted file mode 100644
index b6f45f9..0000000
--- a/font_lib/textures/font_default_00fd.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/textures/font_default_00ff.png b/font_lib/textures/font_default_00ff.png
deleted file mode 100644
index d182a29..0000000
--- a/font_lib/textures/font_default_00ff.png
+++ /dev/null
Binary files differ
diff --git a/font_lib/tools/make_font_lua.sh b/font_lib/tools/make_font_lua.sh
index 4559341..607ff95 100755
--- a/font_lib/tools/make_font_lua.sh
+++ b/font_lib/tools/make_font_lua.sh
@@ -1,9 +1,9 @@
#!/bin/bash
-scriptname=$0
+scriptname=$(basename $0)
identify="identify"
-font_name=default
+font_name=$1
for f in textures/font_${font_name}_????.png
do
@@ -46,3 +46,11 @@ font_lib.register_font(
);
" > font_$font_name.lua
+if grep -q font_lib depends.txt &>/dev/null
+then
+ echo "font_lib already in depends.txt."
+else
+ echo "adding font_lib to depends.txt."
+ echo "font_lib" >> depends.txt
+fi
+
diff --git a/ontime_clocks/README.md b/ontime_clocks/README.md
index 72c94db..2254a43 100644
--- a/ontime_clocks/README.md
+++ b/ontime_clocks/README.md
@@ -2,7 +2,7 @@
This mod provides clocks that display real ingame time.
-For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?f=11&t=13563) at the Minetest forums.
+For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?t=19365) at the Minetest forums.
**Dependancies**: display_lib, default
diff --git a/signs/README.md b/signs/README.md
index 9e678de..0282d2e 100644
--- a/signs/README.md
+++ b/signs/README.md
@@ -2,7 +2,7 @@
This mod provides various signs with text display. Text is locked if area is protected.
-For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?f=11&t=13563) at the Minetest forums.
+For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?t=19365) at the Minetest forums.
**Dependancies**: default, display\_lib, font\_lib
diff --git a/signs/nodes.lua b/signs/nodes.lua
index 2b8ab66..926d6e3 100644
--- a/signs/nodes.lua
+++ b/signs/nodes.lua
@@ -104,7 +104,7 @@ local models = {
entity_fields = {
right = -3/32,
size = { x = 12/16, y = 6/16 },
- resolution = { x = 112, y = 64 },
+ resolution = { x = 9, y = 5 },
maxlines = 2,
color="#000",
},
@@ -127,7 +127,7 @@ local models = {
entity_fields = {
right = 3/32,
size = { x = 12/16, y = 6/16 },
- resolution = { x = 112, y = 64 },
+ resolution = { x = 9, y = 5 },
maxlines = 2,
color = "#000",
},
@@ -149,7 +149,7 @@ local models = {
width = 26/32,
height = 30/32,
entity_fields = {
- resolution = { x = 144, y = 64 },
+ resolution = { x = 11, y = 5 },
maxlines = 1,
color="#000",
valign="top",
diff --git a/signs_road/README.md b/signs_road/README.md
index 2343ea9..0a2f685 100644
--- a/signs_road/README.md
+++ b/signs_road/README.md
@@ -2,7 +2,7 @@
This mod provides road signs with text display. Text is locked if area is protected.
-For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?f=11&t=13563) at the Minetest forums.
+For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?t=19365) at the Minetest forums.
**Dependancies**: default, display\_lib, font\_lib, signs
diff --git a/signs_road/nodes.lua b/signs_road/nodes.lua
index c5d92b6..b167db8 100644
--- a/signs_road/nodes.lua
+++ b/signs_road/nodes.lua
@@ -27,7 +27,7 @@ local models = {
width = 14/16,
height = 12/16,
entity_fields = {
- resolution = { x = 144, y = 64 },
+ resolution = { x = 11, y = 5.5 },
maxlines = 3,
color = "#fff",
},
@@ -44,7 +44,7 @@ local models = {
width = 64/16,
height = 12/16,
entity_fields = {
- resolution = { x = 30, y = 20 },
+ resolution = { x = 2.5, y = 1.5 },
maxlines = 1,
color = "#000",
},
@@ -63,7 +63,7 @@ local models = {
width = 1,
height = 7/16,
entity_fields = {
- resolution = { x = 96, y = 64 },
+ resolution = { x = 8, y = 4 },
maxlines = 1,
color = "#000",
},
@@ -80,7 +80,7 @@ local models = {
width = 1,
height = 7/16,
entity_fields = {
- resolution = { x = 96, y = 64 },
+ resolution = { x = 9, y = 5.5 },
maxlines = 2,
color = "#000",
},
@@ -97,7 +97,7 @@ local models = {
width = 1,
height = 7/16,
entity_fields = {
- resolution = { x = 96, y = 64 },
+ resolution = { x = 9, y = 5.5 },
maxlines = 2,
color = "#fff",
},
@@ -114,7 +114,7 @@ local models = {
width = 1,
height = 7/16,
entity_fields = {
- resolution = { x = 96, y = 64 },
+ resolution = { x = 9, y = 5.5 },
maxlines = 2,
color = "#000",
},
@@ -131,7 +131,7 @@ local models = {
width = 1,
height = 0.5,
entity_fields = {
- resolution = { x = 96, y = 64 },
+ resolution = { x = 7, y = 5 },
maxlines = 1,
color = "#000",
},
@@ -151,7 +151,7 @@ local models = {
width = 1,
height = 0.5,
entity_fields = {
- resolution = { x = 96, y = 64 },
+ resolution = { x = 7, y = 5 },
maxlines = 1,
color = "#000",
},
@@ -176,7 +176,7 @@ local models = {
entity_fields = {
right = -3/32,
size = { x = 12/16, y = 6/16 },
- resolution = { x = 112, y = 64 },
+ resolution = { x = 9, y = 5.5 },
maxlines = 2,
color = "#fff",
},
@@ -200,7 +200,7 @@ local models = {
entity_fields = {
right = 3/32,
size = { x = 12/16, y = 6/16 },
- resolution = { x = 112, y = 64 },
+ resolution = { x = 9, y = 5.5 },
maxlines = 2,
color="#fff",
},
@@ -226,7 +226,7 @@ local models = {
entity_fields = {
right = -3/32,
size = { x = 12/16, y = 6/16 },
- resolution = { x = 112, y = 64 },
+ resolution = { x = 9, y = 5.5 },
maxlines = 2,
color = "#000",
},
@@ -250,7 +250,7 @@ local models = {
entity_fields = {
right = 3/32,
size = { x = 12/16, y = 6/16 },
- resolution = { x = 112, y = 64 },
+ resolution = { x = 9, y = 5.5 },
maxlines = 2,
color = "#000",
},
@@ -276,7 +276,7 @@ local models = {
entity_fields = {
right = -3/32,
size = { x = 12/16, y = 6/16 },
- resolution = { x = 112, y = 64 },
+ resolution = { x = 9, y = 5.5 },
maxlines = 2,
color = "#000",
},
@@ -300,7 +300,7 @@ local models = {
entity_fields = {
right = 3/32,
size = { x = 12/16, y = 6/16 },
- resolution = { x = 112, y = 64 },
+ resolution = { x = 9, y = 5.5 },
maxlines = 2,
color = "#000",
},
diff --git a/steles/README.md b/steles/README.md
index e83a6af..bc14b53 100644
--- a/steles/README.md
+++ b/steles/README.md
@@ -2,7 +2,7 @@
This mod provides stone steles with text display. Text is locked if area is protected.
-For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?f=11&t=13563) at the Minetest forums.
+For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?t=19365) at the Minetest forums.
**Dependancies**: default, display\_lib, font\_lib, technic?
diff --git a/steles/nodes.lua b/steles/nodes.lua
index 39eb9ee..87f4e9b 100644
--- a/steles/nodes.lua
+++ b/steles/nodes.lua
@@ -61,7 +61,7 @@ for i, material in ipairs(steles.materials) do
on_display_update = font_lib.on_display_update,
depth = -2/16-0.001, height = 2/16,
size = { x = 14/16, y = 12/16 },
- resolution = { x = 144, y = 64 },
+ resolution = { x = 11, y = 5 },
maxlines = 3,
},
},