From a62c15cee0ac4ab07d100f5ebf4ec01e92d7ceac Mon Sep 17 00:00:00 2001 From: "Marshall T. Vandegrift" Date: Sat, 17 Jan 2009 15:50:07 -0500 Subject: [PATCH 1/2] Fix break to any2lit. --- src/calibre/ebooks/lit/from_any.py | 3 ++- src/calibre/ebooks/lit/writer.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/lit/from_any.py b/src/calibre/ebooks/lit/from_any.py index cd8b5a115c..af368408ba 100644 --- a/src/calibre/ebooks/lit/from_any.py +++ b/src/calibre/ebooks/lit/from_any.py @@ -38,6 +38,7 @@ def any2lit(opts, path): os.mkdir(oebdir) opts.output = os.path.join(tdir, 'dummy.epub') opts.profile = 'None' + opts.dont_split_on_page_breaks = True any2epub(opts, path, create_epub=False, oeb_cover=True, extract_to=oebdir) opf = glob.glob(os.path.join(oebdir, '*.opf'))[0] opts.output = orig_output @@ -56,4 +57,4 @@ def main(args=sys.argv): return 0 if __name__ == '__main__': - sys.exit(main()) \ No newline at end of file + sys.exit(main()) diff --git a/src/calibre/ebooks/lit/writer.py b/src/calibre/ebooks/lit/writer.py index 67450fb385..90fca90738 100644 --- a/src/calibre/ebooks/lit/writer.py +++ b/src/calibre/ebooks/lit/writer.py @@ -725,7 +725,7 @@ def oeb2lit(opts, inpath): outpath = os.path.basename(inpath) outpath = os.path.splitext(outpath)[0] + '.lit' outpath = os.path.abspath(outpath) - context = Context('Firefox', 'MSReader') + context = Context('Browser', 'MSReader') oeb = OEBBook(inpath, logger=logger) tocadder = HTMLTOCAdder() tocadder.transform(oeb, context) From 3eef5f35bf71bec485dc304665235dbb2e1d5b8b Mon Sep 17 00:00:00 2001 From: "Marshall T. Vandegrift" Date: Sat, 17 Jan 2009 15:59:26 -0500 Subject: [PATCH 2/2] Fix further breakage in oeb2lit --- src/calibre/ebooks/lit/writer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/ebooks/lit/writer.py b/src/calibre/ebooks/lit/writer.py index 90fca90738..6d97471d75 100644 --- a/src/calibre/ebooks/lit/writer.py +++ b/src/calibre/ebooks/lit/writer.py @@ -143,7 +143,7 @@ def warn(x): class ReBinary(object): NSRMAP = {'': None, XML_NS: 'xml'} - def __init__(self, root, path, oeb, map=HTML_MAP): + def __init__(self, root, item, oeb, map=HTML_MAP): self.item = item self.logger = oeb.logger self.manifest = oeb.manifest