From 97a4f94d17e02c0155804a6353cc716b16473f23 Mon Sep 17 00:00:00 2001 From: cracyc Date: Thu, 27 Jul 2017 22:14:09 -0500 Subject: plugins/data: fix small things (nw) --- plugins/data/data_command.lua | 6 +++++- plugins/data/load_dat.lua | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/data/data_command.lua b/plugins/data/data_command.lua index 6923d80c1e8..5e22274e5f0 100644 --- a/plugins/data/data_command.lua +++ b/plugins/data/data_command.lua @@ -3,7 +3,7 @@ local info, ver local datread = require("data/load_dat") do local convert = require("data/button_char") - datread, ver = datread.open("command.dat", "# Command List%-Shorthand", convert) + datread, ver = datread.open("command.dat", "# Command List%-.+hand", convert) end function dat.check(set, softlist) @@ -23,4 +23,8 @@ function dat.get() return info end +function dat.ver() + return ver +end + return dat diff --git a/plugins/data/load_dat.lua b/plugins/data/load_dat.lua index 6f80458c593..d222dde5b0a 100644 --- a/plugins/data/load_dat.lua +++ b/plugins/data/load_dat.lua @@ -141,6 +141,7 @@ function datfile.open(file, vertag, fixupcb) set:gsub("([^,]+)", function(s) sets[#sets + 1] = s end) if #tags > 0 and #sets > 0 then local tag1 = info2:match("^$([^%s]*)") + data = data:gsub("\r", "") -- strip crs if fixupcb then data = fixupcb(data) end -- cgit v1.2.3