diff --git a/src/libprs500/__init__.py b/src/libprs500/__init__.py index 738279ab33..5449f0ac1f 100644 --- a/src/libprs500/__init__.py +++ b/src/libprs500/__init__.py @@ -33,7 +33,7 @@ You may have to adjust the GROUP and the location of the rules file to suit your distribution. """ -__version__ = "0.3.39" +__version__ = "0.3.40" __docformat__ = "epytext" __author__ = "Kovid Goyal " diff --git a/src/libprs500/ebooks/lrf/html/table.py b/src/libprs500/ebooks/lrf/html/table.py index f47d21068c..b8be13ba35 100644 --- a/src/libprs500/ebooks/lrf/html/table.py +++ b/src/libprs500/ebooks/lrf/html/table.py @@ -163,18 +163,18 @@ class Cell(object): ts = tb.textStyle.attrs default_font = get_font(ts['fontfacename'], self.pts_to_pixels(ts['fontsize'])) parindent = self.pts_to_pixels(ts['parindent']) - ls, ws = self.pts_to_pixels(ts['baselineskip']), self.pts_to_pixels(ts['wordspace']) + ls, ws = self.pts_to_pixels(ts['baselineskip']) + self.pts_to_pixels(ts['linespace']), self.pts_to_pixels(ts['wordspace']) top, bottom, left, right = 0, 0, parindent, parindent def add_word(width, height, left, right, top, bottom): if left + width > maxwidth: left = width + ws - top += height + ls - bottom = top+height if top+height > bottom else bottom + top += ls + bottom = top+ls if top+ls > bottom else bottom else: left += (width + ws) right = left if left > right else right - bottom = top+height if top+height > bottom else bottom + bottom = top+ls if top+ls > bottom else bottom return left, right, top, bottom for token, attrs in tokens(tb):