diff options
| author | orwell96 <orwell@bleipb.de> | 2018-12-03 23:17:35 +0100 |
|---|---|---|
| committer | orwell96 <orwell@bleipb.de> | 2018-12-03 23:17:35 +0100 |
| commit | 8928f78ee6305e29ed8d3b9395fcb6564c984fdf (patch) | |
| tree | cd250c2b98d7131158e3744efe238780cec73fec | |
| parent | eccdad46ef2b38cd061aab7ae6bcb252a67c2218 (diff) | |
| parent | a3e0d36a68247cac40349d9089fe3c71546d75e8 (diff) | |
| download | display_modpack-8928f78ee6305e29ed8d3b9395fcb6564c984fdf.tar.gz display_modpack-8928f78ee6305e29ed8d3b9395fcb6564c984fdf.tar.bz2 display_modpack-8928f78ee6305e29ed8d3b9395fcb6564c984fdf.zip | |
Resolved conflicts by reordering of files
816 files changed, 5538 insertions, 2198 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..a28a34b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "display_api"] + path = display_api + url = https://github.com/pyrollo/display_api.git @@ -1,20 +1,95 @@ -# Display Modpack +# Display Modpack +Version 1.2.2 This modpack provides mods with dynamic display. Mods are : -- **display_lib**: A library for adding display entities to nodes; -- **font_lib**: A library for displaying fonts on entities; -- **ontime_clocks**: A mod providing clocks which display the ingame time; -- **signs**: A mod providing signs and direction signs displaying text; -- **signs_road**: A mod providing road signs displaying text; -- **steles**: A mod providing stone steles with text; +- **[display_api](https://github.com/pyrollo/display_modpack/tree/master/display_api)**: A library for adding display entities to nodes; +- **[font_api](https://github.com/pyrollo/display_modpack/tree/master/font_api)**: A library for displaying fonts on entities; +- **[signs_api](https://github.com/pyrollo/display_modpack/tree/master/signs_api)**: A library for the easy creation of signs; +- **[font_metro](https://github.com/pyrollo/display_modpack/tree/master/font_metro)**: A font mod used as default font (includes uppercase, lowercase and accentuated latin letters, usual signs, cyrillic and greek letters) + +- **[boards](https://github.com/pyrollo/display_modpack/tree/master/boards)**: A mod providing school boards (includes *tiny cursive font*, a handwriting style font); +- **[ontime_clocks](https://github.com/pyrollo/display_modpack/tree/master/ontime_clocks)**: A mod providing clocks which display the ingame time; +- **[signs](https://github.com/pyrollo/display_modpack/tree/master/signs)**: A mod providing signs and direction signs displaying text; +- **[signs_road](https://github.com/pyrollo/display_modpack/tree/master/signs_road)**: A mod providing road signs displaying text; +- **[steles](https://github.com/pyrollo/display_modpack/tree/master/steles)**: A mod providing stone steles with text; For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?t=19365) at the Minetest forums.  +## Extra fonts + +*Metro* and *Tiny Cursive* fonts are provided in **Display Modpack** (in **font_metro** and **boards** mods) but you can add more fonts by installing font mods. Be aware that each font mod comes with numerous textures. This can result in slowing media downloading and/or client display. + +Extra font mods can be found here: + * [OldWizard](https://github.com/pyrollo/font_oldwizard): An old style gothic font. + * [Botic](https://github.com/pyrollo/font_botic): A scifi style font. + ## Changelog +### 2018-12-02 (Version 1.2.2) + +- Fixed a bug that prevented Display API from working on some systems (Raspberry Pi) + +### 2018-11-01 (Version 1.2.1) + +- Now font can be chosen per sign / stele + +### 2018-11-01 (Version 1.2) + +- Labels and woodend signs added. + +- Fallback mechanism for missing chars (For example: "é" --> "e" --> "E"). + +- Several bug fixes by 12Me21 and naturefreshmilk. + +### 2018-07-16 (Version 1.1.1) + +- Boards mod added. + +- Bug fix in default font chosing when multiple font registered. + +### 2018-07-13 (Version 1.1.0) + +- Font API rework introducing Font class. + +- Replaced default Epilepsy Font by Metro Font for licensing purposes, + +- Rework of all nodes displaying text accordingly to the Font API rework. + +As font_epilepsy mod has been replaced by font_metro mod, **don't forget to activate font_metro mod after updating** or you won't have any text displayed. + +### 2018-05-30 (Version 1.0.1) + +Mostly bug fixes : + +- Fix steles orientation when placing + +- Update entity on mapblock load + +- Use default formspec style + +- Fix ndef nill value in steles mod when technics not installed + +- Seperate signs API from signs définitions + +- Allow a greater offset between display and block + +### 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/LICENSE.txt b/boards/LICENSE.txt index 341c30b..341c30b 100644 --- a/display_lib/LICENSE.txt +++ b/boards/LICENSE.txt diff --git a/boards/LICENSE_FONT.txt b/boards/LICENSE_FONT.txt new file mode 100644 index 0000000..29d0f9b --- /dev/null +++ b/boards/LICENSE_FONT.txt @@ -0,0 +1,4 @@ +The FontStruction “Tiny Cursive” +(https://fontstruct.com/fontstructions/show/63155) by “cyfry77” is licensed +under a Creative Commons Attribution Share Alike license +(http://creativecommons.org/licenses/by-sa/3.0/).
diff --git a/display_lib/copyright.txt b/boards/copyright.txt index 5d4adad..ad83a10 100644 --- a/display_lib/copyright.txt +++ b/boards/copyright.txt @@ -1,2 +1,2 @@ Code by Pierre-Yves Rollo (pyrollo) - +Font by (cyfry77) diff --git a/boards/depends.txt b/boards/depends.txt new file mode 100644 index 0000000..8c807e3 --- /dev/null +++ b/boards/depends.txt @@ -0,0 +1,2 @@ +default +signs_api diff --git a/boards/font_tinycurs.lua b/boards/font_tinycurs.lua new file mode 100644 index 0000000..a9a323a --- /dev/null +++ b/boards/font_tinycurs.lua @@ -0,0 +1,27 @@ +--[[ + Tinycurs font for Font API + + Original font Tiny Cursive + by cyfry77 + G and J textures by Pierre-Yves Rollo (pyrollo) + released under CC-BY-SA license + + https://fontstruct.com/fontstructions/show/63155/tiny_cursive + + Derivative texture are under CC-BY-SA license + Code is under LGPL v3 license +--]] + +font_api.register_font('tinycurs', + { + default = false, -- Don't register this font as a possible default font + margintop = -2, + marginbottom = -2, + linespacing = -4, + height = 19, + widths = { + [0]=9, [32]=9, [33]=6, [34]=7, [35]=10, [36]=14, [37]=14, [38]=12, [39]=3, [40]=6, [41]=6, [42]=9, [43]=8, [44]=3, [45]=7, [46]=3, [47]=9, [48]=9, [49]=7, [50]=10, [51]=9, [52]=9, [53]=10, [54]=10, [55]=9, [56]=10, [57]=8, [58]=5, [59]=5, [60]=8, [61]=8, [62]=8, [63]=8, [64]=12, [65]=9, [66]=7, [67]=9, [68]=10, [69]=8, [70]=8, [71]=8, [72]=10, [73]=7, [74]=8, [75]=9, [76]=9, [77]=12, [78]=10, [79]=9, [80]=9, [81]=9, [82]=11, [83]=11, [84]=8, [85]=11, [86]=11, [87]=12, [88]=12, [89]=11, [90]=11, [91]=8, [92]=5, [93]=8, [94]=8, [95]=8, [96]=5, [97]=6, [98]=6, [99]=6, [100]=7, [101]=6, [102]=5, [103]=6, [104]=6, [105]=4, [106]=5, [107]=7, [108]=5, [109]=9, [110]=8, [111]=6, [112]=9, [113]=8, [114]=7, [115]=7, [116]=6, [117]=8, [118]=8, [119]=11, [120]=10, [121]=8, [122]=8, [123]=8, [124]=6, [125]=9, [126]=10, [8216]=4, [8217]=4, [8220]=6, [8221]=6 + }, + } +); + diff --git a/boards/init.lua b/boards/init.lua new file mode 100644 index 0000000..4126a6c --- /dev/null +++ b/boards/init.lua @@ -0,0 +1,139 @@ +--[[ + boards mod for Minetest. Black boards with text on it. + (c) Pierre-Yves Rollo + + This file is part of boards. + + boards is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + boards is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with boards. If not, see <http://www.gnu.org/licenses/>. +--]] + +boards = {} +boards.name = minetest.get_current_modname() +boards.path = minetest.get_modpath(boards.name) + +-- Load support for intllib. +local S, NS = dofile(boards.path.."/intllib.lua") +boards.intllib = S +local F = function(...) return minetest.formspec_escape(S(...)) end + +-- Load font +dofile(boards.path.."/font_tinycurs.lua") + +local function set_formspec(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", + "size[6,4]"..default.gui_bg..default.gui_bg_img..default.gui_slots.. + "textarea[0.5,0.7;5.5,3;display_text;"..F("Text")..";${display_text}]".. + "button_exit[3,3.5;2,1;ok;"..F("Write").."]".. + "button_exit[1,3.5;2,1;wipe;"..F("Wipe").."]") +end + +-- On boards, everyone is allowed to write and wipe +local function on_receive_fields(pos, formname, fields, player) + if fields then + if fields.ok or fields.key_enter then + signs_api.set_display_text(pos, fields.display_text, fields.font) + end + if fields.wipe then + signs_api.set_display_text(pos, "", fields.font) + end + end +end + +models = { + black_board = { + depth = 1/16, width = 1, height = 1, + entity_fields = { + top = -1/32, + size = { x = 1, y = 15/16 }, + maxlines = 5, + color = "#fff", + font_name = "tinycurs", + valign = "top", + }, + node_fields = { + description = S("Black board"), + tiles = { "default_wood.png", "default_wood.png", + "default_wood.png", "default_wood.png", + "default_wood.png", "board_black_front.png" }, + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5}, + {-0.5, -7/16, 6/16, 0.5, -0.5, 7/16} + }, + }, + on_construct = function(pos) + set_formspec(pos) + display_api.on_construct(pos) + end, + on_receive_fields = on_receive_fields, + }, + }, + green_board = { + depth = 1/16, width = 1, height = 1, + entity_fields = { + top = -1/32, + size = { x = 1, y = 15/16 }, + maxlines = 5, + color = "#fff", + font_name = "tinycurs", + valign = "top", + }, + node_fields = { + description = S("Green board"), + tiles = { "default_wood.png", "default_wood.png", + "default_wood.png", "default_wood.png", + "default_wood.png", "board_green_front.png" }, + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5}, + {-0.5, -7/16, 6/16, 0.5, -0.5, 7/16} + }, + }, + on_construct = function(pos) + set_formspec(pos) + display_api.on_construct(pos) + end, + on_receive_fields = on_receive_fields, + }, + }, +} + +-- Node registration +for name, model in pairs(models) +do + signs_api.register_sign("boards", name, model) +end + +-- Recipes +minetest.register_craft( + { + output = "boards:black_board", + recipe = { + {"group:wood", "group:stone", "dye:black"}, + } + }) + +minetest.register_craft( + { + output = "boards:green_board", + recipe = { + {"group:wood", "group:stone", "dye:dark_green"}, + } + }) + diff --git a/boards/intllib.lua b/boards/intllib.lua new file mode 100644 index 0000000..6669d72 --- /dev/null +++ b/boards/intllib.lua @@ -0,0 +1,45 @@ + +-- Fallback functions for when `intllib` is not installed. +-- Code released under Unlicense <http://unlicense.org>. + +-- Get the latest version of this file at: +-- https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua + +local function format(str, ...) + local args = { ... } + local function repl(escape, open, num, close) + if escape == "" then + local replacement = tostring(args[tonumber(num)]) + if open == "" then + replacement = replacement..close + end + return replacement + else + return "@"..open..num..close + end + end + return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl)) +end + +local gettext, ngettext +if minetest.get_modpath("intllib") then + if intllib.make_gettext_pair then + -- New method using gettext. + gettext, ngettext = intllib.make_gettext_pair() + else + -- Old method using text files. + gettext = intllib.Getter() + end +end + +-- Fill in missing functions. + +gettext = gettext or function(msgid, ...) + return format(msgid, ...) +end + +ngettext = ngettext or function(msgid, msgid_plural, n, ...) + return format(n==1 and msgid or msgid_plural, ...) +end + +return gettext, ngettext diff --git a/boards/locale/fr.po b/boards/locale/fr.po new file mode 100644 index 0000000..1b081be --- /dev/null +++ b/boards/locale/fr.po @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-07-16 10:00+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: init.lua +msgid "Text" +msgstr "Texte" + +#: init.lua +msgid "Write" +msgstr "Ecrire" + +#: init.lua +msgid "Wipe" +msgstr "Effacer" + +#: init.lua +msgid "Black board" +msgstr "Tableau noir" + +#: init.lua +msgid "Green board" +msgstr "Tableau vert" + + diff --git a/boards/locale/template.pot b/boards/locale/template.pot new file mode 100644 index 0000000..8db98b8 --- /dev/null +++ b/boards/locale/template.pot @@ -0,0 +1,34 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-07-16 10:00+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: init.lua +msgid "Text" +msgstr "" + +#: init.lua +msgid "Write" +msgstr "" + +#: init.lua +msgid "Wipe" +msgstr "" + +#: init.lua +msgid "Black board" +msgstr "" diff --git a/boards/textures/board_black_front.png b/boards/textures/board_black_front.png Binary files differnew file mode 100644 index 0000000..bddf4b6 --- /dev/null +++ b/boards/textures/board_black_front.png diff --git a/boards/textures/board_green_front.png b/boards/textures/board_green_front.png Binary files differnew file mode 100644 index 0000000..57e613f --- /dev/null +++ b/boards/textures/board_green_front.png diff --git a/boards/textures/font_tinycurs_0000.png b/boards/textures/font_tinycurs_0000.png Binary files differnew file mode 100644 index 0000000..5e32523 --- /dev/null +++ b/boards/textures/font_tinycurs_0000.png diff --git a/boards/textures/font_tinycurs_0020.png b/boards/textures/font_tinycurs_0020.png Binary files differnew file mode 100644 index 0000000..4d55fc2 --- /dev/null +++ b/boards/textures/font_tinycurs_0020.png diff --git a/boards/textures/font_tinycurs_0021.png b/boards/textures/font_tinycurs_0021.png Binary files differnew file mode 100644 index 0000000..2341270 --- /dev/null +++ b/boards/textures/font_tinycurs_0021.png diff --git a/boards/textures/font_tinycurs_0022.png b/boards/textures/font_tinycurs_0022.png Binary files differnew file mode 100644 index 0000000..711fc0a --- /dev/null +++ b/boards/textures/font_tinycurs_0022.png diff --git a/boards/textures/font_tinycurs_0023.png b/boards/textures/font_tinycurs_0023.png Binary files differnew file mode 100644 index 0000000..eb7fe6d --- /dev/null +++ b/boards/textures/font_tinycurs_0023.png diff --git a/boards/textures/font_tinycurs_0024.png b/boards/textures/font_tinycurs_0024.png Binary files differnew file mode 100644 index 0000000..21faedc --- /dev/null +++ b/boards/textures/font_tinycurs_0024.png diff --git a/boards/textures/font_tinycurs_0025.png b/boards/textures/font_tinycurs_0025.png Binary files differnew file mode 100644 index 0000000..d13b136 --- /dev/null +++ b/boards/textures/font_tinycurs_0025.png diff --git a/boards/textures/font_tinycurs_0026.png b/boards/textures/font_tinycurs_0026.png Binary files differnew file mode 100644 index 0000000..0217d08 --- /dev/null +++ b/boards/textures/font_tinycurs_0026.png diff --git a/boards/textures/font_tinycurs_0027.png b/boards/textures/font_tinycurs_0027.png Binary files differnew file mode 100644 index 0000000..3358a85 --- /dev/null +++ b/boards/textures/font_tinycurs_0027.png diff --git a/boards/textures/font_tinycurs_0028.png b/boards/textures/font_tinycurs_0028.png Binary files differnew file mode 100644 index 0000000..4867aca --- /dev/null +++ b/boards/textures/font_tinycurs_0028.png diff --git a/boards/textures/font_tinycurs_0029.png b/boards/textures/font_tinycurs_0029.png Binary files differnew file mode 100644 index 0000000..6233ad6 --- /dev/null +++ b/boards/textures/font_tinycurs_0029.png diff --git a/boards/textures/font_tinycurs_002a.png b/boards/textures/font_tinycurs_002a.png Binary files differnew file mode 100644 index 0000000..95ecb14 --- /dev/null +++ b/boards/textures/font_tinycurs_002a.png diff --git a/boards/textures/font_tinycurs_002b.png b/boards/textures/font_tinycurs_002b.png Binary files differnew file mode 100644 index 0000000..8c92a50 --- /dev/null +++ b/boards/textures/font_tinycurs_002b.png diff --git a/boards/textures/font_tinycurs_002c.png b/boards/textures/font_tinycurs_002c.png Binary files differnew file mode 100644 index 0000000..7457341 --- /dev/null +++ b/boards/textures/font_tinycurs_002c.png diff --git a/boards/textures/font_tinycurs_002d.png b/boards/textures/font_tinycurs_002d.png Binary files differnew file mode 100644 index 0000000..f0edd03 --- /dev/null +++ b/boards/textures/font_tinycurs_002d.png diff --git a/boards/textures/font_tinycurs_002e.png b/boards/textures/font_tinycurs_002e.png Binary files differnew file mode 100644 index 0000000..6425d1f --- /dev/null +++ b/boards/textures/font_tinycurs_002e.png diff --git a/boards/textures/font_tinycurs_002f.png b/boards/textures/font_tinycurs_002f.png Binary files differnew file mode 100644 index 0000000..2cf9cfb --- /dev/null +++ b/boards/textures/font_tinycurs_002f.png diff --git a/boards/textures/font_tinycurs_0030.png b/boards/textures/font_tinycurs_0030.png Binary files differnew file mode 100644 index 0000000..0c52286 --- /dev/null +++ b/boards/textures/font_tinycurs_0030.png diff --git a/boards/textures/font_tinycurs_0031.png b/boards/textures/font_tinycurs_0031.png Binary files differnew file mode 100644 index 0000000..3da16d1 --- /dev/null +++ b/boards/textures/font_tinycurs_0031.png diff --git a/boards/textures/font_tinycurs_0032.png b/boards/textures/font_tinycurs_0032.png Binary files differnew file mode 100644 index 0000000..6e647a5 --- /dev/null +++ b/boards/textures/font_tinycurs_0032.png diff --git a/boards/textures/font_tinycurs_0033.png b/boards/textures/font_tinycurs_0033.png Binary files differnew file mode 100644 index 0000000..9322594 --- /dev/null +++ b/boards/textures/font_tinycurs_0033.png diff --git a/boards/textures/font_tinycurs_0034.png b/boards/textures/font_tinycurs_0034.png Binary files differnew file mode 100644 index 0000000..15f4462 --- /dev/null +++ b/boards/textures/font_tinycurs_0034.png diff --git a/boards/textures/font_tinycurs_0035.png b/boards/textures/font_tinycurs_0035.png Binary files differnew file mode 100644 index 0000000..b37d085 --- /dev/null +++ b/boards/textures/font_tinycurs_0035.png diff --git a/boards/textures/font_tinycurs_0036.png b/boards/textures/font_tinycurs_0036.png Binary files differnew file mode 100644 index 0000000..51d11a2 --- /dev/null +++ b/boards/textures/font_tinycurs_0036.png diff --git a/boards/textures/font_tinycurs_0037.png b/boards/textures/font_tinycurs_0037.png Binary files differnew file mode 100644 index 0000000..d46de6c --- /dev/null +++ b/boards/textures/font_tinycurs_0037.png diff --git a/boards/textures/font_tinycurs_0038.png b/boards/textures/font_tinycurs_0038.png Binary files differnew file mode 100644 index 0000000..43126d1 --- /dev/null +++ b/boards/textures/font_tinycurs_0038.png diff --git a/boards/textures/font_tinycurs_0039.png b/boards/textures/font_tinycurs_0039.png Binary files differnew file mode 100644 index 0000000..a5ad51e --- /dev/null +++ b/boards/textures/font_tinycurs_0039.png diff --git a/boards/textures/font_tinycurs_003a.png b/boards/textures/font_tinycurs_003a.png Binary files differnew file mode 100644 index 0000000..f0ae56f --- /dev/null +++ b/boards/textures/font_tinycurs_003a.png diff --git a/boards/textures/font_tinycurs_003b.png b/boards/textures/font_tinycurs_003b.png Binary files differnew file mode 100644 index 0000000..08c8b44 --- /dev/null +++ b/boards/textures/font_tinycurs_003b.png diff --git a/boards/textures/font_tinycurs_003c.png b/boards/textures/font_tinycurs_003c.png Binary files differnew file mode 100644 index 0000000..2c5ddc9 --- /dev/null +++ b/boards/textures/font_tinycurs_003c.png diff --git a/boards/textures/font_tinycurs_003d.png b/boards/textures/font_tinycurs_003d.png Binary files differnew file mode 100644 index 0000000..a80eeee --- /dev/null +++ b/boards/textures/font_tinycurs_003d.png diff --git a/boards/textures/font_tinycurs_003e.png b/boards/textures/font_tinycurs_003e.png Binary files differnew file mode 100644 index 0000000..0cee6d5 --- /dev/null +++ b/boards/textures/font_tinycurs_003e.png diff --git a/boards/textures/font_tinycurs_003f.png b/boards/textures/font_tinycurs_003f.png Binary files differnew file mode 100644 index 0000000..928a174 --- /dev/null +++ b/boards/textures/font_tinycurs_003f.png diff --git a/boards/textures/font_tinycurs_0040.png b/boards/textures/font_tinycurs_0040.png Binary files differnew file mode 100644 index 0000000..e19e0cd --- /dev/null +++ b/boards/textures/font_tinycurs_0040.png diff --git a/boards/textures/font_tinycurs_0041.png b/boards/textures/font_tinycurs_0041.png Binary files differnew file mode 100644 index 0000000..d6505e1 --- /dev/null +++ b/boards/textures/font_tinycurs_0041.png diff --git a/boards/textures/font_tinycurs_0042.png b/boards/textures/font_tinycurs_0042.png Binary files differnew file mode 100644 index 0000000..af72583 --- /dev/null +++ b/boards/textures/font_tinycurs_0042.png diff --git a/boards/textures/font_tinycurs_0043.png b/boards/textures/font_tinycurs_0043.png Binary files differnew file mode 100644 index 0000000..ac8bfce --- /dev/null +++ b/boards/textures/font_tinycurs_0043.png diff --git a/boards/textures/font_tinycurs_0044.png b/boards/textures/font_tinycurs_0044.png Binary files differnew file mode 100644 index 0000000..25ead38 --- /dev/null +++ b/boards/textures/font_tinycurs_0044.png diff --git a/boards/textures/font_tinycurs_0045.png b/boards/textures/font_tinycurs_0045.png Binary files differnew file mode 100644 index 0000000..7ed7872 --- /dev/null +++ b/boards/textures/font_tinycurs_0045.png diff --git a/boards/textures/font_tinycurs_0046.png b/boards/textures/font_tinycurs_0046.png Binary files differnew file mode 100644 index 0000000..a48a33e --- /dev/null +++ b/boards/textures/font_tinycurs_0046.png diff --git a/boards/textures/font_tinycurs_0047.png b/boards/textures/font_tinycurs_0047.png Binary files differnew file mode 100644 index 0000000..17fe5aa --- /dev/null +++ b/boards/textures/font_tinycurs_0047.png diff --git a/boards/textures/font_tinycurs_0048.png b/boards/textures/font_tinycurs_0048.png Binary files differnew file mode 100644 index 0000000..7466bb7 --- /dev/null +++ b/boards/textures/font_tinycurs_0048.png diff --git a/boards/textures/font_tinycurs_0049.png b/boards/textures/font_tinycurs_0049.png Binary files differnew file mode 100644 index 0000000..660d34e --- /dev/null +++ b/boards/textures/font_tinycurs_0049.png diff --git a/boards/textures/font_tinycurs_004a.png b/boards/textures/font_tinycurs_004a.png Binary files differnew file mode 100644 index 0000000..9c4eb48 --- /dev/null +++ b/boards/textures/font_tinycurs_004a.png diff --git a/boards/textures/font_tinycurs_004b.png b/boards/textures/font_tinycurs_004b.png Binary files differnew file mode 100644 index 0000000..5554ef9 --- /dev/null +++ b/boards/textures/font_tinycurs_004b.png diff --git a/boards/textures/font_tinycurs_004c.png b/boards/textures/font_tinycurs_004c.png Binary files differnew file mode 100644 index 0000000..aaa7563 --- /dev/null +++ b/boards/textures/font_tinycurs_004c.png diff --git a/boards/textures/font_tinycurs_004d.png b/boards/textures/font_tinycurs_004d.png Binary files differnew file mode 100644 index 0000000..72cd174 --- /dev/null +++ b/boards/textures/font_tinycurs_004d.png diff --git a/boards/textures/font_tinycurs_004e.png b/boards/textures/font_tinycurs_004e.png Binary files differnew file mode 100644 index 0000000..177fdf3 --- /dev/null +++ b/boards/textures/font_tinycurs_004e.png diff --git a/boards/textures/font_tinycurs_004f.png b/boards/textures/font_tinycurs_004f.png Binary files differnew file mode 100644 index 0000000..2b76002 --- /dev/null +++ b/boards/textures/font_tinycurs_004f.png diff --git a/boards/textures/font_tinycurs_0050.png b/boards/textures/font_tinycurs_0050.png Binary files differnew file mode 100644 index 0000000..4ac9be8 --- /dev/null +++ b/boards/textures/font_tinycurs_0050.png diff --git a/boards/textures/font_tinycurs_0051.png b/boards/textures/font_tinycurs_0051.png Binary files differnew file mode 100644 index 0000000..c900456 --- /dev/null +++ b/boards/textures/font_tinycurs_0051.png diff --git a/boards/textures/font_tinycurs_0052.png b/boards/textures/font_tinycurs_0052.png Binary files differnew file mode 100644 index 0000000..ab5c241 --- /dev/null +++ b/boards/textures/font_tinycurs_0052.png diff --git a/boards/textures/font_tinycurs_0053.png b/boards/textures/font_tinycurs_0053.png Binary files differnew file mode 100644 index 0000000..c627af9 --- /dev/null +++ b/boards/textures/font_tinycurs_0053.png diff --git a/boards/textures/font_tinycurs_0054.png b/boards/textures/font_tinycurs_0054.png Binary files differnew file mode 100644 index 0000000..e9a155d --- /dev/null +++ b/boards/textures/font_tinycurs_0054.png diff --git a/boards/textures/font_tinycurs_0055.png b/boards/textures/font_tinycurs_0055.png Binary files differnew file mode 100644 index 0000000..bd74959 --- /dev/null +++ b/boards/textures/font_tinycurs_0055.png diff --git a/boards/textures/font_tinycurs_0056.png b/boards/textures/font_tinycurs_0056.png Binary files differnew file mode 100644 index 0000000..4446da3 --- /dev/null +++ b/boards/textures/font_tinycurs_0056.png diff --git a/boards/textures/font_tinycurs_0057.png b/boards/textures/font_tinycurs_0057.png Binary files differnew file mode 100644 index 0000000..d0fee31 --- /dev/null +++ b/boards/textures/font_tinycurs_0057.png diff --git a/boards/textures/font_tinycurs_0058.png b/boards/textures/font_tinycurs_0058.png Binary files differnew file mode 100644 index 0000000..84640b9 --- /dev/null +++ b/boards/textures/font_tinycurs_0058.png diff --git a/boards/textures/font_tinycurs_0059.png b/boards/textures/font_tinycurs_0059.png Binary files differnew file mode 100644 index 0000000..9053dd9 --- /dev/null +++ b/boards/textures/font_tinycurs_0059.png diff --git a/boards/textures/font_tinycurs_005a.png b/boards/textures/font_tinycurs_005a.png Binary files differnew file mode 100644 index 0000000..a69dde0 --- /dev/null +++ b/boards/textures/font_tinycurs_005a.png diff --git a/boards/textures/font_tinycurs_005b.png b/boards/textures/font_tinycurs_005b.png Binary files differnew file mode 100644 index 0000000..7e6a3f2 --- /dev/null +++ b/boards/textures/font_tinycurs_005b.png diff --git a/boards/textures/font_tinycurs_005c.png b/boards/textures/font_tinycurs_005c.png Binary files differnew file mode 100644 index 0000000..fd2df37 --- /dev/null +++ b/boards/textures/font_tinycurs_005c.png diff --git a/boards/textures/font_tinycurs_005d.png b/boards/textures/font_tinycurs_005d.png Binary files differnew file mode 100644 index 0000000..e3064d9 --- /dev/null +++ b/boards/textures/font_tinycurs_005d.png diff --git a/boards/textures/font_tinycurs_005e.png b/boards/textures/font_tinycurs_005e.png Binary files differnew file mode 100644 index 0000000..55055f9 --- /dev/null +++ b/boards/textures/font_tinycurs_005e.png diff --git a/boards/textures/font_tinycurs_005f.png b/boards/textures/font_tinycurs_005f.png Binary files differnew file mode 100644 index 0000000..367468a --- /dev/null +++ b/boards/textures/font_tinycurs_005f.png diff --git a/boards/textures/font_tinycurs_0060.png b/boards/textures/font_tinycurs_0060.png Binary files differnew file mode 100644 index 0000000..4170f49 --- /dev/null +++ b/boards/textures/font_tinycurs_0060.png diff --git a/boards/textures/font_tinycurs_0061.png b/boards/textures/font_tinycurs_0061.png Binary files differnew file mode 100644 index 0000000..b545504 --- /dev/null +++ b/boards/textures/font_tinycurs_0061.png diff --git a/boards/textures/font_tinycurs_0062.png b/boards/textures/font_tinycurs_0062.png Binary files differnew file mode 100644 index 0000000..daf3e81 --- /dev/null +++ b/boards/textures/font_tinycurs_0062.png diff --git a/boards/textures/font_tinycurs_0063.png b/boards/textures/font_tinycurs_0063.png Binary files differnew file mode 100644 index 0000000..dee911e --- /dev/null +++ b/boards/textures/font_tinycurs_0063.png diff --git a/boards/textures/font_tinycurs_0064.png b/boards/textures/font_tinycurs_0064.png Binary files differnew file mode 100644 index 0000000..1f4a51e --- /dev/null +++ b/boards/textures/font_tinycurs_0064.png diff --git a/boards/textures/font_tinycurs_0065.png b/boards/textures/font_tinycurs_0065.png Binary files differnew file mode 100644 index 0000000..002357f --- /dev/null +++ b/boards/textures/font_tinycurs_0065.png diff --git a/boards/textures/font_tinycurs_0066.png b/boards/textures/font_tinycurs_0066.png Binary files differnew file mode 100644 index 0000000..23eeae9 --- /dev/null +++ b/boards/textures/font_tinycurs_0066.png diff --git a/boards/textures/font_tinycurs_0067.png b/boards/textures/font_tinycurs_0067.png Binary files differnew file mode 100644 index 0000000..c557d04 --- /dev/null +++ b/boards/textures/font_tinycurs_0067.png diff --git a/boards/textures/font_tinycurs_0068.png b/boards/textures/font_tinycurs_0068.png Binary files differnew file mode 100644 index 0000000..5175ead --- /dev/null +++ b/boards/textures/font_tinycurs_0068.png diff --git a/boards/textures/font_tinycurs_0069.png b/boards/textures/font_tinycurs_0069.png Binary files differnew file mode 100644 index 0000000..db6433d --- /dev/null +++ b/boards/textures/font_tinycurs_0069.png diff --git a/boards/textures/font_tinycurs_006a.png b/boards/textures/font_tinycurs_006a.png Binary files differnew file mode 100644 index 0000000..96da601 --- /dev/null +++ b/boards/textures/font_tinycurs_006a.png diff --git a/boards/textures/font_tinycurs_006b.png b/boards/textures/font_tinycurs_006b.png Binary files differnew file mode 100644 index 0000000..f1e2be7 --- /dev/null +++ b/boards/textures/font_tinycurs_006b.png diff --git a/boards/textures/font_tinycurs_006c.png b/boards/textures/font_tinycurs_006c.png Binary files differnew file mode 100644 index 0000000..8cfd016 --- /dev/null +++ b/boards/textures/font_tinycurs_006c.png diff --git a/boards/textures/font_tinycurs_006d.png b/boards/textures/font_tinycurs_006d.png Binary files differnew file mode 100644 index 0000000..95ead88 --- /dev/null +++ b/boards/textures/font_tinycurs_006d.png diff --git a/boards/textures/font_tinycurs_006e.png b/boards/textures/font_tinycurs_006e.png Binary files differnew file mode 100644 index 0000000..22d177a --- /dev/null +++ b/boards/textures/font_tinycurs_006e.png diff --git a/boards/textures/font_tinycurs_006f.png b/boards/textures/font_tinycurs_006f.png Binary files differnew file mode 100644 index 0000000..52b2e64 --- /dev/null +++ b/boards/textures/font_tinycurs_006f.png diff --git a/boards/textures/font_tinycurs_0070.png b/boards/textures/font_tinycurs_0070.png Binary files differnew file mode 100644 index 0000000..05b3e5b --- /dev/null +++ b/boards/textures/font_tinycurs_0070.png diff --git a/boards/textures/font_tinycurs_0071.png b/boards/textures/font_tinycurs_0071.png Binary files differnew file mode 100644 index 0000000..05d4010 --- /dev/null +++ b/boards/textures/font_tinycurs_0071.png diff --git a/boards/textures/font_tinycurs_0072.png b/boards/textures/font_tinycurs_0072.png Binary files differnew file mode 100644 index 0000000..b36ac4d --- /dev/null +++ b/boards/textures/font_tinycurs_0072.png diff --git a/boards/textures/font_tinycurs_0073.png b/boards/textures/font_tinycurs_0073.png Binary files differnew file mode 100644 index 0000000..6e247b4 --- /dev/null +++ b/boards/textures/font_tinycurs_0073.png diff --git a/boards/textures/font_tinycurs_0074.png b/boards/textures/font_tinycurs_0074.png Binary files differnew file mode 100644 index 0000000..20224c9 --- /dev/null +++ b/boards/textures/font_tinycurs_0074.png diff --git a/boards/textures/font_tinycurs_0075.png b/boards/textures/font_tinycurs_0075.png Binary files differnew file mode 100644 index 0000000..8e1c3e2 --- /dev/null +++ b/boards/textures/font_tinycurs_0075.png diff --git a/boards/textures/font_tinycurs_0076.png b/boards/textures/font_tinycurs_0076.png Binary files differnew file mode 100644 index 0000000..84465fb --- /dev/null +++ b/boards/textures/font_tinycurs_0076.png diff --git a/boards/textures/font_tinycurs_0077.png b/boards/textures/font_tinycurs_0077.png Binary files differnew file mode 100644 index 0000000..0428693 --- /dev/null +++ b/boards/textures/font_tinycurs_0077.png diff --git a/boards/textures/font_tinycurs_0078.png b/boards/textures/font_tinycurs_0078.png Binary files differnew file mode 100644 index 0000000..aa640e9 --- /dev/null +++ b/boards/textures/font_tinycurs_0078.png diff --git a/boards/textures/font_tinycurs_0079.png b/boards/textures/font_tinycurs_0079.png Binary files differnew file mode 100644 index 0000000..6b1da68 --- /dev/null +++ b/boards/textures/font_tinycurs_0079.png diff --git a/boards/textures/font_tinycurs_007a.png b/boards/textures/font_tinycurs_007a.png Binary files differnew file mode 100644 index 0000000..db7af09 --- /dev/null +++ b/boards/textures/font_tinycurs_007a.png diff --git a/boards/textures/font_tinycurs_007b.png b/boards/textures/font_tinycurs_007b.png Binary files differnew file mode 100644 index 0000000..8c3c1b6 --- /dev/null +++ b/boards/textures/font_tinycurs_007b.png diff --git a/boards/textures/font_tinycurs_007c.png b/boards/textures/font_tinycurs_007c.png Binary files differnew file mode 100644 index 0000000..37aa7bb --- /dev/null +++ b/boards/textures/font_tinycurs_007c.png diff --git a/boards/textures/font_tinycurs_007d.png b/boards/textures/font_tinycurs_007d.png Binary files differnew file mode 100644 index 0000000..b0e4b74 --- /dev/null +++ b/boards/textures/font_tinycurs_007d.png diff --git a/boards/textures/font_tinycurs_007e.png b/boards/textures/font_tinycurs_007e.png Binary files differnew file mode 100644 index 0000000..86b6112 --- /dev/null +++ b/boards/textures/font_tinycurs_007e.png diff --git a/boards/textures/font_tinycurs_2018.png b/boards/textures/font_tinycurs_2018.png Binary files differnew file mode 100644 index 0000000..d7535fd --- /dev/null +++ b/boards/textures/font_tinycurs_2018.png diff --git a/boards/textures/font_tinycurs_2019.png b/boards/textures/font_tinycurs_2019.png Binary files differnew file mode 100644 index 0000000..0cdf90d --- /dev/null +++ b/boards/textures/font_tinycurs_2019.png diff --git a/boards/textures/font_tinycurs_201c.png b/boards/textures/font_tinycurs_201c.png Binary files differnew file mode 100644 index 0000000..71d3a16 --- /dev/null +++ b/boards/textures/font_tinycurs_201c.png diff --git a/boards/textures/font_tinycurs_201d.png b/boards/textures/font_tinycurs_201d.png Binary files differnew file mode 100644 index 0000000..f239395 --- /dev/null +++ b/boards/textures/font_tinycurs_201d.png diff --git a/boards/tools/updatepo.sh b/boards/tools/updatepo.sh new file mode 100755 index 0000000..feb2504 --- /dev/null +++ b/boards/tools/updatepo.sh @@ -0,0 +1,25 @@ +#! /bin/bash + +# To create a new translation: +# msginit --locale=ll_CC -o locale/ll_CC.po -i locale/template.pot + +cd "$(dirname "${BASH_SOURCE[0]}")/.."; + +# Extract translatable strings. +xgettext --from-code=UTF-8 \ + --language=Lua \ + --sort-by-file \ + --keyword=S \ + --keyword=NS:1,2 \ + --keyword=N_ \ + --keyword=F \ + --add-comments='Translators:' \ + --add-location=file \ + -o locale/template.pot \ + $(find . -name '*.lua') + +# Update translations. +find locale -name '*.po' | while read -r file; do + echo $file + msgmerge --update $file locale/template.pot; +done diff --git a/display_api/API.md b/display_api/API.md new file mode 100644 index 0000000..0d52e29 --- /dev/null +++ b/display_api/API.md @@ -0,0 +1,94 @@ +# Display Lib API +This document describes Display Lib API. Display Lib allows to add a dynamic display on a node. Display Lib limits node rotations. For wallmounted, only vertical positionning is available, and for facedir, only first four position are availabel (those with default axis). + +## Provided methods +### update\_entities +**display\_lib.update\_entities(pos)** + +This method triggers entities update for the display node at pos. Actual entity update is made by `on_display_update` callback associated to the entity. + +`pos`: Position of the node +### register\_display\_entity +**display\_lib.register\_display\_entity(entity_name)** + +This is a helper to register entities used for display. + +`entity_name`: Name of the entity to register. +## Provided callback implementations +### on_place +**display\_lib.on\_place(itemstack, placer, pointed\_thing)** + +`on_place` node callback implementation. Display nodes should have this callback (avoid placement of horizontal display node). +### on_construct +**display\_lib.on\_construct(pos)** + +`on_construct` node callback implementation. Display nodes should have this callback (creates, places and updates display entities on node construction). +### on_destruct +**display\_lib.on_destruct(pos)** + +`on_destruct` node callback implementation. Display nodes should have this callback (removes display entities on node destruction). +### on_rotate +**display\_lib.on\_rotate(pos, node, user, mode, new_param2)** + +`on_rotate` node callback implementation. Display nodes should have this callback (restricts rotations and rotates display entities associated with node). +### on_activate +**display\_lib.on_activate(entity, staticdata)** + +`On_activate` entity callback implementation for display entities. No need of this method if display entities have been registered using `register_display_entity` (callback is already set). + +## Howto register a display node +* Register display entities with `register_display_entity` + +* Register node with : + - `on_place`, `on_construct`, `on_destruct` and `on_rotate` callbacks using display_api callbacks. + + - `display_modpack_node` group. This will make this node have their entities updated as soon as the mapblock is loaded (Useful after /clearobjects). + + - a `display_entities` field in node definition containing a entity name indexed table. See below for description of each display_entities fields. + +### Display_entities fields +`on_display_update` is a callback in charge of setting up entity texture. If not set, entity will have no texture and will be displayed as unknown item. + +`depth`, `right` and `height` : Entity position regarding to node facedir/wallmounted main axis. +Values for these fields can be any number between -1.5 and 1.5 (default value is 0). +Position 0,0,0 is the center of the node. +`depth` goes from front (-0.5) to rear (0.5), `height` goes from bottom (-0.5) to top (0.5) and `right` goes from left (-0.5) to right (0.5). + +In order to avoid flickering text, it's better to have text a little behind node surface. A good spacing value is given by `display_api.entity_spacing` variable. + +### Example + + display_api.register_display_entity("mymod:entity1") + display_api.register_display_entity("mymod:entity2") + + function my_display_update1(pos, objref) + objref:set_properties({ textures= {"mytexture1.png"}, + visual_size = {x=1, y=1} }) + end + + function my_display_update2(pos, objref) + objref:set_properties({ textures= {"mytexture2.png"}, + visual_size = {x=1, y=1} }) + end + + minetest.register_node("mymod:test_display_node", { + ... + paramtype2 = "facedir", + ... + groups = { display_modpack_node = 1, ... }, + ... + display_entities = { + ["mymod:entity1"] = { + depth = 0.3, + on_display_update = my_display_update1 }, + ["mymod:entity1"] = { + depth = 0.2, height = 0.1, + on_display_update = my_display_update2 }, + }, + ... + on_place = display_api.on_place, + on_construct = display_api.on_construct, + on_destruct = display_api.on_destruct, + on_rotate = display_api.on_rotate, + ... + }) diff --git a/font_lib/LICENSE.txt b/display_api/LICENSE.txt index 341c30b..341c30b 100644 --- a/font_lib/LICENSE.txt +++ b/display_api/LICENSE.txt diff --git a/display_lib/README.md b/display_api/README.md index 3f8571a..26b26f0 100644 --- a/display_lib/README.md +++ b/display_api/README.md @@ -1,4 +1,4 @@ -# Display Lib +# Display API This library's purpose is to ease creation of nodes with one or more displays on sides. For example, signs and clocks. Display can be dynamic and/or different for each node instance. @@ -6,9 +6,9 @@ This library's purpose is to ease creation of nodes with one or more displays on **Dependancies**:default -**License**: LPGL +**License**: LGPLv2 -**API**: See [API.md](https://github.com/pyrollo/display_modpack/blob/master/display_lib/API.md) document please. +**API**: See [API.md](https://github.com/pyrollo/display_modpack/blob/master/display_api/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/display_api/copyright.txt b/display_api/copyright.txt new file mode 100644 index 0000000..e242c7c --- /dev/null +++ b/display_api/copyright.txt @@ -0,0 +1,5 @@ +Code by Pierre-Yves Rollo (pyrollo) +Contributors: +(gpcf): Compatibility with signs lib +(Thomas--S): Fix /clearobjects bug +(12Me21): on_place and on_rotate improvements diff --git a/display_lib/depends.txt b/display_api/depends.txt index e69de29..e69de29 100644 --- a/display_lib/depends.txt +++ b/display_api/depends.txt diff --git a/display_api/init.lua b/display_api/init.lua new file mode 100644 index 0000000..bf95ded --- /dev/null +++ b/display_api/init.lua @@ -0,0 +1,240 @@ +--[[ + display_api mod for Minetest - Library to add dynamic display + capabilities to nodes + (c) Pierre-Yves Rollo + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +--]] + +display_api = {} + +-- Prefered gap between node and entity +-- Entity positionment is up to mods but it is a good practice to use this +-- variable as spacing between entity and node +display_api.entity_spacing = 0.002 + +-- Maximum entity position relative to the node pos +local max_entity_pos = 1.5 + +-- Miscelaneous values depending on wallmounted param2 +local wallmounted_values = { + [2]={dx=-1, dz=0, rx=0, rz=-1, yaw=-math.pi/2}, + [3]={dx=1, dz=0, rx=0, rz=1, yaw=math.pi/2 }, + [4]={dx=0, dz=-1, rx=1, rz=0, yaw=0 }, + [5]={dx=0, dz=1, rx=-1, rz=0, yaw=math.pi } +} + +-- Miscelaneous values depending on facedir param2 +local facedir_values = { + [0]={dx=0, dz=-1, rx=1, rz=0, yaw=0 }, + [1]={dx=-1, dz=0, rx=0, rz=-1, yaw=-math.pi/2}, + [2]={dx=0, dz=1, rx=-1, rz=0, yaw=math.pi }, + [3]={dx=1, dz=0, rx=0, rz=1, yaw=math.pi/2 } +} + +-- dx/dy = depth vector, rx/ly = right vector, yaw = yaw of entity, +local function get_values(node) + local ndef = minetest.registered_nodes[node.name] + + if ndef then + local paramtype2 = ndef.paramtype2 + if paramtype2 == "wallmounted" or paramtype2 == "colorwallmounted" then + return wallmounted_values[node.param2 % 8] + elseif paramtype2 == "facedir" or paramtype2 == "colorfacedir" then + return facedir_values[node.param2 % 32] + end + end +end + +--- Gets the display entities attached with a node. Removes extra ones +local function get_entities(pos) + local objrefs = {} + local ndef = minetest.registered_nodes[minetest.get_node(pos).name] + if ndef and ndef.display_entities then + for _, objref in + ipairs(minetest.get_objects_inside_radius(pos, max_entity_pos)) do + local entity = objref:get_luaentity() + if entity and ndef.display_entities[entity.name] and + entity.nodepos and vector.equals(pos, entity.nodepos) then + if objrefs[entity.name] then + objref:remove() -- Remove duplicates + else + objrefs[entity.name] = objref + end + end + end + end + return objrefs +end + +local function clip_pos_prop(posprop) + if posprop then + return math.max(-max_entity_pos, math.min(max_entity_pos, posprop)) + else + return 0 + end +end + +--- (Create and) place display entities according to the node orientation +local function place_entities(pos) + local node = minetest.get_node(pos) + local ndef = minetest.registered_nodes[node.name] + local values = get_values(node) + local objrefs = get_entities(pos) + + if values and ndef and ndef.display_entities then + for entity_name, props in pairs(ndef.display_entities) do + local depth = clip_pos_prop(props.depth) + local right = clip_pos_prop(props.right) + local top = clip_pos_prop(props.top) + if not objrefs[entity_name] then + objrefs[entity_name] = minetest.add_entity(pos, entity_name, + minetest.serialize({ nodepos = pos })) + end + + objrefs[entity_name]:setpos({ + x = pos.x - values.dx * depth + values.rx * right, + y = pos.y - top, + z = pos.z - values.dz * depth + values.rz * right}) + + objrefs[entity_name]:setyaw(values.yaw) + end + end + return objrefs +end + + +--- Entity update +function update_entity(entity) + if not entity then + return + end + + if not entity.nodepos then + entity.object:remove() -- Remove old/buggy entity + return + end + + local node = minetest.get_node(entity.nodepos) + local ndef = minetest.registered_nodes[node.name] + if ndef and ndef.display_entities and + ndef.display_entities[entity.name] and + ndef.display_entities[entity.name].on_display_update + then + -- Call on_display_update callback of a node for one of its display entities + ndef.display_entities[entity.name].on_display_update(entity.nodepos, + entity.object) + end +end + +--- Force entity update +function display_api.update_entities(pos) + for _, objref in pairs(place_entities(pos)) do + update_entity(objref:get_luaentity()) + end +end + +--- On_activate callback for display_api entities. Calls on_display_update callbacks +--- of corresponding node for each entity. +function display_api.on_activate(entity, staticdata) + if entity then + if string.sub(staticdata, 1, string.len("return")) == "return" then + local data = minetest.deserialize(staticdata) + if data and type(data) == "table" then + entity.nodepos = data.nodepos + end + entity.object:set_armor_groups({immortal=1}) + end + update_entity(entity) + end +end + +--- On_place callback for display_api items. +-- Does nothing more than preventing node from being placed on ceiling or ground +function display_api.on_place(itemstack, placer, pointed_thing, override_param2) + local ndef = itemstack:get_definition() + local above = pointed_thing.above + local under = pointed_thing.under + local dir = {x = under.x - above.x, y = 0, z = under.z - above.z} + + -- If item is not placed on a wall, use the player's view direction instead + if dir.x == 0 and dir.z == 0 then + dir = placer:get_look_dir() + dir.y = 0 + end + + local param2 = 0 + if ndef then + local paramtype2 = ndef.paramtype2 + if paramtype2 == "wallmounted" or paramtype2 == "colorwallmounted" then + param2 = minetest.dir_to_wallmounted(dir) + elseif paramtype2 == "facedir" or paramtype2 == "colorfacedir" then + param2 = minetest.dir_to_facedir(dir) + end + end + return minetest.item_place(itemstack, placer, pointed_thing, + param2 + (override_param2 or 0)) +end + +--- On_construct callback for display_api items. +-- Creates entities and update them. +function display_api.on_construct(pos) + display_api.update_entities(pos) +end + +--- On_destruct callback for display_api items. +-- Removes entities. +function display_api.on_destruct(pos) + for _, objref in pairs(get_entities(pos)) do + objref:remove() + end +end + +-- On_rotate (screwdriver) callback for display_api items. Prevents invalid rotations and reorients entities. +function display_api.on_rotate(pos, node, user, _, new_param2) + node.param2 = new_param2 + if get_values(node) then + minetest.swap_node(pos, node) + place_entities(pos) + return true + else + return false + end +end + +--- Creates display entity with some fields and the on_activate callback +function display_api.register_display_entity(entity_name) + if not minetest.registered_entity then + minetest.register_entity(':'..entity_name, { + collisionbox = { 0, 0, 0, 0, 0, 0 }, + visual = "upright_sprite", + textures = {}, + on_activate = display_api.on_activate, + get_staticdata = function(self) + return minetest.serialize({ nodepos = self.nodepos }) + end, + }) + end +end + +minetest.register_lbm({ + label = "Update display_api entities", + name = "display_api:update_entities", + run_at_every_load = true, + nodenames = {"group:display_modpack_node", "group:display_lib_node"}, + action = function(pos, node) display_api.update_entities(pos) end, +}) + +-- Compatibility +display_lib = display_api diff --git a/display_lib/API.md b/display_lib/API.md deleted file mode 100644 index 148db60..0000000 --- a/display_lib/API.md +++ /dev/null @@ -1,83 +0,0 @@ -# Display Lib API -This document describes Display Lib API. Display Lib allows to add a dynamic display on a node. Display Lib limits node rotations. For wallmounted, only vertical positionning is available, and for facedir, only first four position are availabel (those with default axis). - -## Provided methods -### update\_entities -**display\_lib.update\_entities(pos)** - -This method triggers entities update for the display node at pos. Actual entity update is made by **on\_display\_update** callback associated to the entity. - -**pos**: Position of the node -### register\_display\_entity -**display\_lib.register\_display\_entity(entity_name)** - -This is a helper to register entities used for display. - -**entity_name**: Name of the entity to register. -## Provided callback implementations -### on_place -**display\_lib.on\_place(itemstack, placer, pointed\_thing)** - -**On_place** node callback implementation. Display nodes should have this callback (avoid placement of horizontal display node). -### on_construct -**display\_lib.on\_construct(pos)** - -**On_construct** node callback implementation. Display nodes should have this callback (creates, places and updates display entities on node construction). -### on_destruct -**display\_lib.on_destruct(pos)** - -**On_destruct** node callback implementation. Display nodes should have this callback (removes display entities on node destruction). -### on_rotate -**display\_lib.on\_rotate(pos, node, user, mode, new_param2)** - -**On_rotate** node callback implementation. Display nodes should have this callback (restricts rotations and rotates display entities associated with node). -### on_activate -**display\_lib.on_activate(entity, staticdata)** - -**On_activate** entity callback implementation for display entities. No need of this method if display entities have been registered using **register\_display\_entity** (callback is already set). -## Howto register a display node -* Register display entities with **register\_display\_entity** -* Register node with : - - **on\_place**, **on\_construct**, **on\_destruct** and **on\_rotate** callbacks using **display\_lib** callbacks. - - a **display\_entities** field in node definition containing a entity name indexed table. See below for description of each display\_entities fields. - -### Display_entities fields -**depth**, **right** and **height** : Entity position regarding to node facedir/wallmounted main axis. Values for these fields can be any number between -0.5 and 0.5 (default value is 0). Position 0,0,0 is the center of the node. **depth** goes from front (-0.5) to rear (0.5), **height** goes from bottom (-0.5) to top (0.5) and **height** goes from left (-0.5) to right (0.5). - -**on_display_update** is a callback in charge of setting up entity texture. If not set, entity will have no texture and will be displayed as unknown item. - -### Example - - display_lib.register_display_entity("mymod:entity1") - display_lib.register_display_entity("mymod:entity2") - - function my_display_update1(pos, objref) - objref:set_properties({ textures= {"mytexture1.png"}, - visual_size = {x=1, y=1} }) - end - - function my_display_update2(pos, objref) - objref:set_properties({ textures= {"mytexture2.png"}, - visual_size = {x=1, y=1} }) - end - - minetest.register_node("mymod:test_display_node", { - ... - paramtype2 = "wallmounted", - ... - display_entities = { - ["mymod:entity1"] = { depth = 0.3, - on_display_update = my_display_update1}, - ["mymod:entity1"] = { depth = 0.2, height = 0.1, - on_display_update = my_display_update2}, - }, - ... - on_place = display_lib.on_place, - on_construct = display_lib.on_construct, - on_destruct = display_lib.on_destruct, - on_rotate = display_lib.on_rotate, - ... - }) - - - diff --git a/display_lib/init.lua b/display_lib/init.lua deleted file mode 100644 index 210aac9..0000000 --- a/display_lib/init.lua +++ /dev/null @@ -1,229 +0,0 @@ ---[[ - display_lib mod for Minetest - Library to add dynamic display - capabilities to nodes - (c) Pierre-Yves Rollo - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. ---]] - -display_lib = {} - --- Miscelaneous values depending on wallmounted param2 -local wallmounted_values = { - [0]={dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, -- Should never be used - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=1}, -- Should never be used - {dx=-1, dz=0, rx=0, rz=-1, yaw=-math.pi/2, rotate=5}, - {dx=1, dz=0, rx=0, rz=1, yaw=math.pi/2, rotate=4}, - {dx=0, dz=-1, rx=1, rz=0, yaw=0, rotate=2}, - {dx=0, dz=1, rx=-1, rz=0, yaw=math.pi, rotate=3} -} - --- Miscelaneous values depending on facedir param2 -local facedir_values = { - [0]={dx=0, dz=-1, rx=1, rz=0, yaw=0, rotate=1}, - {dx=-1, dz=0, rx=0, rz=-1, yaw=-math.pi/2, rotate=2}, - {dx=0, dz=1, rx=-1, rz=0, yaw=math.pi, rotate=3}, - {dx=1, dz=0, rx=0, rz=1, yaw=math.pi/2, rotate=0}, - -- Forbiden values : - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - {dx=0, dz=0, rx=0, rz=0, yaw=0, rotate=0}, - } - --- dx/dy = depth vector, rx/ly = right vector, yaw = yaw of entity, --- rotate = next facedir/wallmount on rotate - -local function get_values(node) - local ndef = minetest.registered_nodes[node.name] - - if ndef then - if ndef.paramtype2 == "wallmounted" then - return wallmounted_values[node.param2] - end - if ndef.paramtype2 == "facedir" then - return facedir_values[node.param2] - end - end -end - ---- Gets the display entities attached with a node. Removes extra ones -local function get_entities(pos) - local objrefs = {} - local ndef = minetest.registered_nodes[minetest.get_node(pos).name] - if ndef and ndef.display_entities then - for _, objref in ipairs(minetest.get_objects_inside_radius(pos, 0.5)) do - local entity = objref:get_luaentity() - if entity and ndef.display_entities[entity.name] then - if objrefs[entity.name] then - objref:remove() - else - objrefs[entity.name] = objref - end - end - end - end - return objrefs -end - -local function clip_pos_prop(posprop) - if posprop then - return math.max(-0.5, math.min(0.5, posprop)) - else - return 0 - end -end - ---- (Create and) place display entities according to the node orientation -local function place_entities(pos) - local node = minetest.get_node(pos) - local ndef = minetest.registered_nodes[node.name] - local values = get_values(node) - local objrefs = get_entities(pos) - - if values and ndef and ndef.display_entities then - - for entity_name, props in pairs(ndef.display_entities) do - local depth = clip_pos_prop(props.depth) - local height = clip_pos_prop(props.height) - local right = clip_pos_prop(props.right) - if not objrefs[entity_name] then - objrefs[entity_name] = minetest.add_entity(pos, entity_name) - end - - objrefs[entity_name]:setpos({ - x = pos.x - values.dx * depth + values.rx * right, - y = pos.y + height, - z = pos.z - values.dz * depth + values.rz * right}) - - objrefs[entity_name]:setyaw(values.yaw) - end - end - return objrefs -end - ---- Call on_display_update callback of a node for one of its display entities -local function call_node_on_display_update(pos, objref) - local ndef = minetest.registered_nodes[minetest.get_node(pos).name] - local entity = objref:get_luaentity() - if ndef and ndef.display_entities and entity and ndef.display_entities[entity.name] then - ndef.display_entities[entity.name].on_display_update(pos, objref) - end -end - ---- Force entity update -function display_lib.update_entities(pos) - local objrefs = place_entities(pos) - for _, objref in pairs(objrefs) do - call_node_on_display_update(pos, objref) - end -end - ---- On_activate callback for display_lib entities. Calls on_display_update callbacks ---- of corresponding node for each entity. -function display_lib.on_activate(entity, staticdata) - if entity then - entity.object:set_armor_groups({immortal=1}) - call_node_on_display_update(entity.object:getpos(), entity.object) - end -end - ---- On_place callback for display_lib items. Does nothing more than preventing item ---- from being placed on ceiling or ground -function display_lib.on_place(itemstack, placer, pointed_thing) - local ndef = itemstack:get_definition() - local above = pointed_thing.above - local under = pointed_thing.under - local dir = {x = under.x - above.x, - y = under.y - above.y, - z = under.z - above.z} - - if ndef then - if ndef.paramtype2 == "wallmounted" then - - local wdir = minetest.dir_to_wallmounted(dir) - - if wdir == 0 or wdir == 1 then - dir = placer:get_look_dir() - dir.y = 0 - wdir = minetest.dir_to_wallmounted(dir) - end - - return minetest.item_place(itemstack, placer, pointed_thing, wdir) - else - return minetest.item_place(itemstack, placer, pointed_thing, minetest.dir_to_facedir(dir)) - end - end - -end - ---- On_construct callback for display_lib items. Creates entities and update them. -function display_lib.on_construct(pos) - display_lib.update_entities(pos) -end - ---- On_destruct callback for display_lib items. Removes entities. -function display_lib.on_destruct(pos) - local objrefs = get_entities(pos) - - for _, objref in pairs(objrefs) do - objref:remove() - end -end - --- On_rotate (screwdriver) callback for display_lib items. Prevents axis rotation and reorients entities. -function display_lib.on_rotate(pos, node, user, mode, new_param2) - if mode ~= 1 then return false end - - local values = get_values(node) - - if values then - minetest.swap_node(pos, {name = node.name, param1 = node.param1, param2 = values.rotate}) - place_entities(pos) - return true - else - return false - end -end - ---- Creates display entity with some fields and the on_activate callback -function display_lib.register_display_entity(entity_name) - if not minetest.registered_entity then - minetest.register_entity(':'..entity_name, { - collisionbox = { 0, 0, 0, 0, 0, 0 }, - visual = "upright_sprite", - textures = {}, - on_activate = display_lib.on_activate, - }) - end -end - - - diff --git a/font_api/API.md b/font_api/API.md new file mode 100644 index 0000000..9900a80 --- /dev/null +++ b/font_api/API.md @@ -0,0 +1,145 @@ +# 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 + +### font_api.get_default_font_name() +Returns de default font name. + +### font_api.register_font(font_name, font_def) +Register a new font. +**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...). +**font_def**: Font definition table (see **Font definition table** below). + +### font_api.on_display_update(pos, objref) +Standard on_display_update entity callback. + +**pos**: Node position + +**objref**: Object reference of entity + +Node should have a corresponding display_entity with size, resolution and maxlines fields and optionally halign, valign and color fields. + +### Font definition table +Font definition table used by **font_api.register_font** and **font\_api.Font:new** may/can contain following elements: + +* **height** (required): Font height in pixels (all font textures should have the same height) . +* **widths** (required): Array of character widths in pixels, indexed by UTF codepoints. +* **margintop** (optional): Margin (in texture pixels) added on top of each char texture. +* **marginbottom** (optional): Margin (in texture pixels) added at bottom of each char texture. +* **linespacing** (optional): Spacing (in texture pixels) between each lines. + +**margintop**, **marginbottom** and **linespacing** can be negative numbers (default 0) and are to be used to adjust various font styles to each other. + +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 + +Example : font_courrier_0041.png is for the "A" char in the "courrier" font. + +To ease that declaration (specially to build the **widths** array), a shell is provided to build a {font\_name}.lua file from the texture files (see provided tools). + +## Provided tools + +Still in early stage of development, these tools are helpers to create font mods. + +### make_font_texture.sh + +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. + +__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_api (should be simple, with no spaces). +**{fontsize}**: Font height to be rendered. + +### make_font_lua.sh + +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_api (same as given to make\_font\_texture.sh) + +### An exemple generating a font mod + + mkdir font_myfont + cd font_myfont + /<path_to_font_api>/tools/make_font_texture.sh myfont.ttf myfont 12 + /<path_to_font_api>/tools/make_font_lua.sh myfont + mv font_myfont.lua init.lua + +## Font class +A font usable with font API. This class is supposed to be for internal use but who knows. + +### font\_api.Font:new(def) +Create a new font object. + +**def** is a table containing font definition. See **Font definition table** above. + +### font:get_char_width(char) +Returns the width of char **char** in texture pixels. + +**char**: Unicode codepoint of char. + +### font:get_height(nb_of_lines) +Returns line(s) height. Takes care of top and bottom margins and line spacing. + +**nb_of_lines**: Number of lines in the text. + +### font:get_width(line) + +Returns the width of a text line. Beware, if line contains any new line char, they are ignored. + +**line**: Line of text which the width will be computed. + +### font:make_line_texture(line, texturew, x, y) +Create a texture for a text line. + +**line**: Line of text to be rendered in texture. + +**texturew**: Width of the texture (extra text is not rendered). + +**x**: Starting x position in texture. + +**y**: Vertical position of the line in texture. + +### font:make_text_texture(text, texturew, textureh, maxlines, halign, valign, color) +Builds texture for a multiline colored text. + +**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. + +**halign**: Horizontal text align ("left"/"center"/"right") (optional). + +**valign**: Vertical text align ("top"/"center"/"bottom") (optional). + +**color**: Color of the text (optional). + diff --git a/font_api/LICENSE.txt b/font_api/LICENSE.txt new file mode 100644 index 0000000..341c30b --- /dev/null +++ b/font_api/LICENSE.txt @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + diff --git a/font_api/README.md b/font_api/README.md new file mode 100644 index 0000000..33af92b --- /dev/null +++ b/font_api/README.md @@ -0,0 +1,23 @@ +# Font API + +This library for font display on entities (to be used with display_api for sign creation). + +**Dependancies**: default + +**License**: LGPL + +(Default font taken from VanessaE's homedecor/signs_lib, originally under WTFPL) + +**API**: See [API.md](https://github.com/pyrollo/display_modpack/blob/master/font_api/API.md) document please. + +For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?t=13563) at the Minetest forums. + +## Extra fonts + +You can add fonts by installing fonts mod. Be aware that each font comes with numerous textures. This can result in slowing media downloading and/or client display. + +Font mods can be found here: + + * [Metro](https://github.com/pyrollo/display_modpack/tree/master/font_metro): A multipurpose font with many chars (uppercase, lowercase and accentuated latin letters, usual signs, cyrillic and greek letters). + * [OldWizard](https://github.com/pyrollo/font_oldwizard): An old style gothic font. + * [Botic](https://github.com/pyrollo/font_botic): A scifi style font. diff --git a/font_api/copyright.txt b/font_api/copyright.txt new file mode 100644 index 0000000..ceb5446 --- /dev/null +++ b/font_api/copyright.txt @@ -0,0 +1,3 @@ +Code by Pierre-Yves Rollo (pyrollo) +Contributors: +Andrzej Pieńkowski (apienk): Unicode support and tool for creating texturess diff --git a/font_lib/depends.txt b/font_api/depends.txt index e69de29..e69de29 100644 --- a/font_lib/depends.txt +++ b/font_api/depends.txt diff --git a/font_api/doc/font.svg b/font_api/doc/font.svg new file mode 100644 index 0000000..e4e8757 --- /dev/null +++ b/font_api/doc/font.svg @@ -0,0 +1,463 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="120mm" + height="110mm" + viewBox="0 0 120 110" + version="1.1" + id="svg8" + inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + sodipodi:docname="font.svg"> + <defs + id="defs2"> + <marker + inkscape:stockid="Arrow1Mend" + orient="auto" + refY="0" + refX="0" + id="marker7159" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path7157" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.4,0,0,-0.4,-4,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Mstart" + orient="auto" + refY="0" + refX="0" + id="marker7071" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path7069" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.4,0,0,0.4,4,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Mend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Mend" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path886" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.4,0,0,-0.4,-4,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Mstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Mstart" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path883" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.4,0,0,0.4,4,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path880" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path877" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart-3" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path877-6" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend-7" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path880-5" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart-9" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path877-1" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend-2" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path880-7" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart-9-9" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path877-1-3" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend-2-6" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path880-7-0" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart-1" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path877-2" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend-9" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path880-3" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart-94" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path877-7" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend-8" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path880-4" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="1" + inkscape:pageshadow="2" + inkscape:zoom="0.98994949" + inkscape:cx="-151.37352" + inkscape:cy="445.54867" + inkscape:document-units="mm" + inkscape:current-layer="g8201" + showgrid="true" + inkscape:lockguides="true" + inkscape:window-width="1877" + inkscape:window-height="1052" + inkscape:window-x="1409" + inkscape:window-y="0" + inkscape:window-maximized="1" + showguides="false"> + <inkscape:grid + type="xygrid" + id="grid826" + spacingx="1" + units="mm" + spacingy="1" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-187)"> + <g + id="g7357" + transform="translate(65,-15)" + style="opacity:0.5"> + <rect + y="202" + x="170" + height="70" + width="70" + id="rect828-9" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.98000004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:0.25098039;fill-rule:nonzero;stroke:#999999;stroke-width:0.30550504;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <path + d="m 220,252 h 10 v 10 h -10 z m -50,0 h 10 v 10 h -10 z m 5,-10 h 50 v 10 h -50 z m 4.99998,-10 h 10 v 10 h -10 z M 210,232 h 10 v 10 h -10 z m -5,-10 h 10 v 10 h -10 z m -20,0 h 10 v 10 h -10 z m 5,-10.00002 h 20 v 10 H 190 Z M 195,202 h 10 v 10 h -10 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.98000004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32659864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect854-2" + inkscape:connector-curvature="0" /> + </g> + <g + id="g8201" + transform="translate(0,190)"> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.26499998, 1.05999994;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect1594" + width="120" + height="109.99999" + x="0" + y="-3" /> + <g + transform="translate(-75,-120)" + id="g7361"> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.98000004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0000ff;fill-opacity:0.25098039;fill-rule:nonzero;stroke:#0000ff;stroke-width:0.30550504;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect828" + width="70" + height="70" + x="100" + y="137" /> + <path + inkscape:connector-curvature="0" + id="rect854" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.98000004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32659864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 150,187 h 10 v 10 h -10 z m -50,0 h 10 v 10 h -10 z m 5,-10 h 50 v 10 h -50 z m 4.99999,-10 h 10 v 10 h -10 z M 140,167 h 10 v 10 h -10 z m -5,-10 h 10 v 10 h -10 z m -20,0 h 10 v 10 h -10 z m 5,-10.00002 h 20 v 10 H 120 Z M 125,137 h 10 v 10 h -10 z" /> + </g> + <path + inkscape:connector-curvature="0" + id="path875" + d="M 19.999999,17 V 87" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Lstart);marker-end:url(#Arrow1Lend)" /> + <text + inkscape:transform-center-y="5.2916667" + inkscape:transform-center-x="1.889881" + transform="rotate(-90)" + id="text1193" + y="17.496948" + x="-52.43602" + style="font-style:normal;font-weight:normal;font-size:3.96875px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.26458332px" + y="17.496948" + x="-52.43602" + id="tspan1191" + sodipodi:role="line">Texture Height</tspan></text> + <path + inkscape:connector-curvature="0" + id="path875-3" + d="M 95,97 H 25" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Lstart-3);marker-end:url(#Arrow1Lend-7)" /> + <text + inkscape:transform-center-y="-1.8898824" + inkscape:transform-center-x="5.2916602" + id="text1193-5" + y="101.69528" + x="60.176346" + style="font-style:normal;font-weight:normal;font-size:3.96875px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.26458332px" + y="101.69528" + x="60.176346" + id="tspan1191-6" + sodipodi:role="line">Texture Width</tspan></text> + <rect + y="7" + x="25" + height="85" + width="70" + id="rect828-2" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.98000004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff00ff;stroke-width:0.33665016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path875-0" + d="M 20,7 V 17" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7071);marker-end:url(#marker7159)" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path875-0-6" + d="m 20,87 v 5" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend)" /> + <text + inkscape:transform-center-y="-1.8898824" + inkscape:transform-center-x="5.2916678" + id="text1193-2" + y="10.614426" + x="17.348068" + style="font-style:normal;font-weight:normal;font-size:3.96875px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="text-align:end;text-anchor:end;fill:#000000;fill-opacity:1;stroke-width:0.26458332px" + y="10.614426" + x="17.348068" + id="tspan1191-61" + sodipodi:role="line">Margin</tspan><tspan + id="tspan8103" + style="text-align:end;text-anchor:end;fill:#000000;fill-opacity:1;stroke-width:0.26458332px" + y="15.575363" + x="17.348068" + sodipodi:role="line">Top</tspan></text> + <text + inkscape:transform-center-y="-1.8898824" + inkscape:transform-center-x="5.2916678" + id="text1193-2-8" + y="88.4991" + x="17.240334" + style="font-style:normal;font-weight:normal;font-size:3.96875px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="text-align:end;text-anchor:end;fill:#000000;fill-opacity:1;stroke-width:0.26458332px" + y="88.4991" + x="18.503822" + id="tspan1191-61-7" + sodipodi:role="line">Margin </tspan><tspan + id="tspan8105" + style="text-align:end;text-anchor:end;fill:#000000;fill-opacity:1;stroke-width:0.26458332px" + y="93.460037" + x="17.240334" + sodipodi:role="line">Bottom</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path875-1" + d="M 100,7 V 92" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Lstart-1);marker-end:url(#Arrow1Lend-9)" /> + <text + inkscape:transform-center-y="5.2916667" + inkscape:transform-center-x="1.889881" + transform="rotate(-90)" + id="text1193-0" + y="104.35954" + x="-49.646301" + style="font-style:normal;font-weight:normal;font-size:3.96875px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.26458332px" + y="104.35954" + x="-49.646301" + id="tspan1191-3" + sodipodi:role="line">Line Height</tspan></text> + </g> + </g> +</svg> diff --git a/font_api/doc/lines.svg b/font_api/doc/lines.svg new file mode 100644 index 0000000..f75880f --- /dev/null +++ b/font_api/doc/lines.svg @@ -0,0 +1,544 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="120mm" + height="225mm" + viewBox="0 0 120 225" + version="1.1" + id="svg8" + inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + sodipodi:docname="lines.svg"> + <defs + id="defs2"> + <marker + inkscape:stockid="Arrow1Mend" + orient="auto" + refY="0" + refX="0" + id="marker7159" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path7157" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.4,0,0,-0.4,-4,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Mstart" + orient="auto" + refY="0" + refX="0" + id="marker7071" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path7069" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.4,0,0,0.4,4,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Mend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Mend" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path886" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.4,0,0,-0.4,-4,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Mstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Mstart" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path883" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.4,0,0,0.4,4,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path880" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path877" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart-3" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path877-6" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend-7" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path880-5" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart-9" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path877-1" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend-2" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path880-7" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart-9-9" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path877-1-3" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend-2-6" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path880-7-0" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart-1" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path877-2" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend-9" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path880-3" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart-94" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path877-7" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend-8" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path880-4" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart-1-2" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path877-2-0" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend-9-6" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path880-3-1" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lstart-1-5" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path877-2-4" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend-9-7" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path880-3-6" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="1" + inkscape:pageshadow="2" + inkscape:zoom="0.7" + inkscape:cx="577.84911" + inkscape:cy="466.83879" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:lockguides="true" + inkscape:window-width="1877" + inkscape:window-height="1052" + inkscape:window-x="1409" + inkscape:window-y="0" + inkscape:window-maximized="1" + showguides="false"> + <inkscape:grid + type="xygrid" + id="grid826" + spacingx="1" + units="mm" + spacingy="1" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-72)"> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.26499998, 1.05999993999999997;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect890" + width="120" + height="224.99998" + x="0" + y="72" /> + <g + id="g10629" + transform="translate(-5,-54.999998)"> + <g + id="g8263"> + <g + transform="translate(-40,39.999996)" + id="g8268"> + <rect + y="102" + x="60" + height="70" + width="70" + id="rect828-9" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:0.25098039;fill-rule:nonzero;stroke:#999999;stroke-width:0.30550504;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <path + d="m 110,152 h 10 v 10 h -10 z m -50,0 h 10 v 10 H 60 Z m 5,-10 h 50 v 10 H 65 Z m 4.99998,-10 h 10 v 10 h -10 z M 100,132 h 10 v 10 h -10 z m -5,-10 h 10 v 10 H 95 Z m -20,0 h 10 v 10 H 75 Z m 5,-10.00002 h 20 v 10 H 80 Z M 85,102 h 10 v 10 H 85 Z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32659864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect854-2" + inkscape:connector-curvature="0" /> + <rect + y="92" + x="60" + height="85.000008" + width="70" + id="rect828-2-6" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.33665016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + </g> + <g + transform="translate(-40,170)" + id="g8268-1"> + <rect + y="102" + x="60" + height="70" + width="70" + id="rect828-9-0" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:0.25098039;fill-rule:nonzero;stroke:#999999;stroke-width:0.30550504;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <path + d="m 110,152 h 10 v 10 h -10 z m -50,0 h 10 v 10 H 60 Z m 5,-10 h 50 v 10 H 65 Z m 4.99998,-10 h 10 v 10 h -10 z M 100,132 h 10 v 10 h -10 z m -5,-10 h 10 v 10 H 95 Z m -20,0 h 10 v 10 H 75 Z m 5,-10.00002 h 20 v 10 H 80 Z M 85,102 h 10 v 10 H 85 Z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32659864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect854-2-6" + inkscape:connector-curvature="0" /> + <rect + y="92" + x="60" + height="85.000008" + width="70" + id="rect828-2-6-3" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.33665016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + </g> + </g> + <g + transform="translate(-75,70)" + id="g7361"> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.98000004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0000ff;fill-opacity:0.25098039;fill-rule:nonzero;stroke:#0000ff;stroke-width:0.30550504;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect828" + width="70" + height="70" + x="100" + y="137" /> + <path + inkscape:connector-curvature="0" + id="rect854" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.98000004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32659864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 150,187 h 10 v 10 h -10 z m -50,0 h 10 v 10 h -10 z m 5,-10 h 50 v 10 h -50 z m 4.99999,-10 h 10 v 10 h -10 z M 140,167 h 10 v 10 h -10 z m -5,-10 h 10 v 10 h -10 z m -20,0 h 10 v 10 h -10 z m 5,-10.00002 h 20 v 10 H 120 Z M 125,137 h 10 v 10 h -10 z" /> + </g> + <rect + y="197" + x="25" + height="85" + width="70" + id="rect828-2" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.98000004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff00ff;stroke-width:0.33665016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path875-1" + d="m 100,197 v 85" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Lstart-1);marker-end:url(#Arrow1Lend-9)" /> + <text + inkscape:transform-center-y="5.2916667" + inkscape:transform-center-x="1.889881" + transform="rotate(-90)" + id="text1193-0" + y="104.35954" + x="-239.6463" + style="font-style:normal;font-weight:normal;font-size:3.96875px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.26458332px" + y="104.35954" + x="-239.6463" + id="tspan1191-3" + sodipodi:role="line">Line Height</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path875-1-5" + d="m 15,197 v 20" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Lstart-1-2);marker-end:url(#Arrow1Lend-9-6)" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path875-1-56" + d="M 110,132 V 347" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Lstart-1-5);marker-end:url(#Arrow1Lend-9-7)" /> + <text + inkscape:transform-center-y="5.2916667" + inkscape:transform-center-x="1.889881" + transform="rotate(-90)" + id="text1193-0-9" + y="115.82679" + x="-239.6463" + style="font-style:normal;font-weight:normal;font-size:3.96875px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.26458332px" + y="115.82679" + x="-239.6463" + id="tspan1191-3-3" + sodipodi:role="line">Text Height</tspan></text> + <text + inkscape:transform-center-y="5.2916667" + inkscape:transform-center-x="1.889881" + transform="rotate(-90)" + id="text1193-0-7" + y="11.713711" + x="-206.76294" + style="font-style:normal;font-weight:normal;font-size:3.96875px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.26458332px" + y="11.713711" + x="-206.76294" + id="tspan1191-3-4" + sodipodi:role="line">Line Spacing</tspan></text> + <path + inkscape:connector-curvature="0" + id="path10512" + d="M 25,197 H 15 v 0" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.26499999, 1.05999996;stroke-dashoffset:0;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path10512-5" + d="M 25,217 H 15 v 0" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.26499999, 1.05999996;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path10512-2" + d="M 110,132 H 90" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.26499999, 1.05999996;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path10512-2-5" + d="M 110,347 H 90" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.26499999, 1.05999997;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path10512-2-5-4" + d="M 100,282 H 95" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.26499999, 1.05999998;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path10512-2-5-4-7" + d="M 100,197 H 95" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.26499999, 1.05999999;stroke-dashoffset:0;stroke-opacity:1" /> + </g> + </g> +</svg> diff --git a/font_api/fallbacks.lua b/font_api/fallbacks.lua new file mode 100644 index 0000000..480d865 --- /dev/null +++ b/font_api/fallbacks.lua @@ -0,0 +1,176 @@ +--[[ + font_api mod for Minetest - Library to add font display capability + to display_api mod. + (c) Pierre-Yves Rollo + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +--]] + +-- This is the unicode char fallback map. If a char is not present in +-- font, this maps indicates which char to try to use instead next. + +return { + -- Lowercase chars + ['a'] = 'A', ['b'] = 'B', ['c'] = 'C', ['d'] = 'D', + ['e'] = 'E', ['f'] = 'F', ['g'] = 'G', ['h'] = 'H', + ['i'] = 'I', ['j'] = 'J', ['k'] = 'K', ['l'] = 'L', + ['m'] = 'M', ['n'] = 'N', ['o'] = 'O', ['p'] = 'P', + ['q'] = 'Q', ['r'] = 'R', ['s'] = 'S', ['t'] = 'T', + ['u'] = 'U', ['v'] = 'V', ['w'] = 'W', ['x'] = 'X', + ['y'] = 'Y', ['z'] = 'Z', + + -- Special + ['¢'] = 'c', ['£'] = 'L', ['¥'] = 'Y', ['€'] = 'E', + ['©'] = '(C)', ['®'] = '(R)', ['™'] = 'TM', + ['ª'] = 'a', ['º'] = 'o', + ['«'] = '"', ['»'] = '"', ['´'] = '\'', + ['¹'] = '1', ['²'] = '2', ['³'] = '3', + ['µ'] = 'u', ['¤'] = 'o', + ['¼'] = '1/4', ['½'] = '1/2', ['¾'] = '3/4', + ['⅛'] = '1/8', ['⅜'] = '3/8', ['⅝'] = '5/8', ['⅞'] = '7/8', + ['¿'] = '?', + + -- Upper case accents + ['À'] = 'A', ['Á'] = 'A', ['Â'] = 'A', ['Ã'] = 'A', + ['Ä'] = 'A', ['Å'] = 'A', + ['Æ'] = 'AE', ['Ç'] = 'C', + ['È'] = 'E', ['É'] = 'E', ['Ê'] = 'E', ['Ë'] = 'E', + ['Ì'] = 'I', ['Í'] = 'I', ['Î'] = 'I', ['Ï'] = 'I', + ['Ð'] = 'D', ['Ñ'] = 'N', + ['Ò'] = 'O', ['Ó'] = 'O', ['Ô'] = 'O', ['Õ'] = 'O', + ['Ö'] = 'O', ['Ø'] = 'O', + ['Ú'] = 'U', ['Ù'] = 'U', ['Û'] = 'U', ['Ü'] = 'U', + ['×'] = 'x', ['Ý'] = 'Y', + + -- Lower case accents + ['à'] = 'a', ['à'] = 'a', ['á'] = 'a', ['â'] = 'a', + ['ã'] = 'a', ['ä'] = 'a', ['å'] = 'a', + ['æ'] = 'ae', ['ç'] = 'c', + ['è'] = 'e', ['é'] = 'e', ['ê'] = 'e', ['ë'] = 'e', + ['ì'] = 'i', ['í'] = 'i', ['î'] = 'i', ['ï'] = 'i', + ['ð'] = 'd', ['ñ'] = 'n', + ['ò'] = 'o', ['ó'] = 'o', ['ô'] = 'o', ['õ'] = 'o', + ['ö'] = 'o', ['ø'] = 'o', + ['ù'] = 'u', ['ú'] = 'u', ['û'] = 'u', ['ü'] = 'u', + ['ý'] = 'y', ['ÿ'] = 'y', + + -- Extended latin A + + ['Ā'] = 'A', ['ā'] = 'a', ['Ă'] = 'A', ['ă'] = 'a', + ['Ą'] = 'A', ['ą'] = 'a', ['Ć'] = 'C', ['ć'] = 'c', + ['Ĉ'] = 'C', ['ĉ'] = 'c', ['Ċ'] = 'C', ['ċ'] = 'c', + ['Č'] = 'C', ['č'] = 'c', ['Ď'] = 'D', ['ď'] = 'd', + ['Đ'] = 'D', ['đ'] = 'd', ['Ē'] = 'E', ['ē'] = 'e', + ['Ĕ'] = 'E', ['ĕ'] = 'e', ['Ė'] = 'E', ['ė'] = 'e', + ['Ę'] = 'E', ['ę'] = 'e', ['Ě'] = 'E', ['ě'] = 'e', + ['Ĝ'] = 'G', ['Ğ'] = 'G', ['ğ'] = 'g', ['ĝ'] = 'g', + ['Ġ'] = 'G', ['ġ'] = 'g', ['Ģ'] = 'G', ['ģ'] = 'g', + ['Ĥ'] = 'H', ['ĥ'] = 'h', ['Ħ'] = 'H', ['ħ'] = 'h', + ['Ĩ'] = 'I', ['ĩ'] = 'i', ['Ī'] = 'I', ['ī'] = 'i', + ['Ĭ'] = 'I', ['ĭ'] = 'i', ['Į'] = 'I', ['į'] = 'i', + ['ı'] = 'i', ['İ'] = 'I', ['IJ'] = 'IJ', ['ij'] = 'ij', + ['Ĵ'] = 'J', ['ĵ'] = 'j', ['ķ'] = 'k', ['Ķ'] = 'K', + ['ĸ'] = 'k', + ['Ĺ'] = 'L', ['ĺ'] = 'l', ['Ļ'] = 'L', ['ļ'] = 'l', + ['Ľ'] = 'L', ['ľ'] = 'l', ['Ŀ'] = 'L', ['ŀ'] = 'l', + ['Ł'] = 'L', ['ł'] = 'l', ['Ń'] = 'N', ['ń'] = 'n', + ['Ņ'] = 'N', ['ņ'] = 'n', ['Ň'] = 'N', ['ň'] = 'n', + ['ʼn'] = 'n', ['Ŋ'] = 'n', ['ŋ'] = 'n', + ['Ō'] = 'O', ['ō'] = 'o', ['Ŏ'] = 'O', ['ŏ'] = 'o', + ['ő'] = 'o', ['Ő'] = 'O', ['œ'] = 'oe', ['Œ'] = 'OE', + ['Ŕ'] = 'R', ['ŕ'] = 'r', ['Ŗ'] = 'R', ['ŗ'] = 'r', + ['Ř'] = 'R', ['ř'] = 'r', ['Ś'] = 'S', ['ś'] = 's', + ['Ŝ'] = 'S', ['ŝ'] = 's', ['Ş'] = 'S', ['ş'] = 's', + ['Š'] = 'S', ['š'] = 's', ['Ţ'] = 'T', ['ţ'] = 't', + ['ť'] = 't', ['Ŧ'] = 'T', ['Ť'] = 'T', ['ŧ'] = 't', + ['Ũ'] = 'U', ['ũ'] = 'u', ['Ū'] = 'U', ['ū'] = 'u', + ['Ŭ'] = 'U', ['ŭ'] = 'u', ['Ů'] = 'U', ['ů'] = 'u', + ['Ű'] = 'U', ['ű'] = 'u', ['Ų'] = 'U', ['ų'] = 'u', + ['Ŵ'] = 'W', ['ŵ'] = 'w', ['Ŷ'] = 'Y', ['ŷ'] = 'y', + ['Ÿ'] = 'Y', + ['Ź'] = 'Z', ['ź'] = 'z', ['Ż'] = 'Z', ['ż'] = 'z', + ['Ž'] = 'Z', ['ž'] = 'z', ['ſ'] = 's', + + -- Extended latin B + ['ƀ'] = 'b', ['Ɓ'] = 'B', ['Ƃ'] = 'B', ['ƃ'] = 'b', + ['Ɔ'] = 'O', + ['Ƈ'] = 'C', ['ƈ'] = 'c', ['Ɖ'] = 'D', ['Ɗ'] = 'D', + ['Ƌ'] = 'D', ['ƌ'] = 'd', ['Ǝ'] = 'E', ['Ə'] = 'e', + ['Ɛ'] = 'E', + ['Ƒ'] = 'F', ['ƒ'] = 'f', ['Ɠ'] = 'G', + ['ƕ'] = 'hv', ['Ɨ'] = 'I', ['Ƙ'] = 'K', ['ƙ'] = 'k', + ['ƚ'] = 'l', ['Ɯ'] = 'M', ['Ɲ'] = 'N', ['ƞ'] = 'n', + ['Ɵ'] = 'O', + ['Ơ'] = 'O', ['ơ'] = 'o', ['Ƣ'] = 'OI', ['ƣ'] = 'oi', + ['Ƥ'] = 'P', ['ƥ'] = 'p', ['Ʀ'] = 'YR', + ['Ƨ'] = 'S', ['ƨ'] = 's', ['ƫ'] = 't', + ['Ƭ'] = 'T', ['ƭ'] = 't', ['Ʈ'] = 'T', + ['Ư'] = 'U', ['ư'] = 'u', ['Ʋ'] = 'V', + ['Ƴ'] = 'Y', ['ƴ'] = 'y', ['Ƶ'] = 'Z', ['ƶ'] = 'z', + ['ƻ'] = '2', ['Ƽ'] = '5', ['ƽ'] = '5', + ['DŽ'] = 'DZ', ['Dž'] = 'Dz', ['dž'] = 'dz', + ['LJ'] = 'LJ', ['Lj'] = 'Lj', ['lj'] = 'lj', + ['NJ'] = 'NJ', ['Nj'] = 'Nj', ['nj'] = 'nj', + ['Ǎ'] = 'A', ['ǎ'] = 'a', ['Ǐ'] = 'I', ['ǐ'] = 'i', + ['Ǒ'] = 'O', ['ǒ'] = 'o', ['Ǔ'] = 'U', ['ǔ'] = 'u', + ['Ǖ'] = 'U', ['ǖ'] = 'u', ['Ǘ'] = 'U', ['ǘ'] = 'u', + ['Ǚ'] = 'U', ['ǚ'] = 'u', ['Ǜ'] = 'U', ['ǜ'] = 'u', + ['ǝ'] = 'e', + ['Ǟ'] = 'A', ['ǟ'] = 'a', ['Ǡ'] = 'A', ['ǡ'] = 'a', + ['Ǣ'] = 'Æ', ['ǣ'] = 'æ', ['Ǥ'] = 'G', ['ǥ'] = 'g', + ['Ǧ'] = 'G', ['ǧ'] = 'g', ['Ǩ'] = 'K', ['ǩ'] = 'k', + ['Ǫ'] = 'Q', ['ǫ'] = 'q', ['Ǭ'] = 'Q', ['ǭ'] = 'q', + ['ǰ'] = 'J', + ['DZ'] = 'DZ', ['Dz'] = 'Dz', ['dz'] = 'dz', + ['Ǵ'] = 'G', ['ǵ'] = 'g', ['Ƕ'] = 'H', + ['Ǹ'] = 'N', ['ǹ'] = 'n', ['Ǻ'] = 'A', ['ǻ'] = 'a', + ['Ǽ'] = 'Æ', ['ǽ'] = 'æ', ['Ǿ'] = 'Ø', ['ǿ'] = 'ø', + ['Ȁ'] = 'A', ['ȁ'] = 'a', ['Ȃ'] = 'A', ['ȃ'] = 'a', + ['Ȅ'] = 'E', ['ȅ'] = 'e', ['Ȇ'] = 'E', ['ȇ'] = 'e', + ['Ȉ'] = 'I', ['ȉ'] = 'i', ['Ȋ'] = 'I', ['ȋ'] = 'i', + ['Ȍ'] = 'O', ['ȍ'] = 'o', ['Ȏ'] = 'O', ['ȏ'] = 'o', + ['Ȑ'] = 'R', ['ȑ'] = 'r', ['Ȓ'] = 'R', ['ȓ'] = 'r', + ['Ȕ'] = 'U', ['ȕ'] = 'u', ['Ȗ'] = 'U', ['ȗ'] = 'u', + ['Ș'] = 'S', ['ș'] = 's', ['Ț'] = 'T', ['ț'] = 't', + ['Ȟ'] = 'H', ['ȟ'] = 'h', ['Ƞ'] = 'N', + ['ȡ'] = 'd', + ['Ȣ'] = 'OU', ['ȣ'] = 'ou', ['Ȥ'] = 'Z', ['ȥ'] = 'z', + ['Ȧ'] = 'A', ['ȧ'] = 'a', ['Ȩ'] = 'E', ['ȩ'] = 'e', + ['Ȫ'] = 'O', ['ȫ'] = 'o', ['Ȭ'] = 'O', ['ȭ'] = 'o', + ['Ȯ'] = 'O', ['ȯ'] = 'o', ['Ȱ'] = 'O', ['ȱ'] = 'o', + ['Ȳ'] = 'Y', ['ȳ'] = 'y', ['ȴ'] = 'l', + ['ȵ'] = 'n', ['ȶ'] = 't', ['ȷ'] = 'j', + ['ȸ'] = 'db', ['ȹ'] = 'qp', ['Ⱥ'] = 'A', + ['Ȼ'] = 'C', ['ȼ'] = 'c', ['Ƚ'] = 'L', + ['Ⱦ'] = 'T', ['ȿ'] = 's', ['ɀ'] = 'z', + ['Ƀ'] = 'B', ['Ʉ'] = 'U', ['Ʌ'] = 'V', + ['Ɇ'] = 'E', ['ɇ'] = 'e', ['Ɉ'] = 'J', ['ɉ'] = 'j', + ['Ɋ'] = 'Q', ['ɋ'] = 'q', ['Ɍ'] = 'R', ['ɍ'] = 'r', + ['Ɏ'] = 'Y', ['ɏ'] = 'y', ['ɐ'] = 'a', + ['ɓ'] = 'b', ['ɔ'] = 'o', + ['ɕ'] = 'c', ['ɖ'] = 'd', ['ɗ'] = 'd', + ['ɘ'] = 'e', ['ə'] = 'e', ['ɚ'] = 'e', + ['ɛ'] = 'e', ['ɜ'] = 'e', ['ɝ'] = 'e', ['ɞ'] = 'e', + ['ɟ'] = 'j', + ['ɠ'] = 'g', ['ɡ'] = 'g', ['ɢ'] = 'G', + ['ɥ'] = 'h', ['ɦ'] = 'h', ['ɧ'] = 'h', + ['ɨ'] = 'i', ['ɪ'] = 'I', + ['ɫ'] = 'l', ['ɬ'] = 'l', ['ɭ'] = 'l', + ['ɮ'] = 'lz', + ['ɯ'] = 'm', ['ɰ'] = 'm', ['ɱ'] = 'm', + ['ɲ'] = 'n', ['ɳ'] = 'n', ['ɴ'] = 'N', + ['ɵ'] = 'o', ['ɶ'] = 'Œ', + ['ɹ'] = 'r', ['ɺ'] = 'r', ['ɻ'] = 'r', + ['ɼ'] = 'r', ['ɽ'] = 'r', ['ɾ'] = 'r', ['ɿ'] = 'r', +} diff --git a/font_api/font.lua b/font_api/font.lua new file mode 100644 index 0000000..e12bb4b --- /dev/null +++ b/font_api/font.lua @@ -0,0 +1,272 @@ +--[[ + font_api mod for Minetest - Library to add font display capability + to display_api mod. + (c) Pierre-Yves Rollo + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +--]] + +-- Fallback table +local fallbacks = dofile(font_api.path.."/fallbacks.lua") + +-- Local functions +------------------ + +-- Returns number of UTF8 bytes of the first char of the string +local function get_char_bytes(str) + local msb = str:byte(1) + if msb ~= nil then + if msb < 0x80 then return 1 end + if msb >= 0xF0 then return 4 end + if msb >= 0xE0 then return 3 end + if msb >= 0xC2 then return 2 end + end +end + +-- Returns the unicode codepoint of the first char of the string +local function char_to_codepoint(str) + local bytes = get_char_bytes(str) + if bytes == 1 then + return str:byte(1) + elseif bytes == 2 then + return (str:byte(1) - 0xC2) * 0x40 + + str:byte(2) + elseif bytes == 3 then + return (str:byte(1) - 0xE0) * 0x1000 + + str:byte(2) % 0x40 * 0x40 + + str:byte(3) % 0x40 + elseif bytes == 4 then -- Not tested + return (str:byte(1) - 0xF0) * 0x40000 + + str:byte(2) % 0x40 * 0x1000 + + str:byte(3) % 0x40 * 0x40 + + str:byte(4) % 0x40 + end +end + +-- Split multiline text into array of lines, with <maxlines> maximum lines. +-- Can not use minetest string.split as it has bug if first line(s) empty +local function split_lines(text, maxlines) + local lines = {} + local pos = 1 + repeat + local found = string.find(text, "\n", pos) + found = found or #text + 1 + lines[#lines + 1] = string.sub(text, pos, found - 1) + pos = found + 1 + until (maxlines and (#lines >= maxlines)) or (pos > (#text + 1)) + return lines +end + +-------------------------------------------------------------------------------- +--- Font class + +local Font = {} +font_api.Font = Font + +function Font:new(def) + + if type(def) ~= "table" then + minetest.log("error", + "[font_api] Font definition must be a table.") + return nil + end + + if def.height == nil or def.height <= 0 then + minetest.log("error", + "[font_api] Font definition must have a positive height.") + return nil + end + + if type(def.widths) ~= "table" then + minetest.log("error", + "[font_api] Font definition must have a widths array.") + return nil + end + + if def.widths[0] == nil then + minetest.log("error", + "[font_api] Font must have a char with codepoint 0 (=unknown char).") + return nil + end + + local font = table.copy(def) + setmetatable(font, self) + self.__index = self + return font +end + +--- Gets the next char of a text +-- @return Codepoint of first char, +-- @return Remaining string without this first char + +function Font:get_next_char(text) + local bytes = get_char_bytes(text) + + if bytes == nil then + minetest.log("warning", + "[font_api] Encountered a non UTF char, not displaying text.") + return nil, '' + end + + local codepoint = char_to_codepoint(text) + + -- Fallback mechanism + if self.widths[codepoint] == nil then + local char = text:sub(1, bytes) + + if fallbacks[char] then + return self:get_next_char(fallbacks[char]..text:sub(bytes+1)) + else + return 0, text:sub(bytes+1) -- Ultimate fallback + end + else + return codepoint, text:sub(bytes+1) + end +end + +--- Returns the width of a given char +-- @param char : codepoint of the char +-- @return Char width + +function Font:get_char_width(char) + -- Replace chars with no texture by the NULL(0) char + if self.widths[char] ~= nil then + return self.widths[char] + else + return self.widths[0] + end +end + +--- Text height for multiline text including margins and line spacing +-- @param nb_of_lines : number of text lines (default 1) +-- @return Text height + +function Font:get_height(nb_of_lines) + if nb_of_lines == nil then nb_of_lines = 1 end + + if nb_of_lines > 0 then + return + ( + (self.height or 0) + + (self.margintop or 0) + + (self.marginbottom or 0) + ) * nb_of_lines + + (self.linespacing or 0) * (nb_of_lines -1) + else + return nb_of_lines == 0 and 0 or nil + end +end + +--- Computes text width for a given text (ignores new lines) +-- @param line Line of text which the width will be computed. +-- @return Text width + +function Font:get_width(line) + local codepoint + local width = 0 + line = line or '' + + while line ~= "" do + codepoint, line = self:get_next_char(line) + width = width + self:get_char_width(codepoint) + end + + return width +end + +--- Builds texture part for a text line +-- @param line Text line to be rendered +-- @param texturew Width of the texture (extra text is not rendered) +-- @param x Starting x position in texture +-- @param y Vertical position of the line in texture +-- @return Texture string + +function Font:make_line_texture(line, texturew, x, y) + local codepoint + local texture = "" + line = line or '' + + while line ~= '' do + codepoint, line = self:get_next_char(line) + + -- Add image only if it is visible (at least partly) + if x + self.widths[codepoint] >= 0 and x <= texturew then + texture = texture.. + string.format(":%d,%d=font_%s_%04x.png", + x, y, self.name, codepoint) + end + x = x + self.widths[codepoint] + end + + return texture +end + +--- Builds texture for a multiline colored text +-- @param text Text to be rendered +-- @param texturew Width of the texture (extra text will be truncated) +-- @param textureh Height of the texture +-- @param maxlines Maximum number of lines +-- @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:make_text_texture(text, texturew, textureh, maxlines, + halign, valign, color) + local texture = "" + local lines = {} + local textheight = 0 + local y + + -- Split text into lines (limited to maxlines fist lines) + for num, line in pairs(split_lines(text, maxlines)) do + lines[num] = { text = line, width = self:get_width(line) } + end + + textheight = self:get_height(#lines) + + if #lines then + if valign == "top" then + y = 0 + elseif valign == "bottom" then + y = textureh - textheight + else + y = (textureh - textheight) / 2 + end + end + + y = y + (self.margintop or 0) + + for _, line in pairs(lines) do + if halign == "left" then + texture = texture.. + self:make_line_texture(line.text, texturew, + 0, y) + elseif halign == "right" then + texture = texture.. + self:make_line_texture(line.text, texturew, + texturew - line.width, y) + else + texture = texture.. + self:make_line_texture(line.text, texturew, + (texturew - line.width) / 2, y) + end + + y = y + self:get_height() + (self.linespacing or 0) + end + + texture = string.format("[combine:%dx%d", texturew, textureh)..texture + if color then texture = texture.."^[colorize:"..color end + return texture +end diff --git a/font_api/fontform.lua b/font_api/fontform.lua new file mode 100644 index 0000000..e4952ed --- /dev/null +++ b/font_api/fontform.lua @@ -0,0 +1,167 @@ +--[[ + font_api mod for Minetest - Library to add font display capability + to display_api mod. + (c) Pierre-Yves Rollo + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +--]] + +local modname = minetest.get_current_modname() + +local contexts = {} + +minetest.register_on_leaveplayer(function(player) + if minetest.is_player(player) then + contexts[player:get_player_name()] = nil + end +end) + +local function get_context(playername) + if not contexts[playername] then + contexts[playername] = { playername = playername } + end + return contexts[playername] +end + +-- Show node formspec functions +local function show_node_formspec(playername, pos) + local meta = minetest.get_meta(pos) + + -- Decontextualize formspec + local fs = meta:get_string('formspec') + + if not fs then + return + end + + -- Change context and currrent_name references to nodemeta references + -- Change context and currrent_name references to nodemeta references + local nodemeta = string.format("nodemeta:%i,%i,%i", pos.x, pos.y ,pos.z) + fs = fs:gsub("current_name", nodemeta) + fs = fs:gsub("context", nodemeta) + + -- Change all ${} to their corresponding metadata values + local s, e + repeat + s, e = fs:find('%${.*}') + if s and e then + fs = fs:sub(1, s-1).. + minetest.formspec_escape(meta:get_string(fs:sub(s+2,e-1))).. + fs:sub(e+1) + end + until s == nil + + local context = get_context(playername) + context.node_pos = pos + + -- Find node on_receive_fields + local ndef = minetest.registered_nodes[minetest.get_node(pos).name] + if ndef and ndef.on_receive_fields then + context.on_receive_fields = ndef.on_receive_fields + end + + -- Show formspec + minetest.show_formspec(playername, modname..':context_formspec', fs) +end + +minetest.register_on_player_receive_fields(function(player, formname, fields) + if formname ~= modname..':context_formspec' then + return + end + + if not minetest.is_player(player) then + return true + end + + local context = get_context(player:get_player_name()) + if context.on_receive_fields then + context.on_receive_fields(context.pos, '', fields, player) + end + return true +end) + +-- Specific functions + +local function show_font_formspec(playername) + local context = get_context(playername) + local fonts = {} + for name, _ in pairs(font_api.registered_fonts) do + fonts[#fonts+1] = name + end + table.sort(fonts) + + local fs = string.format( + "size[4,%s]%s%s%sbutton_exit[0,%s;4,1;cancel;Cancel]", + #fonts + 0.8, default.gui_bg, default.gui_bg_img, default.gui_slots, + #fonts) + + for line = 1, #fonts do + local font = font_api.get_font(fonts[line]) + local texture = font:make_text_texture(font.name, font:get_height()*5, + font:get_height()*1.2, 1, "center", "top", "#fff") + fs = string.format( + "%simage[0.1,%s;4.5,0.8;%s]button_exit[0,%s;4,1;font_%s;]", + fs, line-0.9, texture, line-1, font.name) + end + minetest.show_formspec(context.playername, modname..':font_list', fs) +end + +minetest.register_on_player_receive_fields(function(player, formname, fields) + if formname ~= modname..':font_list' then + return + end + + if not minetest.is_player(player) then + return true + end + + local playername = player:get_player_name() + local context = get_context(playername) + + if not context.pos + or minetest.is_protected(context.pos, playername) then + return true + end + + if fields.quit == 'true' then + for name, _ in pairs(font_api.registered_fonts) do + if fields['font_'..name] then + local meta = minetest.get_meta(context.pos) + meta:set_string("font", name) + display_api.update_entities(context.pos) + end + end + + if context.callback and type(context.callback) == "function" then + -- Using after to avoid the "double close" bug + minetest.after(0, context.callback, playername, context.pos) + else + -- Using after to avoid the "double close" bug + minetest.after(0, show_node_formspec, playername, context.pos) + end + end + return true +end) + +-- @param player Player viewing the form +-- @param pos Node pos +-- @param callback function(playername, pos) to be called on form close +function font_api.show_font_list(player, pos, callback) + if minetest.is_player(player) then + local context = get_context(player:get_player_name()) + context.pos = pos + context.callback = callback + show_font_formspec(player:get_player_name()) + end +end diff --git a/font_api/init.lua b/font_api/init.lua new file mode 100644 index 0000000..2c8f4f3 --- /dev/null +++ b/font_api/init.lua @@ -0,0 +1,71 @@ +--[[ + font_api mod for Minetest - Library to add font display capability + to display_api mod. + (c) Pierre-Yves Rollo + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +--]] + +-- Global variables +------------------- + +font_api = {} +font_api.name = minetest.get_current_modname() +font_api.path = minetest.get_modpath(font_api.name) + +-- Inclusions +------------- + +dofile(font_api.path.."/font.lua") +dofile(font_api.path.."/registry.lua") +dofile(font_api.path.."/fontform.lua") + +--- Standard on_display_update entity callback. +-- 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 + +function font_api.on_display_update(pos, objref) + local meta = minetest.get_meta(pos) + local text = meta:get_string("display_text") + local ndef = minetest.registered_nodes[minetest.get_node(pos).name] + local entity = objref:get_luaentity() + + -- If orwell96's modified signs_lib version is available and sign macros are active, + -- replace them in display_lib's text too. + if signs_lib and signs_lib.replace_macros then + text = signs_lib.replace_macros(text) + end + + if entity and ndef.display_entities[entity.name] then + local def = ndef.display_entities[entity.name] + local font = font_api.get_font(meta:get_string("font") ~= "" + and meta:get_string("font") or def.font_name) + + local maxlines = def.maxlines or 1 -- TODO:How to do w/o maxlines ? + + objref:set_properties({ + textures={font:make_text_texture(text, + font:get_height(maxlines) * def.size.x / def.size.y + / (def.aspect_ratio or 1), + font:get_height(maxlines), + def.maxlines, def.halign, def.valign, def.color)}, + visual_size = def.size + }) + end +end + +-- Compatibility +font_lib = font_api diff --git a/font_api/registry.lua b/font_api/registry.lua new file mode 100644 index 0000000..4b49b1e --- /dev/null +++ b/font_api/registry.lua @@ -0,0 +1,162 @@ +--[[ + font_api mod for Minetest - Library to add font display capability + to display_api mod. + (c) Pierre-Yves Rollo + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +--]] + +-- Global variables +------------------- + +font_api.registered_fonts = {} +font_api.registered_fonts_number = 0 + +-- Local variables +------------------ + +local default_font = false + +-- Local functions +------------------ + +-- Gets a default (settings or fist font) +local function get_default_font() + -- First call + if default_font == false then + default_font = nil + + -- First, try with settings + local settings_font = minetest.settings:get("default_font") + + if settings_font ~= nil and settings_font ~= "" then + default_font = font_api.registered_fonts[settings_font] + + if default_font == nil then + minetest.log("warning", "Default font in settings (\"".. + settings_font.."\") is not registered.") + end + end + + -- If failed, choose first font without default = false + if default_font == nil then + for _, font in pairs(font_api.registered_fonts) do + if font.default then + default_font = font + break + end + end + end + + -- If failed, chose first font + if default_font == nil then + for _, font in pairs(font_api.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 object to be used according to font_name +-- @param font_name: Name of the font +-- @return Font object if font found (or default font) + +function font_api.get_font(font_name) + local font = font_api.registered_fonts[font_name] + + if font == nil then + local message + + if font_name == nil then + message = "No font given" + else + message = "Font \""..font_name.."\" unregistered" + end + + font = get_default_font() + + if font ~= nil then + minetest.log("info", message..", using font \""..font.name.."\".") + end + end + + return font +end + +-- API functions +---------------- + +--- Returns de default font name +-- @return Default font name + +function font_api.get_default_font_name() + return get_default_font().name +end + +--- Register a new font +-- Textures corresponding to the font should be named after following patern : +-- font_<name>_<code>.png +-- <name> : name of the font +-- <code> : 4 digit hexadecimal unicode of the char +-- @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 def font definition. A associative array with following keys : +-- @key default True (by default) if this font may be used as default font +-- @key height (mandatory) Height in pixels of all font textures +-- @key widths (mandatory) Array of character widths in pixels, indexed by +-- UTF codepoints +-- @key margintop (optional) Margin (in texture pixels) added on top of each +-- char texture. +-- @key marginbottom (optional) dded at bottom of each char texture. +-- @key linespacing (optional) Spacing (in texture pixels) between each lines. +-- margintop, marginbottom and linespacing can be negative numbers (default 0) +-- and are to be used to adjust various font styles to each other. + +-- TODO: Add something to remove common accent if not defined in font + +function font_api.register_font(font_name, font_def) + + if font_api.registered_fonts[font_name] ~= nil then + minetest.log("error", "Font \""..font_name.."\" already registered.") + return + end + + local font = font_api.Font:new(font_def) + + if font == nil then + minetest.log("error", "Unable to register font \""..font_name.."\".") + return + end + + font.name = font_name + font_api.registered_fonts[font_name] = font + font_api.registered_fonts_number = font_api.registered_fonts_number + 1 + + -- Force to choose again default font + -- (allows use of fonts registered after start) + default_font = false + + minetest.log("action", "New font registered in font_api: "..font_name..".") +end + diff --git a/font_api/settingtypes.txt b/font_api/settingtypes.txt new file mode 100644 index 0000000..d111159 --- /dev/null +++ b/font_api/settingtypes.txt @@ -0,0 +1 @@ +default_font(Default font) string diff --git a/font_api/textures/font_api_center.png b/font_api/textures/font_api_center.png Binary files differnew file mode 100644 index 0000000..967db6a --- /dev/null +++ b/font_api/textures/font_api_center.png diff --git a/font_api/textures/font_api_font.png b/font_api/textures/font_api_font.png Binary files differnew file mode 100644 index 0000000..e450338 --- /dev/null +++ b/font_api/textures/font_api_font.png diff --git a/font_api/textures/font_api_left.png b/font_api/textures/font_api_left.png Binary files differnew file mode 100644 index 0000000..727410b --- /dev/null +++ b/font_api/textures/font_api_left.png diff --git a/font_api/textures/font_api_right.png b/font_api/textures/font_api_right.png Binary files differnew file mode 100644 index 0000000..16401d3 --- /dev/null +++ b/font_api/textures/font_api_right.png diff --git a/font_lib/tools/make_font_lua.sh b/font_api/tools/make_font_lua.sh index 4559341..e858360 100755 --- a/font_lib/tools/make_font_lua.sh +++ b/font_api/tools/make_font_lua.sh @@ -1,9 +1,20 @@ #!/bin/bash -scriptname=$0 +scriptname=$(basename $0) identify="identify" -font_name=default +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 do @@ -39,10 +50,22 @@ $luafile generated by $scriptname $(LANG=en_US date) --]] -font_lib.register_font( +font_api.register_font( '$font_name', - $font_height, - { $font_widths } + { + height = $font_height, + widths = { + $font_widths + }, + } ); " > font_$font_name.lua +if grep -q font_api depends.txt &>/dev/null +then + echo "font_api already in depends.txt." +else + echo "adding font_api to depends.txt." + echo "font_api" >> depends.txt +fi + diff --git a/font_api/tools/make_font_textures.sh b/font_api/tools/make_font_textures.sh new file mode 100755 index 0000000..4a3191c --- /dev/null +++ b/font_api/tools/make_font_textures.sh @@ -0,0 +1,111 @@ +#!/bin/bash + +# This program generates a bitmap font for font_api mod for Minetest game. +# (c) Andrzej Pieńkowski <pienkowski.andrzej@gmail.com> +# (c) Pierre-Yves Rollo <dev@pyrollo.com> +# License: GPL + +usage() { + echo "Usage: $0 fontfile fontname fontsize" + echo "fontfile: A TTF font file to use to create textures." + echo "fontname: The font name to be used in font_api (should be simple, with no spaces)." + echo "fontsize: Font height to be rendered." +} + +if [ $# -ne 3 ] +then + usage + exit 1 +fi + +fontfile=$1 +fontname=$2 +fontsize=$3 + +if [ ! -r "$fontfile" ] +then + echo "$fontfile not readable." + exit 1 +fi + +# check imagemagick +hash convert &>/dev/null +if [ $? -eq 1 ]; then + echo -e "Error: This program requires convert from ImageMagick! Please install it by typing 'sudo apt-get install imagemagick' in terminal." + abort=1 +fi + +# check ttx +hash ttx &>/dev/null +if [ $? -eq 1 ]; then + echo -e "Error: This program requires ttx from FontTools! Please install it by typing 'sudo apt-get install fonttools' in terminal." + abort=1 +fi + +if [ $abort ] +then + exit 1 +fi + +generate() { + for i in $(seq $((0x$1)) $((0x$2))) + do + if echo "$codepoints" | grep -qi $(printf "0x%x" $i) + then + hex=$(printf "%04x" $i) + echo -e "Generating textures/font_${fontname}_$hex.png file for \"\\U$hex\" char." + if [[ "$hex" == "005c" ]] # Backslash char + then + convert -background none -fill black -font "$fontfile" -pointsize $fontsize label:"\\\\" -colorspace gray -channel alpha -threshold 50% textures/font_${fontname}_$hex.png + else + convert -background none -fill black -font "$fontfile" -pointsize $fontsize label:"$(echo -en "\\U$hex")" -colorspace gray -channel alpha -threshold 50% textures/font_${fontname}_$hex.png + fi + fi + done +} + +mkdir textures + +# Reads all available code points in the font. +codepoints=$(ttx -o - "$fontfile" | grep "<map code=" | cut -d \" -f 2) + +# Mandatory chars +generate 0020 007f + +# generate space and null characters +if [ ! -f "textures/font_${fontname}_0030.png" ]; then + echo "Error: Something wrong happened! Font was not generated!" + exit 1 +else + size=$(identify textures/font_${fontname}_0030.png | cut -d " " -f 3) + if ! [[ $fontHeight =~ $re ]] ; then + echo "Error: Something wrong happened! Generated files might be broken!" + exit 1 + else + w=$(expr $(echo $size | cut -d x -f 1) - 1) + h=$(expr $(echo $size | cut -d x -f 2) - 1) + # Space char + convert -size $size xc:transparent -colorspace gray textures/font_${fontname}_0020.png + # Null char + convert -size $size xc:transparent -colorspace gray -stroke black -fill transparent -strokewidth 1 -draw "rectangle 0,0 $w,$h" textures/font_${fontname}_0000.png + fi +fi + +# Optional Unicode pages (see https://en.wikipedia.org/wiki/Unicode) : + +# 00a0-00ff Latin-1 Supplement (full) +generate 00a0 00ff +# 0100-017f Latin Extended-A (full) +generate 0100 017f +# 0370-03ff Greek (full) +generate 0370 03ff +# 0400-04ff Cyrilic (full) +generate 0400 04ff +# 2000-206f General Punctuation (Limited to Dashes) +generate 2010 2015 +# 2000-206f General Punctuation (Limited to Quotes) +generate 2018 201F +# 20a0-20cf Currency Symbols (Limited to Euro symbol) +generate 20ac 20ac + + diff --git a/font_lib/API.md b/font_lib/API.md deleted file mode 100644 index b8bc97a..0000000 --- a/font_lib/API.md +++ /dev/null @@ -1,90 +0,0 @@ -# Font Lib API -This document describes Font Lib API. Font Lib creates textures for font display on entities. - -## Provided methods -### get\_text\_size -**font\_lib.get\_text\_size(font\_name, text)** - -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 -**font\_lib.make\_line\_texture(font\_name, text, width, x, y)** - -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)** - -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 - -**Returns**: Texture string - -### register\_font -**font\_lib.register_font(font\_name, height, widths)** - -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) - -**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 - -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 - -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)** - -Defines the fallback font to be used instead of given font if not registered. - -**font\_name**: Name of the font to be used as fallback font (has to be registered) - -## Provided tools - -### 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. - - diff --git a/font_lib/README.md b/font_lib/README.md deleted file mode 100644 index 6b53a6b..0000000 --- a/font_lib/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Font Lib - -This library for font display on entities (to be used with display_lib for sign creation). - -**Dependancies**: default - -**License**: LGPL - -(Default font taken from VanessaE's homedecor/signs_lib, originally under WTFPL) - -**API**: See [API.md](https://github.com/pyrollo/display_modpack/blob/master/font_lib/API.md) document please. - -For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?t=13563) at the Minetest forums. - diff --git a/font_lib/copyright.txt b/font_lib/copyright.txt deleted file mode 100644 index eb0ec6a..0000000 --- a/font_lib/copyright.txt +++ /dev/null @@ -1,2 +0,0 @@ -Code by Pierre-Yves Rollo (pyrollo) -Textures by Vanessa Ezekowitz (VanessaE) 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 deleted file mode 100644 index ea0c056..0000000 --- a/font_lib/init.lua +++ /dev/null @@ -1,282 +0,0 @@ ---[[ - font_lib mod for Minetest - Library to add font display capability - to display_lib mod. - (c) Pierre-Yves Rollo - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. ---]] - --- Global variables - -font_lib = {} -font_lib.path = minetest.get_modpath("font_lib") -font_lib.registered_fonts = {} - --- Local functions ------------------- - --- Split multiline text into array of lines, with <maxlines> maximum lines. - -local function split_lines(text, maxlines) - local splits = text:split("\n") - if maxlines then - local lines = {} - for num = 1,maxlines do - lines[num] = splits[num] - end - return lines - else - return splits - end -end - --- Returns next char, managing ascii and unicode plane 0 (0000-FFFF). - -local function get_next_char(text, pos) - pos = pos + 1 - local char = text:sub(pos, pos):byte() - - -- 1 byte char - if char < 0x80 then - return char, pos - end - - -- 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 - - -- Not an UTF char - return 0, pos - -end - --- Returns font properties to be used according to font_name - -local function get_font(font_name) - local font = font_lib.registered_fonts[font_name] - - if font == nil then - local message - - if font_name == nil then - message = "No font given" - else - 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] - end - end - - return font -end - --- API functions ----------------- - --- Computes text size for a given font and text (ignores new lines) --- @param font_name Font to be used --- @param text Text to be rendered --- @return Rendered text (width, height) - -function font_lib.get_text_size(font_name, text) - local char - local width = 0 - local pos = 0 - local font = get_font(font_name) - - if font == nil then - return 0, 0 - else - while pos < #text do - char, pos = get_next_char(text, pos) - -- Ignore chars with no texture - if font.widths[char] ~= nil then - width = width + font.widths[char] - end - end - end - - return width, font.height -end - ---- Builds texture part for a text line --- @param font_name Font to be used --- @param text Text to be rendered --- @param width Width of the texture (extra text is not rendered) --- @param x Starting x position in texture --- @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 font = get_font(font_name) - - if font ~= nil then - 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)) - end - end - end - - return texture -end - ---- Builds texture for a multiline colored text --- @param font_name Font to be used --- @param text Text to be rendered --- @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 --- @return Texture string - -function font_lib.make_multiline_texture(font_name, text, width, height, - maxlines, 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 - 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) - 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 - ---- Register a new font --- Textures corresponding to the font should be named after following patern : --- 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 height Font height in pixels --- @param widths Array of character widths in pixel, indexed by unicode number. - -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). - -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 - end -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 --- @param pos Node position --- @param objref Object reference of entity - -function font_lib.on_display_update(pos, objref) - local meta = minetest.get_meta(pos) - local text = meta:get_string("display_text") - local ndef = minetest.registered_nodes[minetest.get_node(pos).name] - local entity = objref:get_luaentity() - - -- If orwell96's modified signs_lib version is available and sign macros are active, - -- replace them in display_lib's text too. - if signs_lib and signs_lib.replace_macros then - text = signs_lib.replace_macros(text) - end - - if entity and ndef.display_entities[entity.name] then - local def = ndef.display_entities[entity.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)}, - 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 Binary files differdeleted file mode 100644 index 65e43a7..0000000 --- a/font_lib/textures/font_default_0000.png +++ /dev/null diff --git a/font_lib/textures/font_default_0020.png b/font_lib/textures/font_default_0020.png Binary files differdeleted file mode 100644 index 049fd14..0000000 --- a/font_lib/textures/font_default_0020.png +++ /dev/null diff --git a/font_lib/textures/font_default_0021.png b/font_lib/textures/font_default_0021.png Binary files differdeleted file mode 100644 index 7691a14..0000000 --- a/font_lib/textures/font_default_0021.png +++ /dev/null diff --git a/font_lib/textures/font_default_0022.png b/font_lib/textures/font_default_0022.png Binary files differdeleted file mode 100644 index 91f4c5f..0000000 --- a/font_lib/textures/font_default_0022.png +++ /dev/null diff --git a/font_lib/textures/font_default_0023.png b/font_lib/textures/font_default_0023.png Binary files differdeleted file mode 100644 index 9290dc1..0000000 --- a/font_lib/textures/font_default_0023.png +++ /dev/null diff --git a/font_lib/textures/font_default_0024.png b/font_lib/textures/font_default_0024.png Binary files differdeleted file mode 100644 index cde69d4..0000000 --- a/font_lib/textures/font_default_0024.png +++ /dev/null diff --git a/font_lib/textures/font_default_0025.png b/font_lib/textures/font_default_0025.png Binary files differdeleted file mode 100644 index 703ab16..0000000 --- a/font_lib/textures/font_default_0025.png +++ /dev/null diff --git a/font_lib/textures/font_default_0026.png b/font_lib/textures/font_default_0026.png Binary files differdeleted file mode 100644 index 6f98d49..0000000 --- a/font_lib/textures/font_default_0026.png +++ /dev/null diff --git a/font_lib/textures/font_default_0027.png b/font_lib/textures/font_default_0027.png Binary files differdeleted file mode 100644 index df31d75..0000000 --- a/font_lib/textures/font_default_0027.png +++ /dev/null diff --git a/font_lib/textures/font_default_0028.png b/font_lib/textures/font_default_0028.png Binary files differdeleted file mode 100644 index 478c2c4..0000000 --- a/font_lib/textures/font_default_0028.png +++ /dev/null diff --git a/font_lib/textures/font_default_0029.png b/font_lib/textures/font_default_0029.png Binary files differdeleted file mode 100644 index 8973488..0000000 --- a/font_lib/textures/font_default_0029.png +++ /dev/null diff --git a/font_lib/textures/font_default_002a.png b/font_lib/textures/font_default_002a.png Binary files differdeleted file mode 100644 index 2b83a5c..0000000 --- a/font_lib/textures/font_default_002a.png +++ /dev/null diff --git a/font_lib/textures/font_default_002b.png b/font_lib/textures/font_default_002b.png Binary files differdeleted file mode 100644 index abce910..0000000 --- a/font_lib/textures/font_default_002b.png +++ /dev/null diff --git a/font_lib/textures/font_default_002c.png b/font_lib/textures/font_default_002c.png Binary files differdeleted file mode 100644 index 8a624c7..0000000 --- a/font_lib/textures/font_default_002c.png +++ /dev/null diff --git a/font_lib/textures/font_default_002d.png b/font_lib/textures/font_default_002d.png Binary files differdeleted file mode 100644 index f0ff962..0000000 --- a/font_lib/textures/font_default_002d.png +++ /dev/null diff --git a/font_lib/textures/font_default_002e.png b/font_lib/textures/font_default_002e.png Binary files differdeleted file mode 100644 index aff49bc..0000000 --- a/font_lib/textures/font_default_002e.png +++ /dev/null diff --git a/font_lib/textures/font_default_002f.png b/font_lib/textures/font_default_002f.png Binary files differdeleted file mode 100644 index 4667bf7..0000000 --- a/font_lib/textures/font_default_002f.png +++ /dev/null diff --git a/font_lib/textures/font_default_0030.png b/font_lib/textures/font_default_0030.png Binary files differdeleted file mode 100644 index 470f0b0..0000000 --- a/font_lib/textures/font_default_0030.png +++ /dev/null diff --git a/font_lib/textures/font_default_0031.png b/font_lib/textures/font_default_0031.png Binary files differdeleted file mode 100644 index e84a9d3..0000000 --- a/font_lib/textures/font_default_0031.png +++ /dev/null diff --git a/font_lib/textures/font_default_0032.png b/font_lib/textures/font_default_0032.png Binary files differdeleted file mode 100644 index 1ef3e84..0000000 --- a/font_lib/textures/font_default_0032.png +++ /dev/null diff --git a/font_lib/textures/font_default_0033.png b/font_lib/textures/font_default_0033.png Binary files differdeleted file mode 100644 index ec9f518..0000000 --- a/font_lib/textures/font_default_0033.png +++ /dev/null diff --git a/font_lib/textures/font_default_0034.png b/font_lib/textures/font_default_0034.png Binary files differdeleted file mode 100644 index bc82823..0000000 --- a/font_lib/textures/font_default_0034.png +++ /dev/null diff --git a/font_lib/textures/font_default_0035.png b/font_lib/textures/font_default_0035.png Binary files differdeleted file mode 100644 index 3ed26c5..0000000 --- a/font_lib/textures/font_default_0035.png +++ /dev/null diff --git a/font_lib/textures/font_default_0036.png b/font_lib/textures/font_default_0036.png Binary files differdeleted file mode 100644 index 6e706a4..0000000 --- a/font_lib/textures/font_default_0036.png +++ /dev/null diff --git a/font_lib/textures/font_default_0037.png b/font_lib/textures/font_default_0037.png Binary files differdeleted file mode 100644 index 884b48a..0000000 --- a/font_lib/textures/font_default_0037.png +++ /dev/null diff --git a/font_lib/textures/font_default_0038.png b/font_lib/textures/font_default_0038.png Binary files differdeleted file mode 100644 index a1e05bf..0000000 --- a/font_lib/textures/font_default_0038.png +++ /dev/null diff --git a/font_lib/textures/font_default_0039.png b/font_lib/textures/font_default_0039.png Binary files differdeleted file mode 100644 index 6443be9..0000000 --- a/font_lib/textures/font_default_0039.png +++ /dev/null diff --git a/font_lib/textures/font_default_003a.png b/font_lib/textures/font_default_003a.png Binary files differdeleted file mode 100644 index 752e9de..0000000 --- a/font_lib/textures/font_default_003a.png +++ /dev/null diff --git a/font_lib/textures/font_default_003b.png b/font_lib/textures/font_default_003b.png Binary files differdeleted file mode 100644 index 77878e8..0000000 --- a/font_lib/textures/font_default_003b.png +++ /dev/null diff --git a/font_lib/textures/font_default_003c.png b/font_lib/textures/font_default_003c.png Binary files differdeleted file mode 100644 index 0252ab9..0000000 --- a/font_lib/textures/font_default_003c.png +++ /dev/null diff --git a/font_lib/textures/font_default_003d.png b/font_lib/textures/font_default_003d.png Binary files differdeleted file mode 100644 index af0325a..0000000 --- a/font_lib/textures/font_default_003d.png +++ /dev/null diff --git a/font_lib/textures/font_default_003e.png b/font_lib/textures/font_default_003e.png Binary files differdeleted file mode 100644 index 77fe954..0000000 --- a/font_lib/textures/font_default_003e.png +++ /dev/null diff --git a/font_lib/textures/font_default_003f.png b/font_lib/textures/font_default_003f.png Binary files differdeleted file mode 100644 index e94177c..0000000 --- a/font_lib/textures/font_default_003f.png +++ /dev/null diff --git a/font_lib/textures/font_default_0040.png b/font_lib/textures/font_default_0040.png Binary files differdeleted file mode 100644 index c7a11d2..0000000 --- a/font_lib/textures/font_default_0040.png +++ /dev/null diff --git a/font_lib/textures/font_default_0041.png b/font_lib/textures/font_default_0041.png Binary files differdeleted file mode 100644 index 5917cc0..0000000 --- a/font_lib/textures/font_default_0041.png +++ /dev/null diff --git a/font_lib/textures/font_default_0042.png b/font_lib/textures/font_default_0042.png Binary files differdeleted file mode 100644 index 69a92b3..0000000 --- a/font_lib/textures/font_default_0042.png +++ /dev/null diff --git a/font_lib/textures/font_default_0043.png b/font_lib/textures/font_default_0043.png Binary files differdeleted file mode 100644 index 6f68703..0000000 --- a/font_lib/textures/font_default_0043.png +++ /dev/null diff --git a/font_lib/textures/font_default_0044.png b/font_lib/textures/font_default_0044.png Binary files differdeleted file mode 100644 index 94c0a30..0000000 --- a/font_lib/textures/font_default_0044.png +++ /dev/null diff --git a/font_lib/textures/font_default_0045.png b/font_lib/textures/font_default_0045.png Binary files differdeleted file mode 100644 index b6732c3..0000000 --- a/font_lib/textures/font_default_0045.png +++ /dev/null diff --git a/font_lib/textures/font_default_0046.png b/font_lib/textures/font_default_0046.png Binary files differdeleted file mode 100644 index 992bdc1..0000000 --- a/font_lib/textures/font_default_0046.png +++ /dev/null diff --git a/font_lib/textures/font_default_0047.png b/font_lib/textures/font_default_0047.png Binary files differdeleted file mode 100644 index 12340e7..0000000 --- a/font_lib/textures/font_default_0047.png +++ /dev/null diff --git a/font_lib/textures/font_default_0048.png b/font_lib/textures/font_default_0048.png Binary files differdeleted file mode 100644 index f315c03..0000000 --- a/font_lib/textures/font_default_0048.png +++ /dev/null diff --git a/font_lib/textures/font_default_0049.png b/font_lib/textures/font_default_0049.png Binary files differdeleted file mode 100644 index 53ef0bc..0000000 --- a/font_lib/textures/font_default_0049.png +++ /dev/null diff --git a/font_lib/textures/font_default_004a.png b/font_lib/textures/font_default_004a.png Binary files differdeleted file mode 100644 index 32cd569..0000000 --- a/font_lib/textures/font_default_004a.png +++ /dev/null diff --git a/font_lib/textures/font_default_004b.png b/font_lib/textures/font_default_004b.png Binary files differdeleted file mode 100644 index 1f770e7..0000000 --- a/font_lib/textures/font_default_004b.png +++ /dev/null diff --git a/font_lib/textures/font_default_004c.png b/font_lib/textures/font_default_004c.png Binary files differdeleted file mode 100644 index 313ecfe..0000000 --- a/font_lib/textures/font_default_004c.png +++ /dev/null diff --git a/font_lib/textures/font_default_004d.png b/font_lib/textures/font_default_004d.png Binary files differdeleted file mode 100644 index f6676fb..0000000 --- a/font_lib/textures/font_default_004d.png +++ /dev/null diff --git a/font_lib/textures/font_default_004e.png b/font_lib/textures/font_default_004e.png Binary files differdeleted file mode 100644 index 4e28110..0000000 --- a/font_lib/textures/font_default_004e.png +++ /dev/null diff --git a/font_lib/textures/font_default_004f.png b/font_lib/textures/font_default_004f.png Binary files differdeleted file mode 100644 index 1b27777..0000000 --- a/font_lib/textures/font_default_004f.png +++ /dev/null diff --git a/font_lib/textures/font_default_0050.png b/font_lib/textures/font_default_0050.png Binary files differdeleted file mode 100644 index ddfff40..0000000 --- a/font_lib/textures/font_default_0050.png +++ /dev/null diff --git a/font_lib/textures/font_default_0051.png b/font_lib/textures/font_default_0051.png Binary files differdeleted file mode 100644 index c3df8ec..0000000 --- a/font_lib/textures/font_default_0051.png +++ /dev/null diff --git a/font_lib/textures/font_default_0052.png b/font_lib/textures/font_default_0052.png Binary files differdeleted file mode 100644 index f93ff7c..0000000 --- a/font_lib/textures/font_default_0052.png +++ /dev/null diff --git a/font_lib/textures/font_default_0053.png b/font_lib/textures/font_default_0053.png Binary files differdeleted file mode 100644 index 389a62b..0000000 --- a/font_lib/textures/font_default_0053.png +++ /dev/null diff --git a/font_lib/textures/font_default_0054.png b/font_lib/textures/font_default_0054.png Binary files differdeleted file mode 100644 index 11ec544..0000000 --- a/font_lib/textures/font_default_0054.png +++ /dev/null diff --git a/font_lib/textures/font_default_0055.png b/font_lib/textures/font_default_0055.png Binary files differdeleted file mode 100644 index 5d15704..0000000 --- a/font_lib/textures/font_default_0055.png +++ /dev/null diff --git a/font_lib/textures/font_default_0056.png b/font_lib/textures/font_default_0056.png Binary files differdeleted file mode 100644 index 3e6f48a..0000000 --- a/font_lib/textures/font_default_0056.png +++ /dev/null diff --git a/font_lib/textures/font_default_0057.png b/font_lib/textures/font_default_0057.png Binary files differdeleted file mode 100644 index cc140d0..0000000 --- a/font_lib/textures/font_default_0057.png +++ /dev/null diff --git a/font_lib/textures/font_default_0058.png b/font_lib/textures/font_default_0058.png Binary files differdeleted file mode 100644 index fe71fb9..0000000 --- a/font_lib/textures/font_default_0058.png +++ /dev/null diff --git a/font_lib/textures/font_default_0059.png b/font_lib/textures/font_default_0059.png Binary files differdeleted file mode 100644 index 1d1db03..0000000 --- a/font_lib/textures/font_default_0059.png +++ /dev/null diff --git a/font_lib/textures/font_default_005a.png b/font_lib/textures/font_default_005a.png Binary files differdeleted file mode 100644 index e89b0eb..0000000 --- a/font_lib/textures/font_default_005a.png +++ /dev/null diff --git a/font_lib/textures/font_default_005b.png b/font_lib/textures/font_default_005b.png Binary files differdeleted file mode 100644 index e547c51..0000000 --- a/font_lib/textures/font_default_005b.png +++ /dev/null diff --git a/font_lib/textures/font_default_005c.png b/font_lib/textures/font_default_005c.png Binary files differdeleted file mode 100644 index 35fc222..0000000 --- a/font_lib/textures/font_default_005c.png +++ /dev/null diff --git a/font_lib/textures/font_default_005d.png b/font_lib/textures/font_default_005d.png Binary files differdeleted file mode 100644 index 040ebe0..0000000 --- a/font_lib/textures/font_default_005d.png +++ /dev/null diff --git a/font_lib/textures/font_default_005e.png b/font_lib/textures/font_default_005e.png Binary files differdeleted file mode 100644 index be3bbb1..0000000 --- a/font_lib/textures/font_default_005e.png +++ /dev/null diff --git a/font_lib/textures/font_default_005f.png b/font_lib/textures/font_default_005f.png Binary files differdeleted file mode 100644 index 3cc8d3d..0000000 --- a/font_lib/textures/font_default_005f.png +++ /dev/null diff --git a/font_lib/textures/font_default_0060.png b/font_lib/textures/font_default_0060.png Binary files differdeleted file mode 100644 index 58500d2..0000000 --- a/font_lib/textures/font_default_0060.png +++ /dev/null diff --git a/font_lib/textures/font_default_0061.png b/font_lib/textures/font_default_0061.png Binary files differdeleted file mode 100644 index 2121aa8..0000000 --- a/font_lib/textures/font_default_0061.png +++ /dev/null diff --git a/font_lib/textures/font_default_0062.png b/font_lib/textures/font_default_0062.png Binary files differdeleted file mode 100644 index ba3feeb..0000000 --- a/font_lib/textures/font_default_0062.png +++ /dev/null diff --git a/font_lib/textures/font_default_0063.png b/font_lib/textures/font_default_0063.png Binary files differdeleted file mode 100644 index cee372c..0000000 --- a/font_lib/textures/font_default_0063.png +++ /dev/null diff --git a/font_lib/textures/font_default_0064.png b/font_lib/textures/font_default_0064.png Binary files differdeleted file mode 100644 index c5989c1..0000000 --- a/font_lib/textures/font_default_0064.png +++ /dev/null diff --git a/font_lib/textures/font_default_0065.png b/font_lib/textures/font_default_0065.png Binary files differdeleted file mode 100644 index 7cd370a..0000000 --- a/font_lib/textures/font_default_0065.png +++ /dev/null diff --git a/font_lib/textures/font_default_0066.png b/font_lib/textures/font_default_0066.png Binary files differdeleted file mode 100644 index a63276c..0000000 --- a/font_lib/textures/font_default_0066.png +++ /dev/null diff --git a/font_lib/textures/font_default_0067.png b/font_lib/textures/font_default_0067.png Binary files differdeleted file mode 100644 index baf3e88..0000000 --- a/font_lib/textures/font_default_0067.png +++ /dev/null diff --git a/font_lib/textures/font_default_0068.png b/font_lib/textures/font_default_0068.png Binary files differdeleted file mode 100644 index 1c9e9b4..0000000 --- a/font_lib/textures/font_default_0068.png +++ /dev/null diff --git a/font_lib/textures/font_default_0069.png b/font_lib/textures/font_default_0069.png Binary files differdeleted file mode 100644 index 785cdb5..0000000 --- a/font_lib/textures/font_default_0069.png +++ /dev/null diff --git a/font_lib/textures/font_default_006a.png b/font_lib/textures/font_default_006a.png Binary files differdeleted file mode 100644 index a7abd8e..0000000 --- a/font_lib/textures/font_default_006a.png +++ /dev/null diff --git a/font_lib/textures/font_default_006b.png b/font_lib/textures/font_default_006b.png Binary files differdeleted file mode 100644 index ff5f32a..0000000 --- a/font_lib/textures/font_default_006b.png +++ /dev/null diff --git a/font_lib/textures/font_default_006c.png b/font_lib/textures/font_default_006c.png Binary files differdeleted file mode 100644 index 53ef0bc..0000000 --- a/font_lib/textures/font_default_006c.png +++ /dev/null diff --git a/font_lib/textures/font_default_006d.png b/font_lib/textures/font_default_006d.png Binary files differdeleted file mode 100644 index 351aeef..0000000 --- a/font_lib/textures/font_default_006d.png +++ /dev/null diff --git a/font_lib/textures/font_default_006e.png b/font_lib/textures/font_default_006e.png Binary files differdeleted file mode 100644 index 60e089d..0000000 --- a/font_lib/textures/font_default_006e.png +++ /dev/null diff --git a/font_lib/textures/font_default_006f.png b/font_lib/textures/font_default_006f.png Binary files differdeleted file mode 100644 index dd48b6c..0000000 --- a/font_lib/textures/font_default_006f.png +++ /dev/null diff --git a/font_lib/textures/font_default_0070.png b/font_lib/textures/font_default_0070.png Binary files differdeleted file mode 100644 index 0fdb26f..0000000 --- a/font_lib/textures/font_default_0070.png +++ /dev/null diff --git a/font_lib/textures/font_default_0071.png b/font_lib/textures/font_default_0071.png Binary files differdeleted file mode 100644 index 787418e..0000000 --- a/font_lib/textures/font_default_0071.png +++ /dev/null diff --git a/font_lib/textures/font_default_0072.png b/font_lib/textures/font_default_0072.png Binary files differdeleted file mode 100644 index 7d2bf4c..0000000 --- a/font_lib/textures/font_default_0072.png +++ /dev/null diff --git a/font_lib/textures/font_default_0073.png b/font_lib/textures/font_default_0073.png Binary files differdeleted file mode 100644 index b2b2ed2..0000000 --- a/font_lib/textures/font_default_0073.png +++ /dev/null diff --git a/font_lib/textures/font_default_0074.png b/font_lib/textures/font_default_0074.png Binary files differdeleted file mode 100644 index dcdbd37..0000000 --- a/font_lib/textures/font_default_0074.png +++ /dev/null diff --git a/font_lib/textures/font_default_0075.png b/font_lib/textures/font_default_0075.png Binary files differdeleted file mode 100644 index 5ef59c7..0000000 --- a/font_lib/textures/font_default_0075.png +++ /dev/null diff --git a/font_lib/textures/font_default_0076.png b/font_lib/textures/font_default_0076.png Binary files differdeleted file mode 100644 index 710703f..0000000 --- a/font_lib/textures/font_default_0076.png +++ /dev/null diff --git a/font_lib/textures/font_default_0077.png b/font_lib/textures/font_default_0077.png Binary files differdeleted file mode 100644 index 373ecb0..0000000 --- a/font_lib/textures/font_default_0077.png +++ /dev/null diff --git a/font_lib/textures/font_default_0078.png b/font_lib/textures/font_default_0078.png Binary files differdeleted file mode 100644 index 23541ff..0000000 --- a/font_lib/textures/font_default_0078.png +++ /dev/null diff --git a/font_lib/textures/font_default_0079.png b/font_lib/textures/font_default_0079.png Binary files differdeleted file mode 100644 index e3fddb2..0000000 --- a/font_lib/textures/font_default_0079.png +++ /dev/null diff --git a/font_lib/textures/font_default_007a.png b/font_lib/textures/font_default_007a.png Binary files differdeleted file mode 100644 index 2a92823..0000000 --- a/font_lib/textures/font_default_007a.png +++ /dev/null diff --git a/font_lib/textures/font_default_007b.png b/font_lib/textures/font_default_007b.png Binary files differdeleted file mode 100644 index 7606697..0000000 --- a/font_lib/textures/font_default_007b.png +++ /dev/null diff --git a/font_lib/textures/font_default_007c.png b/font_lib/textures/font_default_007c.png Binary files differdeleted file mode 100644 index 777f1e4..0000000 --- a/font_lib/textures/font_default_007c.png +++ /dev/null diff --git a/font_lib/textures/font_default_007d.png b/font_lib/textures/font_default_007d.png Binary files differdeleted file mode 100644 index b9ee397..0000000 --- a/font_lib/textures/font_default_007d.png +++ /dev/null diff --git a/font_lib/textures/font_default_007e.png b/font_lib/textures/font_default_007e.png Binary files differdeleted file mode 100644 index 759b56e..0000000 --- a/font_lib/textures/font_default_007e.png +++ /dev/null diff --git a/font_lib/textures/font_default_008a.png b/font_lib/textures/font_default_008a.png Binary files differdeleted file mode 100644 index e4f3236..0000000 --- a/font_lib/textures/font_default_008a.png +++ /dev/null diff --git a/font_lib/textures/font_default_008d.png b/font_lib/textures/font_default_008d.png Binary files differdeleted file mode 100644 index fcc3b38..0000000 --- a/font_lib/textures/font_default_008d.png +++ /dev/null diff --git a/font_lib/textures/font_default_00a1.png b/font_lib/textures/font_default_00a1.png Binary files differdeleted file mode 100644 index df91ae3..0000000 --- a/font_lib/textures/font_default_00a1.png +++ /dev/null diff --git a/font_lib/textures/font_default_00b1.png b/font_lib/textures/font_default_00b1.png Binary files differdeleted file mode 100644 index 2413844..0000000 --- a/font_lib/textures/font_default_00b1.png +++ /dev/null diff --git a/font_lib/textures/font_default_00bf.png b/font_lib/textures/font_default_00bf.png Binary files differdeleted file mode 100644 index fec3deb..0000000 --- a/font_lib/textures/font_default_00bf.png +++ /dev/null diff --git a/font_lib/textures/font_default_00c0.png b/font_lib/textures/font_default_00c0.png Binary files differdeleted file mode 100644 index 4652acf..0000000 --- a/font_lib/textures/font_default_00c0.png +++ /dev/null diff --git a/font_lib/textures/font_default_00c1.png b/font_lib/textures/font_default_00c1.png Binary files differdeleted file mode 100644 index f2d7464..0000000 --- a/font_lib/textures/font_default_00c1.png +++ /dev/null diff --git a/font_lib/textures/font_default_00c2.png b/font_lib/textures/font_default_00c2.png Binary files differdeleted file mode 100644 index c759ac9..0000000 --- a/font_lib/textures/font_default_00c2.png +++ /dev/null diff --git a/font_lib/textures/font_default_00c3.png b/font_lib/textures/font_default_00c3.png Binary files differdeleted file mode 100644 index 6239ee6..0000000 --- a/font_lib/textures/font_default_00c3.png +++ /dev/null diff --git a/font_lib/textures/font_default_00c4.png b/font_lib/textures/font_default_00c4.png Binary files differdeleted file mode 100644 index 1178423..0000000 --- a/font_lib/textures/font_default_00c4.png +++ /dev/null diff --git a/font_lib/textures/font_default_00c5.png b/font_lib/textures/font_default_00c5.png Binary files differdeleted file mode 100644 index 64e5efc..0000000 --- a/font_lib/textures/font_default_00c5.png +++ /dev/null diff --git a/font_lib/textures/font_default_00c6.png b/font_lib/textures/font_default_00c6.png Binary files differdeleted file mode 100644 index 7eaf588..0000000 --- a/font_lib/textures/font_default_00c6.png +++ /dev/null diff --git a/font_lib/textures/font_default_00c7.png b/font_lib/textures/font_default_00c7.png Binary files differdeleted file mode 100644 index 247fbc4..0000000 --- a/font_lib/textures/font_default_00c7.png +++ /dev/null diff --git a/font_lib/textures/font_default_00c8.png b/font_lib/textures/font_default_00c8.png Binary files differdeleted file mode 100644 index 517b63d..0000000 --- a/font_lib/textures/font_default_00c8.png +++ /dev/null diff --git a/font_lib/textures/font_default_00c9.png b/font_lib/textures/font_default_00c9.png Binary files differdeleted file mode 100644 index cd4f8d8..0000000 --- a/font_lib/textures/font_default_00c9.png +++ /dev/null diff --git a/font_lib/textures/font_default_00ca.png b/font_lib/textures/font_default_00ca.png Binary files differdeleted file mode 100644 index 39aa1aa..0000000 --- a/font_lib/textures/font_default_00ca.png +++ /dev/null diff --git a/font_lib/textures/font_default_00cb.png b/font_lib/textures/font_default_00cb.png Binary files differdeleted file mode 100644 index 7058b5a..0000000 --- a/font_lib/textures/font_default_00cb.png +++ /dev/null diff --git a/font_lib/textures/font_default_00cc.png b/font_lib/textures/font_default_00cc.png Binary files differdeleted file mode 100644 index a382d73..0000000 --- a/font_lib/textures/font_default_00cc.png +++ /dev/null diff --git a/font_lib/textures/font_default_00cd.png b/font_lib/textures/font_default_00cd.png Binary files differdeleted file mode 100644 index 86339a1..0000000 --- a/font_lib/textures/font_default_00cd.png +++ /dev/null diff --git a/font_lib/textures/font_default_00ce.png b/font_lib/textures/font_default_00ce.png Binary files differdeleted file mode 100644 index 78583df..0000000 --- a/font_lib/textures/font_default_00ce.png +++ /dev/null diff --git a/font_lib/textures/font_default_00cf.png b/font_lib/textures/font_default_00cf.png Binary files differdeleted file mode 100644 index b680e2e..0000000 --- a/font_lib/textures/font_default_00cf.png +++ /dev/null diff --git a/font_lib/textures/font_default_00d0.png b/font_lib/textures/font_default_00d0.png Binary files differdeleted file mode 100644 index 50db9f9..0000000 --- a/font_lib/textures/font_default_00d0.png +++ /dev/null diff --git a/font_lib/textures/font_default_00d1.png b/font_lib/textures/font_default_00d1.png Binary files differdeleted file mode 100644 index 912524f..0000000 --- a/font_lib/textures/font_default_00d1.png +++ /dev/null diff --git a/font_lib/textures/font_default_00d2.png b/font_lib/textures/font_default_00d2.png Binary files differdeleted file mode 100644 index d7e635f..0000000 --- a/font_lib/textures/font_default_00d2.png +++ /dev/null diff --git a/font_lib/textures/font_default_00d3.png b/font_lib/textures/font_default_00d3.png Binary files differdeleted file mode 100644 index 27ae016..0000000 --- a/font_lib/textures/font_default_00d3.png +++ /dev/null diff --git a/font_lib/textures/font_default_00d4.png b/font_lib/textures/font_default_00d4.png Binary files differdeleted file mode 100644 index a62a3ed..0000000 --- a/font_lib/textures/font_default_00d4.png +++ /dev/null diff --git a/font_lib/textures/font_default_00d5.png b/font_lib/textures/font_default_00d5.png Binary files differdeleted file mode 100644 index 3740df7..0000000 --- a/font_lib/textures/font_default_00d5.png +++ /dev/null diff --git a/font_lib/textures/font_default_00d6.png b/font_lib/textures/font_default_00d6.png Binary files differdeleted file mode 100644 index 9b3cd62..0000000 --- a/font_lib/textures/font_default_00d6.png +++ /dev/null diff --git a/font_lib/textures/font_default_00d7.png b/font_lib/textures/font_default_00d7.png Binary files differdeleted file mode 100644 index a92ac66..0000000 --- a/font_lib/textures/font_default_00d7.png +++ /dev/null diff --git a/font_lib/textures/font_default_00d8.png b/font_lib/textures/font_default_00d8.png Binary files differdeleted file mode 100644 index 0453191..0000000 --- a/font_lib/textures/font_default_00d8.png +++ /dev/null diff --git a/font_lib/textures/font_default_00d9.png b/font_lib/textures/font_default_00d9.png Binary files differdeleted file mode 100644 index 607ac14..0000000 --- a/font_lib/textures/font_default_00d9.png +++ /dev/null diff --git a/font_lib/textures/font_default_00da.png b/font_lib/textures/font_default_00da.png Binary files differdeleted file mode 100644 index 91e5781..0000000 --- a/font_lib/textures/font_default_00da.png +++ /dev/null diff --git a/font_lib/textures/font_default_00db.png b/font_lib/textures/font_default_00db.png Binary files differdeleted file mode 100644 index f63177d..0000000 --- a/font_lib/textures/font_default_00db.png +++ /dev/null diff --git a/font_lib/textures/font_default_00dc.png b/font_lib/textures/font_default_00dc.png Binary files differdeleted file mode 100644 index eeaa7c6..0000000 --- a/font_lib/textures/font_default_00dc.png +++ /dev/null diff --git a/font_lib/textures/font_default_00dd.png b/font_lib/textures/font_default_00dd.png Binary files differdeleted file mode 100644 index f194136..0000000 --- a/font_lib/textures/font_default_00dd.png +++ /dev/null diff --git a/font_lib/textures/font_default_00e0.png b/font_lib/textures/font_default_00e0.png Binary files differdeleted file mode 100644 index b9779fe..0000000 --- a/font_lib/textures/font_default_00e0.png +++ /dev/null diff --git a/font_lib/textures/font_default_00e1.png b/font_lib/textures/font_default_00e1.png Binary files differdeleted file mode 100644 index aeaeaf5..0000000 --- a/font_lib/textures/font_default_00e1.png +++ /dev/null diff --git a/font_lib/textures/font_default_00e2.png b/font_lib/textures/font_default_00e2.png Binary files differdeleted file mode 100644 index 8ca07ed..0000000 --- a/font_lib/textures/font_default_00e2.png +++ /dev/null diff --git a/font_lib/textures/font_default_00e3.png b/font_lib/textures/font_default_00e3.png Binary files differdeleted file mode 100644 index e2f00bb..0000000 --- a/font_lib/textures/font_default_00e3.png +++ /dev/null diff --git a/font_lib/textures/font_default_00e4.png b/font_lib/textures/font_default_00e4.png Binary files differdeleted file mode 100644 index 6bcf6fb..0000000 --- a/font_lib/textures/font_default_00e4.png +++ /dev/null diff --git a/font_lib/textures/font_default_00e5.png b/font_lib/textures/font_default_00e5.png Binary files differdeleted file mode 100644 index 698094e..0000000 --- a/font_lib/textures/font_default_00e5.png +++ /dev/null diff --git a/font_lib/textures/font_default_00e6.png b/font_lib/textures/font_default_00e6.png Binary files differdeleted file mode 100644 index 70ac70a..0000000 --- a/font_lib/textures/font_default_00e6.png +++ /dev/null diff --git a/font_lib/textures/font_default_00e7.png b/font_lib/textures/font_default_00e7.png Binary files differdeleted file mode 100644 index f0462bd..0000000 --- a/font_lib/textures/font_default_00e7.png +++ /dev/null diff --git a/font_lib/textures/font_default_00e8.png b/font_lib/textures/font_default_00e8.png Binary files differdeleted file mode 100644 index 841363e..0000000 --- a/font_lib/textures/font_default_00e8.png +++ /dev/null diff --git a/font_lib/textures/font_default_00e9.png b/font_lib/textures/font_default_00e9.png Binary files differdeleted file mode 100644 index 7752df4..0000000 --- a/font_lib/textures/font_default_00e9.png +++ /dev/null diff --git a/font_lib/textures/font_default_00ea.png b/font_lib/textures/font_default_00ea.png Binary files differdeleted file mode 100644 index b549be6..0000000 --- a/font_lib/textures/font_default_00ea.png +++ /dev/null diff --git a/font_lib/textures/font_default_00eb.png b/font_lib/textures/font_default_00eb.png Binary files differdeleted file mode 100644 index f9c4dbc..0000000 --- a/font_lib/textures/font_default_00eb.png +++ /dev/null diff --git a/font_lib/textures/font_default_00ec.png b/font_lib/textures/font_default_00ec.png Binary files differdeleted file mode 100644 index e86f3a7..0000000 --- a/font_lib/textures/font_default_00ec.png +++ /dev/null diff --git a/font_lib/textures/font_default_00ed.png b/font_lib/textures/font_default_00ed.png Binary files differdeleted file mode 100644 index 94f12e8..0000000 --- a/font_lib/textures/font_default_00ed.png +++ /dev/null diff --git a/font_lib/textures/font_default_00ee.png b/font_lib/textures/font_default_00ee.png Binary files differdeleted file mode 100644 index e8a743d..0000000 --- a/font_lib/textures/font_default_00ee.png +++ /dev/null diff --git a/font_lib/textures/font_default_00ef.png b/font_lib/textures/font_default_00ef.png Binary files differdeleted file mode 100644 index d2c744f..0000000 --- a/font_lib/textures/font_default_00ef.png +++ /dev/null diff --git a/font_lib/textures/font_default_00f2.png b/font_lib/textures/font_default_00f2.png Binary files differdeleted file mode 100644 index f7d1127..0000000 --- a/font_lib/textures/font_default_00f2.png +++ /dev/null diff --git a/font_lib/textures/font_default_00f4.png b/font_lib/textures/font_default_00f4.png Binary files differdeleted file mode 100644 index 4b0cce6..0000000 --- a/font_lib/textures/font_default_00f4.png +++ /dev/null diff --git a/font_lib/textures/font_default_00f5.png b/font_lib/textures/font_default_00f5.png Binary files differdeleted file mode 100644 index ec7cec1..0000000 --- a/font_lib/textures/font_default_00f5.png +++ /dev/null diff --git a/font_lib/textures/font_default_00f6.png b/font_lib/textures/font_default_00f6.png Binary files differdeleted file mode 100644 index 7213c8a..0000000 --- a/font_lib/textures/font_default_00f6.png +++ /dev/null diff --git a/font_lib/textures/font_default_00f7.png b/font_lib/textures/font_default_00f7.png Binary files differdeleted file mode 100644 index 408687d..0000000 --- a/font_lib/textures/font_default_00f7.png +++ /dev/null diff --git a/font_lib/textures/font_default_00f9.png b/font_lib/textures/font_default_00f9.png Binary files differdeleted file mode 100644 index 67d16b5..0000000 --- a/font_lib/textures/font_default_00f9.png +++ /dev/null diff --git a/font_lib/textures/font_default_00fa.png b/font_lib/textures/font_default_00fa.png Binary files differdeleted file mode 100644 index 97de7e1..0000000 --- a/font_lib/textures/font_default_00fa.png +++ /dev/null diff --git a/font_lib/textures/font_default_00fb.png b/font_lib/textures/font_default_00fb.png Binary files differdeleted file mode 100644 index 2861e15..0000000 --- a/font_lib/textures/font_default_00fb.png +++ /dev/null diff --git a/font_lib/textures/font_default_00fc.png b/font_lib/textures/font_default_00fc.png Binary files differdeleted file mode 100644 index c7deddd..0000000 --- a/font_lib/textures/font_default_00fc.png +++ /dev/null diff --git a/font_lib/textures/font_default_00fd.png b/font_lib/textures/font_default_00fd.png Binary files differdeleted file mode 100644 index b6f45f9..0000000 --- a/font_lib/textures/font_default_00fd.png +++ /dev/null diff --git a/font_lib/textures/font_default_00ff.png b/font_lib/textures/font_default_00ff.png Binary files differdeleted file mode 100644 index d182a29..0000000 --- a/font_lib/textures/font_default_00ff.png +++ /dev/null diff --git a/font_metro/CC-BY-SA.txt b/font_metro/CC-BY-SA.txt new file mode 100644 index 0000000..90f931b --- /dev/null +++ b/font_metro/CC-BY-SA.txt @@ -0,0 +1,60 @@ +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. + "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License. + "Creative Commons Compatible License" means a license that is listed at https://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License. + "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. + "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike. + "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. + "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. + "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. + "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. + "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; + to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; + to Distribute and Publicly Perform the Work including as incorporated in Collections; and, + to Distribute and Publicly Perform Adaptations. + + For the avoidance of doubt: + Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; + Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, + Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested. + You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License. + If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. + Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff --git a/font_metro/LGPL.txt b/font_metro/LGPL.txt new file mode 100644 index 0000000..5af9a4a --- /dev/null +++ b/font_metro/LGPL.txt @@ -0,0 +1,458 @@ +GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + +Copyright (C) 1991, 1999 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts +as the successor of the GNU Library Public License, version 2, hence +the version number 2.1.] + + Preamble + +The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + +This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + +When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + +To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + +For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + +We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + +To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + +Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + +Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + +When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + +We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + +For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + +In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + +Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + +The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + +GNU LESSER GENERAL PUBLIC LICENSE +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + +A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + +1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + +You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + +2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + +a) The modified work must itself be a software library. + +b) You must cause the files modified to carry prominent notices +stating that you changed the files and the date of any change. + +c) You must cause the whole of the work to be licensed at no +charge to all third parties under the terms of this License. + +d) If a facility in the modified Library refers to a function or a +table of data to be supplied by an application program that uses +the facility, other than as an argument passed when the facility +is invoked, then you must make a good faith effort to ensure that, +in the event an application does not supply such function or +table, the facility still operates, and performs whatever part of +its purpose remains meaningful. + +(For example, a function in a library to compute square roots has +a purpose that is entirely well-defined independent of the +application. Therefore, Subsection 2d requires that any +application-supplied function or table used by this function must +be optional: if the application does not supply it, the square +root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + +Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + +4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + +5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + +However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + +When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + +If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + +Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + +6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + +You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + +a) Accompany the work with the complete corresponding +machine-readable source code for the Library including whatever +changes were used in the work (which must be distributed under +Sections 1 and 2 above); and, if the work is an executable linked +with the Library, with the complete machine-readable "work that +uses the Library", as object code and/or source code, so that the +user can modify the Library and then relink to produce a modified +executable containing the modified Library. (It is understood +that the user who changes the contents of definitions files in the +Library will not necessarily be able to recompile the application +to use the modified definitions.) + +b) Use a suitable shared library mechanism for linking with the +Library. A suitable mechanism is one that (1) uses at run time a +copy of the library already present on the user's computer system, +rather than copying library functions into the executable, and (2) +will operate properly with a modified version of the library, if +the user installs one, as long as the modified version is +interface-compatible with the version that the work was made with. + +c) Accompany the work with a written offer, valid for at +least three years, to give the same user the materials +specified in Subsection 6a, above, for a charge no more +than the cost of performing this distribution. + +d) If distribution of the work is made by offering access to copy +from a designated place, offer equivalent access to copy the above +specified materials from the same place. + +e) Verify that the user has already received a copy of these +materials or that you have already sent this user a copy. + +For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + +It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + +7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + +a) Accompany the combined library with a copy of the same work +based on the Library, uncombined with any other library +facilities. This must be distributed under the terms of the +Sections above. + +b) Give prominent notice with the combined library of the fact +that part of it is a work based on the Library, and explaining +where to find the accompanying uncombined form of the same work. + +8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + +9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + +10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + +11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + +13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + +14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + +15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/font_metro/README.md b/font_metro/README.md new file mode 100644 index 0000000..f2a2f41 --- /dev/null +++ b/font_metro/README.md @@ -0,0 +1,19 @@ +# Metro font minetest mod for font API + +This mod adds Metro font to Font API mod (from [display_modpack](https://github.com/pyrollo/display_modpack)). + +For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?t=13563) at the Minetest forums. + +This font includes uppercase, lowercase and many accentuated latin letters, greek and cyrillic letters. + + + +**Dependancies**: font_api + +**License**: code under LGPL v2.1, font under CC-BY-SA 3.0 + +## Original Font + +**Original font**: [Metro by Christian Munk](https://fontstruct.com/fontstructions/show/723864/metro_sans) + +**License**: CC-BY-SA diff --git a/font_metro/copyright.txt b/font_metro/copyright.txt new file mode 100644 index 0000000..6358884 --- /dev/null +++ b/font_metro/copyright.txt @@ -0,0 +1,3 @@ +Font by Christian Munk (CMunk) +Code by Pierre-Yves Rollo (pyrollo) + diff --git a/font_metro/depends.txt b/font_metro/depends.txt new file mode 100644 index 0000000..7372f0d --- /dev/null +++ b/font_metro/depends.txt @@ -0,0 +1 @@ +font_api diff --git a/font_metro/init.lua b/font_metro/init.lua new file mode 100644 index 0000000..ec9a918 --- /dev/null +++ b/font_metro/init.lua @@ -0,0 +1,24 @@ +--[[ + + Metro font for Font API + + Original font Metro Sans + by Christian Munk (CMunk) + released under CC-BY-SA license + + https://fontstruct.com/fontstructions/show/723864/metro_sans + + Derivative textures and code are under CC-BY-SA license +--]] + +font_api.register_font( + 'metro', + { + default = true, + margintop = 3, + linespacing = -2, + height = 15, + widths = { [0]=10, [32]=10, [33]=4, [34]=7, [35]=12, [36]=10, [37]=14, [38]=13, [39]=4, [40]=6, [41]=6, [42]=10, [43]=8, [44]=4, [45]=7, [46]=4, [47]=10, [48]=10, [49]=7, [50]=10, [51]=10, [52]=10, [53]=10, [54]=10, [55]=10, [56]=10, [57]=10, [58]=4, [59]=4, [60]=10, [61]=9, [62]=10, [63]=10, [64]=16, [65]=14, [66]=10, [67]=13, [68]=11, [69]=9, [70]=9, [71]=13, [72]=11, [73]=4, [74]=9, [75]=12, [76]=9, [77]=17, [78]=11, [79]=14, [80]=10, [81]=15, [82]=12, [83]=10, [84]=12, [85]=10, [86]=14, [87]=17, [88]=12, [89]=12, [90]=10, [91]=6, [92]=10, [93]=6, [94]=9, [95]=9, [96]=6, [97]=9, [98]=10, [99]=9, [100]=10, [101]=10, [102]=7, [103]=9, [104]=10, [105]=4, [106]=5, [107]=10, [108]=5, [109]=14, [110]=10, [111]=10, [112]=10, [113]=10, [114]=8, [115]=8, [116]=7, [117]=10, [118]=9, [119]=15, [120]=9, [121]=9, [122]=8, [123]=7, [124]=4, [125]=7, [126]=12, [160]=6, [161]=4, [162]=10, [163]=10, [164]=14, [165]=12, [166]=4, [167]=8, [168]=8, [169]=16, [170]=9, [171]=11, [172]=10, [173]=6, [174]=16, [175]=8, [176]=8, [177]=8, [178]=9, [179]=9, [180]=6, [181]=10, [182]=9, [183]=4, [184]=7, [185]=7, [186]=10, [187]=11, [188]=14, [189]=14, [190]=14, [191]=10, [192]=12, [193]=12, [194]=12, [195]=12, [196]=14, [197]=12, [198]=16, [199]=13, [200]=9, [201]=9, [202]=9, [203]=9, [204]=5, [205]=5, [206]=6, [207]=8, [208]=12, [209]=11, [210]=12, [211]=12, [212]=12, [213]=12, [214]=14, [215]=10, [216]=14, [217]=10, [218]=10, [219]=10, [220]=10, [221]=12, [222]=9, [223]=10, [224]=9, [225]=9, [226]=9, [227]=9, [228]=9, [229]=9, [230]=15, [231]=9, [232]=10, [233]=10, [234]=10, [235]=10, [236]=4, [237]=4, [238]=4, [239]=5, [240]=10, [241]=10, [242]=10, [243]=10, [244]=10, [245]=10, [246]=10, [247]=10, [248]=10, [249]=10, [250]=10, [251]=10, [252]=10, [253]=9, [254]=10, [255]=9, [256]=12, [257]=9, [258]=12, [259]=9, [260]=14, [261]=9, [262]=11, [263]=9, [264]=11, [265]=9, [266]=11, [267]=9, [268]=11, [269]=9, [270]=10, [271]=13, [272]=12, [273]=10, [274]=9, [275]=10, [276]=9, [277]=10, [278]=9, [279]=10, [280]=9, [281]=10, [282]=9, [283]=10, [284]=11, [285]=9, [286]=11, [287]=9, [288]=11, [289]=9, [290]=13, [291]=9, [292]=11, [293]=10, [294]=13, [295]=11, [296]=8, [297]=5, [298]=6, [299]=4, [300]=8, [301]=5, [302]=4, [303]=4, [304]=4, [305]=4, [306]=12, [307]=8, [308]=10, [309]=5, [310]=12, [311]=10, [312]=10, [313]=9, [314]=6, [315]=9, [316]=5, [317]=9, [318]=7, [319]=9, [320]=7, [321]=10, [322]=7, [323]=11, [324]=10, [325]=11, [326]=10, [327]=11, [328]=10, [329]=12, [330]=11, [331]=10, [332]=12, [333]=10, [334]=12, [335]=10, [336]=12, [337]=10, [338]=18, [339]=16, [340]=11, [341]=8, [342]=12, [343]=8, [344]=11, [345]=8, [346]=10, [347]=8, [348]=10, [349]=8, [350]=10, [351]=8, [352]=10, [353]=8, [354]=12, [355]=7, [356]=12, [357]=9, [358]=12, [359]=7, [360]=10, [361]=10, [362]=10, [363]=10, [364]=10, [365]=10, [366]=10, [367]=10, [368]=10, [369]=10, [370]=10, [371]=10, [372]=15, [373]=15, [374]=12, [375]=9, [376]=12, [377]=10, [378]=8, [379]=10, [380]=8, [381]=10, [382]=8, [383]=5, [894]=4, [913]=14, [914]=10, [915]=9, [916]=14, [917]=9, [918]=10, [919]=11, [920]=14, [921]=4, [922]=12, [923]=14, [924]=17, [925]=11, [926]=10, [927]=14, [928]=11, [929]=10, [931]=10, [932]=12, [933]=12, [934]=12, [935]=12, [936]=12, [937]=14, [945]=10, [946]=10, [947]=9, [948]=10, [949]=9, [950]=9, [951]=10, [952]=10, [953]=5, [954]=10, [955]=9, [956]=10, [957]=9, [958]=9, [959]=10, [960]=11, [961]=10, [962]=9, [963]=10, [964]=10, [965]=10, [966]=12, [967]=9, [968]=12, [969]=12, [1026]=14, [1028]=13, [1033]=17, [1034]=17, [1035]=14, [1037]=11, [1039]=11, [1040]=14, [1041]=10, [1042]=10, [1043]=10, [1044]=12, [1045]=9, [1046]=18, [1047]=10, [1048]=11, [1049]=11, [1050]=12, [1051]=11, [1052]=17, [1053]=11, [1054]=14, [1055]=11, [1056]=10, [1057]=13, [1058]=12, [1059]=12, [1060]=12, [1061]=12, [1062]=12, [1063]=10, [1064]=16, [1065]=17, [1066]=13, [1067]=13, [1068]=10, [1069]=13, [1070]=17, [1071]=12, [1072]=9, [1073]=10, [1074]=9, [1075]=8, [1076]=11, [1077]=10, [1078]=16, [1079]=9, [1080]=11, [1081]=11, [1082]=10, [1083]=10, [1084]=13, [1085]=10, [1086]=10, [1087]=10, [1088]=10, [1089]=9, [1090]=10, [1091]=9, [1092]=16, [1093]=9, [1094]=10, [1095]=9, [1096]=14, [1097]=15, [1098]=11, [1099]=12, [1100]=9, [1101]=10, [1102]=13, [1103]=11, [8216]=4, [8217]=4, [8220]=7, [8221]=7, [8364]=15 }, + } +); + diff --git a/font_metro/screenshot.png b/font_metro/screenshot.png Binary files differnew file mode 100644 index 0000000..c23f170 --- /dev/null +++ b/font_metro/screenshot.png diff --git a/font_metro/textures/font_metro_0000.png b/font_metro/textures/font_metro_0000.png Binary files differnew file mode 100644 index 0000000..1adb751 --- /dev/null +++ b/font_metro/textures/font_metro_0000.png diff --git a/font_metro/textures/font_metro_0020.png b/font_metro/textures/font_metro_0020.png Binary files differnew file mode 100644 index 0000000..32ff136 --- /dev/null +++ b/font_metro/textures/font_metro_0020.png diff --git a/font_metro/textures/font_metro_0021.png b/font_metro/textures/font_metro_0021.png Binary files differnew file mode 100644 index 0000000..82ffeff --- /dev/null +++ b/font_metro/textures/font_metro_0021.png diff --git a/font_metro/textures/font_metro_0022.png b/font_metro/textures/font_metro_0022.png Binary files differnew file mode 100644 index 0000000..c25a994 --- /dev/null +++ b/font_metro/textures/font_metro_0022.png diff --git a/font_metro/textures/font_metro_0023.png b/font_metro/textures/font_metro_0023.png Binary files differnew file mode 100644 index 0000000..c091368 --- /dev/null +++ b/font_metro/textures/font_metro_0023.png diff --git a/font_metro/textures/font_metro_0024.png b/font_metro/textures/font_metro_0024.png Binary files differnew file mode 100644 index 0000000..67a3479 --- /dev/null +++ b/font_metro/textures/font_metro_0024.png diff --git a/font_metro/textures/font_metro_0025.png b/font_metro/textures/font_metro_0025.png Binary files differnew file mode 100644 index 0000000..aca4c3c --- /dev/null +++ b/font_metro/textures/font_metro_0025.png diff --git a/font_metro/textures/font_metro_0026.png b/font_metro/textures/font_metro_0026.png Binary files differnew file mode 100644 index 0000000..0b47b9b --- /dev/null +++ b/font_metro/textures/font_metro_0026.png diff --git a/font_metro/textures/font_metro_0027.png b/font_metro/textures/font_metro_0027.png Binary files differnew file mode 100644 index 0000000..7e79360 --- /dev/null +++ b/font_metro/textures/font_metro_0027.png diff --git a/font_metro/textures/font_metro_0028.png b/font_metro/textures/font_metro_0028.png Binary files differnew file mode 100644 index 0000000..d9fa321 --- /dev/null +++ b/font_metro/textures/font_metro_0028.png diff --git a/font_metro/textures/font_metro_0029.png b/font_metro/textures/font_metro_0029.png Binary files differnew file mode 100644 index 0000000..67abbc9 --- /dev/null +++ b/font_metro/textures/font_metro_0029.png diff --git a/font_metro/textures/font_metro_002a.png b/font_metro/textures/font_metro_002a.png Binary files differnew file mode 100644 index 0000000..e32e1cd --- /dev/null +++ b/font_metro/textures/font_metro_002a.png diff --git a/font_metro/textures/font_metro_002b.png b/font_metro/textures/font_metro_002b.png Binary files differnew file mode 100644 index 0000000..eebc708 --- /dev/null +++ b/font_metro/textures/font_metro_002b.png diff --git a/font_metro/textures/font_metro_002c.png b/font_metro/textures/font_metro_002c.png Binary files differnew file mode 100644 index 0000000..c87f14b --- /dev/null +++ b/font_metro/textures/font_metro_002c.png diff --git a/font_metro/textures/font_metro_002d.png b/font_metro/textures/font_metro_002d.png Binary files differnew file mode 100644 index 0000000..57f60ee --- /dev/null +++ b/font_metro/textures/font_metro_002d.png diff --git a/font_metro/textures/font_metro_002e.png b/font_metro/textures/font_metro_002e.png Binary files differnew file mode 100644 index 0000000..a31f649 --- /dev/null +++ b/font_metro/textures/font_metro_002e.png diff --git a/font_metro/textures/font_metro_002f.png b/font_metro/textures/font_metro_002f.png Binary files differnew file mode 100644 index 0000000..75b1553 --- /dev/null +++ b/font_metro/textures/font_metro_002f.png diff --git a/font_metro/textures/font_metro_0030.png b/font_metro/textures/font_metro_0030.png Binary files differnew file mode 100644 index 0000000..20106b7 --- /dev/null +++ b/font_metro/textures/font_metro_0030.png diff --git a/font_metro/textures/font_metro_0031.png b/font_metro/textures/font_metro_0031.png Binary files differnew file mode 100644 index 0000000..9217af6 --- /dev/null +++ b/font_metro/textures/font_metro_0031.png diff --git a/font_metro/textures/font_metro_0032.png b/font_metro/textures/font_metro_0032.png Binary files differnew file mode 100644 index 0000000..e3ebed8 --- /dev/null +++ b/font_metro/textures/font_metro_0032.png diff --git a/font_metro/textures/font_metro_0033.png b/font_metro/textures/font_metro_0033.png Binary files differnew file mode 100644 index 0000000..0bb0e5a --- /dev/null +++ b/font_metro/textures/font_metro_0033.png diff --git a/font_metro/textures/font_metro_0034.png b/font_metro/textures/font_metro_0034.png Binary files differnew file mode 100644 index 0000000..af6f3f6 --- /dev/null +++ b/font_metro/textures/font_metro_0034.png diff --git a/font_metro/textures/font_metro_0035.png b/font_metro/textures/font_metro_0035.png Binary files differnew file mode 100644 index 0000000..5b59237 --- /dev/null +++ b/font_metro/textures/font_metro_0035.png diff --git a/font_metro/textures/font_metro_0036.png b/font_metro/textures/font_metro_0036.png Binary files differnew file mode 100644 index 0000000..0ed0125 --- /dev/null +++ b/font_metro/textures/font_metro_0036.png diff --git a/font_metro/textures/font_metro_0037.png b/font_metro/textures/font_metro_0037.png Binary files differnew file mode 100644 index 0000000..c5706f5 --- /dev/null +++ b/font_metro/textures/font_metro_0037.png diff --git a/font_metro/textures/font_metro_0038.png b/font_metro/textures/font_metro_0038.png Binary files differnew file mode 100644 index 0000000..0b997ec --- /dev/null +++ b/font_metro/textures/font_metro_0038.png diff --git a/font_metro/textures/font_metro_0039.png b/font_metro/textures/font_metro_0039.png Binary files differnew file mode 100644 index 0000000..437e8f4 --- /dev/null +++ b/font_metro/textures/font_metro_0039.png diff --git a/font_metro/textures/font_metro_003a.png b/font_metro/textures/font_metro_003a.png Binary files differnew file mode 100644 index 0000000..1bac398 --- /dev/null +++ b/font_metro/textures/font_metro_003a.png diff --git a/font_metro/textures/font_metro_003b.png b/font_metro/textures/font_metro_003b.png Binary files differnew file mode 100644 index 0000000..4169832 --- /dev/null +++ b/font_metro/textures/font_metro_003b.png diff --git a/font_metro/textures/font_metro_003c.png b/font_metro/textures/font_metro_003c.png Binary files differnew file mode 100644 index 0000000..a37e9a5 --- /dev/null +++ b/font_metro/textures/font_metro_003c.png diff --git a/font_metro/textures/font_metro_003d.png b/font_metro/textures/font_metro_003d.png Binary files differnew file mode 100644 index 0000000..682c2b0 --- /dev/null +++ b/font_metro/textures/font_metro_003d.png diff --git a/font_metro/textures/font_metro_003e.png b/font_metro/textures/font_metro_003e.png Binary files differnew file mode 100644 index 0000000..7572fa4 --- /dev/null +++ b/font_metro/textures/font_metro_003e.png diff --git a/font_metro/textures/font_metro_003f.png b/font_metro/textures/font_metro_003f.png Binary files differnew file mode 100644 index 0000000..daf7880 --- /dev/null +++ b/font_metro/textures/font_metro_003f.png diff --git a/font_metro/textures/font_metro_0040.png b/font_metro/textures/font_metro_0040.png Binary files differnew file mode 100644 index 0000000..27bef9d --- /dev/null +++ b/font_metro/textures/font_metro_0040.png diff --git a/font_metro/textures/font_metro_0041.png b/font_metro/textures/font_metro_0041.png Binary files differnew file mode 100644 index 0000000..c8b426f --- /dev/null +++ b/font_metro/textures/font_metro_0041.png diff --git a/font_metro/textures/font_metro_0042.png b/font_metro/textures/font_metro_0042.png Binary files differnew file mode 100644 index 0000000..fb03ff9 --- /dev/null +++ b/font_metro/textures/font_metro_0042.png diff --git a/font_metro/textures/font_metro_0043.png b/font_metro/textures/font_metro_0043.png Binary files differnew file mode 100644 index 0000000..57ecc98 --- /dev/null +++ b/font_metro/textures/font_metro_0043.png diff --git a/font_metro/textures/font_metro_0044.png b/font_metro/textures/font_metro_0044.png Binary files differnew file mode 100644 index 0000000..a6a404e --- /dev/null +++ b/font_metro/textures/font_metro_0044.png diff --git a/font_metro/textures/font_metro_0045.png b/font_metro/textures/font_metro_0045.png Binary files differnew file mode 100644 index 0000000..f3bcf04 --- /dev/null +++ b/font_metro/textures/font_metro_0045.png diff --git a/font_metro/textures/font_metro_0046.png b/font_metro/textures/font_metro_0046.png Binary files differnew file mode 100644 index 0000000..6b56650 --- /dev/null +++ b/font_metro/textures/font_metro_0046.png diff --git a/font_metro/textures/font_metro_0047.png b/font_metro/textures/font_metro_0047.png Binary files differnew file mode 100644 index 0000000..e974a83 --- /dev/null +++ b/font_metro/textures/font_metro_0047.png diff --git a/font_metro/textures/font_metro_0048.png b/font_metro/textures/font_metro_0048.png Binary files differnew file mode 100644 index 0000000..25f61eb --- /dev/null +++ b/font_metro/textures/font_metro_0048.png diff --git a/font_metro/textures/font_metro_0049.png b/font_metro/textures/font_metro_0049.png Binary files differnew file mode 100644 index 0000000..8b4fd24 --- /dev/null +++ b/font_metro/textures/font_metro_0049.png diff --git a/font_metro/textures/font_metro_004a.png b/font_metro/textures/font_metro_004a.png Binary files differnew file mode 100644 index 0000000..19ada66 --- /dev/null +++ b/font_metro/textures/font_metro_004a.png diff --git a/font_metro/textures/font_metro_004b.png b/font_metro/textures/font_metro_004b.png Binary files differnew file mode 100644 index 0000000..7878a79 --- /dev/null +++ b/font_metro/textures/font_metro_004b.png diff --git a/font_metro/textures/font_metro_004c.png b/font_metro/textures/font_metro_004c.png Binary files differnew file mode 100644 index 0000000..342d71e --- /dev/null +++ b/font_metro/textures/font_metro_004c.png diff --git a/font_metro/textures/font_metro_004d.png b/font_metro/textures/font_metro_004d.png Binary files differnew file mode 100644 index 0000000..a3b9ca6 --- /dev/null +++ b/font_metro/textures/font_metro_004d.png diff --git a/font_metro/textures/font_metro_004e.png b/font_metro/textures/font_metro_004e.png Binary files differnew file mode 100644 index 0000000..b24e9ae --- /dev/null +++ b/font_metro/textures/font_metro_004e.png diff --git a/font_metro/textures/font_metro_004f.png b/font_metro/textures/font_metro_004f.png Binary files differnew file mode 100644 index 0000000..10f8fea --- /dev/null +++ b/font_metro/textures/font_metro_004f.png diff --git a/font_metro/textures/font_metro_0050.png b/font_metro/textures/font_metro_0050.png Binary files differnew file mode 100644 index 0000000..d8c9c1e --- /dev/null +++ b/font_metro/textures/font_metro_0050.png diff --git a/font_metro/textures/font_metro_0051.png b/font_metro/textures/font_metro_0051.png Binary files differnew file mode 100644 index 0000000..cfb83c6 --- /dev/null +++ b/font_metro/textures/font_metro_0051.png diff --git a/font_metro/textures/font_metro_0052.png b/font_metro/textures/font_metro_0052.png Binary files differnew file mode 100644 index 0000000..cf51c40 --- /dev/null +++ b/font_metro/textures/font_metro_0052.png diff --git a/font_metro/textures/font_metro_0053.png b/font_metro/textures/font_metro_0053.png Binary files differnew file mode 100644 index 0000000..cd0978f --- /dev/null +++ b/font_metro/textures/font_metro_0053.png diff --git a/font_metro/textures/font_metro_0054.png b/font_metro/textures/font_metro_0054.png Binary files differnew file mode 100644 index 0000000..4ce87b2 --- /dev/null +++ b/font_metro/textures/font_metro_0054.png diff --git a/font_metro/textures/font_metro_0055.png b/font_metro/textures/font_metro_0055.png Binary files differnew file mode 100644 index 0000000..352eef2 --- /dev/null +++ b/font_metro/textures/font_metro_0055.png diff --git a/font_metro/textures/font_metro_0056.png b/font_metro/textures/font_metro_0056.png Binary files differnew file mode 100644 index 0000000..de9763f --- /dev/null +++ b/font_metro/textures/font_metro_0056.png diff --git a/font_metro/textures/font_metro_0057.png b/font_metro/textures/font_metro_0057.png Binary files differnew file mode 100644 index 0000000..105518b --- /dev/null +++ b/font_metro/textures/font_metro_0057.png diff --git a/font_metro/textures/font_metro_0058.png b/font_metro/textures/font_metro_0058.png Binary files differnew file mode 100644 index 0000000..5726bc8 --- /dev/null +++ b/font_metro/textures/font_metro_0058.png diff --git a/font_metro/textures/font_metro_0059.png b/font_metro/textures/font_metro_0059.png Binary files differnew file mode 100644 index 0000000..a0b3d1f --- /dev/null +++ b/font_metro/textures/font_metro_0059.png diff --git a/font_metro/textures/font_metro_005a.png b/font_metro/textures/font_metro_005a.png Binary files differnew file mode 100644 index 0000000..894521c --- /dev/null +++ b/font_metro/textures/font_metro_005a.png diff --git a/font_metro/textures/font_metro_005b.png b/font_metro/textures/font_metro_005b.png Binary files differnew file mode 100644 index 0000000..8d45352 --- /dev/null +++ b/font_metro/textures/font_metro_005b.png diff --git a/font_metro/textures/font_metro_005c.png b/font_metro/textures/font_metro_005c.png Binary files differnew file mode 100644 index 0000000..4f53870 --- /dev/null +++ b/font_metro/textures/font_metro_005c.png diff --git a/font_metro/textures/font_metro_005d.png b/font_metro/textures/font_metro_005d.png Binary files differnew file mode 100644 index 0000000..331146f --- /dev/null +++ b/font_metro/textures/font_metro_005d.png diff --git a/font_metro/textures/font_metro_005e.png b/font_metro/textures/font_metro_005e.png Binary files differnew file mode 100644 index 0000000..e5982a1 --- /dev/null +++ b/font_metro/textures/font_metro_005e.png diff --git a/font_metro/textures/font_metro_005f.png b/font_metro/textures/font_metro_005f.png Binary files differnew file mode 100644 index 0000000..db02065 --- /dev/null +++ b/font_metro/textures/font_metro_005f.png diff --git a/font_metro/textures/font_metro_0060.png b/font_metro/textures/font_metro_0060.png Binary files differnew file mode 100644 index 0000000..b759d07 --- /dev/null +++ b/font_metro/textures/font_metro_0060.png diff --git a/font_metro/textures/font_metro_0061.png b/font_metro/textures/font_metro_0061.png Binary files differnew file mode 100644 index 0000000..6b6f99f --- /dev/null +++ b/font_metro/textures/font_metro_0061.png diff --git a/font_metro/textures/font_metro_0062.png b/font_metro/textures/font_metro_0062.png Binary files differnew file mode 100644 index 0000000..c2f4c08 --- /dev/null +++ b/font_metro/textures/font_metro_0062.png diff --git a/font_metro/textures/font_metro_0063.png b/font_metro/textures/font_metro_0063.png Binary files differnew file mode 100644 index 0000000..59e3598 --- /dev/null +++ b/font_metro/textures/font_metro_0063.png diff --git a/font_metro/textures/font_metro_0064.png b/font_metro/textures/font_metro_0064.png Binary files differnew file mode 100644 index 0000000..268a6e2 --- /dev/null +++ b/font_metro/textures/font_metro_0064.png diff --git a/font_metro/textures/font_metro_0065.png b/font_metro/textures/font_metro_0065.png Binary files differnew file mode 100644 index 0000000..926dcd7 --- /dev/null +++ b/font_metro/textures/font_metro_0065.png diff --git a/font_metro/textures/font_metro_0066.png b/font_metro/textures/font_metro_0066.png Binary files differnew file mode 100644 index 0000000..a4be202 --- /dev/null +++ b/font_metro/textures/font_metro_0066.png diff --git a/font_metro/textures/font_metro_0067.png b/font_metro/textures/font_metro_0067.png Binary files differnew file mode 100644 index 0000000..7a85fa6 --- /dev/null +++ b/font_metro/textures/font_metro_0067.png diff --git a/font_metro/textures/font_metro_0068.png b/font_metro/textures/font_metro_0068.png Binary files differnew file mode 100644 index 0000000..f82d860 --- /dev/null +++ b/font_metro/textures/font_metro_0068.png diff --git a/font_metro/textures/font_metro_0069.png b/font_metro/textures/font_metro_0069.png Binary files differnew file mode 100644 index 0000000..399bbe4 --- /dev/null +++ b/font_metro/textures/font_metro_0069.png diff --git a/font_metro/textures/font_metro_006a.png b/font_metro/textures/font_metro_006a.png Binary files differnew file mode 100644 index 0000000..9775706 --- /dev/null +++ b/font_metro/textures/font_metro_006a.png diff --git a/font_metro/textures/font_metro_006b.png b/font_metro/textures/font_metro_006b.png Binary files differnew file mode 100644 index 0000000..c39dfdb --- /dev/null +++ b/font_metro/textures/font_metro_006b.png diff --git a/font_metro/textures/font_metro_006c.png b/font_metro/textures/font_metro_006c.png Binary files differnew file mode 100644 index 0000000..ada974f --- /dev/null +++ b/font_metro/textures/font_metro_006c.png diff --git a/font_metro/textures/font_metro_006d.png b/font_metro/textures/font_metro_006d.png Binary files differnew file mode 100644 index 0000000..40a1c7f --- /dev/null +++ b/font_metro/textures/font_metro_006d.png diff --git a/font_metro/textures/font_metro_006e.png b/font_metro/textures/font_metro_006e.png Binary files differnew file mode 100644 index 0000000..3818974 --- /dev/null +++ b/font_metro/textures/font_metro_006e.png diff --git a/font_metro/textures/font_metro_006f.png b/font_metro/textures/font_metro_006f.png Binary files differnew file mode 100644 index 0000000..3860b70 --- /dev/null +++ b/font_metro/textures/font_metro_006f.png diff --git a/font_metro/textures/font_metro_0070.png b/font_metro/textures/font_metro_0070.png Binary files differnew file mode 100644 index 0000000..03463ed --- /dev/null +++ b/font_metro/textures/font_metro_0070.png diff --git a/font_metro/textures/font_metro_0071.png b/font_metro/textures/font_metro_0071.png Binary files differnew file mode 100644 index 0000000..1cb35c9 --- /dev/null +++ b/font_metro/textures/font_metro_0071.png diff --git a/font_metro/textures/font_metro_0072.png b/font_metro/textures/font_metro_0072.png Binary files differnew file mode 100644 index 0000000..df04df1 --- /dev/null +++ b/font_metro/textures/font_metro_0072.png diff --git a/font_metro/textures/font_metro_0073.png b/font_metro/textures/font_metro_0073.png Binary files differnew file mode 100644 index 0000000..1be3651 --- /dev/null +++ b/font_metro/textures/font_metro_0073.png diff --git a/font_metro/textures/font_metro_0074.png b/font_metro/textures/font_metro_0074.png Binary files differnew file mode 100644 index 0000000..e21b231 --- /dev/null +++ b/font_metro/textures/font_metro_0074.png diff --git a/font_metro/textures/font_metro_0075.png b/font_metro/textures/font_metro_0075.png Binary files differnew file mode 100644 index 0000000..3b9a88e --- /dev/null +++ b/font_metro/textures/font_metro_0075.png diff --git a/font_metro/textures/font_metro_0076.png b/font_metro/textures/font_metro_0076.png Binary files differnew file mode 100644 index 0000000..5130cd5 --- /dev/null +++ b/font_metro/textures/font_metro_0076.png diff --git a/font_metro/textures/font_metro_0077.png b/font_metro/textures/font_metro_0077.png Binary files differnew file mode 100644 index 0000000..bff32a5 --- /dev/null +++ b/font_metro/textures/font_metro_0077.png diff --git a/font_metro/textures/font_metro_0078.png b/font_metro/textures/font_metro_0078.png Binary files differnew file mode 100644 index 0000000..8dd1b7a --- /dev/null +++ b/font_metro/textures/font_metro_0078.png diff --git a/font_metro/textures/font_metro_0079.png b/font_metro/textures/font_metro_0079.png Binary files differnew file mode 100644 index 0000000..885b3a2 --- /dev/null +++ b/font_metro/textures/font_metro_0079.png diff --git a/font_metro/textures/font_metro_007a.png b/font_metro/textures/font_metro_007a.png Binary files differnew file mode 100644 index 0000000..700b3d7 --- /dev/null +++ b/font_metro/textures/font_metro_007a.png diff --git a/font_metro/textures/font_metro_007b.png b/font_metro/textures/font_metro_007b.png Binary files differnew file mode 100644 index 0000000..d483322 --- /dev/null +++ b/font_metro/textures/font_metro_007b.png diff --git a/font_metro/textures/font_metro_007c.png b/font_metro/textures/font_metro_007c.png Binary files differnew file mode 100644 index 0000000..88c7989 --- /dev/null +++ b/font_metro/textures/font_metro_007c.png diff --git a/font_metro/textures/font_metro_007d.png b/font_metro/textures/font_metro_007d.png Binary files differnew file mode 100644 index 0000000..30fbff4 --- /dev/null +++ b/font_metro/textures/font_metro_007d.png diff --git a/font_metro/textures/font_metro_007e.png b/font_metro/textures/font_metro_007e.png Binary files differnew file mode 100644 index 0000000..95654bb --- /dev/null +++ b/font_metro/textures/font_metro_007e.png diff --git a/font_metro/textures/font_metro_00a0.png b/font_metro/textures/font_metro_00a0.png Binary files differnew file mode 100644 index 0000000..e3593d0 --- /dev/null +++ b/font_metro/textures/font_metro_00a0.png diff --git a/font_metro/textures/font_metro_00a1.png b/font_metro/textures/font_metro_00a1.png Binary files differnew file mode 100644 index 0000000..6378da5 --- /dev/null +++ b/font_metro/textures/font_metro_00a1.png diff --git a/font_metro/textures/font_metro_00a2.png b/font_metro/textures/font_metro_00a2.png Binary files differnew file mode 100644 index 0000000..008727b --- /dev/null +++ b/font_metro/textures/font_metro_00a2.png diff --git a/font_metro/textures/font_metro_00a3.png b/font_metro/textures/font_metro_00a3.png Binary files differnew file mode 100644 index 0000000..8ceeb5a --- /dev/null +++ b/font_metro/textures/font_metro_00a3.png diff --git a/font_metro/textures/font_metro_00a4.png b/font_metro/textures/font_metro_00a4.png Binary files differnew file mode 100644 index 0000000..66b0ea1 --- /dev/null +++ b/font_metro/textures/font_metro_00a4.png diff --git a/font_metro/textures/font_metro_00a5.png b/font_metro/textures/font_metro_00a5.png Binary files differnew file mode 100644 index 0000000..698bcf2 --- /dev/null +++ b/font_metro/textures/font_metro_00a5.png diff --git a/font_metro/textures/font_metro_00a6.png b/font_metro/textures/font_metro_00a6.png Binary files differnew file mode 100644 index 0000000..619f50e --- /dev/null +++ b/font_metro/textures/font_metro_00a6.png diff --git a/font_metro/textures/font_metro_00a7.png b/font_metro/textures/font_metro_00a7.png Binary files differnew file mode 100644 index 0000000..589a147 --- /dev/null +++ b/font_metro/textures/font_metro_00a7.png diff --git a/font_metro/textures/font_metro_00a8.png b/font_metro/textures/font_metro_00a8.png Binary files differnew file mode 100644 index 0000000..0a30bf7 --- /dev/null +++ b/font_metro/textures/font_metro_00a8.png diff --git a/font_metro/textures/font_metro_00a9.png b/font_metro/textures/font_metro_00a9.png Binary files differnew file mode 100644 index 0000000..b3a650e --- /dev/null +++ b/font_metro/textures/font_metro_00a9.png diff --git a/font_metro/textures/font_metro_00aa.png b/font_metro/textures/font_metro_00aa.png Binary files differnew file mode 100644 index 0000000..8185cd6 --- /dev/null +++ b/font_metro/textures/font_metro_00aa.png diff --git a/font_metro/textures/font_metro_00ab.png b/font_metro/textures/font_metro_00ab.png Binary files differnew file mode 100644 index 0000000..caa0031 --- /dev/null +++ b/font_metro/textures/font_metro_00ab.png diff --git a/font_metro/textures/font_metro_00ac.png b/font_metro/textures/font_metro_00ac.png Binary files differnew file mode 100644 index 0000000..ddf800a --- /dev/null +++ b/font_metro/textures/font_metro_00ac.png diff --git a/font_metro/textures/font_metro_00ad.png b/font_metro/textures/font_metro_00ad.png Binary files differnew file mode 100644 index 0000000..331d248 --- /dev/null +++ b/font_metro/textures/font_metro_00ad.png diff --git a/font_metro/textures/font_metro_00ae.png b/font_metro/textures/font_metro_00ae.png Binary files differnew file mode 100644 index 0000000..0f78409 --- /dev/null +++ b/font_metro/textures/font_metro_00ae.png diff --git a/font_metro/textures/font_metro_00af.png b/font_metro/textures/font_metro_00af.png Binary files differnew file mode 100644 index 0000000..1f757e9 --- /dev/null +++ b/font_metro/textures/font_metro_00af.png diff --git a/font_metro/textures/font_metro_00b0.png b/font_metro/textures/font_metro_00b0.png Binary files differnew file mode 100644 index 0000000..4a26c5e --- /dev/null +++ b/font_metro/textures/font_metro_00b0.png diff --git a/font_metro/textures/font_metro_00b1.png b/font_metro/textures/font_metro_00b1.png Binary files differnew file mode 100644 index 0000000..8e6acbb --- /dev/null +++ b/font_metro/textures/font_metro_00b1.png diff --git a/font_metro/textures/font_metro_00b2.png b/font_metro/textures/font_metro_00b2.png Binary files differnew file mode 100644 index 0000000..3795c4b --- /dev/null +++ b/font_metro/textures/font_metro_00b2.png diff --git a/font_metro/textures/font_metro_00b3.png b/font_metro/textures/font_metro_00b3.png Binary files differnew file mode 100644 index 0000000..ddd4ac6 --- /dev/null +++ b/font_metro/textures/font_metro_00b3.png diff --git a/font_metro/textures/font_metro_00b4.png b/font_metro/textures/font_metro_00b4.png Binary files differnew file mode 100644 index 0000000..0f2fc5b --- /dev/null +++ b/font_metro/textures/font_metro_00b4.png diff --git a/font_metro/textures/font_metro_00b5.png b/font_metro/textures/font_metro_00b5.png Binary files differnew file mode 100644 index 0000000..cdfc0a6 --- /dev/null +++ b/font_metro/textures/font_metro_00b5.png diff --git a/font_metro/textures/font_metro_00b6.png b/font_metro/textures/font_metro_00b6.png Binary files differnew file mode 100644 index 0000000..d89dd5e --- /dev/null +++ b/font_metro/textures/font_metro_00b6.png diff --git a/font_metro/textures/font_metro_00b7.png b/font_metro/textures/font_metro_00b7.png Binary files differnew file mode 100644 index 0000000..6549943 --- /dev/null +++ b/font_metro/textures/font_metro_00b7.png diff --git a/font_metro/textures/font_metro_00b8.png b/font_metro/textures/font_metro_00b8.png Binary files differnew file mode 100644 index 0000000..5bdac17 --- /dev/null +++ b/font_metro/textures/font_metro_00b8.png diff --git a/font_metro/textures/font_metro_00b9.png b/font_metro/textures/font_metro_00b9.png Binary files differnew file mode 100644 index 0000000..8a2c0e2 --- /dev/null +++ b/font_metro/textures/font_metro_00b9.png diff --git a/font_metro/textures/font_metro_00ba.png b/font_metro/textures/font_metro_00ba.png Binary files differnew file mode 100644 index 0000000..d1854ea --- /dev/null +++ b/font_metro/textures/font_metro_00ba.png diff --git a/font_metro/textures/font_metro_00bb.png b/font_metro/textures/font_metro_00bb.png Binary files differnew file mode 100644 index 0000000..84c02e2 --- /dev/null +++ b/font_metro/textures/font_metro_00bb.png diff --git a/font_metro/textures/font_metro_00bc.png b/font_metro/textures/font_metro_00bc.png Binary files differnew file mode 100644 index 0000000..51c6205 --- /dev/null +++ b/font_metro/textures/font_metro_00bc.png diff --git a/font_metro/textures/font_metro_00bd.png b/font_metro/textures/font_metro_00bd.png Binary files differnew file mode 100644 index 0000000..89f7169 --- /dev/null +++ b/font_metro/textures/font_metro_00bd.png diff --git a/font_metro/textures/font_metro_00be.png b/font_metro/textures/font_metro_00be.png Binary files differnew file mode 100644 index 0000000..f6ebf58 --- /dev/null +++ b/font_metro/textures/font_metro_00be.png diff --git a/font_metro/textures/font_metro_00bf.png b/font_metro/textures/font_metro_00bf.png Binary files differnew file mode 100644 index 0000000..b0264ad --- /dev/null +++ b/font_metro/textures/font_metro_00bf.png diff --git a/font_metro/textures/font_metro_00c0.png b/font_metro/textures/font_metro_00c0.png Binary files differnew file mode 100644 index 0000000..e3f9d43 --- /dev/null +++ b/font_metro/textures/font_metro_00c0.png diff --git a/font_metro/textures/font_metro_00c1.png b/font_metro/textures/font_metro_00c1.png Binary files differnew file mode 100644 index 0000000..d65d808 --- /dev/null +++ b/font_metro/textures/font_metro_00c1.png diff --git a/font_metro/textures/font_metro_00c2.png b/font_metro/textures/font_metro_00c2.png Binary files differnew file mode 100644 index 0000000..f90c77e --- /dev/null +++ b/font_metro/textures/font_metro_00c2.png diff --git a/font_metro/textures/font_metro_00c3.png b/font_metro/textures/font_metro_00c3.png Binary files differnew file mode 100644 index 0000000..fab6799 --- /dev/null +++ b/font_metro/textures/font_metro_00c3.png diff --git a/font_metro/textures/font_metro_00c4.png b/font_metro/textures/font_metro_00c4.png Binary files differnew file mode 100644 index 0000000..c58ba83 --- /dev/null +++ b/font_metro/textures/font_metro_00c4.png diff --git a/font_metro/textures/font_metro_00c5.png b/font_metro/textures/font_metro_00c5.png Binary files differnew file mode 100644 index 0000000..2fc797f --- /dev/null +++ b/font_metro/textures/font_metro_00c5.png diff --git a/font_metro/textures/font_metro_00c6.png b/font_metro/textures/font_metro_00c6.png Binary files differnew file mode 100644 index 0000000..67f538c --- /dev/null +++ b/font_metro/textures/font_metro_00c6.png diff --git a/font_metro/textures/font_metro_00c7.png b/font_metro/textures/font_metro_00c7.png Binary files differnew file mode 100644 index 0000000..7bbf078 --- /dev/null +++ b/font_metro/textures/font_metro_00c7.png diff --git a/font_metro/textures/font_metro_00c8.png b/font_metro/textures/font_metro_00c8.png Binary files differnew file mode 100644 index 0000000..75d1713 --- /dev/null +++ b/font_metro/textures/font_metro_00c8.png diff --git a/font_metro/textures/font_metro_00c9.png b/font_metro/textures/font_metro_00c9.png Binary files differnew file mode 100644 index 0000000..82a2839 --- /dev/null +++ b/font_metro/textures/font_metro_00c9.png diff --git a/font_metro/textures/font_metro_00ca.png b/font_metro/textures/font_metro_00ca.png Binary files differnew file mode 100644 index 0000000..ba6b8b1 --- /dev/null +++ b/font_metro/textures/font_metro_00ca.png diff --git a/font_metro/textures/font_metro_00cb.png b/font_metro/textures/font_metro_00cb.png Binary files differnew file mode 100644 index 0000000..1ba1281 --- /dev/null +++ b/font_metro/textures/font_metro_00cb.png diff --git a/font_metro/textures/font_metro_00cc.png b/font_metro/textures/font_metro_00cc.png Binary files differnew file mode 100644 index 0000000..82d4db0 --- /dev/null +++ b/font_metro/textures/font_metro_00cc.png diff --git a/font_metro/textures/font_metro_00cd.png b/font_metro/textures/font_metro_00cd.png Binary files differnew file mode 100644 index 0000000..57006aa --- /dev/null +++ b/font_metro/textures/font_metro_00cd.png diff --git a/font_metro/textures/font_metro_00ce.png b/font_metro/textures/font_metro_00ce.png Binary files differnew file mode 100644 index 0000000..74e9b13 --- /dev/null +++ b/font_metro/textures/font_metro_00ce.png diff --git a/font_metro/textures/font_metro_00cf.png b/font_metro/textures/font_metro_00cf.png Binary files differnew file mode 100644 index 0000000..ca0619a --- /dev/null +++ b/font_metro/textures/font_metro_00cf.png diff --git a/font_metro/textures/font_metro_00d0.png b/font_metro/textures/font_metro_00d0.png Binary files differnew file mode 100644 index 0000000..c3d66bf --- /dev/null +++ b/font_metro/textures/font_metro_00d0.png diff --git a/font_metro/textures/font_metro_00d1.png b/font_metro/textures/font_metro_00d1.png Binary files differnew file mode 100644 index 0000000..b80b796 --- /dev/null +++ b/font_metro/textures/font_metro_00d1.png diff --git a/font_metro/textures/font_metro_00d2.png b/font_metro/textures/font_metro_00d2.png Binary files differnew file mode 100644 index 0000000..78ba134 --- /dev/null +++ b/font_metro/textures/font_metro_00d2.png diff --git a/font_metro/textures/font_metro_00d3.png b/font_metro/textures/font_metro_00d3.png Binary files differnew file mode 100644 index 0000000..875c8d6 --- /dev/null +++ b/font_metro/textures/font_metro_00d3.png diff --git a/font_metro/textures/font_metro_00d4.png b/font_metro/textures/font_metro_00d4.png Binary files differnew file mode 100644 index 0000000..a4e29d0 --- /dev/null +++ b/font_metro/textures/font_metro_00d4.png diff --git a/font_metro/textures/font_metro_00d5.png b/font_metro/textures/font_metro_00d5.png Binary files differnew file mode 100644 index 0000000..dc6b34d --- /dev/null +++ b/font_metro/textures/font_metro_00d5.png diff --git a/font_metro/textures/font_metro_00d6.png b/font_metro/textures/font_metro_00d6.png Binary files differnew file mode 100644 index 0000000..88a4888 --- /dev/null +++ b/font_metro/textures/font_metro_00d6.png diff --git a/font_metro/textures/font_metro_00d7.png b/font_metro/textures/font_metro_00d7.png Binary files differnew file mode 100644 index 0000000..ad3e11f --- /dev/null +++ b/font_metro/textures/font_metro_00d7.png diff --git a/font_metro/textures/font_metro_00d8.png b/font_metro/textures/font_metro_00d8.png Binary files differnew file mode 100644 index 0000000..92a4efb --- /dev/null +++ b/font_metro/textures/font_metro_00d8.png diff --git a/font_metro/textures/font_metro_00d9.png b/font_metro/textures/font_metro_00d9.png Binary files differnew file mode 100644 index 0000000..38e488c --- /dev/null +++ b/font_metro/textures/font_metro_00d9.png diff --git a/font_metro/textures/font_metro_00da.png b/font_metro/textures/font_metro_00da.png Binary files differnew file mode 100644 index 0000000..769d2d2 --- /dev/null +++ b/font_metro/textures/font_metro_00da.png diff --git a/font_metro/textures/font_metro_00db.png b/font_metro/textures/font_metro_00db.png Binary files differnew file mode 100644 index 0000000..aa7dbc0 --- /dev/null +++ b/font_metro/textures/font_metro_00db.png diff --git a/font_metro/textures/font_metro_00dc.png b/font_metro/textures/font_metro_00dc.png Binary files differnew file mode 100644 index 0000000..4214d3e --- /dev/null +++ b/font_metro/textures/font_metro_00dc.png diff --git a/font_metro/textures/font_metro_00dd.png b/font_metro/textures/font_metro_00dd.png Binary files differnew file mode 100644 index 0000000..83478f6 --- /dev/null +++ b/font_metro/textures/font_metro_00dd.png diff --git a/font_metro/textures/font_metro_00de.png b/font_metro/textures/font_metro_00de.png Binary files differnew file mode 100644 index 0000000..47cf265 --- /dev/null +++ b/font_metro/textures/font_metro_00de.png diff --git a/font_metro/textures/font_metro_00df.png b/font_metro/textures/font_metro_00df.png Binary files differnew file mode 100644 index 0000000..2e3bbfc --- /dev/null +++ b/font_metro/textures/font_metro_00df.png diff --git a/font_metro/textures/font_metro_00e0.png b/font_metro/textures/font_metro_00e0.png Binary files differnew file mode 100644 index 0000000..8a79863 --- /dev/null +++ b/font_metro/textures/font_metro_00e0.png diff --git a/font_metro/textures/font_metro_00e1.png b/font_metro/textures/font_metro_00e1.png Binary files differnew file mode 100644 index 0000000..bc833e6 --- /dev/null +++ b/font_metro/textures/font_metro_00e1.png diff --git a/font_metro/textures/font_metro_00e2.png b/font_metro/textures/font_metro_00e2.png Binary files differnew file mode 100644 index 0000000..bd3d8a8 --- /dev/null +++ b/font_metro/textures/font_metro_00e2.png diff --git a/font_metro/textures/font_metro_00e3.png b/font_metro/textures/font_metro_00e3.png Binary files differnew file mode 100644 index 0000000..b452cfa --- /dev/null +++ b/font_metro/textures/font_metro_00e3.png diff --git a/font_metro/textures/font_metro_00e4.png b/font_metro/textures/font_metro_00e4.png Binary files differnew file mode 100644 index 0000000..40587b3 --- /dev/null +++ b/font_metro/textures/font_metro_00e4.png diff --git a/font_metro/textures/font_metro_00e5.png b/font_metro/textures/font_metro_00e5.png Binary files differnew file mode 100644 index 0000000..84f75e3 --- /dev/null +++ b/font_metro/textures/font_metro_00e5.png diff --git a/font_metro/textures/font_metro_00e6.png b/font_metro/textures/font_metro_00e6.png Binary files differnew file mode 100644 index 0000000..1b24749 --- /dev/null +++ b/font_metro/textures/font_metro_00e6.png diff --git a/font_metro/textures/font_metro_00e7.png b/font_metro/textures/font_metro_00e7.png Binary files differnew file mode 100644 index 0000000..362942f --- /dev/null +++ b/font_metro/textures/font_metro_00e7.png diff --git a/font_metro/textures/font_metro_00e8.png b/font_metro/textures/font_metro_00e8.png Binary files differnew file mode 100644 index 0000000..8b9e09d --- /dev/null +++ b/font_metro/textures/font_metro_00e8.png diff --git a/font_metro/textures/font_metro_00e9.png b/font_metro/textures/font_metro_00e9.png Binary files differnew file mode 100644 index 0000000..3ffcd95 --- /dev/null +++ b/font_metro/textures/font_metro_00e9.png diff --git a/font_metro/textures/font_metro_00ea.png b/font_metro/textures/font_metro_00ea.png Binary files differnew file mode 100644 index 0000000..a54fb72 --- /dev/null +++ b/font_metro/textures/font_metro_00ea.png diff --git a/font_metro/textures/font_metro_00eb.png b/font_metro/textures/font_metro_00eb.png Binary files differnew file mode 100644 index 0000000..ba1cedf --- /dev/null +++ b/font_metro/textures/font_metro_00eb.png diff --git a/font_metro/textures/font_metro_00ec.png b/font_metro/textures/font_metro_00ec.png Binary files differnew file mode 100644 index 0000000..8523d67 --- /dev/null +++ b/font_metro/textures/font_metro_00ec.png diff --git a/font_metro/textures/font_metro_00ed.png b/font_metro/textures/font_metro_00ed.png Binary files differnew file mode 100644 index 0000000..0c0da94 --- /dev/null +++ b/font_metro/textures/font_metro_00ed.png diff --git a/font_metro/textures/font_metro_00ee.png b/font_metro/textures/font_metro_00ee.png Binary files differnew file mode 100644 index 0000000..7ef96bf --- /dev/null +++ b/font_metro/textures/font_metro_00ee.png diff --git a/font_metro/textures/font_metro_00ef.png b/font_metro/textures/font_metro_00ef.png Binary files differnew file mode 100644 index 0000000..aa7dcb8 --- /dev/null +++ b/font_metro/textures/font_metro_00ef.png diff --git a/font_metro/textures/font_metro_00f0.png b/font_metro/textures/font_metro_00f0.png Binary files differnew file mode 100644 index 0000000..440d37f --- /dev/null +++ b/font_metro/textures/font_metro_00f0.png diff --git a/font_metro/textures/font_metro_00f1.png b/font_metro/textures/font_metro_00f1.png Binary files differnew file mode 100644 index 0000000..13534c7 --- /dev/null +++ b/font_metro/textures/font_metro_00f1.png diff --git a/font_metro/textures/font_metro_00f2.png b/font_metro/textures/font_metro_00f2.png Binary files differnew file mode 100644 index 0000000..c494847 --- /dev/null +++ b/font_metro/textures/font_metro_00f2.png diff --git a/font_metro/textures/font_metro_00f3.png b/font_metro/textures/font_metro_00f3.png Binary files differnew file mode 100644 index 0000000..7066581 --- /dev/null +++ b/font_metro/textures/font_metro_00f3.png diff --git a/font_metro/textures/font_metro_00f4.png b/font_metro/textures/font_metro_00f4.png Binary files differnew file mode 100644 index 0000000..5dd2c22 --- /dev/null +++ b/font_metro/textures/font_metro_00f4.png diff --git a/font_metro/textures/font_metro_00f5.png b/font_metro/textures/font_metro_00f5.png Binary files differnew file mode 100644 index 0000000..bd0b9f9 --- /dev/null +++ b/font_metro/textures/font_metro_00f5.png diff --git a/font_metro/textures/font_metro_00f6.png b/font_metro/textures/font_metro_00f6.png Binary files differnew file mode 100644 index 0000000..939197a --- /dev/null +++ b/font_metro/textures/font_metro_00f6.png diff --git a/font_metro/textures/font_metro_00f7.png b/font_metro/textures/font_metro_00f7.png Binary files differnew file mode 100644 index 0000000..9828e25 --- /dev/null +++ b/font_metro/textures/font_metro_00f7.png diff --git a/font_metro/textures/font_metro_00f8.png b/font_metro/textures/font_metro_00f8.png Binary files differnew file mode 100644 index 0000000..8a408e6 --- /dev/null +++ b/font_metro/textures/font_metro_00f8.png diff --git a/font_metro/textures/font_metro_00f9.png b/font_metro/textures/font_metro_00f9.png Binary files differnew file mode 100644 index 0000000..b56216f --- /dev/null +++ b/font_metro/textures/font_metro_00f9.png diff --git a/font_metro/textures/font_metro_00fa.png b/font_metro/textures/font_metro_00fa.png Binary files differnew file mode 100644 index 0000000..967e218 --- /dev/null +++ b/font_metro/textures/font_metro_00fa.png diff --git a/font_metro/textures/font_metro_00fb.png b/font_metro/textures/font_metro_00fb.png Binary files differnew file mode 100644 index 0000000..0be79c6 --- /dev/null +++ b/font_metro/textures/font_metro_00fb.png diff --git a/font_metro/textures/font_metro_00fc.png b/font_metro/textures/font_metro_00fc.png Binary files differnew file mode 100644 index 0000000..172bc3b --- /dev/null +++ b/font_metro/textures/font_metro_00fc.png diff --git a/font_metro/textures/font_metro_00fd.png b/font_metro/textures/font_metro_00fd.png Binary files differnew file mode 100644 index 0000000..77ca53f --- /dev/null +++ b/font_metro/textures/font_metro_00fd.png diff --git a/font_metro/textures/font_metro_00fe.png b/font_metro/textures/font_metro_00fe.png Binary files differnew file mode 100644 index 0000000..6d3d2ce --- /dev/null +++ b/font_metro/textures/font_metro_00fe.png diff --git a/font_metro/textures/font_metro_00ff.png b/font_metro/textures/font_metro_00ff.png Binary files differnew file mode 100644 index 0000000..1c41bc3 --- /dev/null +++ b/font_metro/textures/font_metro_00ff.png diff --git a/font_metro/textures/font_metro_0100.png b/font_metro/textures/font_metro_0100.png Binary files differnew file mode 100644 index 0000000..5c89175 --- /dev/null +++ b/font_metro/textures/font_metro_0100.png diff --git a/font_metro/textures/font_metro_0101.png b/font_metro/textures/font_metro_0101.png Binary files differnew file mode 100644 index 0000000..6bf46f8 --- /dev/null +++ b/font_metro/textures/font_metro_0101.png diff --git a/font_metro/textures/font_metro_0102.png b/font_metro/textures/font_metro_0102.png Binary files differnew file mode 100644 index 0000000..d8cb5ff --- /dev/null +++ b/font_metro/textures/font_metro_0102.png diff --git a/font_metro/textures/font_metro_0103.png b/font_metro/textures/font_metro_0103.png Binary files differnew file mode 100644 index 0000000..68bd928 --- /dev/null +++ b/font_metro/textures/font_metro_0103.png diff --git a/font_metro/textures/font_metro_0104.png b/font_metro/textures/font_metro_0104.png Binary files differnew file mode 100644 index 0000000..437addc --- /dev/null +++ b/font_metro/textures/font_metro_0104.png diff --git a/font_metro/textures/font_metro_0105.png b/font_metro/textures/font_metro_0105.png Binary files differnew file mode 100644 index 0000000..74b43b3 --- /dev/null +++ b/font_metro/textures/font_metro_0105.png diff --git a/font_metro/textures/font_metro_0106.png b/font_metro/textures/font_metro_0106.png Binary files differnew file mode 100644 index 0000000..b67e299 --- /dev/null +++ b/font_metro/textures/font_metro_0106.png diff --git a/font_metro/textures/font_metro_0107.png b/font_metro/textures/font_metro_0107.png Binary files differnew file mode 100644 index 0000000..e69f634 --- /dev/null +++ b/font_metro/textures/font_metro_0107.png diff --git a/font_metro/textures/font_metro_0108.png b/font_metro/textures/font_metro_0108.png Binary files differnew file mode 100644 index 0000000..9de2eaf --- /dev/null +++ b/font_metro/textures/font_metro_0108.png diff --git a/font_metro/textures/font_metro_0109.png b/font_metro/textures/font_metro_0109.png Binary files differnew file mode 100644 index 0000000..8bbcd3c --- /dev/null +++ b/font_metro/textures/font_metro_0109.png diff --git a/font_metro/textures/font_metro_010a.png b/font_metro/textures/font_metro_010a.png Binary files differnew file mode 100644 index 0000000..1b6fac9 --- /dev/null +++ b/font_metro/textures/font_metro_010a.png diff --git a/font_metro/textures/font_metro_010b.png b/font_metro/textures/font_metro_010b.png Binary files differnew file mode 100644 index 0000000..e23b242 --- /dev/null +++ b/font_metro/textures/font_metro_010b.png diff --git a/font_metro/textures/font_metro_010c.png b/font_metro/textures/font_metro_010c.png Binary files differnew file mode 100644 index 0000000..efaaa2f --- /dev/null +++ b/font_metro/textures/font_metro_010c.png diff --git a/font_metro/textures/font_metro_010d.png b/font_metro/textures/font_metro_010d.png Binary files differnew file mode 100644 index 0000000..10bee1e --- /dev/null +++ b/font_metro/textures/font_metro_010d.png diff --git a/font_metro/textures/font_metro_010e.png b/font_metro/textures/font_metro_010e.png Binary files differnew file mode 100644 index 0000000..19106f3 --- /dev/null +++ b/font_metro/textures/font_metro_010e.png diff --git a/font_metro/textures/font_metro_010f.png b/font_metro/textures/font_metro_010f.png Binary files differnew file mode 100644 index 0000000..448172a --- /dev/null +++ b/font_metro/textures/font_metro_010f.png diff --git a/font_metro/textures/font_metro_0110.png b/font_metro/textures/font_metro_0110.png Binary files differnew file mode 100644 index 0000000..470dbc2 --- /dev/null +++ b/font_metro/textures/font_metro_0110.png diff --git a/font_metro/textures/font_metro_0111.png b/font_metro/textures/font_metro_0111.png Binary files differnew file mode 100644 index 0000000..4738a78 --- /dev/null +++ b/font_metro/textures/font_metro_0111.png diff --git a/font_metro/textures/font_metro_0112.png b/font_metro/textures/font_metro_0112.png Binary files differnew file mode 100644 index 0000000..db122a1 --- /dev/null +++ b/font_metro/textures/font_metro_0112.png diff --git a/font_metro/textures/font_metro_0113.png b/font_metro/textures/font_metro_0113.png Binary files differnew file mode 100644 index 0000000..b1a0fb9 --- /dev/null +++ b/font_metro/textures/font_metro_0113.png diff --git a/font_metro/textures/font_metro_0114.png b/font_metro/textures/font_metro_0114.png Binary files differnew file mode 100644 index 0000000..be61b13 --- /dev/null +++ b/font_metro/textures/font_metro_0114.png diff --git a/font_metro/textures/font_metro_0115.png b/font_metro/textures/font_metro_0115.png Binary files differnew file mode 100644 index 0000000..fa6ec65 --- /dev/null +++ b/font_metro/textures/font_metro_0115.png diff --git a/font_metro/textures/font_metro_0116.png b/font_metro/textures/font_metro_0116.png Binary files differnew file mode 100644 index 0000000..4871668 --- /dev/null +++ b/font_metro/textures/font_metro_0116.png diff --git a/font_metro/textures/font_metro_0117.png b/font_metro/textures/font_metro_0117.png Binary files differnew file mode 100644 index 0000000..1df2d20 --- /dev/null +++ b/font_metro/textures/font_metro_0117.png diff --git a/font_metro/textures/font_metro_0118.png b/font_metro/textures/font_metro_0118.png Binary files differnew file mode 100644 index 0000000..3721c4c --- /dev/null +++ b/font_metro/textures/font_metro_0118.png diff --git a/font_metro/textures/font_metro_0119.png b/font_metro/textures/font_metro_0119.png Binary files differnew file mode 100644 index 0000000..8247414 --- /dev/null +++ b/font_metro/textures/font_metro_0119.png diff --git a/font_metro/textures/font_metro_011a.png b/font_metro/textures/font_metro_011a.png Binary files differnew file mode 100644 index 0000000..a7c1f4d --- /dev/null +++ b/font_metro/textures/font_metro_011a.png diff --git a/font_metro/textures/font_metro_011b.png b/font_metro/textures/font_metro_011b.png Binary files differnew file mode 100644 index 0000000..799bf76 --- /dev/null +++ b/font_metro/textures/font_metro_011b.png diff --git a/font_metro/textures/font_metro_011c.png b/font_metro/textures/font_metro_011c.png Binary files differnew file mode 100644 index 0000000..e5722e9 --- /dev/null +++ b/font_metro/textures/font_metro_011c.png diff --git a/font_metro/textures/font_metro_011d.png b/font_metro/textures/font_metro_011d.png Binary files differnew file mode 100644 index 0000000..6621e25 --- /dev/null +++ b/font_metro/textures/font_metro_011d.png diff --git a/font_metro/textures/font_metro_011e.png b/font_metro/textures/font_metro_011e.png Binary files differnew file mode 100644 index 0000000..b001bad --- /dev/null +++ b/font_metro/textures/font_metro_011e.png diff --git a/font_metro/textures/font_metro_011f.png b/font_metro/textures/font_metro_011f.png Binary files differnew file mode 100644 index 0000000..32b0e05 --- /dev/null +++ b/font_metro/textures/font_metro_011f.png diff --git a/font_metro/textures/font_metro_0120.png b/font_metro/textures/font_metro_0120.png Binary files differnew file mode 100644 index 0000000..883d007 --- /dev/null +++ b/font_metro/textures/font_metro_0120.png diff --git a/font_metro/textures/font_metro_0121.png b/font_metro/textures/font_metro_0121.png Binary files differnew file mode 100644 index 0000000..3e37bef --- /dev/null +++ b/font_metro/textures/font_metro_0121.png diff --git a/font_metro/textures/font_metro_0122.png b/font_metro/textures/font_metro_0122.png Binary files differnew file mode 100644 index 0000000..5e3894d --- /dev/null +++ b/font_metro/textures/font_metro_0122.png diff --git a/font_metro/textures/font_metro_0123.png b/font_metro/textures/font_metro_0123.png Binary files differnew file mode 100644 index 0000000..5f6bcdb --- /dev/null +++ b/font_metro/textures/font_metro_0123.png diff --git a/font_metro/textures/font_metro_0124.png b/font_metro/textures/font_metro_0124.png Binary files differnew file mode 100644 index 0000000..37a0392 --- /dev/null +++ b/font_metro/textures/font_metro_0124.png diff --git a/font_metro/textures/font_metro_0125.png b/font_metro/textures/font_metro_0125.png Binary files differnew file mode 100644 index 0000000..e3d44a4 --- /dev/null +++ b/font_metro/textures/font_metro_0125.png diff --git a/font_metro/textures/font_metro_0126.png b/font_metro/textures/font_metro_0126.png Binary files differnew file mode 100644 index 0000000..fd795b4 --- /dev/null +++ b/font_metro/textures/font_metro_0126.png diff --git a/font_metro/textures/font_metro_0127.png b/font_metro/textures/font_metro_0127.png Binary files differnew file mode 100644 index 0000000..cba0e40 --- /dev/null +++ b/font_metro/textures/font_metro_0127.png diff --git a/font_metro/textures/font_metro_0128.png b/font_metro/textures/font_metro_0128.png Binary files differnew file mode 100644 index 0000000..0cbd488 --- /dev/null +++ b/font_metro/textures/font_metro_0128.png diff --git a/font_metro/textures/font_metro_0129.png b/font_metro/textures/font_metro_0129.png Binary files differnew file mode 100644 index 0000000..a004066 --- /dev/null +++ b/font_metro/textures/font_metro_0129.png diff --git a/font_metro/textures/font_metro_012a.png b/font_metro/textures/font_metro_012a.png Binary files differnew file mode 100644 index 0000000..7507618 --- /dev/null +++ b/font_metro/textures/font_metro_012a.png diff --git a/font_metro/textures/font_metro_012b.png b/font_metro/textures/font_metro_012b.png Binary files differnew file mode 100644 index 0000000..6376b38 --- /dev/null +++ b/font_metro/textures/font_metro_012b.png diff --git a/font_metro/textures/font_metro_012c.png b/font_metro/textures/font_metro_012c.png Binary files differnew file mode 100644 index 0000000..7f00372 --- /dev/null +++ b/font_metro/textures/font_metro_012c.png diff --git a/font_metro/textures/font_metro_012d.png b/font_metro/textures/font_metro_012d.png Binary files differnew file mode 100644 index 0000000..6221709 --- /dev/null +++ b/font_metro/textures/font_metro_012d.png diff --git a/font_metro/textures/font_metro_012e.png b/font_metro/textures/font_metro_012e.png Binary files differnew file mode 100644 index 0000000..81b3f4e --- /dev/null +++ b/font_metro/textures/font_metro_012e.png diff --git a/font_metro/textures/font_metro_012f.png b/font_metro/textures/font_metro_012f.png Binary files differnew file mode 100644 index 0000000..762d761 --- /dev/null +++ b/font_metro/textures/font_metro_012f.png diff --git a/font_metro/textures/font_metro_0130.png b/font_metro/textures/font_metro_0130.png Binary files differnew file mode 100644 index 0000000..995e318 --- /dev/null +++ b/font_metro/textures/font_metro_0130.png diff --git a/font_metro/textures/font_metro_0131.png b/font_metro/textures/font_metro_0131.png Binary files differnew file mode 100644 index 0000000..3b7c7d2 --- /dev/null +++ b/font_metro/textures/font_metro_0131.png diff --git a/font_metro/textures/font_metro_0132.png b/font_metro/textures/font_metro_0132.png Binary files differnew file mode 100644 index 0000000..8439650 --- /dev/null +++ b/font_metro/textures/font_metro_0132.png diff --git a/font_metro/textures/font_metro_0133.png b/font_metro/textures/font_metro_0133.png Binary files differnew file mode 100644 index 0000000..623bc13 --- /dev/null +++ b/font_metro/textures/font_metro_0133.png diff --git a/font_metro/textures/font_metro_0134.png b/font_metro/textures/font_metro_0134.png Binary files differnew file mode 100644 index 0000000..4352bfc --- /dev/null +++ b/font_metro/textures/font_metro_0134.png diff --git a/font_metro/textures/font_metro_0135.png b/font_metro/textures/font_metro_0135.png Binary files differnew file mode 100644 index 0000000..d2ce9a3 --- /dev/null +++ b/font_metro/textures/font_metro_0135.png diff --git a/font_metro/textures/font_metro_0136.png b/font_metro/textures/font_metro_0136.png Binary files differnew file mode 100644 index 0000000..e6446f6 --- /dev/null +++ b/font_metro/textures/font_metro_0136.png diff --git a/font_metro/textures/font_metro_0137.png b/font_metro/textures/font_metro_0137.png Binary files differnew file mode 100644 index 0000000..792dccf --- /dev/null +++ b/font_metro/textures/font_metro_0137.png diff --git a/font_metro/textures/font_metro_0138.png b/font_metro/textures/font_metro_0138.png Binary files differnew file mode 100644 index 0000000..d5f8060 --- /dev/null +++ b/font_metro/textures/font_metro_0138.png diff --git a/font_metro/textures/font_metro_0139.png b/font_metro/textures/font_metro_0139.png Binary files differnew file mode 100644 index 0000000..3663947 --- /dev/null +++ b/font_metro/textures/font_metro_0139.png diff --git a/font_metro/textures/font_metro_013a.png b/font_metro/textures/font_metro_013a.png Binary files differnew file mode 100644 index 0000000..8e6a246 --- /dev/null +++ b/font_metro/textures/font_metro_013a.png diff --git a/font_metro/textures/font_metro_013b.png b/font_metro/textures/font_metro_013b.png Binary files differnew file mode 100644 index 0000000..e626f5c --- /dev/null +++ b/font_metro/textures/font_metro_013b.png diff --git a/font_metro/textures/font_metro_013c.png b/font_metro/textures/font_metro_013c.png Binary files differnew file mode 100644 index 0000000..eff1255 --- /dev/null +++ b/font_metro/textures/font_metro_013c.png diff --git a/font_metro/textures/font_metro_013d.png b/font_metro/textures/font_metro_013d.png Binary files differnew file mode 100644 index 0000000..416dc42 --- /dev/null +++ b/font_metro/textures/font_metro_013d.png diff --git a/font_metro/textures/font_metro_013e.png b/font_metro/textures/font_metro_013e.png Binary files differnew file mode 100644 index 0000000..182be48 --- /dev/null +++ b/font_metro/textures/font_metro_013e.png diff --git a/font_metro/textures/font_metro_013f.png b/font_metro/textures/font_metro_013f.png Binary files differnew file mode 100644 index 0000000..cb5efd5 --- /dev/null +++ b/font_metro/textures/font_metro_013f.png diff --git a/font_metro/textures/font_metro_0140.png b/font_metro/textures/font_metro_0140.png Binary files differnew file mode 100644 index 0000000..5082efd --- /dev/null +++ b/font_metro/textures/font_metro_0140.png diff --git a/font_metro/textures/font_metro_0141.png b/font_metro/textures/font_metro_0141.png Binary files differnew file mode 100644 index 0000000..4eafaf8 --- /dev/null +++ b/font_metro/textures/font_metro_0141.png diff --git a/font_metro/textures/font_metro_0142.png b/font_metro/textures/font_metro_0142.png Binary files differnew file mode 100644 index 0000000..054770c --- /dev/null +++ b/font_metro/textures/font_metro_0142.png diff --git a/font_metro/textures/font_metro_0143.png b/font_metro/textures/font_metro_0143.png Binary files differnew file mode 100644 index 0000000..1018e63 --- /dev/null +++ b/font_metro/textures/font_metro_0143.png diff --git a/font_metro/textures/font_metro_0144.png b/font_metro/textures/font_metro_0144.png Binary files differnew file mode 100644 index 0000000..ea352f9 --- /dev/null +++ b/font_metro/textures/font_metro_0144.png diff --git a/font_metro/textures/font_metro_0145.png b/font_metro/textures/font_metro_0145.png Binary files differnew file mode 100644 index 0000000..9500de2 --- /dev/null +++ b/font_metro/textures/font_metro_0145.png diff --git a/font_metro/textures/font_metro_0146.png b/font_metro/textures/font_metro_0146.png Binary files differnew file mode 100644 index 0000000..c19f343 --- /dev/null +++ b/font_metro/textures/font_metro_0146.png diff --git a/font_metro/textures/font_metro_0147.png b/font_metro/textures/font_metro_0147.png Binary files differnew file mode 100644 index 0000000..1d28465 --- /dev/null +++ b/font_metro/textures/font_metro_0147.png diff --git a/font_metro/textures/font_metro_0148.png b/font_metro/textures/font_metro_0148.png Binary files differnew file mode 100644 index 0000000..5b124d0 --- /dev/null +++ b/font_metro/textures/font_metro_0148.png diff --git a/font_metro/textures/font_metro_0149.png b/font_metro/textures/font_metro_0149.png Binary files differnew file mode 100644 index 0000000..6fff698 --- /dev/null +++ b/font_metro/textures/font_metro_0149.png diff --git a/font_metro/textures/font_metro_014a.png b/font_metro/textures/font_metro_014a.png Binary files differnew file mode 100644 index 0000000..c35e049 --- /dev/null +++ b/font_metro/textures/font_metro_014a.png diff --git a/font_metro/textures/font_metro_014b.png b/font_metro/textures/font_metro_014b.png Binary files differnew file mode 100644 index 0000000..c55abaa --- /dev/null +++ b/font_metro/textures/font_metro_014b.png diff --git a/font_metro/textures/font_metro_014c.png b/font_metro/textures/font_metro_014c.png Binary files differnew file mode 100644 index 0000000..a619f50 --- /dev/null +++ b/font_metro/textures/font_metro_014c.png diff --git a/font_metro/textures/font_metro_014d.png b/font_metro/textures/font_metro_014d.png Binary files differnew file mode 100644 index 0000000..34354d6 --- /dev/null +++ b/font_metro/textures/font_metro_014d.png diff --git a/font_metro/textures/font_metro_014e.png b/font_metro/textures/font_metro_014e.png Binary files differnew file mode 100644 index 0000000..06f6ca5 --- /dev/null +++ b/font_metro/textures/font_metro_014e.png diff --git a/font_metro/textures/font_metro_014f.png b/font_metro/textures/font_metro_014f.png Binary files differnew file mode 100644 index 0000000..8f5cf29 --- /dev/null +++ b/font_metro/textures/font_metro_014f.png diff --git a/font_metro/textures/font_metro_0150.png b/font_metro/textures/font_metro_0150.png Binary files differnew file mode 100644 index 0000000..61c14b0 --- /dev/null +++ b/font_metro/textures/font_metro_0150.png diff --git a/font_metro/textures/font_metro_0151.png b/font_metro/textures/font_metro_0151.png Binary files differnew file mode 100644 index 0000000..1d7e21a --- /dev/null +++ b/font_metro/textures/font_metro_0151.png diff --git a/font_metro/textures/font_metro_0152.png b/font_metro/textures/font_metro_0152.png Binary files differnew file mode 100644 index 0000000..e1644ff --- /dev/null +++ b/font_metro/textures/font_metro_0152.png diff --git a/font_metro/textures/font_metro_0153.png b/font_metro/textures/font_metro_0153.png Binary files differnew file mode 100644 index 0000000..ab3a072 --- /dev/null +++ b/font_metro/textures/font_metro_0153.png diff --git a/font_metro/textures/font_metro_0154.png b/font_metro/textures/font_metro_0154.png Binary files differnew file mode 100644 index 0000000..bbe2548 --- /dev/null +++ b/font_metro/textures/font_metro_0154.png diff --git a/font_metro/textures/font_metro_0155.png b/font_metro/textures/font_metro_0155.png Binary files differnew file mode 100644 index 0000000..4d424d0 --- /dev/null +++ b/font_metro/textures/font_metro_0155.png diff --git a/font_metro/textures/font_metro_0156.png b/font_metro/textures/font_metro_0156.png Binary files differnew file mode 100644 index 0000000..8339db8 --- /dev/null +++ b/font_metro/textures/font_metro_0156.png diff --git a/font_metro/textures/font_metro_0157.png b/font_metro/textures/font_metro_0157.png Binary files differnew file mode 100644 index 0000000..6c03f74 --- /dev/null +++ b/font_metro/textures/font_metro_0157.png diff --git a/font_metro/textures/font_metro_0158.png b/font_metro/textures/font_metro_0158.png Binary files differnew file mode 100644 index 0000000..bc6987b --- /dev/null +++ b/font_metro/textures/font_metro_0158.png diff --git a/font_metro/textures/font_metro_0159.png b/font_metro/textures/font_metro_0159.png Binary files differnew file mode 100644 index 0000000..64e3fde --- /dev/null +++ b/font_metro/textures/font_metro_0159.png diff --git a/font_metro/textures/font_metro_015a.png b/font_metro/textures/font_metro_015a.png Binary files differnew file mode 100644 index 0000000..948a9f9 --- /dev/null +++ b/font_metro/textures/font_metro_015a.png diff --git a/font_metro/textures/font_metro_015b.png b/font_metro/textures/font_metro_015b.png Binary files differnew file mode 100644 index 0000000..7823622 --- /dev/null +++ b/font_metro/textures/font_metro_015b.png diff --git a/font_metro/textures/font_metro_015c.png b/font_metro/textures/font_metro_015c.png Binary files differnew file mode 100644 index 0000000..3fa276b --- /dev/null +++ b/font_metro/textures/font_metro_015c.png diff --git a/font_metro/textures/font_metro_015d.png b/font_metro/textures/font_metro_015d.png Binary files differnew file mode 100644 index 0000000..b7c9d86 --- /dev/null +++ b/font_metro/textures/font_metro_015d.png diff --git a/font_metro/textures/font_metro_015e.png b/font_metro/textures/font_metro_015e.png Binary files differnew file mode 100644 index 0000000..c112cab --- /dev/null +++ b/font_metro/textures/font_metro_015e.png diff --git a/font_metro/textures/font_metro_015f.png b/font_metro/textures/font_metro_015f.png Binary files differnew file mode 100644 index 0000000..e4278e0 --- /dev/null +++ b/font_metro/textures/font_metro_015f.png diff --git a/font_metro/textures/font_metro_0160.png b/font_metro/textures/font_metro_0160.png Binary files differnew file mode 100644 index 0000000..eecde8f --- /dev/null +++ b/font_metro/textures/font_metro_0160.png diff --git a/font_metro/textures/font_metro_0161.png b/font_metro/textures/font_metro_0161.png Binary files differnew file mode 100644 index 0000000..dc7fd23 --- /dev/null +++ b/font_metro/textures/font_metro_0161.png diff --git a/font_metro/textures/font_metro_0162.png b/font_metro/textures/font_metro_0162.png Binary files differnew file mode 100644 index 0000000..8ee9bd0 --- /dev/null +++ b/font_metro/textures/font_metro_0162.png diff --git a/font_metro/textures/font_metro_0163.png b/font_metro/textures/font_metro_0163.png Binary files differnew file mode 100644 index 0000000..3a8bae8 --- /dev/null +++ b/font_metro/textures/font_metro_0163.png diff --git a/font_metro/textures/font_metro_0164.png b/font_metro/textures/font_metro_0164.png Binary files differnew file mode 100644 index 0000000..cb92252 --- /dev/null +++ b/font_metro/textures/font_metro_0164.png diff --git a/font_metro/textures/font_metro_0165.png b/font_metro/textures/font_metro_0165.png Binary files differnew file mode 100644 index 0000000..84f2f55 --- /dev/null +++ b/font_metro/textures/font_metro_0165.png diff --git a/font_metro/textures/font_metro_0166.png b/font_metro/textures/font_metro_0166.png Binary files differnew file mode 100644 index 0000000..d9a4602 --- /dev/null +++ b/font_metro/textures/font_metro_0166.png diff --git a/font_metro/textures/font_metro_0167.png b/font_metro/textures/font_metro_0167.png Binary files differnew file mode 100644 index 0000000..72b212e --- /dev/null +++ b/font_metro/textures/font_metro_0167.png diff --git a/font_metro/textures/font_metro_0168.png b/font_metro/textures/font_metro_0168.png Binary files differnew file mode 100644 index 0000000..3c08782 --- /dev/null +++ b/font_metro/textures/font_metro_0168.png diff --git a/font_metro/textures/font_metro_0169.png b/font_metro/textures/font_metro_0169.png Binary files differnew file mode 100644 index 0000000..037f241 --- /dev/null +++ b/font_metro/textures/font_metro_0169.png diff --git a/font_metro/textures/font_metro_016a.png b/font_metro/textures/font_metro_016a.png Binary files differnew file mode 100644 index 0000000..1488cf6 --- /dev/null +++ b/font_metro/textures/font_metro_016a.png diff --git a/font_metro/textures/font_metro_016b.png b/font_metro/textures/font_metro_016b.png Binary files differnew file mode 100644 index 0000000..3e38980 --- /dev/null +++ b/font_metro/textures/font_metro_016b.png diff --git a/font_metro/textures/font_metro_016c.png b/font_metro/textures/font_metro_016c.png Binary files differnew file mode 100644 index 0000000..fee1da2 --- /dev/null +++ b/font_metro/textures/font_metro_016c.png diff --git a/font_metro/textures/font_metro_016d.png b/font_metro/textures/font_metro_016d.png Binary files differnew file mode 100644 index 0000000..02d7907 --- /dev/null +++ b/font_metro/textures/font_metro_016d.png diff --git a/font_metro/textures/font_metro_016e.png b/font_metro/textures/font_metro_016e.png Binary files differnew file mode 100644 index 0000000..6c415b5 --- /dev/null +++ b/font_metro/textures/font_metro_016e.png diff --git a/font_metro/textures/font_metro_016f.png b/font_metro/textures/font_metro_016f.png Binary files differnew file mode 100644 index 0000000..258810f --- /dev/null +++ b/font_metro/textures/font_metro_016f.png diff --git a/font_metro/textures/font_metro_0170.png b/font_metro/textures/font_metro_0170.png Binary files differnew file mode 100644 index 0000000..d9fd023 --- /dev/null +++ b/font_metro/textures/font_metro_0170.png diff --git a/font_metro/textures/font_metro_0171.png b/font_metro/textures/font_metro_0171.png Binary files differnew file mode 100644 index 0000000..59ed156 --- /dev/null +++ b/font_metro/textures/font_metro_0171.png diff --git a/font_metro/textures/font_metro_0172.png b/font_metro/textures/font_metro_0172.png Binary files differnew file mode 100644 index 0000000..2ea8962 --- /dev/null +++ b/font_metro/textures/font_metro_0172.png diff --git a/font_metro/textures/font_metro_0173.png b/font_metro/textures/font_metro_0173.png Binary files differnew file mode 100644 index 0000000..c4fac5b --- /dev/null +++ b/font_metro/textures/font_metro_0173.png diff --git a/font_metro/textures/font_metro_0174.png b/font_metro/textures/font_metro_0174.png Binary files differnew file mode 100644 index 0000000..cc5530f --- /dev/null +++ b/font_metro/textures/font_metro_0174.png diff --git a/font_metro/textures/font_metro_0175.png b/font_metro/textures/font_metro_0175.png Binary files differnew file mode 100644 index 0000000..c37d0bc --- /dev/null +++ b/font_metro/textures/font_metro_0175.png diff --git a/font_metro/textures/font_metro_0176.png b/font_metro/textures/font_metro_0176.png Binary files differnew file mode 100644 index 0000000..4fbbc6a --- /dev/null +++ b/font_metro/textures/font_metro_0176.png diff --git a/font_metro/textures/font_metro_0177.png b/font_metro/textures/font_metro_0177.png Binary files differnew file mode 100644 index 0000000..a579c40 --- /dev/null +++ b/font_metro/textures/font_metro_0177.png diff --git a/font_metro/textures/font_metro_0178.png b/font_metro/textures/font_metro_0178.png Binary files differnew file mode 100644 index 0000000..4c8bd27 --- /dev/null +++ b/font_metro/textures/font_metro_0178.png diff --git a/font_metro/textures/font_metro_0179.png b/font_metro/textures/font_metro_0179.png Binary files differnew file mode 100644 index 0000000..1f13329 --- /dev/null +++ b/font_metro/textures/font_metro_0179.png diff --git a/font_metro/textures/font_metro_017a.png b/font_metro/textures/font_metro_017a.png Binary files differnew file mode 100644 index 0000000..0696c0a --- /dev/null +++ b/font_metro/textures/font_metro_017a.png diff --git a/font_metro/textures/font_metro_017b.png b/font_metro/textures/font_metro_017b.png Binary files differnew file mode 100644 index 0000000..ebdc01e --- /dev/null +++ b/font_metro/textures/font_metro_017b.png diff --git a/font_metro/textures/font_metro_017c.png b/font_metro/textures/font_metro_017c.png Binary files differnew file mode 100644 index 0000000..a82a35a --- /dev/null +++ b/font_metro/textures/font_metro_017c.png diff --git a/font_metro/textures/font_metro_017d.png b/font_metro/textures/font_metro_017d.png Binary files differnew file mode 100644 index 0000000..d3d7f4e --- /dev/null +++ b/font_metro/textures/font_metro_017d.png diff --git a/font_metro/textures/font_metro_017e.png b/font_metro/textures/font_metro_017e.png Binary files differnew file mode 100644 index 0000000..7394bb1 --- /dev/null +++ b/font_metro/textures/font_metro_017e.png diff --git a/font_metro/textures/font_metro_017f.png b/font_metro/textures/font_metro_017f.png Binary files differnew file mode 100644 index 0000000..1e30d93 --- /dev/null +++ b/font_metro/textures/font_metro_017f.png diff --git a/font_metro/textures/font_metro_037e.png b/font_metro/textures/font_metro_037e.png Binary files differnew file mode 100644 index 0000000..f908ae1 --- /dev/null +++ b/font_metro/textures/font_metro_037e.png diff --git a/font_metro/textures/font_metro_0391.png b/font_metro/textures/font_metro_0391.png Binary files differnew file mode 100644 index 0000000..81cf86e --- /dev/null +++ b/font_metro/textures/font_metro_0391.png diff --git a/font_metro/textures/font_metro_0392.png b/font_metro/textures/font_metro_0392.png Binary files differnew file mode 100644 index 0000000..8fd8ebd --- /dev/null +++ b/font_metro/textures/font_metro_0392.png diff --git a/font_metro/textures/font_metro_0393.png b/font_metro/textures/font_metro_0393.png Binary files differnew file mode 100644 index 0000000..63581a3 --- /dev/null +++ b/font_metro/textures/font_metro_0393.png diff --git a/font_metro/textures/font_metro_0394.png b/font_metro/textures/font_metro_0394.png Binary files differnew file mode 100644 index 0000000..576913d --- /dev/null +++ b/font_metro/textures/font_metro_0394.png diff --git a/font_metro/textures/font_metro_0395.png b/font_metro/textures/font_metro_0395.png Binary files differnew file mode 100644 index 0000000..94674ac --- /dev/null +++ b/font_metro/textures/font_metro_0395.png diff --git a/font_metro/textures/font_metro_0396.png b/font_metro/textures/font_metro_0396.png Binary files differnew file mode 100644 index 0000000..ccd40bf --- /dev/null +++ b/font_metro/textures/font_metro_0396.png diff --git a/font_metro/textures/font_metro_0397.png b/font_metro/textures/font_metro_0397.png Binary files differnew file mode 100644 index 0000000..7913f0e --- /dev/null +++ b/font_metro/textures/font_metro_0397.png diff --git a/font_metro/textures/font_metro_0398.png b/font_metro/textures/font_metro_0398.png Binary files differnew file mode 100644 index 0000000..1430f4f --- /dev/null +++ b/font_metro/textures/font_metro_0398.png diff --git a/font_metro/textures/font_metro_0399.png b/font_metro/textures/font_metro_0399.png Binary files differnew file mode 100644 index 0000000..5e7fa23 --- /dev/null +++ b/font_metro/textures/font_metro_0399.png diff --git a/font_metro/textures/font_metro_039a.png b/font_metro/textures/font_metro_039a.png Binary files differnew file mode 100644 index 0000000..a3114bb --- /dev/null +++ b/font_metro/textures/font_metro_039a.png diff --git a/font_metro/textures/font_metro_039b.png b/font_metro/textures/font_metro_039b.png Binary files differnew file mode 100644 index 0000000..9552837 --- /dev/null +++ b/font_metro/textures/font_metro_039b.png diff --git a/font_metro/textures/font_metro_039c.png b/font_metro/textures/font_metro_039c.png Binary files differnew file mode 100644 index 0000000..3617397 --- /dev/null +++ b/font_metro/textures/font_metro_039c.png diff --git a/font_metro/textures/font_metro_039d.png b/font_metro/textures/font_metro_039d.png Binary files differnew file mode 100644 index 0000000..a7cc5aa --- /dev/null +++ b/font_metro/textures/font_metro_039d.png diff --git a/font_metro/textures/font_metro_039e.png b/font_metro/textures/font_metro_039e.png Binary files differnew file mode 100644 index 0000000..7851f04 --- /dev/null +++ b/font_metro/textures/font_metro_039e.png diff --git a/font_metro/textures/font_metro_039f.png b/font_metro/textures/font_metro_039f.png Binary files differnew file mode 100644 index 0000000..d68f5c5 --- /dev/null +++ b/font_metro/textures/font_metro_039f.png diff --git a/font_metro/textures/font_metro_03a0.png b/font_metro/textures/font_metro_03a0.png Binary files differnew file mode 100644 index 0000000..6e53ad2 --- /dev/null +++ b/font_metro/textures/font_metro_03a0.png diff --git a/font_metro/textures/font_metro_03a1.png b/font_metro/textures/font_metro_03a1.png Binary files differnew file mode 100644 index 0000000..36f186d --- /dev/null +++ b/font_metro/textures/font_metro_03a1.png diff --git a/font_metro/textures/font_metro_03a3.png b/font_metro/textures/font_metro_03a3.png Binary files differnew file mode 100644 index 0000000..57323ec --- /dev/null +++ b/font_metro/textures/font_metro_03a3.png diff --git a/font_metro/textures/font_metro_03a4.png b/font_metro/textures/font_metro_03a4.png Binary files differnew file mode 100644 index 0000000..ae5729e --- /dev/null +++ b/font_metro/textures/font_metro_03a4.png diff --git a/font_metro/textures/font_metro_03a5.png b/font_metro/textures/font_metro_03a5.png Binary files differnew file mode 100644 index 0000000..cfbf4d4 --- /dev/null +++ b/font_metro/textures/font_metro_03a5.png diff --git a/font_metro/textures/font_metro_03a6.png b/font_metro/textures/font_metro_03a6.png Binary files differnew file mode 100644 index 0000000..9697d6c --- /dev/null +++ b/font_metro/textures/font_metro_03a6.png diff --git a/font_metro/textures/font_metro_03a7.png b/font_metro/textures/font_metro_03a7.png Binary files differnew file mode 100644 index 0000000..3c45a18 --- /dev/null +++ b/font_metro/textures/font_metro_03a7.png diff --git a/font_metro/textures/font_metro_03a8.png b/font_metro/textures/font_metro_03a8.png Binary files differnew file mode 100644 index 0000000..c8078cb --- /dev/null +++ b/font_metro/textures/font_metro_03a8.png diff --git a/font_metro/textures/font_metro_03a9.png b/font_metro/textures/font_metro_03a9.png Binary files differnew file mode 100644 index 0000000..c191ec3 --- /dev/null +++ b/font_metro/textures/font_metro_03a9.png diff --git a/font_metro/textures/font_metro_03b1.png b/font_metro/textures/font_metro_03b1.png Binary files differnew file mode 100644 index 0000000..c6c7901 --- /dev/null +++ b/font_metro/textures/font_metro_03b1.png diff --git a/font_metro/textures/font_metro_03b2.png b/font_metro/textures/font_metro_03b2.png Binary files differnew file mode 100644 index 0000000..79238f0 --- /dev/null +++ b/font_metro/textures/font_metro_03b2.png diff --git a/font_metro/textures/font_metro_03b3.png b/font_metro/textures/font_metro_03b3.png Binary files differnew file mode 100644 index 0000000..5c3ee08 --- /dev/null +++ b/font_metro/textures/font_metro_03b3.png diff --git a/font_metro/textures/font_metro_03b4.png b/font_metro/textures/font_metro_03b4.png Binary files differnew file mode 100644 index 0000000..0ef059d --- /dev/null +++ b/font_metro/textures/font_metro_03b4.png diff --git a/font_metro/textures/font_metro_03b5.png b/font_metro/textures/font_metro_03b5.png Binary files differnew file mode 100644 index 0000000..16437a1 --- /dev/null +++ b/font_metro/textures/font_metro_03b5.png diff --git a/font_metro/textures/font_metro_03b6.png b/font_metro/textures/font_metro_03b6.png Binary files differnew file mode 100644 index 0000000..0879b13 --- /dev/null +++ b/font_metro/textures/font_metro_03b6.png diff --git a/font_metro/textures/font_metro_03b7.png b/font_metro/textures/font_metro_03b7.png Binary files differnew file mode 100644 index 0000000..85ffb96 --- /dev/null +++ b/font_metro/textures/font_metro_03b7.png diff --git a/font_metro/textures/font_metro_03b8.png b/font_metro/textures/font_metro_03b8.png Binary files differnew file mode 100644 index 0000000..9e47ea1 --- /dev/null +++ b/font_metro/textures/font_metro_03b8.png diff --git a/font_metro/textures/font_metro_03b9.png b/font_metro/textures/font_metro_03b9.png Binary files differnew file mode 100644 index 0000000..44d19db --- /dev/null +++ b/font_metro/textures/font_metro_03b9.png diff --git a/font_metro/textures/font_metro_03ba.png b/font_metro/textures/font_metro_03ba.png Binary files differnew file mode 100644 index 0000000..c8daf16 --- /dev/null +++ b/font_metro/textures/font_metro_03ba.png diff --git a/font_metro/textures/font_metro_03bb.png b/font_metro/textures/font_metro_03bb.png Binary files differnew file mode 100644 index 0000000..ddbf8c2 --- /dev/null +++ b/font_metro/textures/font_metro_03bb.png diff --git a/font_metro/textures/font_metro_03bc.png b/font_metro/textures/font_metro_03bc.png Binary files differnew file mode 100644 index 0000000..a32b5ae --- /dev/null +++ b/font_metro/textures/font_metro_03bc.png diff --git a/font_metro/textures/font_metro_03bd.png b/font_metro/textures/font_metro_03bd.png Binary files differnew file mode 100644 index 0000000..9ef1f0c --- /dev/null +++ b/font_metro/textures/font_metro_03bd.png diff --git a/font_metro/textures/font_metro_03be.png b/font_metro/textures/font_metro_03be.png Binary files differnew file mode 100644 index 0000000..4d45b9f --- /dev/null +++ b/font_metro/textures/font_metro_03be.png diff --git a/font_metro/textures/font_metro_03bf.png b/font_metro/textures/font_metro_03bf.png Binary files differnew file mode 100644 index 0000000..fc76915 --- /dev/null +++ b/font_metro/textures/font_metro_03bf.png diff --git a/font_metro/textures/font_metro_03c0.png b/font_metro/textures/font_metro_03c0.png Binary files differnew file mode 100644 index 0000000..74241d7 --- /dev/null +++ b/font_metro/textures/font_metro_03c0.png diff --git a/font_metro/textures/font_metro_03c1.png b/font_metro/textures/font_metro_03c1.png Binary files differnew file mode 100644 index 0000000..b62f225 --- /dev/null +++ b/font_metro/textures/font_metro_03c1.png diff --git a/font_metro/textures/font_metro_03c2.png b/font_metro/textures/font_metro_03c2.png Binary files differnew file mode 100644 index 0000000..37b31d2 --- /dev/null +++ b/font_metro/textures/font_metro_03c2.png diff --git a/font_metro/textures/font_metro_03c3.png b/font_metro/textures/font_metro_03c3.png Binary files differnew file mode 100644 index 0000000..0aaf81c --- /dev/null +++ b/font_metro/textures/font_metro_03c3.png diff --git a/font_metro/textures/font_metro_03c4.png b/font_metro/textures/font_metro_03c4.png Binary files differnew file mode 100644 index 0000000..ed600dc --- /dev/null +++ b/font_metro/textures/font_metro_03c4.png diff --git a/font_metro/textures/font_metro_03c5.png b/font_metro/textures/font_metro_03c5.png Binary files differnew file mode 100644 index 0000000..15e0ca2 --- /dev/null +++ b/font_metro/textures/font_metro_03c5.png diff --git a/font_metro/textures/font_metro_03c6.png b/font_metro/textures/font_metro_03c6.png Binary files differnew file mode 100644 index 0000000..f9eba2c --- /dev/null +++ b/font_metro/textures/font_metro_03c6.png diff --git a/font_metro/textures/font_metro_03c7.png b/font_metro/textures/font_metro_03c7.png Binary files differnew file mode 100644 index 0000000..ed33748 --- /dev/null +++ b/font_metro/textures/font_metro_03c7.png diff --git a/font_metro/textures/font_metro_03c8.png b/font_metro/textures/font_metro_03c8.png Binary files differnew file mode 100644 index 0000000..0653e44 --- /dev/null +++ b/font_metro/textures/font_metro_03c8.png diff --git a/font_metro/textures/font_metro_03c9.png b/font_metro/textures/font_metro_03c9.png Binary files differnew file mode 100644 index 0000000..89056c4 --- /dev/null +++ b/font_metro/textures/font_metro_03c9.png diff --git a/font_metro/textures/font_metro_0402.png b/font_metro/textures/font_metro_0402.png Binary files differnew file mode 100644 index 0000000..f4a8868 --- /dev/null +++ b/font_metro/textures/font_metro_0402.png diff --git a/font_metro/textures/font_metro_0404.png b/font_metro/textures/font_metro_0404.png Binary files differnew file mode 100644 index 0000000..1aa63dc --- /dev/null +++ b/font_metro/textures/font_metro_0404.png diff --git a/font_metro/textures/font_metro_0409.png b/font_metro/textures/font_metro_0409.png Binary files differnew file mode 100644 index 0000000..721bd33 --- /dev/null +++ b/font_metro/textures/font_metro_0409.png diff --git a/font_metro/textures/font_metro_040a.png b/font_metro/textures/font_metro_040a.png Binary files differnew file mode 100644 index 0000000..b11677d --- /dev/null +++ b/font_metro/textures/font_metro_040a.png diff --git a/font_metro/textures/font_metro_040b.png b/font_metro/textures/font_metro_040b.png Binary files differnew file mode 100644 index 0000000..aafeda9 --- /dev/null +++ b/font_metro/textures/font_metro_040b.png diff --git a/font_metro/textures/font_metro_040d.png b/font_metro/textures/font_metro_040d.png Binary files differnew file mode 100644 index 0000000..3815806 --- /dev/null +++ b/font_metro/textures/font_metro_040d.png diff --git a/font_metro/textures/font_metro_040f.png b/font_metro/textures/font_metro_040f.png Binary files differnew file mode 100644 index 0000000..8ef6020 --- /dev/null +++ b/font_metro/textures/font_metro_040f.png diff --git a/font_metro/textures/font_metro_0410.png b/font_metro/textures/font_metro_0410.png Binary files differnew file mode 100644 index 0000000..c0d701d --- /dev/null +++ b/font_metro/textures/font_metro_0410.png diff --git a/font_metro/textures/font_metro_0411.png b/font_metro/textures/font_metro_0411.png Binary files differnew file mode 100644 index 0000000..1a17a27 --- /dev/null +++ b/font_metro/textures/font_metro_0411.png diff --git a/font_metro/textures/font_metro_0412.png b/font_metro/textures/font_metro_0412.png Binary files differnew file mode 100644 index 0000000..409864b --- /dev/null +++ b/font_metro/textures/font_metro_0412.png diff --git a/font_metro/textures/font_metro_0413.png b/font_metro/textures/font_metro_0413.png Binary files differnew file mode 100644 index 0000000..68b0a85 --- /dev/null +++ b/font_metro/textures/font_metro_0413.png diff --git a/font_metro/textures/font_metro_0414.png b/font_metro/textures/font_metro_0414.png Binary files differnew file mode 100644 index 0000000..99eeb5a --- /dev/null +++ b/font_metro/textures/font_metro_0414.png diff --git a/font_metro/textures/font_metro_0415.png b/font_metro/textures/font_metro_0415.png Binary files differnew file mode 100644 index 0000000..ccd9009 --- /dev/null +++ b/font_metro/textures/font_metro_0415.png diff --git a/font_metro/textures/font_metro_0416.png b/font_metro/textures/font_metro_0416.png Binary files differnew file mode 100644 index 0000000..cc0fb7e --- /dev/null +++ b/font_metro/textures/font_metro_0416.png diff --git a/font_metro/textures/font_metro_0417.png b/font_metro/textures/font_metro_0417.png Binary files differnew file mode 100644 index 0000000..fa054e8 --- /dev/null +++ b/font_metro/textures/font_metro_0417.png diff --git a/font_metro/textures/font_metro_0418.png b/font_metro/textures/font_metro_0418.png Binary files differnew file mode 100644 index 0000000..58fe26e --- /dev/null +++ b/font_metro/textures/font_metro_0418.png diff --git a/font_metro/textures/font_metro_0419.png b/font_metro/textures/font_metro_0419.png Binary files differnew file mode 100644 index 0000000..a908dfd --- /dev/null +++ b/font_metro/textures/font_metro_0419.png diff --git a/font_metro/textures/font_metro_041a.png b/font_metro/textures/font_metro_041a.png Binary files differnew file mode 100644 index 0000000..a25cf96 --- /dev/null +++ b/font_metro/textures/font_metro_041a.png diff --git a/font_metro/textures/font_metro_041b.png b/font_metro/textures/font_metro_041b.png Binary files differnew file mode 100644 index 0000000..98021a6 --- /dev/null +++ b/font_metro/textures/font_metro_041b.png diff --git a/font_metro/textures/font_metro_041c.png b/font_metro/textures/font_metro_041c.png Binary files differnew file mode 100644 index 0000000..14addeb --- /dev/null +++ b/font_metro/textures/font_metro_041c.png diff --git a/font_metro/textures/font_metro_041d.png b/font_metro/textures/font_metro_041d.png Binary files differnew file mode 100644 index 0000000..4d24d0d --- /dev/null +++ b/font_metro/textures/font_metro_041d.png diff --git a/font_metro/textures/font_metro_041e.png b/font_metro/textures/font_metro_041e.png Binary files differnew file mode 100644 index 0000000..30b3512 --- /dev/null +++ b/font_metro/textures/font_metro_041e.png diff --git a/font_metro/textures/font_metro_041f.png b/font_metro/textures/font_metro_041f.png Binary files differnew file mode 100644 index 0000000..626f245 --- /dev/null +++ b/font_metro/textures/font_metro_041f.png diff --git a/font_metro/textures/font_metro_0420.png b/font_metro/textures/font_metro_0420.png Binary files differnew file mode 100644 index 0000000..3660ace --- /dev/null +++ b/font_metro/textures/font_metro_0420.png diff --git a/font_metro/textures/font_metro_0421.png b/font_metro/textures/font_metro_0421.png Binary files differnew file mode 100644 index 0000000..d09fe66 --- /dev/null +++ b/font_metro/textures/font_metro_0421.png diff --git a/font_metro/textures/font_metro_0422.png b/font_metro/textures/font_metro_0422.png Binary files differnew file mode 100644 index 0000000..93b8739 --- /dev/null +++ b/font_metro/textures/font_metro_0422.png diff --git a/font_metro/textures/font_metro_0423.png b/font_metro/textures/font_metro_0423.png Binary files differnew file mode 100644 index 0000000..a6407bc --- /dev/null +++ b/font_metro/textures/font_metro_0423.png diff --git a/font_metro/textures/font_metro_0424.png b/font_metro/textures/font_metro_0424.png Binary files differnew file mode 100644 index 0000000..3dc5053 --- /dev/null +++ b/font_metro/textures/font_metro_0424.png diff --git a/font_metro/textures/font_metro_0425.png b/font_metro/textures/font_metro_0425.png Binary files differnew file mode 100644 index 0000000..1944370 --- /dev/null +++ b/font_metro/textures/font_metro_0425.png diff --git a/font_metro/textures/font_metro_0426.png b/font_metro/textures/font_metro_0426.png Binary files differnew file mode 100644 index 0000000..0b18975 --- /dev/null +++ b/font_metro/textures/font_metro_0426.png diff --git a/font_metro/textures/font_metro_0427.png b/font_metro/textures/font_metro_0427.png Binary files differnew file mode 100644 index 0000000..82ed510 --- /dev/null +++ b/font_metro/textures/font_metro_0427.png diff --git a/font_metro/textures/font_metro_0428.png b/font_metro/textures/font_metro_0428.png Binary files differnew file mode 100644 index 0000000..2a5b305 --- /dev/null +++ b/font_metro/textures/font_metro_0428.png diff --git a/font_metro/textures/font_metro_0429.png b/font_metro/textures/font_metro_0429.png Binary files differnew file mode 100644 index 0000000..d5ede1c --- /dev/null +++ b/font_metro/textures/font_metro_0429.png diff --git a/font_metro/textures/font_metro_042a.png b/font_metro/textures/font_metro_042a.png Binary files differnew file mode 100644 index 0000000..c3ba662 --- /dev/null +++ b/font_metro/textures/font_metro_042a.png diff --git a/font_metro/textures/font_metro_042b.png b/font_metro/textures/font_metro_042b.png Binary files differnew file mode 100644 index 0000000..4461c5e --- /dev/null +++ b/font_metro/textures/font_metro_042b.png diff --git a/font_metro/textures/font_metro_042c.png b/font_metro/textures/font_metro_042c.png Binary files differnew file mode 100644 index 0000000..d8f0d53 --- /dev/null +++ b/font_metro/textures/font_metro_042c.png diff --git a/font_metro/textures/font_metro_042d.png b/font_metro/textures/font_metro_042d.png Binary files differnew file mode 100644 index 0000000..a5d19c7 --- /dev/null +++ b/font_metro/textures/font_metro_042d.png diff --git a/font_metro/textures/font_metro_042e.png b/font_metro/textures/font_metro_042e.png Binary files differnew file mode 100644 index 0000000..9e79798 --- /dev/null +++ b/font_metro/textures/font_metro_042e.png diff --git a/font_metro/textures/font_metro_042f.png b/font_metro/textures/font_metro_042f.png Binary files differnew file mode 100644 index 0000000..1893da1 --- /dev/null +++ b/font_metro/textures/font_metro_042f.png diff --git a/font_metro/textures/font_metro_0430.png b/font_metro/textures/font_metro_0430.png Binary files differnew file mode 100644 index 0000000..1ed5b2a --- /dev/null +++ b/font_metro/textures/font_metro_0430.png diff --git a/font_metro/textures/font_metro_0431.png b/font_metro/textures/font_metro_0431.png Binary files differnew file mode 100644 index 0000000..ac885bf --- /dev/null +++ b/font_metro/textures/font_metro_0431.png diff --git a/font_metro/textures/font_metro_0432.png b/font_metro/textures/font_metro_0432.png Binary files differnew file mode 100644 index 0000000..78ace1a --- /dev/null +++ b/font_metro/textures/font_metro_0432.png diff --git a/font_metro/textures/font_metro_0433.png b/font_metro/textures/font_metro_0433.png Binary files differnew file mode 100644 index 0000000..67b0ef2 --- /dev/null +++ b/font_metro/textures/font_metro_0433.png diff --git a/font_metro/textures/font_metro_0434.png b/font_metro/textures/font_metro_0434.png Binary files differnew file mode 100644 index 0000000..54efad8 --- /dev/null +++ b/font_metro/textures/font_metro_0434.png diff --git a/font_metro/textures/font_metro_0435.png b/font_metro/textures/font_metro_0435.png Binary files differnew file mode 100644 index 0000000..581f017 --- /dev/null +++ b/font_metro/textures/font_metro_0435.png diff --git a/font_metro/textures/font_metro_0436.png b/font_metro/textures/font_metro_0436.png Binary files differnew file mode 100644 index 0000000..7ef22d0 --- /dev/null +++ b/font_metro/textures/font_metro_0436.png diff --git a/font_metro/textures/font_metro_0437.png b/font_metro/textures/font_metro_0437.png Binary files differnew file mode 100644 index 0000000..c725537 --- /dev/null +++ b/font_metro/textures/font_metro_0437.png diff --git a/font_metro/textures/font_metro_0438.png b/font_metro/textures/font_metro_0438.png Binary files differnew file mode 100644 index 0000000..a0d7849 --- /dev/null +++ b/font_metro/textures/font_metro_0438.png diff --git a/font_metro/textures/font_metro_0439.png b/font_metro/textures/font_metro_0439.png Binary files differnew file mode 100644 index 0000000..1acba26 --- /dev/null +++ b/font_metro/textures/font_metro_0439.png diff --git a/font_metro/textures/font_metro_043a.png b/font_metro/textures/font_metro_043a.png Binary files differnew file mode 100644 index 0000000..c5d30ca --- /dev/null +++ b/font_metro/textures/font_metro_043a.png diff --git a/font_metro/textures/font_metro_043b.png b/font_metro/textures/font_metro_043b.png Binary files differnew file mode 100644 index 0000000..ef07207 --- /dev/null +++ b/font_metro/textures/font_metro_043b.png diff --git a/font_metro/textures/font_metro_043c.png b/font_metro/textures/font_metro_043c.png Binary files differnew file mode 100644 index 0000000..8e4baa2 --- /dev/null +++ b/font_metro/textures/font_metro_043c.png diff --git a/font_metro/textures/font_metro_043d.png b/font_metro/textures/font_metro_043d.png Binary files differnew file mode 100644 index 0000000..1d27972 --- /dev/null +++ b/font_metro/textures/font_metro_043d.png diff --git a/font_metro/textures/font_metro_043e.png b/font_metro/textures/font_metro_043e.png Binary files differnew file mode 100644 index 0000000..d4823e3 --- /dev/null +++ b/font_metro/textures/font_metro_043e.png diff --git a/font_metro/textures/font_metro_043f.png b/font_metro/textures/font_metro_043f.png Binary files differnew file mode 100644 index 0000000..63a1d40 --- /dev/null +++ b/font_metro/textures/font_metro_043f.png diff --git a/font_metro/textures/font_metro_0440.png b/font_metro/textures/font_metro_0440.png Binary files differnew file mode 100644 index 0000000..379fbd4 --- /dev/null +++ b/font_metro/textures/font_metro_0440.png diff --git a/font_metro/textures/font_metro_0441.png b/font_metro/textures/font_metro_0441.png Binary files differnew file mode 100644 index 0000000..758da15 --- /dev/null +++ b/font_metro/textures/font_metro_0441.png diff --git a/font_metro/textures/font_metro_0442.png b/font_metro/textures/font_metro_0442.png Binary files differnew file mode 100644 index 0000000..b8097de --- /dev/null +++ b/font_metro/textures/font_metro_0442.png diff --git a/font_metro/textures/font_metro_0443.png b/font_metro/textures/font_metro_0443.png Binary files differnew file mode 100644 index 0000000..75d51a9 --- /dev/null +++ b/font_metro/textures/font_metro_0443.png diff --git a/font_metro/textures/font_metro_0444.png b/font_metro/textures/font_metro_0444.png Binary files differnew file mode 100644 index 0000000..82707e1 --- /dev/null +++ b/font_metro/textures/font_metro_0444.png diff --git a/font_metro/textures/font_metro_0445.png b/font_metro/textures/font_metro_0445.png Binary files differnew file mode 100644 index 0000000..617b4a2 --- /dev/null +++ b/font_metro/textures/font_metro_0445.png diff --git a/font_metro/textures/font_metro_0446.png b/font_metro/textures/font_metro_0446.png Binary files differnew file mode 100644 index 0000000..1767192 --- /dev/null +++ b/font_metro/textures/font_metro_0446.png diff --git a/font_metro/textures/font_metro_0447.png b/font_metro/textures/font_metro_0447.png Binary files differnew file mode 100644 index 0000000..2c53be3 --- /dev/null +++ b/font_metro/textures/font_metro_0447.png diff --git a/font_metro/textures/font_metro_0448.png b/font_metro/textures/font_metro_0448.png Binary files differnew file mode 100644 index 0000000..965d7e6 --- /dev/null +++ b/font_metro/textures/font_metro_0448.png diff --git a/font_metro/textures/font_metro_0449.png b/font_metro/textures/font_metro_0449.png Binary files differnew file mode 100644 index 0000000..80de181 --- /dev/null +++ b/font_metro/textures/font_metro_0449.png diff --git a/font_metro/textures/font_metro_044a.png b/font_metro/textures/font_metro_044a.png Binary files differnew file mode 100644 index 0000000..1ef064e --- /dev/null +++ b/font_metro/textures/font_metro_044a.png diff --git a/font_metro/textures/font_metro_044b.png b/font_metro/textures/font_metro_044b.png Binary files differnew file mode 100644 index 0000000..010b9ba --- /dev/null +++ b/font_metro/textures/font_metro_044b.png diff --git a/font_metro/textures/font_metro_044c.png b/font_metro/textures/font_metro_044c.png Binary files differnew file mode 100644 index 0000000..edde5c6 --- /dev/null +++ b/font_metro/textures/font_metro_044c.png diff --git a/font_metro/textures/font_metro_044d.png b/font_metro/textures/font_metro_044d.png Binary files differnew file mode 100644 index 0000000..afad017 --- /dev/null +++ b/font_metro/textures/font_metro_044d.png diff --git a/font_metro/textures/font_metro_044e.png b/font_metro/textures/font_metro_044e.png Binary files differnew file mode 100644 index 0000000..f4a317a --- /dev/null +++ b/font_metro/textures/font_metro_044e.png diff --git a/font_metro/textures/font_metro_044f.png b/font_metro/textures/font_metro_044f.png Binary files differnew file mode 100644 index 0000000..19c4a8a --- /dev/null +++ b/font_metro/textures/font_metro_044f.png diff --git a/font_metro/textures/font_metro_2018.png b/font_metro/textures/font_metro_2018.png Binary files differnew file mode 100644 index 0000000..da29503 --- /dev/null +++ b/font_metro/textures/font_metro_2018.png diff --git a/font_metro/textures/font_metro_2019.png b/font_metro/textures/font_metro_2019.png Binary files differnew file mode 100644 index 0000000..d86af6a --- /dev/null +++ b/font_metro/textures/font_metro_2019.png diff --git a/font_metro/textures/font_metro_201c.png b/font_metro/textures/font_metro_201c.png Binary files differnew file mode 100644 index 0000000..32098bd --- /dev/null +++ b/font_metro/textures/font_metro_201c.png diff --git a/font_metro/textures/font_metro_201d.png b/font_metro/textures/font_metro_201d.png Binary files differnew file mode 100644 index 0000000..b6d1340 --- /dev/null +++ b/font_metro/textures/font_metro_201d.png diff --git a/font_metro/textures/font_metro_20ac.png b/font_metro/textures/font_metro_20ac.png Binary files differnew file mode 100644 index 0000000..5c1b000 --- /dev/null +++ b/font_metro/textures/font_metro_20ac.png diff --git a/ontime_clocks/README.md b/ontime_clocks/README.md index 72c94db..d9db998 100644 --- a/ontime_clocks/README.md +++ b/ontime_clocks/README.md @@ -2,9 +2,9 @@ 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 +**Dependancies**: display_api, default **License**: Code under LGPL, textures under CC-BY-SA diff --git a/ontime_clocks/common.lua b/ontime_clocks/common.lua index 39462d3..cced299 100644 --- a/ontime_clocks/common.lua +++ b/ontime_clocks/common.lua @@ -19,7 +19,7 @@ --]] -- Entity for time display -display_lib.register_display_entity("ontime_clocks:display") +display_api.register_display_entity("ontime_clocks:display") function ontime_clocks.get_h24() return math.floor(minetest.get_timeofday()*24)%24 diff --git a/ontime_clocks/copyright.txt b/ontime_clocks/copyright.txt index b752dff..a2afd94 100644 --- a/ontime_clocks/copyright.txt +++ b/ontime_clocks/copyright.txt @@ -1,4 +1,8 @@ Code, Textures and Models by Pierre-Yves Rollo (pyrollo) -intllib support (i18n) by fat115 +intllib support (i18n) by (fat115) intllib fallback code and tools by Diego Martínez (kaeza) - +Extra contibutors: +(Thomas--S) +Translations: +Muhammad Nur Hidayat Yasuyoshi (MuhdNurHidayat) +(fat115) diff --git a/ontime_clocks/depends.txt b/ontime_clocks/depends.txt index bdefee1..07a2ec1 100644 --- a/ontime_clocks/depends.txt +++ b/ontime_clocks/depends.txt @@ -1,5 +1,5 @@ default dye -display_lib +display_api intllib? diff --git a/ontime_clocks/nodes.lua b/ontime_clocks/nodes.lua index 70bbfd1..aa3583d 100644 --- a/ontime_clocks/nodes.lua +++ b/ontime_clocks/nodes.lua @@ -35,7 +35,7 @@ minetest.register_node("ontime_clocks:green_digital", { wall_top = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } }, tiles = {"ontime_clocks_digital.png"}, - groups = {oddly_breakable_by_hand=1,not_blocking_trains=1}, + groups = {oddly_breakable_by_hand = 1, not_blocking_trains = 1, display_modpack_node = 1}, display_entities = { ["ontime_clocks:display"] = { depth = 13/32 - 0.01, @@ -45,17 +45,17 @@ minetest.register_node("ontime_clocks:green_digital", { "#040", "#0F0", ontime_clocks.get_h24(), ontime_clocks.get_m12())) end }, }, - on_place = display_lib.on_place, - on_construct = display_lib.on_construct, - on_destruct = display_lib.on_destruct, - on_rotate = display_lib.on_rotate, + on_place = display_api.on_place, + on_construct = display_api.on_construct, + on_destruct = display_api.on_destruct, + on_rotate = display_api.on_rotate, }) minetest.register_abm({ nodenames = {"ontime_clocks:green_digital"}, interval = 5, chance = 1, - action = display_lib.update_entities, + action = display_api.update_entities, }) -- Red digital clock @@ -73,7 +73,7 @@ minetest.register_node("ontime_clocks:red_digital", { wall_top = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } }, tiles = {"ontime_clocks_digital.png"}, - groups = {oddly_breakable_by_hand=1,not_blocking_trains=1}, + groups = {oddly_breakable_by_hand = 1, not_blocking_trains = 1, display_modpack_node = 1}, display_entities = { ["ontime_clocks:display"] = { depth = 13/32 - 0.01, @@ -83,17 +83,17 @@ minetest.register_node("ontime_clocks:red_digital", { "#400", "#F00", ontime_clocks.get_h24(), ontime_clocks.get_m12())) end }, }, - on_place = display_lib.on_place, - on_construct = display_lib.on_construct, - on_destruct = display_lib.on_destruct, - on_rotate = display_lib.on_rotate, + on_place = display_api.on_place, + on_construct = display_api.on_construct, + on_destruct = display_api.on_destruct, + on_rotate = display_api.on_rotate, }) minetest.register_abm({ nodenames = {"ontime_clocks:red_digital"}, interval = 5, chance = 1, - action = display_lib.update_entities, + action = display_api.update_entities, }) @@ -111,7 +111,7 @@ minetest.register_node("ontime_clocks:white", { wall_top = { -7/16, 0.5, -7/16, 7/16, 7/16, 7/16}, }, tiles = {"ontime_clocks_white.png"}, - groups = {choppy=1,oddly_breakable_by_hand=1,not_blocking_trains=1}, + groups = {choppy = 1, oddly_breakable_by_hand = 1, not_blocking_trains = 1, display_modpack_node = 1}, display_entities = { ["ontime_clocks:display"] = { depth = 6/16 - 0.01, @@ -121,17 +121,17 @@ minetest.register_node("ontime_clocks:white", { "#000", 36, ontime_clocks.get_h12(), ontime_clocks.get_m12())) end }, }, - on_place = display_lib.on_place, - on_construct = display_lib.on_construct, - on_destruct = display_lib.on_destruct, - on_rotate = display_lib.on_rotate, + on_place = display_api.on_place, + on_construct = display_api.on_construct, + on_destruct = display_api.on_destruct, + on_rotate = display_api.on_rotate, }) minetest.register_abm({ nodenames = {"ontime_clocks:white"}, interval = 5, chance = 1, - action = display_lib.update_entities, + action = display_api.update_entities, }) minetest.register_node("ontime_clocks:frameless_black", { @@ -148,7 +148,7 @@ minetest.register_node("ontime_clocks:frameless_black", { wall_top = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } }, tiles = {"ontime_clocks_frameless.png"}, - groups = {choppy=1,oddly_breakable_by_hand=1,not_blocking_trains=1}, + groups = {choppy = 1, oddly_breakable_by_hand = 1, not_blocking_trains = 1, display_modpack_node = 1}, display_entities = { ["ontime_clocks:display"] = { depth = 7/16, @@ -158,17 +158,17 @@ minetest.register_node("ontime_clocks:frameless_black", { "#000", 48, ontime_clocks.get_h12(), ontime_clocks.get_m12())) end }, }, - on_place = display_lib.on_place, - on_construct = display_lib.on_construct, - on_destruct = display_lib.on_destruct, - on_rotate = display_lib.on_rotate, + on_place = display_api.on_place, + on_construct = display_api.on_construct, + on_destruct = display_api.on_destruct, + on_rotate = display_api.on_rotate, }) minetest.register_abm({ nodenames = {"ontime_clocks:frameless_black"}, interval = 5, chance = 1, - action = display_lib.update_entities, + action = display_api.update_entities, }) minetest.register_node("ontime_clocks:frameless_gold", { @@ -185,7 +185,7 @@ minetest.register_node("ontime_clocks:frameless_gold", { wall_top = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } }, tiles = {"ontime_clocks_frameless.png^[colorize:#FF0"}, - groups = {choppy=1,oddly_breakable_by_hand=1,not_blocking_trains=1}, + groups = {choppy = 1, oddly_breakable_by_hand = 1, not_blocking_trains = 1, display_modpack_node = 1}, display_entities = { ["ontime_clocks:display"] = { depth = 7/16, @@ -195,17 +195,17 @@ minetest.register_node("ontime_clocks:frameless_gold", { "#FF0", 48, ontime_clocks.get_h12(), ontime_clocks.get_m12())) end }, }, - on_place = display_lib.on_place, - on_construct = display_lib.on_construct, - on_destruct = display_lib.on_destruct, - on_rotate = display_lib.on_rotate, + on_place = display_api.on_place, + on_construct = display_api.on_construct, + on_destruct = display_api.on_destruct, + on_rotate = display_api.on_rotate, }) minetest.register_abm({ nodenames = {"ontime_clocks:frameless_gold"}, interval = 5, chance = 1, - action = display_lib.update_entities, + action = display_api.update_entities, }) minetest.register_node("ontime_clocks:frameless_white", { @@ -222,7 +222,7 @@ minetest.register_node("ontime_clocks:frameless_white", { wall_top = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } }, tiles = {"ontime_clocks_frameless.png^[colorize:#FFF"}, - groups = {choppy=1,oddly_breakable_by_hand=1,not_blocking_trains=1}, + groups = {choppy = 1, oddly_breakable_by_hand = 1, not_blocking_trains = 1, display_modpack_node = 1}, display_entities = { ["ontime_clocks:display"] = { depth = 7/16, @@ -232,15 +232,15 @@ minetest.register_node("ontime_clocks:frameless_white", { "#FFF", 48, ontime_clocks.get_h12(), ontime_clocks.get_m12())) end }, }, - on_place = display_lib.on_place, - on_construct = display_lib.on_construct, - on_destruct = display_lib.on_destruct, - on_rotate = display_lib.on_rotate, + on_place = display_api.on_place, + on_construct = display_api.on_construct, + on_destruct = display_api.on_destruct, + on_rotate = display_api.on_rotate, }) minetest.register_abm({ nodenames = {"ontime_clocks:frameless_white"}, interval = 5, chance = 1, - action = display_lib.update_entities, + action = display_api.update_entities, }) diff --git a/screenshot.png b/screenshot.png Binary files differindex 43589d0..33d5bdb 100644 --- a/screenshot.png +++ b/screenshot.png 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/common.lua b/signs/common.lua index 49c6dd4..733a44c 100644 --- a/signs/common.lua +++ b/signs/common.lua @@ -21,111 +21,6 @@ local S = signs.intllib local F = function(...) return minetest.formspec_escape(S(...)) end -function signs.set_display_text(pos,text) - local meta = minetest.get_meta(pos) - meta:set_string("display_text", text) - meta:set_string("infotext", "\""..text.."\"") - display_lib.update_entities(pos) -end - -function signs.set_formspec(pos) - local meta = minetest.get_meta(pos) - local ndef = minetest.registered_nodes[minetest.get_node(pos).name] - if ndef and ndef.display_entities and ndef.display_entities["signs:display_text"] then - local maxlines = ndef.display_entities["signs:display_text"].maxlines - local formspec - - if maxlines == 1 then - formspec = "size[6,3]".. - "field[0.5,0.7;5.5,1;display_text;"..F("Text")..";${display_text}]".. - "button_exit[2,2;2,1;ok;"..F("Write").."]" - else - local extralabel = "" - if maxlines then - extralabel = F(" (first %s lines only)"):format(maxlines) - end - - formspec = "size[6,4]".. - "textarea[0.5,0.7;5.5,2;display_text;"..F("Text")..""..extralabel..";${display_text}]".. - "button_exit[2,3;2,1;ok;"..F("Write").."]" - end - - meta:set_string("formspec", formspec) - end -end - -function signs.on_receive_fields(pos, formname, fields, player) - if not minetest.is_protected(pos, player:get_player_name()) then - if fields and (fields.ok or fields.key_enter) then - signs.set_display_text(pos, fields.display_text) - end - end -end - --- On place callback for direction signs --- (chooses which sign according to look direction) -function signs.on_place_direction(itemstack, placer, pointed_thing) - local name = itemstack:get_name() - local ndef = minetest.registered_nodes[name] - - local bdir = {x = pointed_thing.under.x - pointed_thing.above.x, - y = pointed_thing.under.y - pointed_thing.above.y, - z = pointed_thing.under.z - pointed_thing.above.z} - local pdir = placer:get_look_dir() - - local ndir, test - - if ndef.paramtype2 == "facedir" then - if bdir.x == 0 and bdir.z == 0 then - -- Ceiling or floor pointed (facedir chosen from player dir) - ndir = minetest.dir_to_facedir({x=pdir.x, y=0, z=pdir.z}) - else - -- Wall pointed - ndir = minetest.dir_to_facedir(bdir) - end - - test = {[0]=-pdir.x, pdir.z, pdir.x, -pdir.z} - end - - if ndef.paramtype2 == "wallmounted" then - ndir = minetest.dir_to_wallmounted(bdir) - if ndir == 0 or ndir == 1 then - -- Ceiling or floor - ndir = minetest.dir_to_wallmounted({x=pdir.x, y=0, z=pdir.z}) - end - - test = {0, pdir.z, -pdir.z, -pdir.x, pdir.x} - end - - -- Only for direction signs - if ndef.signs_other_dir then - if test[ndir] > 0 then - itemstack:set_name(ndef.signs_other_dir) - end - itemstack = minetest.item_place(itemstack, placer, pointed_thing, ndir) - itemstack:set_name(name) - - return itemstack - else - return minetest.item_place(itemstack, placer, pointed_thing, ndir) - end -end - --- Handles screwdriver rotation. Direction is affected for direction signs -function signs.on_rotate(pos, node, player, mode, new_param2) - if mode == 2 then - local ndef = minetest.registered_nodes[node.name] - if ndef.signs_other_dir then - minetest.swap_node(pos, {name = ndef.signs_other_dir, - param1 = node.param1, param2 = node.param2}) - display_lib.update_entities(pos) - end - else - display_lib.on_rotate(pos, node, user, mode, new_param2) - end - return false; -end - -- Generic callback for show_formspec displayed formspecs of "sign" mod minetest.register_on_player_receive_fields(function(player, formname, fields) @@ -140,59 +35,3 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end end end) - -function signs.register_sign(mod, name, model) - -- Default fields - local fields = { - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = {-model.width/2, -model.height/2, 0.5, - model.width/2, model.height/2, 0.5 - model.depth}, - }, - groups = {choppy=2, dig_immediate=2, not_blocking_trains = 1}, - sounds = default.node_sound_defaults(), - display_entities = { - ["signs:display_text"] = { - on_display_update = font_lib.on_display_update, - depth = 0.499 - model.depth, - size = { x = model.width, y = model.height }, - resolution = { x = 64, y = 64 }, - maxlines = 1, - }, - - }, - on_place = display_lib.on_place, - on_construct = function(pos) - signs.set_formspec(pos) - display_lib.on_construct(pos) - end, - on_destruct = display_lib.on_destruct, - on_rotate = signs.on_rotate, - on_receive_fields = signs.on_receive_fields, - on_punch = function(pos, node, player, pointed_thing) display_lib.update_entities(pos) end, - } - - -- Node fields override - for key, value in pairs(model.node_fields) do - if key == "groups" then - for key2, value2 in pairs(value) do - fields[key][key2] = value2 - end - else - fields[key] = value - end - end - - if not fields.wield_image then fields.wield_image = fields.inventory_image end - - -- Entity fields override - for key, value in pairs(model.entity_fields) do - fields.display_entities["signs:display_text"][key] = value - end - - minetest.register_node(mod..":"..name, fields) -end diff --git a/signs/compatibility.lua b/signs/compatibility.lua index 3284230..dea8750 100644 --- a/signs/compatibility.lua +++ b/signs/compatibility.lua @@ -23,7 +23,7 @@ ------------------------------------ local wallmounted_to_facedir = { - [0]=1, -- Should not happend with signs + [0]=1, -- Should not happend with signs [1]=1, -- Should not happend with signs [2]=1, [3]=3, @@ -43,9 +43,9 @@ local function compatibility_check_1(pos, node) node.name = convert_nodes[node.name] if node.name then node.param2 = wallmounted_to_facedir[node.param2] - display_lib.on_destruct(pos) + display_api.on_destruct(pos) minetest.swap_node(pos, node) - display_lib.on_construct(pos) + display_api.on_construct(pos) end end @@ -76,7 +76,7 @@ local function compatibility_check_2(pos, node) end end -- Create new entity - display_lib.update_entities(pos) + display_api.update_entities(pos) end minetest.register_lbm({ name = "signs:conpatibility_2", @@ -84,7 +84,34 @@ minetest.register_lbm({ name = "signs:conpatibility_2", action = compatibility_check_2, }) +--Backwards compatibility API functions +signs.set_display_text = function(...) + minetest.log("warning", "signs.set_display_text() is deprecated, please use signs_api.set_display_text() instead.") + return signs_api.set_display_text(...) +end + +signs.set_formspec = function(...) + minetest.log("warning", "signs.set_formspec() is deprecated, please use signs_api.set_formspec() instead.") + return signs_api.set_formspec(...) +end + +signs.on_receive_fields = function(...) + minetest.log("warning", "signs.on_receive_fields() is deprecated, please use signs_api.on_receive_fields() instead.") + return signs_api.on_receive_fields(...) +end +signs.on_place_direction = function(...) + minetest.log("warning", "signs.on_place_direction() is deprecated, please use signs_api.on_place_direction() instead.") + return signs_api.on_place_direction(...) +end +signs.on_rotate = function(...) + minetest.log("warning", "signs.on_rotate() is deprecated, please use signs_api.on_rotate() instead.") + return signs_api.on_rotate(...) +end +signs.register_sign = function(...) + minetest.log("warning", "signs.register_sign() is deprecated, please use signs_api.register_sign() instead.") + return signs_api.register_sign(...) +end diff --git a/signs/copyright.txt b/signs/copyright.txt index d6f87c4..9e3b294 100644 --- a/signs/copyright.txt +++ b/signs/copyright.txt @@ -1,4 +1,10 @@ Code, Textures and Models by Pierre-Yves Rollo (pyrollo) -intllib support (i18n) by fat115 +intllib support (i18n) by (fat115) intllib fallback code and tools by Diego Martínez (kaeza) -Extra contributors : (gpcf) +Extra contributors: +(gpcf) +(Thomas--S) +Translations: +Muhammad Nur Hidayat Yasuyoshi (MuhdNurHidayat) +(fat115) + diff --git a/signs/crafts.lua b/signs/crafts.lua index b4e0206..ef82dbc 100644 --- a/signs/crafts.lua +++ b/signs/crafts.lua @@ -2,17 +2,60 @@ minetest.register_craft({ output = 'signs:wooden_right_sign', recipe = { {'group:wood', 'group:wood', 'group:wood'}, - {'group:wood', 'group:wood', ''}, + {'group:wood', 'group:wood', 'dye:black'}, {'', '', ''}, } }) minetest.register_craft({ + output = 'signs:wooden_right_sign', + type = 'shapeless', + recipe = { 'signs:wooden_long_sign' } +}) + +minetest.register_craft({ + output = 'signs:wooden_long_sign', + recipe = { + {'group:wood', 'dye:black', 'group:wood'}, + {'group:wood', 'group:wood', 'group:wood'}, + {'', '', ''}, + } +}) + +minetest.register_craft({ + output = 'signs:wooden_long_sign', + type = 'shapeless', + recipe = { 'signs:wooden_right_sign' } +}) + +minetest.register_craft({ + output = 'signs:wooden_sign', + recipe = { + {'', 'dye:black', ''}, + {'group:wood', 'group:wood', 'group:wood'}, + {'group:wood', 'group:wood', 'group:wood'}, + } +}) + +minetest.register_craft({ output = 'signs:paper_poster', recipe = { - {'default:paper', 'default:paper', ''}, + {'default:paper', 'default:paper', 'dye:black'}, {'default:paper', 'default:paper', ''}, {'default:paper', 'default:paper', ''}, } }) +minetest.register_craft({ + output = 'signs:label_small', + recipe = { + {'default:paper', 'dye:black'}, + } +}) + +minetest.register_craft({ + output = 'signs:label_small', + recipe = { + {'default:paper', 'default:paper', 'dye:black'}, + } +}) diff --git a/signs/depends.txt b/signs/depends.txt index 3feca07..aaf5bff 100644 --- a/signs/depends.txt +++ b/signs/depends.txt @@ -1,4 +1,6 @@ default +dye +display_api +font_api +signs_api intllib? -display_lib -font_lib diff --git a/signs/nodes.lua b/signs/nodes.lua index ef7cea5..428da2e 100644 --- a/signs/nodes.lua +++ b/signs/nodes.lua @@ -23,10 +23,10 @@ local F = function(...) return minetest.formspec_escape(S(...)) end -- Poster specific formspec local function display_poster(pos, node, player) - local formspec local meta = minetest.get_meta(pos) + local def = minetest.registered_nodes[node.name].display_entities["signs:display_text"] - + local p_text = meta:get_string("text") local d_text = meta:get_string("display_text") -- If orwell96's modified signs_lib version is available and sign macros are active, @@ -35,48 +35,56 @@ local function display_poster(pos, node, player) p_text = signs_lib.replace_macros(p_text) d_text = signs_lib.replace_macros(d_text) end - + + local font = font_api.get_font(meta:get_string("font") or def.font_name) + + local fs + local fname = string.format("%s@%s:display", + node.name, minetest.pos_to_string(pos)) + -- Title texture - local titletexture = font_lib.make_multiline_texture( - def.font_name, d_text, - 116, 12, def.maxlines, def.valign, def.color) - - - formspec = - "size[7,9]".. - "background[0,0;7,9;signs_poster_formspec.png]".. - "image[0,0;8.4,1.5;"..titletexture.."]".. - "textarea[0.3,1.5;7,8;;"..minetest.colorize("#111", minetest.formspec_escape(p_text))..";]".. - "bgcolor[#0000]" + local titletexture = font:make_text_texture( + d_text, font:get_height()*8.4, + font:get_height(), 1, "center") + + fs = string.format([=[ + size[7,9]bgcolor[#0000] + background[0,0;7,9;signs_poster_formspec.png] + image[0,-0.2;8.4,2;%s] + textarea[0.3,1.5;7,8;;%s;]]=], + titletexture, + minetest.colorize("#111", + minetest.formspec_escape(p_text))) if minetest.is_protected(pos, player:get_player_name()) then - formspec = formspec.. - "button_exit[2.5,8;2,1;ok;"..F("Close").."]" + fs = string.format("%sbutton_exit[2.5,8;2,1;ok;%s]", fs, F("Close")) else - formspec = formspec.. - "button[1,8;2,1;edit;"..F("Edit").."]".. - "button_exit[4,8;2,1;ok;"..F("Close").."]" + fs = string.format( + "%sbutton[1,8;2,1;edit;%s]button_exit[4,8;2,1;ok;%s]", + fs, F("Edit"), F("Close")) end - minetest.show_formspec(player:get_player_name(), - node.name.."@"..minetest.pos_to_string(pos)..":display", - formspec) + minetest.show_formspec(player:get_player_name(), fname, fs) end local function edit_poster(pos, node, player) - local formspec local meta = minetest.get_meta(pos) + local fs + local fname = string.format("%s@%s:edit", + node.name, minetest.pos_to_string(pos)) + if not minetest.is_protected(pos, player:get_player_name()) then - formspec = - "size[6.5,7.5]".. - "field[0.5,0.7;6,1;display_text;"..F("Title")..";".. - minetest.formspec_escape(meta:get_string("display_text")).."]".. - "textarea[0.5,1.7;6,6;text;"..F("Text")..";".. - minetest.formspec_escape(meta:get_string("text")).."]".. - "button_exit[2.25,7;2,1;write;"..F("Write").."]" - minetest.show_formspec(player:get_player_name(), - node.name.."@"..minetest.pos_to_string(pos)..":edit", - formspec) + fs = string.format([=[ + size[6.5,7.5]%s%s%s + field[0.5,0.7;6,1;display_text;%s;%s] + textarea[0.5,1.7;6,6;text;%s;%s] + button[1.25,7;2,1;font;%s] + button_exit[3.25,7;2,1;write;%s]]=], + default.gui_bg, default.gui_bg_img, default.gui_slots, F("Title"), + minetest.formspec_escape(meta:get_string("display_text")), + F("Text"), minetest.formspec_escape(meta:get_string("text")), + F("Title font"), F("Write")) + minetest.show_formspec(player:get_player_name(), fname, fs) end end @@ -86,100 +94,167 @@ local function on_receive_fields_poster(pos, formname, fields, player) local node = minetest.get_node(pos) if not minetest.is_protected(pos, player:get_player_name()) and fields then - if formname == node.name.."@"..minetest.pos_to_string(pos)..":display" and - fields.edit then + if formname == node.name.."@"..minetest.pos_to_string(pos)..":display" + and fields.edit then edit_poster(pos, node, player) + return true end - if formname == node.name.."@"..minetest.pos_to_string(pos)..":edit" and - (fields.write or fields.key_enter) then - meta:set_string("display_text", fields.display_text) - meta:set_string("text", fields.text) - meta:set_string("infotext", "\""..fields.display_text - .."\"\n"..S("(right-click to read more text)")) - display_lib.update_entities(pos) - display_poster(pos, node, player) + if formname == node.name.."@"..minetest.pos_to_string(pos)..":edit" + then + if (fields.write or fields.font or fields.key_enter) then + meta:set_string("display_text", fields.display_text) + meta:set_string("text", fields.text) + meta:set_string("infotext", "\""..fields.display_text + .."\"\n"..S("(right-click to read more text)")) + display_api.update_entities(pos) + end + if (fields.write or fields.key_enter) then + display_poster(pos, node, player) + elseif (fields.font) then + font_api.show_font_list(player, pos, function (playername, pos) + local player = minetest.get_player_by_name(playername) + local node = minetest.get_node(pos) + if player and node then + edit_poster(pos, node, player) + end + end) + end + return true end end end -- Text entity for all signs -display_lib.register_display_entity("signs:display_text") +display_api.register_display_entity("signs:display_text") -- Sign models and registration local models = { + wooden_sign = { + depth = 1/16, width = 14/16, height = 12/16, + entity_fields = { + size = { x = 12/16, y = 10/16 }, + maxlines = 3, + color = "#000", + }, + node_fields = { + description = S("Wooden sign"), + tiles = { "signs_wooden.png" }, + inventory_image = "signs_wooden_inventory.png", + groups= { dig_immediate = 2 }, + }, + }, + wooden_long_sign = { + depth = 1/16, width = 1, height = 7/16, + entity_fields = { + size = { x = 1, y = 6/16 }, + maxlines = 2, + color = "#000", + }, + node_fields = { + description = S("Wooden long sign"), + tiles = { "signs_wooden_long.png", "signs_wooden_long.png", + "signs_wooden_long.png^[transformR90", + "signs_wooden_long.png^[transformR90", + "signs_wooden_long.png", "signs_wooden_long.png", + }, + inventory_image = "signs_wooden_long_inventory.png", + groups= { dig_immediate = 2 }, + }, + }, wooden_right_sign = { - depth = 1/16, - width = 14/16, - height = 7/16, + depth = 1/16, width = 14/16, height = 7/16, entity_fields = { - right = -3/32, + right = -3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, maxlines = 2, color="#000", }, node_fields = { description = S("Wooden direction sign"), tiles = { "signs_wooden_direction.png" }, - inventory_image = "signs_wooden_inventory.png", - signs_other_dir = 'signs:wooden_left_sign', - on_place = signs.on_place_direction, + inventory_image = "signs_wooden_direction_inventory.png", + signs_other_dir = 'signs:wooden_left_sign', + on_place = signs_api.on_place_direction, drawtype = "mesh", mesh = "signs_dir_right.obj", selection_box = { type="fixed", fixed = {-0.5, -7/32, 0.5, 7/16, 7/32, 7/16}}, collision_box = { type="fixed", fixed = {-0,5, -7/32, 0.5, 7/16, 7/32, 7/16}}, + groups= { dig_immediate = 2 }, }, }, wooden_left_sign = { - depth = 1/16, - width = 14/16, - height = 7/16, + depth = 1/16, width = 14/16, height = 7/16, entity_fields = { - right = 3/32, + right = 3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, maxlines = 2, color = "#000", }, node_fields = { description = S("Wooden direction sign"), tiles = { "signs_wooden_direction.png" }, - inventory_image = "signs_wooden_inventory.png", - signs_other_dir = 'signs:wooden_right_sign', + inventory_image = "signs_wooden_direction_inventory.png", + signs_other_dir = 'signs:wooden_right_sign', drawtype = "mesh", mesh = "signs_dir_left.obj", selection_box = { type="fixed", fixed = {-7/16, -7/32, 0.5, 0.5, 7/32, 7/16}}, collision_box = { type="fixed", fixed = {-7/16, -7/32, 0.5, 0.5, 7/32, 7/16}}, - groups = { not_in_creative_inventory = 1 }, + groups = { not_in_creative_inventory = 1, dig_immediate = 2 }, drop = "signs:wooden_right_sign", }, }, paper_poster = { - depth = 1/32, - width = 26/32, - height = 30/32, + depth = 1/32, width = 26/32, height = 30/32, entity_fields = { - resolution = { x = 144, y = 64 }, + top = -11/32, + size = { x = 26/32, y = 6/32 }, maxlines = 1, - color="#000", - valign="top", + color = "#000", }, node_fields = { description = S("Poster"), tiles = { "signs_poster_sides.png", "signs_poster_sides.png", - "signs_poster_sides.png", "signs_poster_sides.png", - "signs_poster_sides.png", "signs_poster.png" }, + "signs_poster_sides.png", "signs_poster_sides.png", + "signs_poster_sides.png", "signs_poster.png" }, inventory_image = "signs_poster_inventory.png", - on_construct = display_lib.on_construct, + groups= { dig_immediate = 3 }, + on_construct = display_api.on_construct, on_rightclick = display_poster, on_receive_fields = on_receive_fields_poster, }, }, + label_small = { + depth = 1/32, width = 4/16, height = 4/16, + entity_fields = { + size = { x = 4/16, y = 4/16 }, + maxlines = 1, + color = "#000", + }, + node_fields = { + description = S("Small label"), + tiles = { "signs_label.png" }, + inventory_image = "signs_label_small_inventory.png", + groups= { dig_immediate = 3 }, + }, + }, + label_medium = { + depth = 1/32, width = 8/16, height = 8/16, + entity_fields = { + size = { x = 8/16, y = 8/16 }, + maxlines = 2, + color = "#000", + }, + node_fields = { + description = S("Label"), + tiles = { "signs_label.png" }, + inventory_image = "signs_label_medium_inventory.png", + groups= { dig_immediate = 3 }, + }, + }, } -- Node registration for name, model in pairs(models) do - signs.register_sign("signs", name, model) + signs_api.register_sign("signs", name, model) end - diff --git a/signs/svg/poster.svg b/signs/svg/poster.svg index 4f6f774..cc9e8fd 100644 --- a/signs/svg/poster.svg +++ b/signs/svg/poster.svg @@ -15,8 +15,8 @@ height="32px" id="svg2985" version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="affiche.svg" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="poster.svg" inkscape:export-filename="/home/pyrollo/dev/minetest-mods/signs/textures/signs_poster.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -73,18 +73,18 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.197802" - inkscape:cx="-4.798213" - inkscape:cy="9.6735437" - inkscape:current-layer="layer5" + inkscape:zoom="22.395604" + inkscape:cx="15.573035" + inkscape:cy="16.910322" + inkscape:current-layer="layer2" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:window-width="1239" - inkscape:window-height="776" - inkscape:window-x="41" - inkscape:window-y="24" - inkscape:window-maximized="1" + inkscape:window-width="1441" + inkscape:window-height="1038" + inkscape:window-x="2012" + inkscape:window-y="467" + inkscape:window-maximized="0" showguides="true" inkscape:guide-bbox="true" inkscape:object-paths="true"> @@ -95,11 +95,13 @@ visible="true" enabled="true" snapvisiblegridlinesonly="true" - spacingx="0.5px" - spacingy="0.5px" + spacingx="0.5" + spacingy="0.5" dotted="false" color="#ff0000" - opacity="0.1254902" /> + opacity="0.1254902" + originx="0" + originy="0" /> </sodipodi:namedview> <metadata id="metadata2990"> @@ -109,7 +111,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -127,7 +129,7 @@ height="32.081406" width="32.003735" /> <rect - style="color:#000000;fill:#feffed;fill-opacity:0.76862745;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#feffed;fill-opacity:0.76862745;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate" id="rect5482" width="32" height="32" @@ -136,18 +138,22 @@ <flowRoot xml:space="preserve" id="flowRoot5628" - style="font-size:4px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion - id="flowRegion5630"><rect + style="font-style:normal;font-weight:normal;line-height:0.01%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"><flowRegion + id="flowRegion5630" + style="font-family:sans-serif"><rect id="rect5632" width="3.6625218" height="4.6728725" x="12.692533" - y="-10.876763" /></flowRegion><flowPara - id="flowPara5634" /></flowRoot> </g> + y="-10.876763" + style="font-family:sans-serif" /></flowRegion><flowPara + id="flowPara5634" + style="font-size:4px;line-height:1.25;font-family:sans-serif"> </flowPara></flowRoot> </g> <g inkscape:groupmode="layer" id="layer4" - inkscape:label="Fond inv"> + inkscape:label="Fond inv" + style="display:inline"> <image style="display:inline" y="-0.081405997" @@ -158,7 +164,7 @@ width="32.003735" clip-path="url(#clipPath4132)" /> <rect - style="color:#000000;fill:#feffed;fill-opacity:0.76862745;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#feffed;fill-opacity:0.76862745;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate" id="rect5482-0" width="26" height="30" @@ -175,260 +181,284 @@ transform="matrix(1,0,0,1.3429336,0,-1.0576018)"> <text transform="scale(0.85711508,1.1667045)" - sodipodi:linespacing="125%" id="text4138" y="5.1426907" x="18.756834" - style="font-size:3.42846036px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve"><tspan y="5.1426907" x="18.756834" id="tspan4140" sodipodi:role="line" - style="font-weight:bold;-inkscape-font-specification:Sans Bold">READ ME !</tspan></text> + style="font-weight:bold;font-size:3.42845988px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold'">READ ME !</tspan></text> </g> </g> <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Label frame" + style="display:none"> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff41c1;fill-opacity:0.41711228;fill-rule:nonzero;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect4585" + width="16" + height="16" + x="8" + y="8" + ry="0" + inkscape:export-filename="/home/pyrollo/dev/minetest-mods/display_modpack/signs/textures/signs_label.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff41c1;fill-opacity:0.41711228;fill-rule:nonzero;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect4585-3" + width="8" + height="8" + x="12" + y="12" + ry="0" /> + </g> + <g id="layer1" inkscape:label="Texte" inkscape:groupmode="layer" - style="display:inline"> + style="display:none"> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 4,11.5 4,0" + d="M 4,11.5 H 8" id="path2997-2" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 7,9.5 4,0" + d="m 7,9.5 h 4" id="path3017" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 12,9.5 1,0" + d="m 12,9.5 h 1" id="path3019" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 14,9.5 3,0" + d="m 14,9.5 h 3" id="path3021" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 18,9.5 4,0" + d="m 18,9.5 h 4" id="path3023" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 23,9.5 1,0" + d="m 23,9.5 h 1" id="path3025" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 25,9.5 3,0" + d="m 25,9.5 h 3" id="path3027" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 9,11.5 3,0" + d="m 9,11.5 h 3" id="path3029" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 13,11.5 1,0" + d="m 13,11.5 h 1" id="path3031" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 15,11.5 4,0" + d="m 15,11.5 h 4" id="path3033" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 20,11.5 3,0" + d="m 20,11.5 h 3" id="path3035" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 24,11.5 1,0" + d="m 24,11.5 h 1" id="path3037" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 26,11.5 2,0" + d="m 26,11.5 h 2" id="path3039" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 4,13.5 1,0" + d="M 4,13.5 H 5" id="path3041" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 6,13.5 7,0" + d="m 6,13.5 h 7" id="path3043" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 17,13.5 -3,0" + d="M 17,13.5 H 14" id="path3045" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 7,16.5 1,0" + d="M 7,16.5 H 8" id="path3047" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 9,16.5 7,0" + d="m 9,16.5 h 7" id="path3049" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 17,16.5 2,0" + d="m 17,16.5 h 2" id="path3051" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 20,16.5 6,0" + d="m 20,16.5 h 6" id="path3053" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 27,16.5 1,0" + d="m 27,16.5 h 1" id="path3055" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 4,18.5 5,0" + d="M 4,18.5 H 9" id="path3057" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 10,18.5 1,0" + d="m 10,18.5 h 1" id="path3059" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 12,18.5 3,0" + d="m 12,18.5 h 3" id="path3061" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 16,18.5 4,0" + d="m 16,18.5 h 4" id="path3063" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 21,18.5 2,0" + d="m 21,18.5 h 2" id="path3065" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 24,18.5 4,0" + d="m 24,18.5 h 4" id="path3067" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 4,20.5 2,0" + d="M 4,20.5 H 6" id="path3069" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 7,20.5 5,0" + d="m 7,20.5 h 5" id="path3071" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 13,20.5 1,0" + d="m 13,20.5 h 1" id="path3073" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 15,20.5 4,0" + d="m 15,20.5 h 4" id="path3075" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 20,20.5 4,0" + d="m 20,20.5 h 4" id="path3077" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 26,20.5 2,0" + d="m 26,20.5 h 2" id="path3079" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 4,22.5 4,0" + d="M 4,22.5 H 8" id="path3081" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 9,22.5 5,0" + d="m 9,22.5 h 5" id="path3083" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 15,22.5 5,0" + d="m 15,22.5 h 5" id="path3085" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 21,25.5 1,0" + d="m 21,25.5 h 1" id="path3087" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 23,25.5 5,0" + d="m 23,25.5 h 5" id="path3089" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 4,27.5 1,0" + d="M 4,27.5 H 5" id="path3091" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 6,27.5 5,0" + d="m 6,27.5 h 5" id="path3093" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 12,27.5 6,0" + d="m 12,27.5 h 6" id="path3095" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 19,27.5 1,0" + d="m 19,27.5 h 1" id="path3097" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 21,27.5 3,0" + d="m 21,27.5 h 3" id="path3099" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 7,25.5 2,0" + d="M 7,25.5 H 9" id="path3101" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 10,25.5 5,0" + d="m 10,25.5 h 5" id="path3103" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 16,25.5 4,0" + d="m 16,25.5 h 4" id="path3105" inkscape:connector-curvature="0" /> </g> diff --git a/signs/textures/signs_label.png b/signs/textures/signs_label.png Binary files differnew file mode 100644 index 0000000..4cf7edc --- /dev/null +++ b/signs/textures/signs_label.png diff --git a/signs/textures/signs_label_medium_inventory.png b/signs/textures/signs_label_medium_inventory.png Binary files differnew file mode 100644 index 0000000..9622201 --- /dev/null +++ b/signs/textures/signs_label_medium_inventory.png diff --git a/signs/textures/signs_label_small_inventory.png b/signs/textures/signs_label_small_inventory.png Binary files differnew file mode 100644 index 0000000..2dd60af --- /dev/null +++ b/signs/textures/signs_label_small_inventory.png diff --git a/signs/textures/signs_wooden.png b/signs/textures/signs_wooden.png Binary files differnew file mode 100644 index 0000000..164948a --- /dev/null +++ b/signs/textures/signs_wooden.png diff --git a/signs/textures/signs_wooden_direction_inventory.png b/signs/textures/signs_wooden_direction_inventory.png Binary files differnew file mode 100644 index 0000000..c4be3af --- /dev/null +++ b/signs/textures/signs_wooden_direction_inventory.png diff --git a/signs/textures/signs_wooden_inventory.png b/signs/textures/signs_wooden_inventory.png Binary files differindex d997480..bb7e949 100644 --- a/signs/textures/signs_wooden_inventory.png +++ b/signs/textures/signs_wooden_inventory.png diff --git a/signs/textures/signs_wooden_long.png b/signs/textures/signs_wooden_long.png Binary files differnew file mode 100644 index 0000000..c23a56a --- /dev/null +++ b/signs/textures/signs_wooden_long.png diff --git a/signs/textures/signs_wooden_long_inventory.png b/signs/textures/signs_wooden_long_inventory.png Binary files differnew file mode 100644 index 0000000..78d2545 --- /dev/null +++ b/signs/textures/signs_wooden_long_inventory.png diff --git a/signs_api/LICENSE.txt b/signs_api/LICENSE.txt new file mode 100644 index 0000000..341c30b --- /dev/null +++ b/signs_api/LICENSE.txt @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + diff --git a/signs_api/README.md b/signs_api/README.md new file mode 100644 index 0000000..99ff20a --- /dev/null +++ b/signs_api/README.md @@ -0,0 +1,29 @@ +# Signs API + +This mod provides various helper functions for registereing signs with text display. Text is locked if area is protected. +No actual signs get registered by this mod, the signs are defined in the sign submod. + +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 + +**License**: Code under LGPL, Textures and models under CC-BY-SA + +## API Functions +### `signs_api.set_display_text(pos, text)` +Sets the text of a sign. Usually called in `on_receive_fields`. + +### `signs_api.set_formspec(pos)` +Usually called in `on_construct` to set the formspec. + +### `signs_api.on_receive_fields(pos, formname, fields, player)` +Helper function for `on_receive_fields`. Sets the display text and checks for protection. + +### `signs_api.on_place_direction(itemstack, placer, pointed_thing)` +On place callback for direction signs (chooses which sign according to look direction). + +### `signs_api.on_rotate(pos, node, player, mode, new_param2)` +Handles screwdriver rotation. Direction is affected for direction signs. + +### `signs_api.register_sign(mod, name, model)` +A method to quickly register signs. diff --git a/signs_api/copyright.txt b/signs_api/copyright.txt new file mode 100644 index 0000000..b70e051 --- /dev/null +++ b/signs_api/copyright.txt @@ -0,0 +1,10 @@ +Code by Pierre-Yves Rollo (pyrollo) +intllib support (i18n) by (fat115) +intllib fallback code and tools by Diego Martínez (kaeza) +Extra contributors: +(gpcf) +(Thomas--S) +Translations: +Muhammad Nur Hidayat Yasuyoshi (MuhdNurHidayat) +(fat115) + diff --git a/signs_api/depends.txt b/signs_api/depends.txt new file mode 100644 index 0000000..f75ffcc --- /dev/null +++ b/signs_api/depends.txt @@ -0,0 +1,4 @@ +default +intllib? +display_api +font_api diff --git a/signs_api/init.lua b/signs_api/init.lua new file mode 100644 index 0000000..9fcaa10 --- /dev/null +++ b/signs_api/init.lua @@ -0,0 +1,218 @@ +--[[ + signs mod for Minetest - Various signs with text displayed on + (c) Pierre-Yves Rollo + + This file is part of signs. + + signs is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + signs is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with signs. If not, see <http://www.gnu.org/licenses/>. +--]] + +signs_api = {} +signs_api.name = minetest.get_current_modname() +signs_api.path = minetest.get_modpath(signs_api.name) + +-- Load support for intllib. +local S, NS = dofile(signs_api.path.."/intllib.lua") +signs_api.intllib = S +local F = function(...) return minetest.formspec_escape(S(...)) end + +function signs_api.set_display_text(pos, text, font) + local meta = minetest.get_meta(pos) + meta:set_string("display_text", text) + if text and text ~= "" then + meta:set_string("infotext", "\""..text.."\"") + else + meta:set_string("infotext", "") + end + if font then + meta:set_string("font", font) + end + display_api.update_entities(pos) +end + +function signs_api.set_formspec(pos) + local meta = minetest.get_meta(pos) + local ndef = minetest.registered_nodes[minetest.get_node(pos).name] + if ndef and ndef.display_entities + and ndef.display_entities["signs:display_text"] then + local maxlines = ndef.display_entities["signs:display_text"].maxlines + local fs, y + + if maxlines == 1 then + fs = "field[0.5,0.7;5.5,1;display_text;"..F("Text").. + ";${display_text}]" + y = 1.2 + else + local extralabel = "" + if maxlines then + extralabel = F(" (first %s lines only)"):format(maxlines) + end + + fs = "textarea[0.5,0.7;5.5,2;display_text;"..F("Text").."".. + extralabel..";${display_text}]" + y = 2.4 + end + + fs = fs.."button[1,"..y..";2,1;font;"..F("Font").."]" + fs = fs.."button_exit[3,"..y..";2,1;ok;"..F("Write").."]" + y = y + 0.8 + fs = "size[6,"..y.."]"..default.gui_bg.. + default.gui_bg_img..default.gui_slots..fs + + meta:set_string("formspec", fs) + end +end + +function signs_api.on_receive_fields(pos, formname, fields, player) + if not minetest.is_protected(pos, player:get_player_name()) then + if fields and (fields.ok or fields.key_enter) then + signs_api.set_display_text(pos, fields.display_text) + end + if fields and (fields.font) then + signs_api.set_display_text(pos, fields.display_text) + font_api.show_font_list(player, pos) + end + end +end + +-- On place callback for direction signs +-- (chooses which sign according to look direction) +function signs_api.on_place_direction(itemstack, placer, pointed_thing) + local name = itemstack:get_name() + local ndef = minetest.registered_nodes[name] + + local bdir = {x = pointed_thing.under.x - pointed_thing.above.x, + y = pointed_thing.under.y - pointed_thing.above.y, + z = pointed_thing.under.z - pointed_thing.above.z} + local pdir = placer:get_look_dir() + + local ndir, test + + if ndef.paramtype2 == "facedir" then + if bdir.x == 0 and bdir.z == 0 then + -- Ceiling or floor pointed (facedir chosen from player dir) + ndir = minetest.dir_to_facedir({x=pdir.x, y=0, z=pdir.z}) + else + -- Wall pointed + ndir = minetest.dir_to_facedir(bdir) + end + + test = {[0]=-pdir.x, pdir.z, pdir.x, -pdir.z} + end + + if ndef.paramtype2 == "wallmounted" then + ndir = minetest.dir_to_wallmounted(bdir) + if ndir == 0 or ndir == 1 then + -- Ceiling or floor + ndir = minetest.dir_to_wallmounted({x=pdir.x, y=0, z=pdir.z}) + end + + test = {0, pdir.z, -pdir.z, -pdir.x, pdir.x} + end + + -- Only for direction signs + if ndef.signs_other_dir then + if test[ndir] > 0 then + itemstack:set_name(ndef.signs_other_dir) + end + itemstack = minetest.item_place(itemstack, placer, pointed_thing, ndir) + itemstack:set_name(name) + + return itemstack + else + return minetest.item_place(itemstack, placer, pointed_thing, ndir) + end +end + +-- Handles screwdriver rotation. Direction is affected for direction signs +-- If rotation mode is 2 and sign is directional, swap direction. +-- Otherwise use display_api's on_rotate function. +function signs_api.on_rotate(pos, node, player, mode, new_param2) + if mode == 2 then + local ndef = minetest.registered_nodes[node.name] + if ndef.signs_other_dir then + minetest.swap_node(pos, {name = ndef.signs_other_dir, + param1 = node.param1, param2 = node.param2}) + display_api.update_entities(pos) + return true + end + end + return display_api.on_rotate(pos, node, user, mode, new_param2) +end + +function signs_api.register_sign(mod, name, model) + -- Default fields + local fields = { + sunlight_propagates = true, + paramtype = "light", + paramtype2 = "facedir", + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = {-model.width/2, -model.height/2, 0.5, + model.width/2, model.height/2, 0.5 - model.depth}, + }, + groups = {choppy=2, dig_immediate=2, not_blocking_trains = 1, display_modpack_node = 1}, + sounds = default.node_sound_defaults(), + display_entities = { + ["signs:display_text"] = { + on_display_update = font_api.on_display_update, + depth = 0.5 - display_api.entity_spacing - model.depth, + size = { x = model.width, y = model.height }, + aspect_ratio = 1/2, + maxlines = 1, + }, + + }, + on_place = display_api.on_place, + on_construct = function(pos) + local ndef = minetest.registered_nodes[minetest.get_node(pos).name] + local meta = minetest.get_meta(pos) + meta:set_string("font", ndef.display_entities.font_name or + font_api.get_default_font_name()) + signs_api.set_formspec(pos) + display_api.on_construct(pos) + end, + on_destruct = display_api.on_destruct, + on_rotate = signs_api.on_rotate, + on_receive_fields = signs_api.on_receive_fields, + on_punch = function(pos, node, player, pointed_thing) + signs_api.set_formspec(pos) + display_api.update_entities(pos) + end, + } + + -- Node fields override + for key, value in pairs(model.node_fields) do + if key == "groups" then + for key2, value2 in pairs(value) do + fields[key][key2] = value2 + end + else + fields[key] = value + end + end + + if not fields.wield_image then fields.wield_image = fields.inventory_image end + + -- Entity fields override + for key, value in pairs(model.entity_fields) do + fields.display_entities["signs:display_text"][key] = value + end + + minetest.register_node(mod..":"..name, fields) +end + +-- Text entity for all signs +display_api.register_display_entity("signs:display_text") diff --git a/signs_api/intllib.lua b/signs_api/intllib.lua new file mode 100644 index 0000000..6669d72 --- /dev/null +++ b/signs_api/intllib.lua @@ -0,0 +1,45 @@ + +-- Fallback functions for when `intllib` is not installed. +-- Code released under Unlicense <http://unlicense.org>. + +-- Get the latest version of this file at: +-- https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua + +local function format(str, ...) + local args = { ... } + local function repl(escape, open, num, close) + if escape == "" then + local replacement = tostring(args[tonumber(num)]) + if open == "" then + replacement = replacement..close + end + return replacement + else + return "@"..open..num..close + end + end + return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl)) +end + +local gettext, ngettext +if minetest.get_modpath("intllib") then + if intllib.make_gettext_pair then + -- New method using gettext. + gettext, ngettext = intllib.make_gettext_pair() + else + -- Old method using text files. + gettext = intllib.Getter() + end +end + +-- Fill in missing functions. + +gettext = gettext or function(msgid, ...) + return format(msgid, ...) +end + +ngettext = ngettext or function(msgid, msgid_plural, n, ...) + return format(n==1 and msgid or msgid_plural, ...) +end + +return gettext, ngettext diff --git a/signs_api/locale/fr.po b/signs_api/locale/fr.po new file mode 100644 index 0000000..e490d1b --- /dev/null +++ b/signs_api/locale/fr.po @@ -0,0 +1,49 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-01 05:56+0100\n" +"PO-Revision-Date: 2017-05-08 07:08+0200\n" +"Last-Translator: Peppy <peppy@twang-factory.com>\n" +"Language-Team: \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.12\n" + +#: common.lua +msgid "Text" +msgstr "Texte" + +#: common.lua +msgid "Write" +msgstr "Écrire" + +#: common.lua +#, lua-format +msgid " (first %s lines only)" +msgstr " (uniquement les %s premières lignes)" + +#~ msgid "Title" +#~ msgstr "Titre" + +#~ msgid "Close" +#~ msgstr "Fermer" + +#~ msgid "(right-click to read more text)" +#~ msgstr "(Clic-droit pour afficher le texte entier)" + +#~ msgid "Wooden direction sign" +#~ msgstr "Panneau de direction en bois" + +#~ msgid "Poster" +#~ msgstr "Affiche" + +#~ msgid "Textd" +#~ msgstr "Texte" diff --git a/signs_api/locale/ms.po b/signs_api/locale/ms.po new file mode 100644 index 0000000..9c8aab8 --- /dev/null +++ b/signs_api/locale/ms.po @@ -0,0 +1,46 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Muhammad Nur Hidayat <muhdnurhidayat96@yahoo.com>, 2017. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-01 05:56+0100\n" +"PO-Revision-Date: 2017-08-27 15:50+0800\n" +"Last-Translator: Muhammad Nur Hidayat <muhdnurhidayat96@yahoo.com>\n" +"Language-Team: Malay <muhdnurhidayat96@yahoo.com>\n" +"Language: ms\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Vé 0.1.4\n" + +#: common.lua +msgid "Text" +msgstr "Teks" + +#: common.lua +msgid "Write" +msgstr "Tulis" + +#: common.lua +#, lua-format +msgid " (first %s lines only)" +msgstr "( %s baris pertama sahaja )" + +#~ msgid "Title" +#~ msgstr "Tajuk" + +#~ msgid "Close" +#~ msgstr "Tutup" + +#~ msgid "(right-click to read more text)" +#~ msgstr "(klik-kanan untuk baca teks penuh)" + +#~ msgid "Wooden direction sign" +#~ msgstr "Papan tanda arah kayu" + +#~ msgid "Poster" +#~ msgstr "Poster" diff --git a/signs_api/locale/template.pot b/signs_api/locale/template.pot new file mode 100644 index 0000000..6004024 --- /dev/null +++ b/signs_api/locale/template.pot @@ -0,0 +1,31 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-01 05:56+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: common.lua +msgid "Text" +msgstr "" + +#: common.lua +msgid "Write" +msgstr "" + +#: common.lua +#, lua-format +msgid " (first %s lines only)" +msgstr "" diff --git a/signs_api/tools/updatepo.sh b/signs_api/tools/updatepo.sh new file mode 100755 index 0000000..feb2504 --- /dev/null +++ b/signs_api/tools/updatepo.sh @@ -0,0 +1,25 @@ +#! /bin/bash + +# To create a new translation: +# msginit --locale=ll_CC -o locale/ll_CC.po -i locale/template.pot + +cd "$(dirname "${BASH_SOURCE[0]}")/.."; + +# Extract translatable strings. +xgettext --from-code=UTF-8 \ + --language=Lua \ + --sort-by-file \ + --keyword=S \ + --keyword=NS:1,2 \ + --keyword=N_ \ + --keyword=F \ + --add-comments='Translators:' \ + --add-location=file \ + -o locale/template.pot \ + $(find . -name '*.lua') + +# Update translations. +find locale -name '*.po' | while read -r file; do + echo $file + msgmerge --update $file locale/template.pot; +done 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/compatibility.lua b/signs_road/compatibility.lua index fa5f94b..5fb673a 100644 --- a/signs_road/compatibility.lua +++ b/signs_road/compatibility.lua @@ -22,7 +22,7 @@ ------------------------------------ local wallmounted_to_facedir = { - [0]=1, -- Should not happend with signs + [0]=1, -- Should not happend with signs [1]=1, -- Should not happend with signs [2]=1, [3]=3, @@ -45,9 +45,9 @@ local function compatibility_check(pos, node) node.name = convert_nodes[node.name] if node.name then node.param2 = wallmounted_to_facedir[node.param2] - display_lib.on_destruct(pos) + display_api.on_destruct(pos) minetest.swap_node(pos, node) - display_lib.on_construct(pos) + display_api.on_construct(pos) end end @@ -69,7 +69,7 @@ local function compatibility_check_2(pos, node) end end -- Create new entity - display_lib.update_entities(pos) + display_api.update_entities(pos) end minetest.register_lbm({ name = "signs_road:conpatibility_2", @@ -82,4 +82,9 @@ minetest.register_lbm({ name = "signs_road:conpatibility_2", action = compatibility_check_2, }) +-- Node name tidy up +-------------------- +minetest.register_alias("signs_road:green_street_sign", "signs_road:green_sign") +minetest.register_alias("signs_road:yellow_street_sign", "signs_road:yellow_sign") +minetest.register_alias("signs_road:white_street_sign", "signs_road:white_sign") diff --git a/signs_road/copyright.txt b/signs_road/copyright.txt index c53bf3d..bb7adc8 100644 --- a/signs_road/copyright.txt +++ b/signs_road/copyright.txt @@ -1,5 +1,9 @@ Code, Textures and Models by Pierre-Yves Rollo (pyrollo) -intllib support (i18n) by fat115 +intllib support (i18n) by (fat115) intllib fallback code and tools by Diego Martínez (kaeza) -Extra contributors : (gpcf) - +Extra contributors: +(gpcf) +(Thomas--S) +Translations: +Muhammad Nur Hidayat Yasuyoshi (MuhdNurHidayat) +(fat115) diff --git a/signs_road/crafts.lua b/signs_road/crafts.lua index 3c15437..314a91a 100644 --- a/signs_road/crafts.lua +++ b/signs_road/crafts.lua @@ -19,57 +19,54 @@ along with signs_road. If not, see <http://www.gnu.org/licenses/>. --]] +-- Standard rectangle signs + minetest.register_craft({ - output = 'signs_road:blue_street_sign 2', + output = 'signs_road:white_sign 2', recipe = { - {'dye:blue', 'dye:white', ''}, + {'dye:white', 'dye:black', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) minetest.register_craft({ - output = 'signs_road:red_street_sign 2', + output = 'signs_road:blue_sign 2', recipe = { - {'dye:white', 'dye:red', ''}, + {'dye:blue', 'dye:white', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) minetest.register_craft({ - output = 'signs_road:white_street_sign 2', + output = 'signs_road:green_sign 2', recipe = { - {'dye:white', 'dye:black', ''}, + {'dye:green', 'dye:white', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) minetest.register_craft({ - type = "shapeless", - output = 'signs_road:large_street_sign', - recipe = {'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign'}, -}) - -minetest.register_craft({ - output = 'signs_road:green_street_sign 2', + output = 'signs_road:yellow_sign 2', recipe = { - {'dye:green', 'dye:white', ''}, + {'dye:yellow', 'dye:black', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) minetest.register_craft({ - output = 'signs_road:yellow_street_sign 2', + output = 'signs_road:red_sign 2', recipe = { - {'dye:yellow', 'dye:black', ''}, + {'dye:red', 'dye:white', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) +-- Standard direction signs minetest.register_craft({ output = 'signs_road:black_right_sign 2', @@ -81,6 +78,24 @@ minetest.register_craft({ }) minetest.register_craft({ + output = 'signs_road:white_right_sign 2', + recipe = { + {'dye:white', 'dye:black', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot', ''}, + {'', '', ''}, + } +}) + +minetest.register_craft({ + output = 'signs_road:blue_right_sign 2', + recipe = { + {'dye:blue', 'dye:white', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot', ''}, + {'', '', ''}, + } +}) + +minetest.register_craft({ output = 'signs_road:green_right_sign 2', recipe = { {'dye:green', 'dye:white', 'default:steel_ingot'}, @@ -92,18 +107,95 @@ minetest.register_craft({ minetest.register_craft({ output = 'signs_road:yellow_right_sign 2', recipe = { - {'dye:yellow', 'dye:white', 'default:steel_ingot'}, + {'dye:yellow', 'dye:black', 'default:steel_ingot'}, {'default:steel_ingot', 'default:steel_ingot', ''}, {'', '', ''}, } }) minetest.register_craft({ - output = 'signs_road:white_right_sign 2', + output = 'signs_road:red_right_sign 2', recipe = { - {'dye:white', 'dye:black', 'default:steel_ingot'}, + {'dye:red', 'dye:white', 'default:steel_ingot'}, {'default:steel_ingot', 'default:steel_ingot', ''}, {'', '', ''}, } }) +-- Transform Rectangle <-> Direction + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:white_right_sign', + recipe = {'signs_road:white_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:white_sign', + recipe = {'signs_road:white_right_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:blue_right_sign', + recipe = {'signs_road:blue_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:blue_sign', + recipe = {'signs_road:blue_right_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:green_right_sign', + recipe = {'signs_road:green_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:green_sign', + recipe = {'signs_road:green_right_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:yellow_right_sign', + recipe = {'signs_road:yellow_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:yellow_sign', + recipe = {'signs_road:yellow_right_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:red_right_sign', + recipe = {'signs_road:red_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:red_sign', + recipe = {'signs_road:red_right_sign'}, +}) + +-- Various signs + +minetest.register_craft({ + output = 'signs_road:blue_street_sign 4', + recipe = { + {'dye:blue', 'dye:white', 'dye:blue'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + } +}) + +minetest.register_craft({ + output = 'signs_road:red_street_sign 2', + recipe = { + {'dye:white', 'dye:red', 'dye:black'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'', '', ''}, + } +}) + +minetest.register_craft({ + type = "shapeless", + output = 'signs_road:large_street_sign', + recipe = {'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign'}, +}) diff --git a/signs_road/depends.txt b/signs_road/depends.txt index 730e727..eeb3b01 100644 --- a/signs_road/depends.txt +++ b/signs_road/depends.txt @@ -1,6 +1,6 @@ default intllib? dye -display_lib -font_lib -signs +display_api +font_api +signs_api diff --git a/signs_road/nodes.lua b/signs_road/nodes.lua index c5d92b6..74eca23 100644 --- a/signs_road/nodes.lua +++ b/signs_road/nodes.lua @@ -27,16 +27,16 @@ local models = { width = 14/16, height = 12/16, entity_fields = { - resolution = { x = 144, y = 64 }, + size = { x = 14/16, y = 10/16 }, maxlines = 3, color = "#fff", }, node_fields = { description = S("Blue street sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_blue.png" }, - inventory_image = "signs_road_blue.png", + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_blue_street.png" }, + inventory_image = "signs_road_blue_street.png", }, }, large_street_sign = { @@ -44,106 +44,139 @@ local models = { width = 64/16, height = 12/16, entity_fields = { - resolution = { x = 30, y = 20 }, maxlines = 1, color = "#000", }, node_fields = { visual_scale = 1, description = S("Large banner"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_large_white.png" }, inventory_image = "signs_road_white.png", }, }, - red_street_sign = { depth = 1/16, width = 1, height = 7/16, entity_fields = { - resolution = { x = 96, y = 64 }, + size = { x = 1, y = 4/16 }, maxlines = 1, color = "#000", }, node_fields = { description = S("Red and white town sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_red_white.png" }, inventory_image="signs_road_red_white.png", }, }, - white_street_sign = { + white_sign = { depth = 1/16, width = 1, height = 7/16, entity_fields = { - resolution = { x = 96, y = 64 }, + size = { x = 1, y = 6/16 }, maxlines = 2, color = "#000", }, node_fields = { description = S("White street sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_white.png" }, inventory_image = "signs_road_white.png", }, }, - green_street_sign = { + blue_sign = { + depth = 1/16, + width = 1, + height = 7/16, + entity_fields = { + size = { x = 1, y = 6/16 }, + maxlines = 2, + color = "#fff", + }, + node_fields = { + description = S("Blue road sign"), + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_blue.png" }, + inventory_image = "signs_road_blue.png", + }, + }, + green_sign = { depth = 1/16, width = 1, height = 7/16, entity_fields = { - resolution = { x = 96, y = 64 }, + size = { x = 1, y = 6/16 }, maxlines = 2, color = "#fff", }, node_fields = { - description = S("Green street sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + description = S("Green road sign"), + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_green.png" }, inventory_image = "signs_road_green.png", }, }, - yellow_street_sign = { + yellow_sign = { depth = 1/16, width = 1, height = 7/16, entity_fields = { - resolution = { x = 96, y = 64 }, + size = { x = 1, y = 6/16 }, maxlines = 2, color = "#000", }, node_fields = { - description = S("Yellow street sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + description = S("Yellow road sign"), + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_yellow.png" }, inventory_image="signs_road_yellow.png", }, }, + red_sign = { + depth = 1/16, + width = 1, + height = 7/16, + entity_fields = { + size = { x = 1, y = 6/16 }, + maxlines = 2, + color = "#fff", + }, + node_fields = { + description = S("Red road sign"), + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_red.png" }, + inventory_image = "signs_road_red.png", + }, + }, black_right_sign = { depth = 1/32, width = 1, height = 0.5, entity_fields = { - resolution = { x = 96, y = 64 }, + aspect_ratio = 3/4, + size = { x = 1, y = 3/16 }, maxlines = 1, color = "#000", }, node_fields = { description = S("Black direction sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_black_dir_right.png" }, inventory_image = "signs_road_black_dir_inventory.png", signs_other_dir = "signs_road:black_left_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, }, }, black_left_sign = { @@ -151,32 +184,127 @@ local models = { width = 1, height = 0.5, entity_fields = { - resolution = { x = 96, y = 64 }, + aspect_ratio = 3/4, + size = { x = 1, y = 3/16 }, maxlines = 1, color = "#000", }, node_fields = { description = S("Black direction sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_black_dir_left.png" }, inventory_image = "signs_road_black_dir_inventory.png", signs_other_dir = "signs_road:black_right_sign", groups = { not_in_creative_inventory = 1 }, drop = "signs_road:black_right_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, + }, + }, + white_right_sign = { + depth = 1/16, + width = 14/16, + height = 7/16, + entity_fields = { + right = -3/32, + size = { x = 12/16, y = 6/16 }, + maxlines = 2, + color = "#000", + }, + node_fields = { + description = S("White direction sign"), + tiles = { "signs_road_white_direction.png" }, + inventory_image = "signs_road_white_dir_inventory.png", + signs_other_dir = "signs_road:white_left_sign", + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, + drawtype = "mesh", + mesh = "signs_dir_right.obj", + selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + }, + }, + white_left_sign = { + depth = 1/16, + width = 14/16, + height = 7/16, + entity_fields = { + right = 3/32, + size = { x = 12/16, y = 6/16 }, + maxlines = 2, + color = "#000", + }, + node_fields = { + description = S("White direction sign"), + tiles = { "signs_road_white_direction.png" }, + inventory_image = "signs_road_white_dir_inventory.png", + signs_other_dir = "signs_road:white_right_sign", + on_place=signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, + drawtype = "mesh", + mesh = "signs_dir_left.obj", + selection_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, + groups = { not_in_creative_inventory = 1 }, + drop = "signs_road:white_right_sign", + }, + }, + blue_right_sign = { + depth = 1/16, + width = 14/16, + height = 7/16, + entity_fields = { + right = -3/32, + size = { x = 12/16, y = 6/16 }, + maxlines = 2, + color = "#fff", + }, + node_fields = { + description = S("Blue direction sign"), + tiles = { "signs_road_blue_direction.png" }, + inventory_image = "signs_road_blue_dir_inventory.png", + signs_other_dir = "signs_road:blue_left_sign", + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, + drawtype = "mesh", + mesh = "signs_dir_right.obj", + selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + }, + }, + blue_left_sign = { + depth = 1/16, + width = 14/16, + height = 7/16, + entity_fields = { + right = 3/32, + size = { x = 12/16, y = 6/16 }, + maxlines = 2, + color="#fff", + }, + node_fields = { + description = S("Blue direction sign"), + tiles = { "signs_road_blue_direction.png" }, + inventory_image = "signs_road_blue_dir_inventory.png", + signs_other_dir = "signs_road:blue_right_sign", + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, + drawtype = "mesh", + mesh = "signs_dir_left.obj", + selection_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, + groups = { not_in_creative_inventory = 1 }, + drop = "signs_road:blue_right_sign", }, }, - green_right_sign = { depth = 1/16, width = 14/16, height = 7/16, entity_fields = { - right = -3/32, + right = -3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, maxlines = 2, color = "#fff", }, @@ -185,12 +313,12 @@ local models = { tiles = { "signs_road_green_direction.png" }, inventory_image = "signs_road_green_dir_inventory.png", signs_other_dir = "signs_road:green_left_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_right.obj", selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, - collision_box = { type = "fixed", fixed = { -0,5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, }, }, green_left_sign = { @@ -198,9 +326,8 @@ local models = { width = 14/16, height = 7/16, entity_fields = { - right = 3/32, + right = 3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, maxlines = 2, color="#fff", }, @@ -209,8 +336,8 @@ local models = { tiles = { "signs_road_green_direction.png" }, inventory_image = "signs_road_green_dir_inventory.png", signs_other_dir = "signs_road:green_right_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_left.obj", selection_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, @@ -224,9 +351,8 @@ local models = { width = 14/16, height = 7/16, entity_fields = { - right = -3/32, + right = -3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, maxlines = 2, color = "#000", }, @@ -235,12 +361,12 @@ local models = { tiles = { "signs_road_yellow_direction.png" }, inventory_image = "signs_road_yellow_dir_inventory.png", signs_other_dir = "signs_road:yellow_left_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_right.obj", selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, - collision_box = { type = "fixed", fixed = { -0,5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, }, }, yellow_left_sign = { @@ -248,9 +374,8 @@ local models = { width = 14/16, height = 7/16, entity_fields = { - right = 3/32, + right = 3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, maxlines = 2, color = "#000", }, @@ -259,64 +384,62 @@ local models = { tiles = { "signs_road_yellow_direction.png" }, inventory_image = "signs_road_yellow_dir_inventory.png", signs_other_dir = "signs_road:yellow_right_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_left.obj", selection_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, collision_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, groups = { not_in_creative_inventory = 1 }, - drop = "signs_road:yellow_left_sign", + drop = "signs_road:yellow_right_sign", }, }, - white_right_sign = { + red_right_sign = { depth = 1/16, width = 14/16, height = 7/16, entity_fields = { - right = -3/32, + right = -3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, maxlines = 2, - color = "#000", + color = "#fff", }, node_fields = { - description = S("White direction sign"), - tiles = { "signs_road_white_direction.png" }, - inventory_image = "signs_road_white_dir_inventory.png", - signs_other_dir = "signs_road:white_left_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + description = S("Red direction sign"), + tiles = { "signs_road_red_direction.png" }, + inventory_image = "signs_road_red_dir_inventory.png", + signs_other_dir = "signs_road:red_left_sign", + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_right.obj", selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, - collision_box = { type = "fixed", fixed = { -0,5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, }, }, - white_left_sign = { + red_left_sign = { depth = 1/16, width = 14/16, height = 7/16, entity_fields = { - right = 3/32, + right = 3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, maxlines = 2, - color = "#000", + color = "#fff", }, node_fields = { - description = S("White direction sign"), - tiles = { "signs_road_white_direction.png" }, - inventory_image = "signs_road_white_dir_inventory.png", - signs_other_dir = "signs_road:white_right_sign", - on_place=signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + description = S("Red direction sign"), + tiles = { "signs_road_red_direction.png" }, + inventory_image = "signs_road_red_dir_inventory.png", + signs_other_dir = "signs_road:red_right_sign", + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_left.obj", selection_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, collision_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, groups = { not_in_creative_inventory = 1 }, - drop = "signs_road:white_right_sign", + drop = "signs_road:red_right_sign", }, }, } @@ -324,7 +447,5 @@ local models = { -- Node registration for name, model in pairs(models) do - signs.register_sign("signs_road", name, model) + signs_api.register_sign("signs_road", name, model) end - - diff --git a/signs_road/svg/green_street.svg b/signs_road/svg/green_street.svg deleted file mode 100644 index 89d8474..0000000 --- a/signs_road/svg/green_street.svg +++ /dev/null @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32px" - height="32px" - id="svg2985" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="green_street.svg" - inkscape:export-filename="/home/pyrollo/dev/minetest-mods/signs/textures/signs_green_street.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs2987" /> - <sodipodi:namedview - id="base" - pagecolor="#d2d038" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="15.836083" - inkscape:cx="8.8574553" - inkscape:cy="17.483424" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="1325" - inkscape:window-height="744" - inkscape:window-x="41" - inkscape:window-y="24" - inkscape:window-maximized="1"> - <inkscape:grid - type="xygrid" - id="grid2993" - empspacing="2" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" - spacingx="0.5px" - spacingy="0.5px" - color="#ff0000" - opacity="0.1254902" /> - </sodipodi:namedview> - <metadata - id="metadata2990"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Fond" - inkscape:groupmode="layer" - style="display:none"> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" - id="rect3110-2" - width="32" - height="32" - x="0" - y="0" - rx="0" - ry="0" - inkscape:export-filename="/home/pyrollo/dev/minetest-mods/display_modpack/signs_road/textures/signs_road_green_inventory.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - </g> - <g - inkscape:groupmode="layer" - id="layer5" - inkscape:label="Fond inv" - style="display:inline"> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" - id="rect3110" - width="32" - height="14" - x="0" - y="9" - rx="0" - ry="0" /> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#008040;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" - id="rect3767" - width="30" - height="12" - x="1" - y="10" - ry="2.4000001" - rx="2" /> - </g> -</svg> diff --git a/signs_road/svg/signs_green_direction.svg b/signs_road/svg/signs_green_direction.svg deleted file mode 100644 index 3cdbc77..0000000 --- a/signs_road/svg/signs_green_direction.svg +++ /dev/null @@ -1,168 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32" - height="32" - viewBox="0 0 32 32" - id="svg2" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="signs_green_direction.svg" - inkscape:export-filename="/home/pyrollo/dev/minetest-mods/display_modpack/signs_road/textures/signs_green_direction.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs4" /> - <sodipodi:namedview - id="base" - pagecolor="#e8e285" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="15.839192" - inkscape:cx="11.800709" - inkscape:cy="20.241354" - inkscape:document-units="px" - inkscape:current-layer="layer2" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - units="px" - inkscape:window-width="1325" - inkscape:window-height="744" - inkscape:window-x="41" - inkscape:window-y="24" - inkscape:window-maximized="1"> - <inkscape:grid - type="xygrid" - id="grid4147" /> - </sodipodi:namedview> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:groupmode="layer" - id="layer2" - inkscape:label="Texture" - style="display:inline"> - <rect - transform="translate(-14.285706,-286.07651)" - style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.98000004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - id="rect4192" - width="32" - height="32" - x="14.285706" - y="286.07651" /> - <path - style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - d="m 2,18 0,14 30,0 0,-10 -2,0 0,-4 -28,0 z" - id="rect4164-7" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - d="m 2,2 0,14 28,0 0,-4 2,0 L 32,2 2,2 Z" - id="rect4164" - inkscape:connector-curvature="0" /> - <path - style="fill:#008040;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 3,3 22,0 4,6 -4,6 -22,0 z" - id="path4234" - inkscape:connector-curvature="0" /> - <path - style="fill:#008040;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 3,19 22,0 4,6 -4,6 -22,0 z" - id="path4234-5" - inkscape:connector-curvature="0" /> - </g> - <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="Inventory" - style="display:none"> - <path - style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 2,10 0,14 24,0 6,-7 -6,-7 z" - id="path4212-3" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - <path - style="display:inline;fill:#008040;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 3,11 22,0 4,6 -4,6 -22,0 z" - id="path4234-5-5" - inkscape:connector-curvature="0" /> - </g> - <g - inkscape:label="Guides" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-14.285706,-286.07651)" - style="display:none"> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149" - width="1.9999995" - height="13.999997" - x="14.285706" - y="288.07651" /> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149-3" - width="2.0000005" - height="10.000003" - x="44.285706" - y="298.07651" /> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149-3-6" - width="24" - height="1.9999976" - x="16.285706" - y="302.07651" /> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149-3-7" - width="2.0000005" - height="10.000003" - x="14.285706" - y="308.07651" /> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149-3-5" - width="24" - height="2.0000024" - x="16.285706" - y="286.07651" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 16.285706,288.07651 24,0 6,7 -6,7 -24,0 z" - id="path4193" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 16.285706,304.07651 0,14 24,0 6,-7 -6,-7 z" - id="path4212" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - </g> -</svg> diff --git a/signs_road/svg/signs_road_black_direction.svg b/signs_road/svg/signs_road_black_direction.svg deleted file mode 100644 index f513524..0000000 --- a/signs_road/svg/signs_road_black_direction.svg +++ /dev/null @@ -1,172 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32" - height="32" - viewBox="0 0 32 32" - id="svg2" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="signs_road_black_direction.svg" - inkscape:export-filename="/home/pyrollo/dev/minetest-mods/display_modpack/signs_road/textures/signs_road_black_dir_inventory.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs4" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="7.919596" - inkscape:cx="0.60099162" - inkscape:cy="14.877077" - inkscape:document-units="px" - inkscape:current-layer="layer3" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - units="px" - inkscape:window-width="1325" - inkscape:window-height="744" - inkscape:window-x="41" - inkscape:window-y="24" - inkscape:window-maximized="1"> - <inkscape:grid - type="xygrid" - id="grid4147" /> - </sodipodi:namedview> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Guides" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-14.285706,-286.07651)" - style="display:none" - sodipodi:insensitive="true"> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149" - width="1.9999995" - height="13.999997" - x="14.285706" - y="288.07651" /> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149-3" - width="2.0000005" - height="10.000003" - x="44.285706" - y="298.07651" /> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149-3-6" - width="24" - height="1.9999976" - x="16.285706" - y="302.07651" /> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149-3-7" - width="2.0000005" - height="10.000003" - x="14.285706" - y="308.07651" /> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149-3-5" - width="24" - height="2.0000024" - x="16.285706" - y="286.07651" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 16.285706,288.07651 24,0 6,7 -6,7 -24,0 z" - id="path4193" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 16.285706,304.07651 0,14 24,0 6,-7 -6,-7 z" - id="path4212" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - </g> - <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="Inventory" - style="display:none"> - <path - style="display:inline;fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 1,10 24,0 6,7 -6,7 -24,0 z" - id="path4193-3-3" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - <path - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 2,11 22,0 4,6 -4,6 -22,0 z" - id="path4234-6" - inkscape:connector-curvature="0" /> - </g> - <g - inkscape:groupmode="layer" - id="layer2" - inkscape:label="Texture" - style="display:inline"> - <rect - style="fill:#808080;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4147" - width="32" - height="32" - x="0" - y="0" /> - <path - transform="translate(-14.285706,-286.07651)" - style="display:inline;fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 16.285706,288.07651 24,0 6,7 -6,7 -24,0 z" - id="path4193-3" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - <path - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 3,3 22,0 4,6 -4,6 -22,0 z" - id="path4234" - inkscape:connector-curvature="0" /> - <path - transform="translate(-14.285706,-286.07651)" - style="display:inline;fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 16.285706,304.07651 0,14 24,0 6,-7 -6,-7 z" - id="path4212-6" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - <path - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 3,19 22,0 4,6 -4,6 -22,0 z" - id="path4234-5" - inkscape:connector-curvature="0" /> - </g> -</svg> diff --git a/signs_road/svg/signs_road_direction.svg b/signs_road/svg/signs_road_direction.svg new file mode 100644 index 0000000..665146b --- /dev/null +++ b/signs_road/svg/signs_road_direction.svg @@ -0,0 +1,316 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="32" + height="32" + viewBox="0 0 32 32" + id="svg2" + version="1.1" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="signs_road_direction.svg" + inkscape:export-filename="/home/pyrollo/dev/minetest-mods/display_modpack/signs_road/textures/signs_road_blue_direction.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#e8e285" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:zoom="11.2" + inkscape:cx="9.0886289" + inkscape:cy="9.9967465" + inkscape:document-units="px" + inkscape:current-layer="layer4" + showgrid="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + units="px" + inkscape:window-width="1323" + inkscape:window-height="713" + inkscape:window-x="43" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:measure-start="20,25" + inkscape:measure-end="0,0"> + <inkscape:grid + type="xygrid" + id="grid4147" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Texture Background" + style="display:none"> + <image + y="0" + x="0" + id="image4617" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH4QgZBgMAIw0eIgAAA8hJREFUWMPFls+KJEUQxn8RlVlV vYPsCuI77Hrd8zoexfP6CoIXfYPFBxAEwYfQk4hnvXiZ0zKjCz6CIKizO931JzPCQ1XWVI894sHp DWi6OjqyIuKLzO9LYbbnz5+7iDD2mXttxdUwkMbMOA48ePAmAGaZru9QUZSwFweQbfre7a7YbE4Y +p4QAgBPnjwRDlgoD6oVZhnXzJ9XHWYOQNu2mGVEBNWKpm7ouh6J+3HFhr6n0um17abFzElp5DaT Fy9+cYCHDx9xDBMR+QcCee5CPnvvTpJ+/fQZTx+dHvxPszl+A8b/2z7+/gt+u/oDAJ9tKaBSuXPY f9/+xUfffX47Asewb3/9iW9e/Lj8LkiomyNHQOHmKBYEQlDSOBylgEOj0JSMEGuOZU2I+wUAR0Pg rXv3+fL9T/YLcD8eAl998ClvnzzYp2IzO0ryD9853SOji4ufJwREhLsu4hD0OaepgMvLS6oqHA16 ma1patyNUNQOwJ/9cLTTkJJhZsjrug+cnZ15jPH13QfMjXEcrwsIQQGlriMp2azVBnMHxddUSnP/ jT1fiUvJ2IarySc1salYI5xS4vHjxwIsjeiyK+dOlruBypL8v/rKiwFcM+6OiDLMRLdSYQA2m/Z6 D5yfX7ioUMSpyHS5L6x9pfObvpwT/dBTVRUxRFQnBIZxwHImxsiu26Gqyz7S9QjcnLU4pWRLAjeH lFjHr+MAmqZm026IM99vd/M4qmqZebfrMDNyNlwzcn5+4etuUjIKEsX/bwgcuk2520JuIsJu1+EY qjqvz/PGF7Qwkpsvc3318tUEm+WDycuaddw6+fKcBtydfuiWzs2MECpSGjFztDBSSeZutG0DWXD3 W6G+Gedu88dxSYQY6ZPTDz0hROqmodt1qCopZUKIqAqhMFIhGnefgnQgZahSIMR6Sb5msXVclGud HwfDqxHHyMmptEIUoFkQ6LpuKqLrdgD0Qz8fm0mc6lgjMs9sHAhBMcsM40BZs44bhgnuWgUVYbvd YuY0TU2I1ZLYzKfiRUlpRMvubOqGfugp4iSihKqi3BdSmuBd7+h1XPH12ei6HgRCqAhVwM2XxGX2 5lMRoTBSjBOJqOge9ZYNV8ikqduFxQ5RNIz4pPM0dUPKia7rMDfCfDwtZ07fPZXlSrbZtMsRqesa dycP3ZJgDXWBf7Np9+KyGaITxzdNjaCknBjHcb546KIJtjopYRxHlECoFVW9VsOs9LtuTw1DVdGl kbJmHbdWw5cvL9lsTthdbhc1LJDfVMWQsyExoxrvXA3XnRf7G4ElQvNOekeUAAAAAElFTkSuQmCC " + style="stroke-width:1.0666666;image-rendering:optimizeSpeed" + preserveAspectRatio="none" + height="32" + width="32" /> + </g> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Black Border" + style="display:none"> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 2,2 v 14 h 28 v -4 h 2 V 2 Z" + id="rect4164" + inkscape:connector-curvature="0" /> + </g> + <g + style="display:none" + inkscape:label="White Border" + id="g1256" + inkscape:groupmode="layer"> + <path + inkscape:connector-curvature="0" + id="path1254" + d="m 2,2 v 14 h 28 v -4 h 2 V 2 Z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + </g> + <g + inkscape:groupmode="layer" + id="layer4" + inkscape:label="Yellow Background" + style="display:none"> + <path + style="display:inline;fill:#fbdf00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 3,3 h 22 l 4,6 -4,6 H 3 Z" + id="path4234" + inkscape:connector-curvature="0" /> + </g> + <g + style="display:none" + inkscape:label="Green Background" + id="g1268" + inkscape:groupmode="layer"> + <path + inkscape:connector-curvature="0" + id="path1264" + d="m 3,3 h 22 l 4,6 -4,6 H 3 Z" + style="display:inline;fill:#008040;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + inkscape:groupmode="layer" + id="g1280" + inkscape:label="Blue Background" + style="display:none"> + <path + style="display:inline;fill:#0040c0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 3,3 h 22 l 4,6 -4,6 H 3 Z" + id="path1276" + inkscape:connector-curvature="0" /> + </g> + <g + inkscape:groupmode="layer" + id="g1274" + inkscape:label="Red Background" + style="display:none"> + <path + style="display:inline;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 3,3 h 22 l 4,6 -4,6 H 3 Z" + id="path1270" + inkscape:connector-curvature="0" /> + </g> + <g + style="display:none" + inkscape:label="White Background" + id="g1262" + inkscape:groupmode="layer"> + <path + inkscape:connector-curvature="0" + id="path1258" + d="m 3,3 h 22 l 4,6 -4,6 H 3 Z" + style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path1260" + d="m 3,19 h 22 l 4,6 -4,6 H 3 Z" + style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="Inventory Black Border" + style="display:none"> + <path + style="display:inline;fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 2,10 v 14 h 24 l 6,-7 -6,-7 z" + id="path4212-3" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + </g> + <g + style="display:inline" + inkscape:label="Inventory White Border" + id="g854" + inkscape:groupmode="layer"> + <path + sodipodi:nodetypes="cccccc" + inkscape:connector-curvature="0" + id="path852" + d="m 2,10 v 14 h 24 l 6,-7 -6,-7 z" + style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> + <g + style="display:none" + inkscape:label="Inventory Yellow Background" + id="g850" + inkscape:groupmode="layer"> + <path + inkscape:connector-curvature="0" + id="path848" + d="m 3,11 h 22 l 4,6 -4,6 H 3 Z" + style="display:inline;fill:#fbdf00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + inkscape:groupmode="layer" + id="g870" + inkscape:label="Inventory Green Background" + style="display:inline"> + <path + style="display:inline;fill:#008040;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 3,11 h 22 l 4,6 -4,6 H 3 Z" + id="path868" + inkscape:connector-curvature="0" /> + </g> + <g + inkscape:groupmode="layer" + id="g866" + inkscape:label="Inventory Blue Background" + style="display:none"> + <path + style="display:inline;fill:#0040c0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 3,11 h 22 l 4,6 -4,6 H 3 Z" + id="path864" + inkscape:connector-curvature="0" /> + </g> + <g + inkscape:groupmode="layer" + id="g862" + inkscape:label="Inventory Red Background" + style="display:none"> + <path + style="display:inline;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 3,11 h 22 l 4,6 -4,6 H 3 Z" + id="path860" + inkscape:connector-curvature="0" /> + </g> + <g + inkscape:groupmode="layer" + id="g858" + inkscape:label="Inventory White Background" + style="display:none"> + <path + style="display:inline;fill:#fbdf00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 3,11 h 22 l 4,6 -4,6 H 3 Z" + id="path856" + inkscape:connector-curvature="0" /> + </g> + <g + inkscape:label="Guides" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-14.285706,-286.07651)" + style="display:none"> + <rect + style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4149" + width="1.9999995" + height="13.999997" + x="14.285706" + y="288.07651" /> + <rect + style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4149-3" + width="2.0000005" + height="10.000003" + x="44.285706" + y="298.07651" /> + <rect + style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4149-3-6" + width="24" + height="1.9999976" + x="16.285706" + y="302.07651" /> + <rect + style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4149-3-7" + width="2.0000005" + height="10.000003" + x="14.285706" + y="308.07651" /> + <rect + style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4149-3-5" + width="24" + height="2.0000024" + x="16.285706" + y="286.07651" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 16.285706,288.07651 h 24 l 6,7 -6,7 h -24 z" + id="path4193" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 16.285706,304.07651 v 14 h 24 l 6,-7 -6,-7 z" + id="path4212" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.33333337px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="14.285706" + y="279.07651" + id="text874"><tspan + sodipodi:role="line" + id="tspan872" + x="14.285706" + y="279.07651">Inventory: export page to 32x32 png</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.33333337px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="14.285706" + y="281.07651" + id="text874-2"><tspan + sodipodi:role="line" + id="tspan872-8" + x="14.285706" + y="281.07651">Texture: export page to 32x32 png</tspan></text> + </g> +</svg> diff --git a/signs_road/svg/signs_road_rectangle.svg b/signs_road/svg/signs_road_rectangle.svg new file mode 100644 index 0000000..3dad58d --- /dev/null +++ b/signs_road/svg/signs_road_rectangle.svg @@ -0,0 +1,188 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="32px" + height="32px" + id="svg2985" + version="1.1" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="signs_road_rectangle.svg" + inkscape:export-filename="/home/pyrollo/dev/minetest-mods/display_modpack/signs_road/textures/signs_road_red.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2987" /> + <sodipodi:namedview + id="base" + pagecolor="#d2d038" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:zoom="15.836083" + inkscape:cx="0.23789952" + inkscape:cy="17.483424" + inkscape:current-layer="layer5" + showgrid="true" + inkscape:grid-bbox="true" + inkscape:document-units="px" + inkscape:window-width="1323" + inkscape:window-height="713" + inkscape:window-x="43" + inkscape:window-y="27" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid2993" + empspacing="2" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + spacingx="0.5" + spacingy="0.5" + color="#ff0000" + opacity="0.1254902" + originx="0" + originy="0" /> + </sodipodi:namedview> + <metadata + id="metadata2990"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Black Border" + style="display:inline"> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" + id="rect3110" + width="32" + height="14" + x="0" + y="9" + rx="0" + ry="0" /> + </g> + <g + style="display:inline" + inkscape:label="White Border" + id="g901" + inkscape:groupmode="layer"> + <rect + ry="0" + rx="0" + y="9" + x="0" + height="14" + width="32" + id="rect899" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" /> + </g> + <g + style="display:inline" + inkscape:label="Blue Background" + id="g897" + inkscape:groupmode="layer"> + <rect + rx="2" + ry="2.4000001" + y="10" + x="1" + height="12" + width="30" + id="rect895" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#0040c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" /> + </g> + <g + inkscape:groupmode="layer" + id="g917" + inkscape:label="Green Background" + style="display:inline"> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#008040;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" + id="rect915" + width="30" + height="12" + x="1" + y="10" + ry="2.4000001" + rx="2" /> + </g> + <g + inkscape:groupmode="layer" + id="g905" + inkscape:label="Yellow Background" + style="display:none"> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fbdf00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate" + id="rect903" + width="30" + height="12" + x="1" + y="10" + ry="2.4000001" + rx="2" /> + </g> + <g + style="display:none" + inkscape:label="Red Background" + id="g909" + inkscape:groupmode="layer"> + <rect + rx="2" + ry="2.4000001" + y="10" + x="1" + height="12" + width="30" + id="rect907" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" /> + </g> + <g + inkscape:groupmode="layer" + id="g913" + inkscape:label="White Background" + style="display:none"> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" + id="rect911" + width="30" + height="12" + x="1" + y="10" + ry="2.4000001" + rx="2" /> + </g> + <g + inkscape:groupmode="layer" + id="layer1" + inkscape:label="Red Frame" + style="display:none"> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.02928686;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate" + id="rect3767-5" + width="28.970713" + height="10.970714" + x="1.5146437" + y="10.514643" + ry="2.1941426" + rx="1.9313809" /> + </g> +</svg> diff --git a/signs_road/svg/signs_road_red.svg b/signs_road/svg/signs_road_red.svg deleted file mode 100644 index 513b970..0000000 --- a/signs_road/svg/signs_road_red.svg +++ /dev/null @@ -1,123 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32px" - height="32px" - id="svg2985" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="signs_road_red.svg" - inkscape:export-filename="/home/pyrollo/dev/minetest-mods/display_modpack/signs_road/textures/signs_road_red_inventory.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs2987" /> - <sodipodi:namedview - id="base" - pagecolor="#f9f6c0" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="11.197802" - inkscape:cx="11.734227" - inkscape:cy="23.110862" - inkscape:current-layer="layer5" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="1325" - inkscape:window-height="744" - inkscape:window-x="41" - inkscape:window-y="24" - inkscape:window-maximized="1"> - <inkscape:grid - type="xygrid" - id="grid2993" - empspacing="2" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" - spacingx="0.5px" - spacingy="0.5px" - color="#ff0000" - opacity="0.1254902" /> - </sodipodi:namedview> - <metadata - id="metadata2990"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Texture" - inkscape:groupmode="layer" - style="display:none"> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" - id="rect3110-2" - width="32" - height="32" - x="0" - y="0" - rx="0" - ry="0" /> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" - id="rect3110" - width="32" - height="14" - x="0" - y="9" - rx="0" - ry="0" /> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.02928686;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate" - id="rect3767" - width="28.970713" - height="10.970714" - x="1.5146434" - y="10.514644" - ry="2.1941426" - rx="1.9313809" /> - </g> - <g - inkscape:groupmode="layer" - id="layer5" - inkscape:label="Inventory" - style="display:inline"> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" - id="rect3110-7" - width="32" - height="14" - x="0" - y="9" - rx="0" - ry="0" /> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.02928686;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate" - id="rect3767-5" - width="28.970713" - height="10.970714" - x="1.5146434" - y="10.514644" - ry="2.1941426" - rx="1.9313809" /> - </g> -</svg> diff --git a/signs_road/svg/signs_blue_street.svg b/signs_road/svg/signs_road_street_blue.svg index 0aa87ff..0aa87ff 100644 --- a/signs_road/svg/signs_blue_street.svg +++ b/signs_road/svg/signs_road_street_blue.svg diff --git a/signs_road/svg/signs_yellow_direction.svg b/signs_road/svg/signs_yellow_direction.svg deleted file mode 100644 index 1414a5c..0000000 --- a/signs_road/svg/signs_yellow_direction.svg +++ /dev/null @@ -1,168 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32" - height="32" - viewBox="0 0 32 32" - id="svg2" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="signs_yellow_direction.svg" - inkscape:export-filename="/home/pyrollo/dev/minetest-mods/display_modpack/signs_road/textures/signs_road_yellow_direction.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs4" /> - <sodipodi:namedview - id="base" - pagecolor="#e8e285" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="15.839192" - inkscape:cx="12.242651" - inkscape:cy="20.241354" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - units="px" - inkscape:window-width="1325" - inkscape:window-height="744" - inkscape:window-x="41" - inkscape:window-y="24" - inkscape:window-maximized="1"> - <inkscape:grid - type="xygrid" - id="grid4147" /> - </sodipodi:namedview> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:groupmode="layer" - id="layer2" - inkscape:label="Texture" - style="display:inline"> - <rect - transform="translate(-14.285706,-286.07651)" - style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.98000004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - id="rect4192" - width="32" - height="32" - x="14.285706" - y="286.07651" /> - <path - style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - d="m 2,18 0,14 30,0 0,-10 -2,0 0,-4 -28,0 z" - id="rect4164-7" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - d="m 2,2 0,14 28,0 0,-4 2,0 L 32,2 2,2 Z" - id="rect4164" - inkscape:connector-curvature="0" /> - <path - style="fill:#fbdf00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 3,3 22,0 4,6 -4,6 -22,0 z" - id="path4234" - inkscape:connector-curvature="0" /> - <path - style="fill:#fbdf00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 3,19 22,0 4,6 -4,6 -22,0 z" - id="path4234-5" - inkscape:connector-curvature="0" /> - </g> - <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="Inventory" - style="display:none"> - <path - style="display:inline;fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 2,10 0,14 24,0 6,-7 -6,-7 z" - id="path4212-3" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - <path - style="display:inline;fill:#fbdf00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 3,11 22,0 4,6 -4,6 -22,0 z" - id="path4234-5-5" - inkscape:connector-curvature="0" /> - </g> - <g - inkscape:label="Guides" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-14.285706,-286.07651)" - style="display:none"> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149" - width="1.9999995" - height="13.999997" - x="14.285706" - y="288.07651" /> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149-3" - width="2.0000005" - height="10.000003" - x="44.285706" - y="298.07651" /> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149-3-6" - width="24" - height="1.9999976" - x="16.285706" - y="302.07651" /> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149-3-7" - width="2.0000005" - height="10.000003" - x="14.285706" - y="308.07651" /> - <rect - style="fill:none;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4149-3-5" - width="24" - height="2.0000024" - x="16.285706" - y="286.07651" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 16.285706,288.07651 24,0 6,7 -6,7 -24,0 z" - id="path4193" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#ff00ff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 16.285706,304.07651 0,14 24,0 6,-7 -6,-7 z" - id="path4212" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - </g> -</svg> diff --git a/signs_road/svg/white_street.svg b/signs_road/svg/white_street.svg deleted file mode 100644 index f33bc02..0000000 --- a/signs_road/svg/white_street.svg +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32px" - height="32px" - id="svg2985" - version="1.1" - inkscape:version="0.92.1 r15371" - sodipodi:docname="white_street.svg" - inkscape:export-filename="/home/pyrollo/dev/minetest-mods/display_modpack/signs_road/textures/signs_road_yellow_inventory.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs2987" /> - <sodipodi:namedview - id="base" - pagecolor="#d2d038" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="15.836083" - inkscape:cx="-5.5084709" - inkscape:cy="17.483424" - inkscape:current-layer="layer5" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="1325" - inkscape:window-height="744" - inkscape:window-x="41" - inkscape:window-y="24" - inkscape:window-maximized="1"> - <inkscape:grid - type="xygrid" - id="grid2993" - empspacing="2" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" - spacingx="0.5" - spacingy="0.5" - color="#ff0000" - opacity="0.1254902" - originx="0" - originy="0" /> - </sodipodi:namedview> - <metadata - id="metadata2990"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Fond" - inkscape:groupmode="layer" - style="display:none"> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" - id="rect3110-2" - width="32" - height="32" - x="0" - y="0" - rx="0" - ry="0" - inkscape:export-filename="/home/pyrollo/dev/minetest-mods/display_modpack/signs_road/textures/signs_road_green_inventory.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - </g> - <g - inkscape:groupmode="layer" - id="layer5" - inkscape:label="Fond inv" - style="display:inline"> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" - id="rect3110" - width="32" - height="14" - x="0" - y="9" - rx="0" - ry="0" /> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" - id="rect3767" - width="30" - height="12" - x="1" - y="10" - ry="2.4000001" - rx="2" /> - </g> -</svg> diff --git a/signs_road/svg/yellow_street.svg b/signs_road/svg/yellow_street.svg deleted file mode 100644 index ea26f30..0000000 --- a/signs_road/svg/yellow_street.svg +++ /dev/null @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32px" - height="32px" - id="svg2985" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="yellow_street.svg" - inkscape:export-filename="/home/pyrollo/dev/minetest-mods/display_modpack/signs_road/textures/signs_road_yellow_inventory.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs2987" /> - <sodipodi:namedview - id="base" - pagecolor="#d2d038" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="15.836083" - inkscape:cx="8.8574553" - inkscape:cy="17.483424" - inkscape:current-layer="layer5" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="1325" - inkscape:window-height="744" - inkscape:window-x="41" - inkscape:window-y="24" - inkscape:window-maximized="1"> - <inkscape:grid - type="xygrid" - id="grid2993" - empspacing="2" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" - spacingx="0.5px" - spacingy="0.5px" - color="#ff0000" - opacity="0.1254902" /> - </sodipodi:namedview> - <metadata - id="metadata2990"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Fond" - inkscape:groupmode="layer" - style="display:none"> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" - id="rect3110-2" - width="32" - height="32" - x="0" - y="0" - rx="0" - ry="0" - inkscape:export-filename="/home/pyrollo/dev/minetest-mods/display_modpack/signs_road/textures/signs_road_green_inventory.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - </g> - <g - inkscape:groupmode="layer" - id="layer5" - inkscape:label="Fond inv" - style="display:inline"> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" - id="rect3110" - width="32" - height="14" - x="0" - y="9" - rx="0" - ry="0" /> - <rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fbdf00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" - id="rect3767" - width="30" - height="12" - x="1" - y="10" - ry="2.4000001" - rx="2" /> - </g> -</svg> diff --git a/signs_road/textures/signs_road_blue.png b/signs_road/textures/signs_road_blue.png Binary files differindex 540a390..51dc83b 100644 --- a/signs_road/textures/signs_road_blue.png +++ b/signs_road/textures/signs_road_blue.png diff --git a/signs_road/textures/signs_road_blue_dir_inventory.png b/signs_road/textures/signs_road_blue_dir_inventory.png Binary files differnew file mode 100644 index 0000000..426c997 --- /dev/null +++ b/signs_road/textures/signs_road_blue_dir_inventory.png diff --git a/signs_road/textures/signs_road_blue_direction.png b/signs_road/textures/signs_road_blue_direction.png Binary files differnew file mode 100644 index 0000000..bba2b00 --- /dev/null +++ b/signs_road/textures/signs_road_blue_direction.png diff --git a/signs_road/textures/signs_road_blue_street.png b/signs_road/textures/signs_road_blue_street.png Binary files differnew file mode 100644 index 0000000..540a390 --- /dev/null +++ b/signs_road/textures/signs_road_blue_street.png diff --git a/signs_road/textures/signs_road_red.png b/signs_road/textures/signs_road_red.png Binary files differnew file mode 100644 index 0000000..5614f6f --- /dev/null +++ b/signs_road/textures/signs_road_red.png diff --git a/signs_road/textures/signs_road_red_dir_inventory.png b/signs_road/textures/signs_road_red_dir_inventory.png Binary files differnew file mode 100644 index 0000000..4d9d559 --- /dev/null +++ b/signs_road/textures/signs_road_red_dir_inventory.png diff --git a/signs_road/textures/signs_road_red_direction.png b/signs_road/textures/signs_road_red_direction.png Binary files differnew file mode 100644 index 0000000..632a925 --- /dev/null +++ b/signs_road/textures/signs_road_red_direction.png 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/copyright.txt b/steles/copyright.txt index 63371e7..1a4e167 100644 --- a/steles/copyright.txt +++ b/steles/copyright.txt @@ -1 +1,9 @@ Code by Pierre-Yves Rollo +intllib support (i18n) by (fat115) +intllib fallback code and tools by Diego Martínez (kaeza) +Extra contibutors: +(Thomas--S) +Translations: +Muhammad Nur Hidayat Yasuyoshi (MuhdNurHidayat) +(fat115) + diff --git a/steles/depends.txt b/steles/depends.txt index 35625c0..ba43223 100644 --- a/steles/depends.txt +++ b/steles/depends.txt @@ -1,5 +1,5 @@ default intllib? -display_lib -font_lib +display_api +font_api technic? diff --git a/steles/nodes.lua b/steles/nodes.lua index 39eb9ee..79a9ed3 100644 --- a/steles/nodes.lua +++ b/steles/nodes.lua @@ -21,25 +21,16 @@ local S = steles.intllib local F = function(...) return minetest.formspec_escape(S(...)) end -function steles.on_receive_fields(pos, formname, fields, player) - if not minetest.is_protected(pos, player:get_player_name()) then - local meta = minetest.get_meta(pos) - if fields and fields.ok then - meta:set_string("display_text", fields.display_text) - meta:set_string("infotext", "\""..fields.display_text.."\"") - display_lib.update_entities(pos) - end - end -end - -display_lib.register_display_entity("steles:text") +display_api.register_display_entity("steles:text") for i, material in ipairs(steles.materials) do local ndef = minetest.registered_nodes[material] if ndef then + local groups = table.copy(ndef.groups) local parts = material:split(":") + groups.display_modpack_node = 1 minetest.register_node("steles:"..parts[2].."_stele", { description = steles.materials_desc[i], @@ -51,43 +42,53 @@ for i, material in ipairs(steles.materials) do node_box = { type = "fixed", fixed = { - {-5/16, -4/16, -2/16, 5/16, 0.5, 2/16}, - {-7/16, -0.5, -4/16, 7/16, -4/16, 4/16} - } + {-5/16, -5/16, -2/16, 5/16, 0.5, 2/16}, + {-7/16, -0.5, -4/16, 7/16, -5/16, 4/16} + }, }, - groups = ndef.groups, + groups = groups, display_entities = { ["steles:text"] = { - 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 }, + on_display_update = font_api.on_display_update, + depth = -2/16 - display_api.entity_spacing, + top = -2/16, + aspect_ratio = 0.4, + size = { x = 10/16, y = 12/16 }, maxlines = 3, }, }, - on_place = display_lib.on_place, + on_place = function(itemstack, placer, pointed_thing) + minetest.rotate_node(itemstack, placer, pointed_thing) + return display_api.on_place(itemstack, placer, pointed_thing) + end, on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", "size[6,4]" - .."textarea[0.5,0.7;5.5,2;display_text;" - ..F("Displayed text (3 lines max)") - ..";${display_text}]" - .."button_exit[2,3;2,1;ok;"..F("Write").."]") - display_lib.on_construct(pos) - end, - on_destruct = display_lib.on_destruct, - on_rotate = display_lib.on_rotate, + local meta = minetest.get_meta(pos) + meta:set_string("formspec", string.format([=[ + size[6,4]%s%s%s + textarea[0.5,0.7;5.5,2;display_text;%s;${display_text}] + button[1,3;2,1;font;%s] + button_exit[3,3;2,1;ok;%s]]=], + default.gui_bg, default.gui_bg_img, default.gui_slots, + F("Displayed text (3 lines max)"), + F("Font"), F("Write"))) + display_api.on_construct(pos) + end, + on_destruct = display_api.on_destruct, + on_rotate = display_api.on_rotate, on_receive_fields = function(pos, formname, fields, player) - if not minetest.is_protected(pos, player:get_player_name()) then - local meta = minetest.get_meta(pos) - if fields and fields.ok then - meta:set_string("display_text", fields.display_text) - meta:set_string("infotext", "\""..fields.display_text.."\"") - display_lib.update_entities(pos) - end - end - end, - on_punch = function(pos, node, player, pointed_thing) display_lib.update_entities(pos) end, + if not minetest.is_protected(pos, player:get_player_name()) then + local meta = minetest.get_meta(pos) + if fields.ok or fields.font then + meta:set_string("display_text", fields.display_text) + meta:set_string("infotext", "\""..fields.display_text.."\"") + display_api.update_entities(pos) + end + if fields.font then + font_api.show_font_list(player, pos) + end + end + end, + on_punch = display_api.update_entities, }) end end |
