From 24922999dc1d38f9825b41238095c9a8b31cc670 Mon Sep 17 00:00:00 2001 From: Apprentice Harper Date: Thu, 14 Apr 2016 17:35:48 +0100 Subject: [PATCH] Fix for Topaz books of no more than two text pages. --- .../DeDRM.app/Contents/Resources/genbook.py | 2 +- DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/genbook.py | 2 +- DeDRM_calibre_plugin/DeDRM_plugin/genbook.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/genbook.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/genbook.py index 3ed925d..4036896 100644 --- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/genbook.py +++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/genbook.py @@ -385,7 +385,7 @@ def generateBook(bookDir, raw, fixedimage): # print "first normal text page is", spage # get page height and width from first text page for use in stylesheet scaling - pname = 'page%04d.dat' % (pnum + 1) + pname = 'page%04d.dat' % (pnum - 1) fname = os.path.join(pageDir,pname) flat_xml = convert2xml.fromData(dict, fname) diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/genbook.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/genbook.py index 3ed925d..4036896 100644 --- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/genbook.py +++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/genbook.py @@ -385,7 +385,7 @@ def generateBook(bookDir, raw, fixedimage): # print "first normal text page is", spage # get page height and width from first text page for use in stylesheet scaling - pname = 'page%04d.dat' % (pnum + 1) + pname = 'page%04d.dat' % (pnum - 1) fname = os.path.join(pageDir,pname) flat_xml = convert2xml.fromData(dict, fname) diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/genbook.py b/DeDRM_calibre_plugin/DeDRM_plugin/genbook.py index 3ed925d..4036896 100644 --- a/DeDRM_calibre_plugin/DeDRM_plugin/genbook.py +++ b/DeDRM_calibre_plugin/DeDRM_plugin/genbook.py @@ -385,7 +385,7 @@ def generateBook(bookDir, raw, fixedimage): # print "first normal text page is", spage # get page height and width from first text page for use in stylesheet scaling - pname = 'page%04d.dat' % (pnum + 1) + pname = 'page%04d.dat' % (pnum - 1) fname = os.path.join(pageDir,pname) flat_xml = convert2xml.fromData(dict, fname)