From 315b6e150dd96e9e276f3d817a937fbe8271d85c Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Mon, 30 Dec 2024 22:15:41 -0800 Subject: [PATCH] enable synthetic spreads for all devices (#789) --- kindlecomicconverter/comic2ebook.py | 132 ++++++++++++---------------- 1 file changed, 58 insertions(+), 74 deletions(-) diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py index 3a9afcf..6dc1554 100755 --- a/kindlecomicconverter/comic2ebook.py +++ b/kindlecomicconverter/comic2ebook.py @@ -298,22 +298,15 @@ def buildOPF(dstdir, title, filelist, cover=None): "\n", "\n", "\n", - "landscape\n", - "pre-paginated\n", "\n"]) if options.kfx: f.writelines(["\n"]) else: f.writelines(["\n"]) - elif options.supportSyntheticSpread: - f.writelines([ - "landscape\n", - "pre-paginated\n" - ]) - else: - f.writelines(["portrait\n", - "portrait\n", - "pre-paginated\n"]) + f.writelines([ + "landscape\n", + "pre-paginated\n" + ]) f.writelines(["\n\n\n", "\n" % (entry, - pageSpreadProperty("center")) - ) - pageside = "right" - elif entry.endswith("-b"): - f.write( - "\n" % (entry, - pageSpreadProperty("right")) - ) - pageside = "right" - elif entry.endswith("-c"): - f.write( - "\n" % (entry, - pageSpreadProperty("left")) - ) - pageside = "right" - else: - f.write( - "\n" % (entry, - pageSpreadProperty(pageside)) - ) - if pageside == "right": - pageside = "left" - else: - pageside = "right" + for entry in reflist: + if options.righttoleft: + if entry.endswith("-a"): + f.write( + "\n" % (entry, + pageSpreadProperty("center")) + ) + pageside = "right" + elif entry.endswith("-b"): + f.write( + "\n" % (entry, + pageSpreadProperty("right")) + ) + pageside = "right" + elif entry.endswith("-c"): + f.write( + "\n" % (entry, + pageSpreadProperty("left")) + ) + pageside = "right" else: - if entry.endswith("-a"): - f.write( - "\n" % (entry, - pageSpreadProperty("center")) - ) - pageside = "left" - elif entry.endswith("-b"): - f.write( - "\n" % (entry, - pageSpreadProperty("left")) - ) - pageside = "left" - elif entry.endswith("-c"): - f.write( - "\n" % (entry, - pageSpreadProperty("right")) - ) + f.write( + "\n" % (entry, + pageSpreadProperty(pageside)) + ) + if pageside == "right": pageside = "left" else: - f.write( - "\n" % (entry, - pageSpreadProperty(pageside)) - ) - if pageside == "right": - pageside = "left" - else: - pageside = "right" - else: - for entry in reflist: - f.write("\n") + pageside = "right" + else: + if entry.endswith("-a"): + f.write( + "\n" % (entry, + pageSpreadProperty("center")) + ) + pageside = "left" + elif entry.endswith("-b"): + f.write( + "\n" % (entry, + pageSpreadProperty("left")) + ) + pageside = "left" + elif entry.endswith("-c"): + f.write( + "\n" % (entry, + pageSpreadProperty("right")) + ) + pageside = "left" + else: + f.write( + "\n" % (entry, + pageSpreadProperty(pageside)) + ) + if pageside == "right": + pageside = "left" + else: + pageside = "right" f.write("\n\n") f.close() os.mkdir(os.path.join(dstdir, 'META-INF')) @@ -1063,7 +1052,6 @@ def checkOptions(options): options.keep_epub = True options.format = 'MOBI' options.kfx = False - options.supportSyntheticSpread = False if options.format == 'Auto': if options.profile in ['KDX']: options.format = 'CBZ' @@ -1075,10 +1063,6 @@ def checkOptions(options): options.iskindle = True else: options.isKobo = True - # Other Kobo devices probably support synthetic spreads as well, but - # they haven't been tested. - if options.profile in ['KoF']: - options.supportSyntheticSpread = True if options.white_borders: options.bordersColor = 'white' if options.black_borders: