From 922b53ac60d939e88f18c298548884dc5175abaf Mon Sep 17 00:00:00 2001 From: Tigran Aivazian Date: Fri, 14 Sep 2012 21:27:06 +0100 Subject: [PATCH 1/2] Cleanup of cleanUpTocTitle() function: (f(x)) is a more elegant way of forcing the return of a single value than the use of a dummy variable. --- unireader.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/unireader.lua b/unireader.lua index b8bf01596..1ff7775be 100644 --- a/unireader.lua +++ b/unireader.lua @@ -1605,8 +1605,7 @@ function UniReader:screenRotate(orien) end function UniReader:cleanUpTocTitle(title) - local s, _ = title:gsub("\13", "") - return s + return (title:gsub("\13", "")) end function UniReader:fillToc() From 29b1ef5ddefe5fc4a385cc57941aba77f0b30bb5 Mon Sep 17 00:00:00 2001 From: Tigran Aivazian Date: Fri, 14 Sep 2012 21:43:23 +0100 Subject: [PATCH 2/2] Cleanup of expandAllTOCSubItems(). --- unireader.lua | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/unireader.lua b/unireader.lua index 1ff7775be..3caa70d1c 100644 --- a/unireader.lua +++ b/unireader.lua @@ -1726,15 +1726,12 @@ end function UniReader:expandAllTOCSubItems(xidx, item_no) if string.find(self.toc_cview[item_no], "^+ ") then for i=#self.toc_children[xidx],1,-1 do - table.insert(self.toc_cview, item_no+1, - self.toc_xview[self.toc_children[xidx][i]]) - table.insert(self.toc_curidx_to_x, item_no+1, - self.toc_children[xidx][i]) + table.insert(self.toc_cview, item_no+1, self.toc_xview[self.toc_children[xidx][i]]) + table.insert(self.toc_curidx_to_x, item_no+1, self.toc_children[xidx][i]) self:expandAllTOCSubItems(self.toc_curidx_to_x[item_no+1], item_no+1) end self.toc_cview[item_no] = string.gsub(self.toc_cview[item_no], "^+ ", "- ", 1) end - end -- calculate the position as index into self.toc_cview[],