From 35e4ceaf579c80557ed236291be2ebb25adbfc4c Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Thu, 19 Apr 2012 00:04:41 +0800 Subject: [PATCH] fix page comparing in addJump --- cre.cpp | 2 +- crereader.lua | 4 ++-- unireader.lua | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cre.cpp b/cre.cpp index 058a7a579..e3b9243e0 100644 --- a/cre.cpp +++ b/cre.cpp @@ -99,7 +99,7 @@ static int getNumberOfPages(lua_State *L) { static int getCurrentPage(lua_State *L) { CreDocument *doc = (CreDocument*) luaL_checkudata(L, 1, "credocument"); - lua_pushinteger(L, doc->text_view->getCurPage()); + lua_pushinteger(L, doc->text_view->getCurPage()+1); return 1; } diff --git a/crereader.lua b/crereader.lua index 93270a701..c197cf2aa 100644 --- a/crereader.lua +++ b/crereader.lua @@ -114,7 +114,7 @@ function CREReader:goto(pos, is_ignore_jump, pos_type) self.doc:gotoPos(pos) end - -- add to jump_stack, distinguish jump from normal page turn + -- add to jump history, distinguish jump from normal page turn -- NOTE: -- even though we have called gotoPos() or gotoXPointer() previously, -- self.pos hasn't been updated yet here, so we can still make use of it. @@ -168,7 +168,7 @@ function CREReader:prevView() end ---------------------------------------------------- --- jump stack related methods +-- jump history related methods ---------------------------------------------------- function CREReader:isSamePage(p1, p2) return self.doc:getPageFromXPointer(p1) == self.doc:getPageFromXPointer(p2) diff --git a/unireader.lua b/unireader.lua index d13261ad6..53305e873 100644 --- a/unireader.lua +++ b/unireader.lua @@ -1362,7 +1362,7 @@ function UniReader:addJump(pageno) -- set up new head -- if backward stack top is the same as page to record, remove it if #self.jump_history ~= 0 and - self.jump_history[#self.jump_history].page == pageno then + self:isSamePage(self.jump_history[#self.jump_history].page, pageno) then self.jump_history[#self.jump_history] = nil end table.insert(self.jump_history, jump_item)