Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #8381: reference \t and \T PML indents properly.

Browse Source
This commit is contained in:
John Schember 2011-01-16 21:35:53 -05:00
parent cfa57f63df
commit 34da8b73cc
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/calibre/ebooks/pml/pmlconverter.py
View File

@ -34,18 +34,15 @@ class PML_HTMLizer(object):
'ra', 'ra',
'c', 'c',
'r', 'r',
't',
's', 's',
'l', 'l',
'k', 'k',
'T',
'FN', 'FN',
'SB', 'SB',
] ]
STATES_VALUE_REQ = [ STATES_VALUE_REQ = [
'a', 'a',
'T',
'FN', 'FN',
'SB', 'SB',
] ]
@ -96,8 +93,6 @@ class PML_HTMLizer(object):
'Sb': 'sb', 'Sb': 'sb',
'c': 'c', 'c': 'c',
'r': 'r', 'r': 'r',
't': 't',
'T': 'T',
'i': 'i', 'i': 'i',
'I': 'i', 'I': 'i',
'u': 'u', 'u': 'u',
@ -133,8 +128,6 @@ class PML_HTMLizer(object):
DIV_STATES = [ DIV_STATES = [
'c', 'c',
'r', 'r',
't',
'T',
'FN', 'FN',
'SB', 'SB',
] ]
@ -255,8 +248,6 @@ class PML_HTMLizer(object):
for key, val in self.state.items(): for key, val in self.state.items():
if val[0]: if val[0]:
if key == 'T':
self.state['T'][0] = False
if key in self.DIV_STATES: if key in self.DIV_STATES:
div.append(key) div.append(key)
elif key in self.SPAN_STATES: elif key in self.SPAN_STATES:
@ -506,6 +497,9 @@ class PML_HTMLizer(object):
self.toc = TOC() self.toc = TOC()
self.file_name = file_name self.file_name = file_name
indent_state = {'t': False, 'T': False}
adv_indent_val = ''
for s in self.STATES: for s in self.STATES:
self.state[s] = [False, '']; self.state[s] = [False, ''];
@ -515,6 +509,8 @@ class PML_HTMLizer(object):
parsed = [] parsed = []
empty = True empty = True
basic_indent = indent_state['t']
adv_indent = indent_state['T']
# Must use StringIO, cStringIO does not support unicode # Must use StringIO, cStringIO does not support unicode
line = StringIO.StringIO(line) line = StringIO.StringIO(line)
@ -527,7 +523,7 @@ class PML_HTMLizer(object):
if c == '\\': if c == '\\':
c = line.read(1) c = line.read(1)
if c in 'qcrtTiIuobBlk': if c in 'qcriIuobBlk':
text = self.process_code(c, line) text = self.process_code(c, line)
elif c in 'FS': elif c in 'FS':
l = line.read(1) l = line.read(1)
@ -574,6 +570,15 @@ class PML_HTMLizer(object):
elif c == 'w': elif c == 'w':
empty = False empty = False
text = '<hr width="%s" />' % self.code_value(line) text = '<hr width="%s" />' % self.code_value(line)
elif c == 't':
indent_state[c] = not indent_state[c]
if indent_state[c]:
basic_indent = True
elif c == 'T':
indent_state[c] = not indent_state[c]
if indent_state[c]:
adv_indent = True
adv_indent_val = self.code_value(line)
elif c == '-': elif c == '-':
empty = False empty = False
text = '&shy;' text = '&shy;'
@ -590,6 +595,16 @@ class PML_HTMLizer(object):
if not empty: if not empty:
text = self.end_line() text = self.end_line()
parsed.append(text) parsed.append(text)
if basic_indent:
parsed.insert(0, self.STATES_TAGS['t'][0])
parsed.append(self.STATES_TAGS['t'][1])
elif adv_indent:
parsed.insert(0, self.STATES_TAGS['T'][0] % adv_indent_val)
parsed.append(self.STATES_TAGS['T'][1])
indent_state['T'] = False
adv_indent_val = ''
output.append(u''.join(parsed)) output.append(u''.join(parsed))
line.close() line.close()