Merge pull request #26 from codexp/issue-25

add support for cyrillic characters

encoding.lua

@@ -0,0 +1,265 @@
+-- encoding borrowed from signs_lib mod of https://github.com/lord-server/lord
+
+local ansi_decode = {
+	[128] = "\208\130",
+	[129] = "\208\131",
+	[130] = "\226\128\154",
+	[131] = "\209\147",
+	[132] = "\226\128\158",
+	[133] = "\226\128\166",
+	[134] = "\226\128\160",
+	[135] = "\226\128\161",
+	[136] = "\226\130\172",
+	[137] = "\226\128\176",
+	[138] = "\208\137",
+	[139] = "\226\128\185",
+	[140] = "\208\138",
+	[141] = "\208\140",
+	[142] = "\208\139",
+	[143] = "\208\143",
+	[144] = "\209\146",
+	[145] = "\226\128\152",
+	[146] = "\226\128\153",
+	[147] = "\226\128\156",
+	[148] = "\226\128\157",
+	[149] = "\226\128\162",
+	[150] = "\226\128\147",
+	[151] = "\226\128\148",
+	[152] = "\194\152",
+	[153] = "\226\132\162",
+	[154] = "\209\153",
+	[155] = "\226\128\186",
+	[156] = "\209\154",
+	[157] = "\209\156",
+	[158] = "\209\155",
+	[159] = "\209\159",
+	[160] = "\194\160",
+	[161] = "\209\142",
+	[162] = "\209\158",
+	[163] = "\208\136",
+	[164] = "\194\164",
+	[165] = "\210\144",
+	[166] = "\194\166",
+	[167] = "\194\167",
+	[168] = "\208\129",
+	[169] = "\194\169",
+	[170] = "\208\132",
+	[171] = "\194\171",
+	[172] = "\194\172",
+	[173] = "\194\173",
+	[174] = "\194\174",
+	[175] = "\208\135",
+	[176] = "\194\176",
+	[177] = "\194\177",
+	[178] = "\208\134",
+	[179] = "\209\150",
+	[180] = "\210\145",
+	[181] = "\194\181",
+	[182] = "\194\182",
+	[183] = "\194\183",
+	[184] = "\209\145",
+	[185] = "\226\132\150",
+	[186] = "\209\148",
+	[187] = "\194\187",
+	[188] = "\209\152",
+	[189] = "\208\133",
+	[190] = "\209\149",
+	[191] = "\209\151"
+}
+local utf8_decode = {
+	[128] = {
+		[147] = "\150",
+		[148] = "\151",
+		[152] = "\145",
+		[153] = "\146",
+		[154] = "\130",
+		[156] = "\147",
+		[157] = "\148",
+		[158] = "\132",
+		[160] = "\134",
+		[161] = "\135",
+		[162] = "\149",
+		[166] = "\133",
+		[176] = "\137",
+		[185] = "\139",
+		[186] = "\155"
+	},
+	[130] = {[172] = "\136"},
+	[132] = {[150] = "\185", [162] = "\153"},
+	[194] = {
+		[152] = "\152",
+		[160] = "\160",
+		[164] = "\164",
+		[166] = "\166",
+		[167] = "\167",
+		[169] = "\169",
+		[171] = "\171",
+		[172] = "\172",
+		[173] = "\173",
+		[174] = "\174",
+		[176] = "\176",
+		[177] = "\177",
+		[181] = "\181",
+		[182] = "\182",
+		[183] = "\183",
+		[187] = "\187"
+	},
+	[208] = {
+		[129] = "\168",
+		[130] = "\128",
+		[131] = "\129",
+		[132] = "\170",
+		[133] = "\189",
+		[134] = "\178",
+		[135] = "\175",
+		[136] = "\163",
+		[137] = "\138",
+		[138] = "\140",
+		[139] = "\142",
+		[140] = "\141",
+		[143] = "\143",
+		[144] = "\192",
+		[145] = "\193",
+		[146] = "\194",
+		[147] = "\195",
+		[148] = "\196",
+		[149] = "\197",
+		[150] = "\198",
+		[151] = "\199",
+		[152] = "\200",
+		[153] = "\201",
+		[154] = "\202",
+		[155] = "\203",
+		[156] = "\204",
+		[157] = "\205",
+		[158] = "\206",
+		[159] = "\207",
+		[160] = "\208",
+		[161] = "\209",
+		[162] = "\210",
+		[163] = "\211",
+		[164] = "\212",
+		[165] = "\213",
+		[166] = "\214",
+		[167] = "\215",
+		[168] = "\216",
+		[169] = "\217",
+		[170] = "\218",
+		[171] = "\219",
+		[172] = "\220",
+		[173] = "\221",
+		[174] = "\222",
+		[175] = "\223",
+		[176] = "\224",
+		[177] = "\225",
+		[178] = "\226",
+		[179] = "\227",
+		[180] = "\228",
+		[181] = "\229",
+		[182] = "\230",
+		[183] = "\231",
+		[184] = "\232",
+		[185] = "\233",
+		[186] = "\234",
+		[187] = "\235",
+		[188] = "\236",
+		[189] = "\237",
+		[190] = "\238",
+		[191] = "\239"
+	},
+	[209] = {
+		[128] = "\240",
+		[129] = "\241",
+		[130] = "\242",
+		[131] = "\243",
+		[132] = "\244",
+		[133] = "\245",
+		[134] = "\246",
+		[135] = "\247",
+		[136] = "\248",
+		[137] = "\249",
+		[138] = "\250",
+		[139] = "\251",
+		[140] = "\252",
+		[141] = "\253",
+		[142] = "\254",
+		[143] = "\255",
+		[144] = "\161",
+		[145] = "\184",
+		[146] = "\144",
+		[147] = "\131",
+		[148] = "\186",
+		[149] = "\190",
+		[150] = "\179",
+		[151] = "\191",
+		[152] = "\188",
+		[153] = "\154",
+		[154] = "\156",
+		[155] = "\158",
+		[156] = "\157",
+		[158] = "\162",
+		[159] = "\159"
+	},
+	[210] = {[144] = "\165", [145] = "\180"}
+}
+
+local nmdc = {
+	[36] = "$",
+	[124] = "|"
+}
+
+function AnsiToUtf8(s)
+	local r, b = ""
+	for i = 1, s and s:len() or 0 do
+		b = s:byte(i)
+		if b < 128 then
+			r = r .. string.char(b)
+		else
+			if b > 239 then
+				r = r .. "\209" .. string.char(b - 112)
+			elseif b > 191 then
+				r = r .. "\208" .. string.char(b - 48)
+			elseif ansi_decode[b] then
+				r = r .. ansi_decode[b]
+			else
+				r = r .. "_"
+			end
+		end
+	end
+	return r
+end
+
+function Utf8ToAnsi(s)
+	local a, j, r, b = 0, 0, ""
+	for i = 1, s and s:len() or 0 do
+		b = s:byte(i)
+		if b < 128 then
+			if nmdc[b] then
+				r = r .. nmdc[b]
+			else
+				r = r .. string.char(b)
+			end
+		elseif a == 2 then
+			a, j = a - 1, b
+		elseif a == 1 then
+			--if j == nil or b == nil then return r end
+			--print(j)
+			--print(b)
+			--local ansi = utf8_decode[j]
+			--if ansi == nil then return r end
+			--if ansi[b] == nil then return r end
+			if utf8_decode[j] then
+				if utf8_decode[j][b] then
+					a, r = a - 1, r .. utf8_decode[j][b]
+				end
+			end
+		elseif b == 226 then
+			a = 2
+		elseif b == 194 or b == 208 or b == 209 or b == 210 then
+			j, a = b, 1
+		else
+			r = r .. "_"
+		end
+	end
+	return r
+end

