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 #763238 (Multi-line PML chapter causes page-break)

Browse Source
This commit is contained in:
Kovid Goyal 2011-04-16 20:44:22 -06:00
commit 4f2deef829
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ __docformat__ = 'restructuredtext en'
import os import os
import re import re
import StringIO import StringIO
from copy import deepcopy
from calibre import my_unichr, prepare_string_for_xml from calibre import my_unichr, prepare_string_for_xml
from calibre.ebooks.metadata.toc import TOC from calibre.ebooks.metadata.toc import TOC
@ -25,6 +26,7 @@ class PML_HTMLizer(object):
'sp', 'sp',
'sb', 'sb',
'h1', 'h1',
'h1c',
'h2', 'h2',
'h3', 'h3',
'h4', 'h4',
@ -58,6 +60,7 @@ class PML_HTMLizer(object):
STATES_TAGS = { STATES_TAGS = {
'h1': ('<h1 style="page-break-before: always;">', '</h1>'), 'h1': ('<h1 style="page-break-before: always;">', '</h1>'),
'h1c': ('<h1>', '</h1>'),
'h2': ('<h2>', '</h2>'), 'h2': ('<h2>', '</h2>'),
'h3': ('<h3>', '</h3>'), 'h3': ('<h3>', '</h3>'),
'h4': ('<h4>', '</h4>'), 'h4': ('<h4>', '</h4>'),
@ -140,6 +143,10 @@ class PML_HTMLizer(object):
'd', 'd',
'b', 'b',
] ]
NEW_LINE_EXCHANGE_STATES = {
'h1': 'h1c',
}
def __init__(self): def __init__(self):
self.state = {} self.state = {}
@ -219,11 +226,17 @@ class PML_HTMLizer(object):
def start_line(self): def start_line(self):
start = u'' start = u''
state = deepcopy(self.state)
div = [] div = []
span = [] span = []
other = [] other = []
for key, val in state.items():
if key in self.NEW_LINE_EXCHANGE_STATES and val[0]:
state[self.NEW_LINE_EXCHANGE_STATES[key]] = val
state[key] = [False, '']
for key, val in self.state.items(): for key, val in state.items():
if val[0]: if val[0]:
if key in self.DIV_STATES: if key in self.DIV_STATES:
div.append((key, val[1])) div.append((key, val[1]))