Merge remote-tracking branch 'upstream/master'

resolved conflicts with refactored structure
This commit is contained in:
HW
2013-10-22 17:19:08 +02:00
14 changed files with 74 additions and 19 deletions

View File

@@ -18,7 +18,7 @@ function ReaderDictionary:stardictLookup(word)
word = string.gsub(word, "%p+$", '')
DEBUG("stripped word:", word)
-- escape quotes and other funny characters in word
local std_out = io.popen("./sdcv -nj "..("%q"):format(word), "r")
local std_out = io.popen("./sdcv --utf8-input --utf8-output -nj "..("%q"):format(word), "r")
local results_str = std_out:read("*all")
if results_str then
--DEBUG("result str:", word, results_str)