From f50e8d695c46888d678a81a2643a812441ce18b2 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Mon, 5 Mar 2012 13:43:23 +0800 Subject: [PATCH] mod: add UniReader:cleanUpTOCTitle() re-apply the changes introduced by HW in commit: 3c56f50cae98edb18d3ea8580dd9bb2fd715f658 I mistakenly overwrote it when merging from djvu branch. :( Since the title needs to be cleaned in two places, I turn it into a method. --- unireader.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/unireader.lua b/unireader.lua index 4852dbfbd..eb936d131 100644 --- a/unireader.lua +++ b/unireader.lua @@ -407,6 +407,10 @@ function UniReader:setrotate(rotate) self:goto(self.pageno) end +function UniReader:cleanUpTOCTitle(title) + return title:gsub("\13", "") +end + function UniReader:fillTOC() self.toc = self.doc:getTOC() end @@ -419,8 +423,7 @@ function UniReader:getTOCTitleByPage(pageno) for _k,_v in ipairs(self.toc) do if _v.page >= pageno then - --@TODO clean up special characters in title 05.03 2012 - return _v.title + return self:cleanUpTOCTitle(_v.title) end end return "" @@ -435,7 +438,7 @@ function UniReader:showTOC() -- build menu items for _k,_v in ipairs(self.toc) do table.insert(menu_items, - (" "):rep(_v.depth-1).._v.title) + (" "):rep(_v.depth-1)..self:cleanUpTOCTitle(_v.title)) end toc_menu = SelectMenu:new{ menu_title = "Table of Contents",