IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2726 from jfbu/fixmultirow

Browse Source 
Fix #2723: extra spaces in latex pdf output from multirow cell
This commit is contained in:
Jean-François B 2016-07-02 07:39:47 +02:00 committed by GitHub
commit 8a79144e26
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sphinx/writers/latex.py
View File

@ -1121,28 +1121,28 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.remember_multirow[self.table.col] -= 1
if self.remember_multirowcol.get(self.table.col, 0):
extracols = self.remember_multirowcol[self.table.col]
self.body.append(' \\multicolumn{')
self.body.append('\\multicolumn{')
self.body.append(str(extracols + 1))
self.body.append('}{|l|}{}')
self.body.append('}{|l|}{}\\relax ')
self.table.col += extracols
self.body.append(' & ')
self.body.append('&')
else:
self.body.append(' & ')
self.body.append('&')
self.table.col += 1
context = ''
if 'morecols' in node:
self.body.append(' \\multicolumn{')
self.body.append('\\multicolumn{')
self.body.append(str(node.get('morecols') + 1))
if self.table.col == 1:
self.body.append('}{|l|}{')
self.body.append('}{|l|}{\\relax ')
else:
self.body.append('}{l|}{')
context += '}'
self.body.append('}{l|}{\\relax ')
context += '\\unskip}\\relax '
if 'morerows' in node:
self.body.append(' \\multirow{')
self.body.append('\\multirow{')
self.body.append(str(node.get('morerows') + 1))
self.body.append('}{*}{')
context += '}'
self.body.append('}{*}{\\relax ')
context += '\\unskip}\\relax '
self.remember_multirow[self.table.col] = node.get('morerows')
if 'morecols' in node:
if 'morerows' in node:
@ -1160,16 +1160,16 @@ class LaTeXTranslator(nodes.NodeVisitor):
pass
else:
self.body.append('\\textsf{\\relax ')
context += '}'
context += '\\unskip}\\relax '
while self.remember_multirow.get(self.table.col + 1, 0):
self.table.col += 1
self.remember_multirow[self.table.col] -= 1
context += ' & '
context += '&'
if self.remember_multirowcol.get(self.table.col, 0):
extracols = self.remember_multirowcol[self.table.col]
context += ' \\multicolumn{'
context += '\\multicolumn{'
context += str(extracols + 1)
context += '}{l|}{}'
context += '}{l|}{}\\relax '
self.table.col += extracols
if len(node.traverse(nodes.paragraph)) >= 2:
self.table.has_problematic = True