init.lua

@@ -16,8 +16,16 @@ local enable_colored_metal_signs = true
 local current_keyword = minetest.settings:get("interact_keyword") or "iaccept"
 
 signs_lib = {}
+signs_lib.path = minetest.get_modpath(minetest.get_current_modname())
 screwdriver = screwdriver or {}
 
+-- Load support for intllib.
+local S, NS = dofile(signs_lib.path .. "/intllib.lua")
+signs_lib.gettext = S
+
+-- text encoding
+dofile(signs_lib.path .. "/encoding.lua");
+
 signs_lib.wallmounted_rotate = function(pos, node, user, mode, new_param2)
 	if mode ~= screwdriver.ROTATE_AXIS then return false end
 	minetest.swap_node(pos, {name = node.name, param2 = (node.param2 + 1) % 6})
@@ -113,11 +121,6 @@ signs_lib.sign_post_model = {
 	}
 }
 
--- Load support for intllib.
-local MP = minetest.get_modpath(minetest.get_current_modname())
-local S, NS = dofile(MP.."/intllib.lua")
-signs_lib.gettext = S
-
 -- the list of standard sign nodes
 
 signs_lib.sign_node_list = {
@@ -174,28 +177,48 @@ end
 
 -- CONSTANTS
 
-local MP = minetest.get_modpath("signs_lib")
-
--- Used by `build_char_db' to locate the file.
-local FONT_FMT = "%s/hdf_%02x.png"
-
--- Simple texture name for building text texture.
-local FONT_FMT_SIMPLE = "hdf_%02x.png"
-
 -- Path to the textures.
-local TP = MP.."/textures"
+local TP = signs_lib.path .. "/textures"
+-- Font file formatter
+local CHAR_FILE = "%s_%02x.png"
+-- Fonts path
+local CHAR_PATH = TP .. "/" .. CHAR_FILE
+
+-- Font name.
+local font_name = "hdf"
 
 -- Lots of overkill here. KISS advocates, go away, shoo! ;) -- kaeza
 
 local PNG_HDR = string.char(0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A)
 
+-- check if a file does exist
+-- to avoid reopening file after checking again
+-- pass TRUE as second argument
+function file_exists(name, return_handle, mode)
+	mode = mode or "r";
+	local f = io.open(name, mode)
+	if f ~= nil then
+		if (return_handle) then
+			return f
+		end
+		io.close(f) 
+		return true 
+	else 
+		return false 
+	end
+end
+
 -- Read the image size from a PNG file.
 -- Returns image_w, image_h.
 -- Only the LSB is read from each field!
 local function read_image_size(filename)
-	local f = io.open(filename, "rb")
+	local f = file_exists(filename, true, "rb")
+	-- file might not exist (don't crash the game)
+	if (not f) then
+		return 0, 0
+	end
 	f:seek("set", 0x0)
-	local hdr = f:read(8)
+	local hdr = f:read(string.len(PNG_HDR))
 	if hdr ~= PNG_HDR then
 		f:close()
 		return
@@ -243,8 +266,8 @@ local function build_char_db()
 	local total_width = 0
 	local char_count = 0
 
-	for c = 32, 126 do
+	for c = 32, 255 do
-		local w, h = read_image_size(FONT_FMT:format(TP, c))
+		local w, h = read_image_size(CHAR_PATH:format(font_name, c))
 		if w and h then
 			local ch = string.char(c)
 			charwidth[ch] = w
@@ -308,6 +331,19 @@ local function fill_line(x, y, w, c)
 	return table.concat(tex)
 end
 
+-- make char texture file name
+-- if texture file does not exist use fallback texture instead
+local function char_tex(font_name, ch)
+	local c = ch:byte()
+	local exists, tex = file_exists(CHAR_PATH:format(font_name, c))
+	if exists and c ~= 14 then
+		tex = CHAR_FILE:format(font_name, c)
+	else
+		tex = CHAR_FILE:format(font_name, 0x0)
+	end
+	return tex, exists
+end
+
 local function make_line_texture(line, lineno, pos)
 
 	local width = 0
@@ -344,9 +380,9 @@ local function make_line_texture(line, lineno, pos)
 					end
 					if #chars < MAX_INPUT_CHARS then
 						table.insert(chars, {
-							off=ch_offs,
+							off = ch_offs,
-							tex=FONT_FMT_SIMPLE:format(c:byte()),
+							tex = char_tex(font_name, c),
-							col=("%X"):format(cur_color),
+							col = ("%X"):format(cur_color),
 						})
 					end
 					ch_offs = ch_offs + w
@@ -387,7 +423,10 @@ local function make_line_texture(line, lineno, pos)
 			end
 			table.insert(texture, (":%d,%d=%s"):format(xpos + ch.off, ypos, ch.tex))
 		end
-		table.insert(texture, (":%d,%d=hdf_20.png"):format(xpos + word.w, ypos))
+		table.insert(
+			texture, 
+			(":%d,%d="):format(xpos + word.w, ypos) .. char_tex(font_name, " ")
+		)
 		xpos = xpos + word.w + charwidth[" "]
 		if xpos >= (SIGN_WIDTH + charwidth[" "]) then break end
 	end
@@ -413,10 +452,11 @@ end
 
 local function set_obj_text(obj, text, new, pos)
 	local split = new and split_lines_and_words or split_lines_and_words_old
+	local text_ansi = Utf8ToAnsi(text)
 	local n = minetest.registered_nodes[minetest.get_node(pos).name]
 	local text_scale = (n and n.text_scale) or DEFAULT_TEXT_SCALE
 	obj:set_properties({
-		textures={make_sign_texture(split(text), pos)},
+		textures={make_sign_texture(split(text_ansi), pos)},
 		visual_size = text_scale,
 	})
 end
@@ -636,7 +676,7 @@ function signs_lib.receive_fields(pos, formname, fields, sender, lock)
 	if fields and fields.text and fields.ok then
 		minetest.log("action", S("@1 wrote \"@2\" to @3sign at @4",
 			(sender:get_player_name() or ""),
-			fields.text,
+			fields.text:gsub('\\', '\\\\'):gsub("\n", "\\n"),
 			lockstr,
 			minetest.pos_to_string(pos)
 		))