Workaround upstream LaTeX June 2021 induced issue with complex tables

Closes sphinx-doc#9315
jfbu · Jun 16, 2021 · 7333f8d · 7333f8d
1 parent f14561d
commit 7333f8d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
@@ -1009,7 +1009,7 @@ def visit_entry(self, node: Element) -> None:
         if cell.width > 1 or cell.height > 1:
             self.body.append(r'\begin{varwidth}[t]{\sphinxcolwidth{%d}{%d}}'
                              % (cell.width, self.table.colcount) + CR)
-            context = (r'\par' + CR + r'\vskip-\baselineskip'
+            context = (r'\par' + CR + r'\vskip-\baselineskip\vskip0pt'
                        r'\vbox{\hbox{\strut}}\end{varwidth}%' + CR + context)
             self.needs_linetrimming = 1
         if len(node.traverse(nodes.paragraph)) >= 2:

diff --git a/tests/roots/test-latex-table/expects/complex_spanning_cell.tex b/tests/roots/test-latex-table/expects/complex_spanning_cell.tex
@@ -22,14 +22,14 @@
 \sphinxAtStartPar
 cell1\sphinxhyphen{}1
 \par
-\vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}%
+\vskip-\baselineskip\vskip0pt\vbox{\hbox{\strut}}\end{varwidth}%
 }%
 &\sphinxmultirow{3}{2}{%
 \begin{varwidth}[t]{\sphinxcolwidth{1}{5}}
 \sphinxAtStartPar
 cell1\sphinxhyphen{}2
 \par
-\vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}%
+\vskip-\baselineskip\vskip0pt\vbox{\hbox{\strut}}\end{varwidth}%
 }%
 &
 \sphinxAtStartPar
@@ -39,22 +39,22 @@
 \sphinxAtStartPar
 cell1\sphinxhyphen{}4
 \par
-\vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}%
+\vskip-\baselineskip\vskip0pt\vbox{\hbox{\strut}}\end{varwidth}%
 }%
 &\sphinxmultirow{2}{5}{%
 \begin{varwidth}[t]{\sphinxcolwidth{1}{5}}
 \sphinxAtStartPar
 cell1\sphinxhyphen{}5
 \par
-\vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}%
+\vskip-\baselineskip\vskip0pt\vbox{\hbox{\strut}}\end{varwidth}%
 }%
 \\
 \cline{3-3}\sphinxtablestrut{1}&\sphinxtablestrut{2}&\sphinxmultirow{2}{6}{%
 \begin{varwidth}[t]{\sphinxcolwidth{1}{5}}
 \sphinxAtStartPar
 cell2\sphinxhyphen{}3
 \par
-\vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}%
+\vskip-\baselineskip\vskip0pt\vbox{\hbox{\strut}}\end{varwidth}%
 }%
 &\sphinxtablestrut{4}&\sphinxtablestrut{5}\\
 \cline{5-5}\sphinxtablestrut{1}&\sphinxtablestrut{2}&\sphinxtablestrut{6}&\sphinxtablestrut{4}&

diff --git a/tests/roots/test-latex-table/expects/gridtable.tex b/tests/roots/test-latex-table/expects/gridtable.tex
@@ -22,7 +22,7 @@
 \sphinxAtStartPar
 cell1\sphinxhyphen{}2
 \par
-\vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}%
+\vskip-\baselineskip\vskip0pt\vbox{\hbox{\strut}}\end{varwidth}%
 }%
 &
 \sphinxAtStartPar
@@ -33,7 +33,7 @@
 \sphinxAtStartPar
 cell2\sphinxhyphen{}1
 \par
-\vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}%
+\vskip-\baselineskip\vskip0pt\vbox{\hbox{\strut}}\end{varwidth}%
 }%
 &\sphinxtablestrut{5}&
 \sphinxAtStartPar
@@ -48,7 +48,7 @@
 \sphinxAtStartPar
 cell3\sphinxhyphen{}2\sphinxhyphen{}par2
 \par
-\vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}%
+\vskip-\baselineskip\vskip0pt\vbox{\hbox{\strut}}\end{varwidth}%
 }%
 \sphinxstopmulticolumn
 \\
@@ -61,7 +61,7 @@
 \sphinxAtStartPar
 cell5\sphinxhyphen{}1
 \par
-\vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}%
+\vskip-\baselineskip\vskip0pt\vbox{\hbox{\strut}}\end{varwidth}%
 \sphinxstopmulticolumn
 \\
 \hline