From dc18dbd5b0d1aad09dfdf80abfaf4cc0ec72be81 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 24 Sep 2013 18:37:14 +0530 Subject: [PATCH] ... --- src/calibre/ebooks/docx/settings.py | 4 +++- src/calibre/ebooks/docx/to_html.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/docx/settings.py b/src/calibre/ebooks/docx/settings.py index 193c5bd3cb..be85fb9f5e 100644 --- a/src/calibre/ebooks/docx/settings.py +++ b/src/calibre/ebooks/docx/settings.py @@ -10,8 +10,10 @@ from calibre.ebooks.docx.names import XPath, get class Settings(object): - def __init__(self, root): + def __init__(self): self.default_tab_stop = 720 / 20 + + def __call__(self, root): for dts in XPath('//w:defaultTabStop[@w:val]')(root): try: self.default_tab_stop = int(get(dts, 'w:val')) / 20 diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py index fa414b9503..c6b2e230d4 100644 --- a/src/calibre/ebooks/docx/to_html.py +++ b/src/calibre/ebooks/docx/to_html.py @@ -55,6 +55,7 @@ class Convert(object): self.mi = self.docx.metadata self.body = BODY() self.theme = Theme() + self.settings = Settings() self.tables = Tables() self.fields = Fields() self.styles = Styles(self.tables) @@ -267,7 +268,7 @@ class Convert(object): except KeyError: self.log.warn('Settings %s do not exist' % sename) else: - self.settings = Settings(fromstring(seraw)) + self.settings(fromstring(seraw)) if foname is not None: try: