From edeedddeb80bc4323f3e7cbb5ac7fd74434378f2 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 12 Jul 2009 20:52:03 -0400 Subject: [PATCH] Fix more errors when moving to new txtml output. --- src/calibre/ebooks/pdb/palmdoc/writer.py | 5 +++-- src/calibre/ebooks/pdb/ztxt/writer.py | 4 ++-- src/calibre/ebooks/txt/txtml.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/calibre/ebooks/pdb/palmdoc/writer.py b/src/calibre/ebooks/pdb/palmdoc/writer.py index f99c698b2d..12c1c4aaa7 100644 --- a/src/calibre/ebooks/pdb/palmdoc/writer.py +++ b/src/calibre/ebooks/pdb/palmdoc/writer.py @@ -3,6 +3,7 @@ ''' Writer content to palmdoc pdb file. ''' +import os __license__ = 'GPL v3' __copyright__ = '2009, John Schember ' @@ -46,10 +47,10 @@ class Writer(FormatWriter): def _generate_text(self, oeb_book): writer = TXTMLizer(self.log) - txt = writer.extract_content(oeb_book, opts) + txt = writer.extract_content(oeb_book, self.opts) self.log.debug('\tReplacing newlines with selected type...') - txt = specified_newlines(TxtNewlines(opts.newline).newline, txt).encode(self.opts.output_encoding, 'replace') + txt = specified_newlines(TxtNewlines('windows').newline, txt).encode(self.opts.output_encoding, 'replace') txt_length = len(txt) diff --git a/src/calibre/ebooks/pdb/ztxt/writer.py b/src/calibre/ebooks/pdb/ztxt/writer.py index 48600714ca..566c0def44 100644 --- a/src/calibre/ebooks/pdb/ztxt/writer.py +++ b/src/calibre/ebooks/pdb/ztxt/writer.py @@ -51,10 +51,10 @@ class Writer(FormatWriter): def _generate_text(self, oeb_book): writer = TXTMLizer(self.log) - txt = writer.extract_content(oeb_book, opts) + txt = writer.extract_content(oeb_book, self.opts) self.log.debug('\tReplacing newlines with selected type...') - txt = specified_newlines(TxtNewlines(opts.newline).newline, txt).encode(self.opts.output_encoding, 'replace') + txt = specified_newlines(TxtNewlines('windows').newline, txt).encode(self.opts.output_encoding, 'replace') txt_length = len(txt) diff --git a/src/calibre/ebooks/txt/txtml.py b/src/calibre/ebooks/txt/txtml.py index d609426d93..94f2a181c5 100644 --- a/src/calibre/ebooks/txt/txtml.py +++ b/src/calibre/ebooks/txt/txtml.py @@ -37,7 +37,7 @@ class TXTMLizer(object): self.log = log def extract_content(self, oeb_book, opts): - self.log.info('Converting XHTML to PML markup...') + self.log.info('Converting XHTML to TXT...') self.oeb_book = oeb_book self.opts = opts return self.mlize_spine()