diff --git a/CHANGES b/CHANGES index 9a5c3ef5101..61b9ee3f860 100644 --- a/CHANGES +++ b/CHANGES @@ -109,6 +109,7 @@ Bugs fixed :confval:`numfig` is not True * #8442: LaTeX: some indexed terms are ignored when using xelatex engine (or pdflatex and :confval:`latex_use_xindy` set to True) with memoir class +* #8780: LaTeX: long words in narrow columns may not be hyphenated Testing -------- diff --git a/doc/extdev/deprecated.rst b/doc/extdev/deprecated.rst index dc9d9973d5e..1350085ef37 100644 --- a/doc/extdev/deprecated.rst +++ b/doc/extdev/deprecated.rst @@ -12,17 +12,13 @@ The following is a list of deprecated interfaces. .. tabularcolumns:: |>{\raggedright}\Y{.4}|>{\centering}\Y{.1}|>{\centering}\Y{.12}|>{\raggedright\arraybackslash}\Y{.38}| -.. |LaTeXHyphenate| raw:: latex - - \hspace{0pt} - .. list-table:: deprecated APIs :header-rows: 1 :class: deprecated :widths: 40, 10, 10, 40 * - Target - - |LaTeXHyphenate|\ Deprecated + - Deprecated - (will be) Removed - Alternatives diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py index 918dda7746b..5d42ad71d18 100644 --- a/sphinx/writers/latex.py +++ b/sphinx/writers/latex.py @@ -1161,7 +1161,9 @@ def visit_paragraph(self, node: Element) -> None: # (first one is label node) pass else: - self.body.append('\n') + # the \hskip0pt\relax is to allow hyphenation of first word of + # a paragraph in narrow contexts such as in a table cell + self.body.append('\\hskip0pt\\relax\n') def depart_paragraph(self, node: Element) -> None: self.body.append('\n') diff --git a/tests/roots/test-latex-equations/expects/latex-equations.tex b/tests/roots/test-latex-equations/expects/latex-equations.tex index ce07a012836..7732d172b81 100644 --- a/tests/roots/test-latex-equations/expects/latex-equations.tex +++ b/tests/roots/test-latex-equations/expects/latex-equations.tex @@ -1,13 +1,14 @@ +\hskip0pt\relax Equation without a label. \begin{equation*} \begin{split}E = mc^2\end{split} -\end{equation*} +\end{equation*}\hskip0pt\relax Equation with label. \begin{equation}\label{equation:equations:test} \begin{split}E = hv\end{split} -\end{equation} +\end{equation}\hskip0pt\relax Second equation without label. \begin{equation*} \begin{split}c^2 = a^2 + b^2\end{split} -\end{equation*} +\end{equation*}\hskip0pt\relax Equation with label \eqref{equation:equations:test} is important. diff --git a/tests/roots/test-latex-table/expects/complex_spanning_cell.tex b/tests/roots/test-latex-table/expects/complex_spanning_cell.tex index 5d524c25708..442c68d8d27 100644 --- a/tests/roots/test-latex-table/expects/complex_spanning_cell.tex +++ b/tests/roots/test-latex-table/expects/complex_spanning_cell.tex @@ -1,10 +1,10 @@ -\label{\detokenize{complex:complex-spanning-cell}} +\label{\detokenize{complex:complex-spanning-cell}}\hskip0pt\relax table having … \begin{itemize} -\item {} +\item {} \hskip0pt\relax consecutive multirow at top of row (1\sphinxhyphen{}1 and 1\sphinxhyphen{}2) -\item {} +\item {} \hskip0pt\relax consecutive multirow at end of row (1\sphinxhyphen{}4 and 1\sphinxhyphen{}5) \end{itemize} @@ -16,26 +16,30 @@ \hline \sphinxmultirow{3}{1}{% \begin{varwidth}[t]{\sphinxcolwidth{1}{5}} +\hskip0pt\relax cell1\sphinxhyphen{}1 \par \vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}% }% &\sphinxmultirow{3}{2}{% \begin{varwidth}[t]{\sphinxcolwidth{1}{5}} +\hskip0pt\relax cell1\sphinxhyphen{}2 \par \vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}% }% -& +&\hskip0pt\relax cell1\sphinxhyphen{}3 &\sphinxmultirow{3}{4}{% \begin{varwidth}[t]{\sphinxcolwidth{1}{5}} +\hskip0pt\relax cell1\sphinxhyphen{}4 \par \vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}% }% &\sphinxmultirow{2}{5}{% \begin{varwidth}[t]{\sphinxcolwidth{1}{5}} +\hskip0pt\relax cell1\sphinxhyphen{}5 \par \vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}% @@ -43,12 +47,13 @@ \\ \cline{3-3}\sphinxtablestrut{1}&\sphinxtablestrut{2}&\sphinxmultirow{2}{6}{% \begin{varwidth}[t]{\sphinxcolwidth{1}{5}} +\hskip0pt\relax cell2\sphinxhyphen{}3 \par \vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}% }% &\sphinxtablestrut{4}&\sphinxtablestrut{5}\\ -\cline{5-5}\sphinxtablestrut{1}&\sphinxtablestrut{2}&\sphinxtablestrut{6}&\sphinxtablestrut{4}& +\cline{5-5}\sphinxtablestrut{1}&\sphinxtablestrut{2}&\sphinxtablestrut{6}&\sphinxtablestrut{4}&\hskip0pt\relax cell3\sphinxhyphen{}5 \\ \hline diff --git a/tests/roots/test-latex-table/expects/gridtable.tex b/tests/roots/test-latex-table/expects/gridtable.tex index 28b0b086bbf..c91773f511c 100644 --- a/tests/roots/test-latex-table/expects/gridtable.tex +++ b/tests/roots/test-latex-table/expects/gridtable.tex @@ -4,47 +4,51 @@ \centering \begin{tabulary}{\linewidth}[t]{|T|T|T|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header3 \\ -\hline +\hline\hskip0pt\relax cell1\sphinxhyphen{}1 &\sphinxmultirow{2}{5}{% \begin{varwidth}[t]{\sphinxcolwidth{1}{3}} +\hskip0pt\relax cell1\sphinxhyphen{}2 \par \vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}% }% -& +&\hskip0pt\relax cell1\sphinxhyphen{}3 \\ \cline{1-1}\cline{3-3}\sphinxmultirow{2}{7}{% \begin{varwidth}[t]{\sphinxcolwidth{1}{3}} +\hskip0pt\relax cell2\sphinxhyphen{}1 \par \vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}% }% -&\sphinxtablestrut{5}& +&\sphinxtablestrut{5}&\hskip0pt\relax cell2\sphinxhyphen{}3 \\ \cline{2-3}\sphinxtablestrut{7}&\sphinxstartmulticolumn{2}% \sphinxmultirow{2}{9}{% \begin{varwidth}[t]{\sphinxcolwidth{2}{3}} +\hskip0pt\relax cell3\sphinxhyphen{}2 \par \vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}% }% \sphinxstopmulticolumn \\ -\cline{1-1} +\cline{1-1}\hskip0pt\relax cell4\sphinxhyphen{}1 &\multicolumn{2}{l|}{\sphinxtablestrut{9}}\\ \hline\sphinxstartmulticolumn{3}% \begin{varwidth}[t]{\sphinxcolwidth{3}{3}} +\hskip0pt\relax cell5\sphinxhyphen{}1 \par \vskip-\baselineskip\vbox{\hbox{\strut}}\end{varwidth}% diff --git a/tests/roots/test-latex-table/expects/longtable.tex b/tests/roots/test-latex-table/expects/longtable.tex index 9febfcef522..041b8749f76 100644 --- a/tests/roots/test-latex-table/expects/longtable.tex +++ b/tests/roots/test-latex-table/expects/longtable.tex @@ -2,9 +2,9 @@ \begin{savenotes}\sphinxatlongtablestart\begin{longtable}[c]{|l|l|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -13,9 +13,9 @@ \multicolumn{2}{c}% {\makebox[0pt]{\sphinxtablecontinued{\tablename\ \thetable{} \textendash{} continued from previous page}}}\\ \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -26,19 +26,19 @@ \endfoot \endlastfoot - +\hskip0pt\relax cell1\sphinxhyphen{}1 -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/longtable_having_align.tex b/tests/roots/test-latex-table/expects/longtable_having_align.tex index 1969e19d2f6..e9dfe1cc424 100644 --- a/tests/roots/test-latex-table/expects/longtable_having_align.tex +++ b/tests/roots/test-latex-table/expects/longtable_having_align.tex @@ -2,9 +2,9 @@ \begin{savenotes}\sphinxatlongtablestart\begin{longtable}[r]{|l|l|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -13,9 +13,9 @@ \multicolumn{2}{c}% {\makebox[0pt]{\sphinxtablecontinued{\tablename\ \thetable{} \textendash{} continued from previous page}}}\\ \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -26,19 +26,19 @@ \endfoot \endlastfoot - +\hskip0pt\relax cell1\sphinxhyphen{}1 -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/longtable_having_caption.tex b/tests/roots/test-latex-table/expects/longtable_having_caption.tex index f0041e9ec81..2e0004d449e 100644 --- a/tests/roots/test-latex-table/expects/longtable_having_caption.tex +++ b/tests/roots/test-latex-table/expects/longtable_having_caption.tex @@ -4,9 +4,9 @@ \sphinxthelongtablecaptionisattop \caption{caption for longtable\strut}\label{\detokenize{longtable:id1}}\\*[\sphinxlongtablecapskipadjust] \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -15,9 +15,9 @@ \multicolumn{2}{c}% {\makebox[0pt]{\sphinxtablecontinued{\tablename\ \thetable{} \textendash{} continued from previous page}}}\\ \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -28,19 +28,19 @@ \endfoot \endlastfoot - +\hskip0pt\relax cell1\sphinxhyphen{}1 -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/longtable_having_problematic_cell.tex b/tests/roots/test-latex-table/expects/longtable_having_problematic_cell.tex index 050527b693d..926cbcc6506 100644 --- a/tests/roots/test-latex-table/expects/longtable_having_problematic_cell.tex +++ b/tests/roots/test-latex-table/expects/longtable_having_problematic_cell.tex @@ -2,9 +2,9 @@ \begin{savenotes}\sphinxatlongtablestart\begin{longtable}[c]{|*{2}{\X{1}{2}|}} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -13,9 +13,9 @@ \multicolumn{2}{c}% {\makebox[0pt]{\sphinxtablecontinued{\tablename\ \thetable{} \textendash{} continued from previous page}}}\\ \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -27,24 +27,24 @@ \endlastfoot \begin{itemize} -\item {} +\item {} \hskip0pt\relax item1 -\item {} +\item {} \hskip0pt\relax item2 \end{itemize} -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/longtable_having_stub_columns_and_problematic_cell.tex b/tests/roots/test-latex-table/expects/longtable_having_stub_columns_and_problematic_cell.tex index 68e74c5f482..c0b867edc5a 100644 --- a/tests/roots/test-latex-table/expects/longtable_having_stub_columns_and_problematic_cell.tex +++ b/tests/roots/test-latex-table/expects/longtable_having_stub_columns_and_problematic_cell.tex @@ -2,11 +2,11 @@ \begin{savenotes}\sphinxatlongtablestart\begin{longtable}[c]{|*{3}{\X{1}{3}|}} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header3 \\ \hline @@ -15,11 +15,11 @@ \multicolumn{3}{c}% {\makebox[0pt]{\sphinxtablecontinued{\tablename\ \thetable{} \textendash{} continued from previous page}}}\\ \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header3 \\ \hline @@ -31,23 +31,23 @@ \endlastfoot \sphinxstyletheadfamily \begin{itemize} -\item {} +\item {} \hskip0pt\relax instub1\sphinxhyphen{}1a -\item {} +\item {} \hskip0pt\relax instub1\sphinxhyphen{}1b \end{itemize} -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax instub1\sphinxhyphen{}2 -& +&\hskip0pt\relax notinstub1\sphinxhyphen{}3 \\ -\hline\sphinxstyletheadfamily +\hline\sphinxstyletheadfamily \hskip0pt\relax cell2\sphinxhyphen{}1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax cell2\sphinxhyphen{}2 -& +&\hskip0pt\relax cell2\sphinxhyphen{}3 \\ \hline diff --git a/tests/roots/test-latex-table/expects/longtable_having_verbatim.tex b/tests/roots/test-latex-table/expects/longtable_having_verbatim.tex index c7213b9066c..dba6573d100 100644 --- a/tests/roots/test-latex-table/expects/longtable_having_verbatim.tex +++ b/tests/roots/test-latex-table/expects/longtable_having_verbatim.tex @@ -2,9 +2,9 @@ \begin{savenotes}\sphinxatlongtablestart\begin{longtable}[c]{|*{2}{\X{1}{2}|}} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -13,9 +13,9 @@ \multicolumn{2}{c}% {\makebox[0pt]{\sphinxtablecontinued{\tablename\ \thetable{} \textendash{} continued from previous page}}}\\ \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -30,17 +30,17 @@ \begin{sphinxVerbatimintable}[commandchars=\\\{\}] \PYG{n}{hello} \PYG{n}{world} \end{sphinxVerbatimintable} -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/longtable_having_widths.tex b/tests/roots/test-latex-table/expects/longtable_having_widths.tex index 884fd9f8ae9..e2f35e62869 100644 --- a/tests/roots/test-latex-table/expects/longtable_having_widths.tex +++ b/tests/roots/test-latex-table/expects/longtable_having_widths.tex @@ -2,9 +2,9 @@ \begin{savenotes}\sphinxatlongtablestart\begin{longtable}[c]{|\X{30}{100}|\X{70}{100}|} \hline\noalign{\phantomsection\label{\detokenize{longtable:namedlongtable}}\label{\detokenize{longtable:mylongtable}}}% -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -13,9 +13,9 @@ \multicolumn{2}{c}% {\makebox[0pt]{\sphinxtablecontinued{\tablename\ \thetable{} \textendash{} continued from previous page}}}\\ \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -26,22 +26,22 @@ \endfoot \endlastfoot - +\hskip0pt\relax cell1\sphinxhyphen{}1 -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline \end{longtable}\sphinxatlongtableend\end{savenotes} - +\hskip0pt\relax See {\hyperref[\detokenize{longtable:mylongtable}]{\sphinxcrossref{mylongtable}}}, same as {\hyperref[\detokenize{longtable:namedlongtable}]{\sphinxcrossref{\DUrole{std,std-ref}{this one}}}}. diff --git a/tests/roots/test-latex-table/expects/longtable_having_widths_and_problematic_cell.tex b/tests/roots/test-latex-table/expects/longtable_having_widths_and_problematic_cell.tex index 17c5ec4cc6d..8b91bbeccfc 100644 --- a/tests/roots/test-latex-table/expects/longtable_having_widths_and_problematic_cell.tex +++ b/tests/roots/test-latex-table/expects/longtable_having_widths_and_problematic_cell.tex @@ -2,9 +2,9 @@ \begin{savenotes}\sphinxatlongtablestart\begin{longtable}[c]{|\X{30}{100}|\X{70}{100}|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -13,9 +13,9 @@ \multicolumn{2}{c}% {\makebox[0pt]{\sphinxtablecontinued{\tablename\ \thetable{} \textendash{} continued from previous page}}}\\ \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -27,24 +27,24 @@ \endlastfoot \begin{itemize} -\item {} +\item {} \hskip0pt\relax item1 -\item {} +\item {} \hskip0pt\relax item2 \end{itemize} -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/longtable_with_tabularcolumn.tex b/tests/roots/test-latex-table/expects/longtable_with_tabularcolumn.tex index 2fbbbc4effb..5d5936d16b2 100644 --- a/tests/roots/test-latex-table/expects/longtable_with_tabularcolumn.tex +++ b/tests/roots/test-latex-table/expects/longtable_with_tabularcolumn.tex @@ -2,9 +2,9 @@ \begin{savenotes}\sphinxatlongtablestart\begin{longtable}[c]{|c|c|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -13,9 +13,9 @@ \multicolumn{2}{c}% {\makebox[0pt]{\sphinxtablecontinued{\tablename\ \thetable{} \textendash{} continued from previous page}}}\\ \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline @@ -26,19 +26,19 @@ \endfoot \endlastfoot - +\hskip0pt\relax cell1\sphinxhyphen{}1 -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/simple_table.tex b/tests/roots/test-latex-table/expects/simple_table.tex index 8044a6cc40b..f339ec772ea 100644 --- a/tests/roots/test-latex-table/expects/simple_table.tex +++ b/tests/roots/test-latex-table/expects/simple_table.tex @@ -4,24 +4,24 @@ \centering \begin{tabulary}{\linewidth}[t]{|T|T|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ -\hline +\hline\hskip0pt\relax cell1\sphinxhyphen{}1 -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/table_having_caption.tex b/tests/roots/test-latex-table/expects/table_having_caption.tex index d4423a05de9..dd864f0b613 100644 --- a/tests/roots/test-latex-table/expects/table_having_caption.tex +++ b/tests/roots/test-latex-table/expects/table_having_caption.tex @@ -8,24 +8,24 @@ \sphinxaftertopcaption \begin{tabulary}{\linewidth}[t]{|T|T|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ -\hline +\hline\hskip0pt\relax cell1\sphinxhyphen{}1 -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/table_having_problematic_cell.tex b/tests/roots/test-latex-table/expects/table_having_problematic_cell.tex index 7a9b0f293b8..99a47b94020 100644 --- a/tests/roots/test-latex-table/expects/table_having_problematic_cell.tex +++ b/tests/roots/test-latex-table/expects/table_having_problematic_cell.tex @@ -4,30 +4,30 @@ \centering \begin{tabular}[t]{|*{2}{\X{1}{2}|}} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline\begin{itemize} -\item {} +\item {} \hskip0pt\relax item1 -\item {} +\item {} \hskip0pt\relax item2 \end{itemize} -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/table_having_stub_columns_and_problematic_cell.tex b/tests/roots/test-latex-table/expects/table_having_stub_columns_and_problematic_cell.tex index 700fc466348..3a4cb7eaaed 100644 --- a/tests/roots/test-latex-table/expects/table_having_stub_columns_and_problematic_cell.tex +++ b/tests/roots/test-latex-table/expects/table_having_stub_columns_and_problematic_cell.tex @@ -4,31 +4,31 @@ \centering \begin{tabular}[t]{|*{3}{\X{1}{3}|}} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header3 \\ \hline\sphinxstyletheadfamily \begin{itemize} -\item {} +\item {} \hskip0pt\relax instub1\sphinxhyphen{}1a -\item {} +\item {} \hskip0pt\relax instub1\sphinxhyphen{}1b \end{itemize} -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax instub1\sphinxhyphen{}2 -& +&\hskip0pt\relax notinstub1\sphinxhyphen{}3 \\ -\hline\sphinxstyletheadfamily +\hline\sphinxstyletheadfamily \hskip0pt\relax cell2\sphinxhyphen{}1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax cell2\sphinxhyphen{}2 -& +&\hskip0pt\relax cell2\sphinxhyphen{}3 \\ \hline diff --git a/tests/roots/test-latex-table/expects/table_having_threeparagraphs_cell_in_first_col.tex b/tests/roots/test-latex-table/expects/table_having_threeparagraphs_cell_in_first_col.tex index 6d3e81021dc..daa29f2b241 100644 --- a/tests/roots/test-latex-table/expects/table_having_threeparagraphs_cell_in_first_col.tex +++ b/tests/roots/test-latex-table/expects/table_having_threeparagraphs_cell_in_first_col.tex @@ -4,14 +4,14 @@ \centering \begin{tabulary}{\linewidth}[t]{|T|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 \\ -\hline +\hline\hskip0pt\relax cell1\sphinxhyphen{}1\sphinxhyphen{}par1 - +\hskip0pt\relax cell1\sphinxhyphen{}1\sphinxhyphen{}par2 - +\hskip0pt\relax cell1\sphinxhyphen{}1\sphinxhyphen{}par3 \\ \hline diff --git a/tests/roots/test-latex-table/expects/table_having_verbatim.tex b/tests/roots/test-latex-table/expects/table_having_verbatim.tex index f66bb800198..e8bba4bf45c 100644 --- a/tests/roots/test-latex-table/expects/table_having_verbatim.tex +++ b/tests/roots/test-latex-table/expects/table_having_verbatim.tex @@ -4,26 +4,26 @@ \centering \begin{tabular}[t]{|*{2}{\X{1}{2}|}} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline \begin{sphinxVerbatimintable}[commandchars=\\\{\}] \PYG{n}{hello} \PYG{n}{world} \end{sphinxVerbatimintable} -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/table_having_widths.tex b/tests/roots/test-latex-table/expects/table_having_widths.tex index 094596becd4..186a7752c3e 100644 --- a/tests/roots/test-latex-table/expects/table_having_widths.tex +++ b/tests/roots/test-latex-table/expects/table_having_widths.tex @@ -5,29 +5,29 @@ \phantomsection\label{\detokenize{tabular:namedtabular}}\label{\detokenize{tabular:mytabular}}\nobreak \begin{tabular}[t]{|\X{30}{100}|\X{70}{100}|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ -\hline +\hline\hskip0pt\relax cell1\sphinxhyphen{}1 -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline \end{tabular} \par \sphinxattableend\end{savenotes} - +\hskip0pt\relax See {\hyperref[\detokenize{tabular:mytabular}]{\sphinxcrossref{\DUrole{std,std-ref}{this}}}}, same as {\hyperref[\detokenize{tabular:namedtabular}]{\sphinxcrossref{namedtabular}}}. diff --git a/tests/roots/test-latex-table/expects/table_having_widths_and_problematic_cell.tex b/tests/roots/test-latex-table/expects/table_having_widths_and_problematic_cell.tex index a636b022eb5..42346de6150 100644 --- a/tests/roots/test-latex-table/expects/table_having_widths_and_problematic_cell.tex +++ b/tests/roots/test-latex-table/expects/table_having_widths_and_problematic_cell.tex @@ -4,30 +4,30 @@ \centering \begin{tabular}[t]{|\X{30}{100}|\X{70}{100}|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ \hline\begin{itemize} -\item {} +\item {} \hskip0pt\relax item1 -\item {} +\item {} \hskip0pt\relax item2 \end{itemize} -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/tabular_having_widths.tex b/tests/roots/test-latex-table/expects/tabular_having_widths.tex index 5ee1542d4b4..f516affe6e9 100644 --- a/tests/roots/test-latex-table/expects/tabular_having_widths.tex +++ b/tests/roots/test-latex-table/expects/tabular_having_widths.tex @@ -4,24 +4,24 @@ \raggedright \begin{tabular}[t]{|\X{30}{100}|\X{70}{100}|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ -\hline +\hline\hskip0pt\relax cell1\sphinxhyphen{}1 -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/tabularcolumn.tex b/tests/roots/test-latex-table/expects/tabularcolumn.tex index 02e9af4401d..f7f8d56187c 100644 --- a/tests/roots/test-latex-table/expects/tabularcolumn.tex +++ b/tests/roots/test-latex-table/expects/tabularcolumn.tex @@ -4,24 +4,24 @@ \centering \begin{tabulary}{\linewidth}[t]{|c|c|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ -\hline +\hline\hskip0pt\relax cell1\sphinxhyphen{}1 -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/roots/test-latex-table/expects/tabulary_having_widths.tex b/tests/roots/test-latex-table/expects/tabulary_having_widths.tex index 06d347fa36d..00874cb8987 100644 --- a/tests/roots/test-latex-table/expects/tabulary_having_widths.tex +++ b/tests/roots/test-latex-table/expects/tabulary_having_widths.tex @@ -4,24 +4,24 @@ \raggedleft \begin{tabulary}{\linewidth}[t]{|T|T|} \hline -\sphinxstyletheadfamily +\sphinxstyletheadfamily \hskip0pt\relax header1 -&\sphinxstyletheadfamily +&\sphinxstyletheadfamily \hskip0pt\relax header2 \\ -\hline +\hline\hskip0pt\relax cell1\sphinxhyphen{}1 -& +&\hskip0pt\relax cell1\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell2\sphinxhyphen{}1 -& +&\hskip0pt\relax cell2\sphinxhyphen{}2 \\ -\hline +\hline\hskip0pt\relax cell3\sphinxhyphen{}1 -& +&\hskip0pt\relax cell3\sphinxhyphen{}2 \\ \hline diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py index 6f6041aea84..819e088a66c 100644 --- a/tests/test_build_latex.py +++ b/tests/test_build_latex.py @@ -730,13 +730,14 @@ def test_footnote(app, status, warning): '\\end{footnote}') in result assert '\\begin{footnote}[3]\\sphinxAtStartFootnote\nnamed\n%\n\\end{footnote}' in result assert '\\sphinxcite{footnote:bar}' in result - assert ('\\bibitem[bar]{footnote:bar}\ncite\n') in result + assert ('\\bibitem[bar]{footnote:bar}\\hskip0pt\\relax\ncite\n') in result assert '\\sphinxcaption{Table caption \\sphinxfootnotemark[4]' in result assert ('\\hline%\n\\begin{footnotetext}[4]\\sphinxAtStartFootnote\n' 'footnote in table caption\n%\n\\end{footnotetext}\\ignorespaces %\n' '\\begin{footnotetext}[5]\\sphinxAtStartFootnote\n' - 'footnote in table header\n%\n\\end{footnotetext}\\ignorespaces \n' - 'VIDIOC\\_CROPCAP\n&\n') in result + 'footnote in table header\n%\n\\end{footnotetext}\\ignorespaces ' + '\\hskip0pt\\relax\n' + 'VIDIOC\\_CROPCAP\n&\\hskip0pt\\relax\n') in result assert ('Information about VIDIOC\\_CROPCAP %\n' '\\begin{footnote}[6]\\sphinxAtStartFootnote\n' 'footnote in table not in header\n%\n\\end{footnote}\n\\\\\n\\hline\n' @@ -776,7 +777,7 @@ def test_reference_in_caption_and_codeblock_in_footnote(app, status, warning): assert ('This is a reference to the code\\sphinxhyphen{}block in the footnote:\n' '{\\hyperref[\\detokenize{index:codeblockinfootnote}]' '{\\sphinxcrossref{\\DUrole{std,std-ref}{I am in a footnote}}}}') in result - assert ('&\nThis is one more footnote with some code in it %\n' + assert ('&\\hskip0pt\\relax\nThis is one more footnote with some code in it %\n' '\\begin{footnote}[11]\\sphinxAtStartFootnote\n' 'Third footnote in longtable\n') in result assert ('\\end{sphinxVerbatim}\n%\n\\end{footnote}.\n') in result @@ -816,13 +817,15 @@ def test_latex_show_urls_is_inline(app, status, warning): assert ('\\sphinxhref{http://sphinx-doc.org/~test/}{URL including tilde} ' '(http://sphinx\\sphinxhyphen{}doc.org/\\textasciitilde{}test/)') in result assert ('\\item[{\\sphinxhref{http://sphinx-doc.org/}{URL in term} ' - '(http://sphinx\\sphinxhyphen{}doc.org/)}] \\leavevmode\nDescription' in result) + '(http://sphinx\\sphinxhyphen{}doc.org/)}] ' + '\\leavevmode\\hskip0pt\\relax\nDescription' in result) assert ('\\item[{Footnote in term \\sphinxfootnotemark[6]}] ' '\\leavevmode%\n\\begin{footnotetext}[6]\\sphinxAtStartFootnote\n' - 'Footnote in term\n%\n\\end{footnotetext}\\ignorespaces \n' - 'Description') in result + 'Footnote in term\n%\n\\end{footnotetext}\\ignorespaces ' + '\\hskip0pt\\relax\nDescription') in result assert ('\\item[{\\sphinxhref{http://sphinx-doc.org/}{Term in deflist} ' - '(http://sphinx\\sphinxhyphen{}doc.org/)}] \\leavevmode\nDescription') in result + '(http://sphinx\\sphinxhyphen{}doc.org/)}] ' + '\\leavevmode\\hskip0pt\\relax\nDescription') in result assert '\\sphinxurl{https://github.com/sphinx-doc/sphinx}\n' in result assert ('\\sphinxhref{mailto:sphinx-dev@googlegroups.com}' '{sphinx\\sphinxhyphen{}dev@googlegroups.com}') in result @@ -867,16 +870,16 @@ def test_latex_show_urls_is_footnote(app, status, warning): '{URL in term}\\sphinxfootnotemark[9]}] ' '\\leavevmode%\n\\begin{footnotetext}[9]\\sphinxAtStartFootnote\n' '\\sphinxnolinkurl{http://sphinx-doc.org/}\n%\n' - '\\end{footnotetext}\\ignorespaces \nDescription') in result + '\\end{footnotetext}\\ignorespaces \\hskip0pt\\relax\nDescription') in result assert ('\\item[{Footnote in term \\sphinxfootnotemark[11]}] ' '\\leavevmode%\n\\begin{footnotetext}[11]\\sphinxAtStartFootnote\n' - 'Footnote in term\n%\n\\end{footnotetext}\\ignorespaces \n' - 'Description') in result + 'Footnote in term\n%\n\\end{footnotetext}\\ignorespaces ' + '\\hskip0pt\\relax\nDescription') in result assert ('\\item[{\\sphinxhref{http://sphinx-doc.org/}{Term in deflist}' '\\sphinxfootnotemark[10]}] ' '\\leavevmode%\n\\begin{footnotetext}[10]\\sphinxAtStartFootnote\n' '\\sphinxnolinkurl{http://sphinx-doc.org/}\n%\n' - '\\end{footnotetext}\\ignorespaces \nDescription') in result + '\\end{footnotetext}\\ignorespaces \\hskip0pt\\relax\nDescription') in result assert ('\\sphinxurl{https://github.com/sphinx-doc/sphinx}\n' in result) assert ('\\sphinxhref{mailto:sphinx-dev@googlegroups.com}' '{sphinx\\sphinxhyphen{}dev@googlegroups.com}\n') in result @@ -913,13 +916,13 @@ def test_latex_show_urls_is_no(app, status, warning): 'Footnote inside footnote\n%\n\\end{footnotetext}\\ignorespaces') in result assert '\\sphinxhref{http://sphinx-doc.org/~test/}{URL including tilde}' in result assert ('\\item[{\\sphinxhref{http://sphinx-doc.org/}{URL in term}}] ' - '\\leavevmode\nDescription') in result + '\\leavevmode\\hskip0pt\\relax\nDescription') in result assert ('\\item[{Footnote in term \\sphinxfootnotemark[6]}] ' '\\leavevmode%\n\\begin{footnotetext}[6]\\sphinxAtStartFootnote\n' - 'Footnote in term\n%\n\\end{footnotetext}\\ignorespaces \n' - 'Description') in result + 'Footnote in term\n%\n\\end{footnotetext}\\ignorespaces ' + '\\hskip0pt\\relax\nDescription') in result assert ('\\item[{\\sphinxhref{http://sphinx-doc.org/}{Term in deflist}}] ' - '\\leavevmode\nDescription') in result + '\\leavevmode\\hskip0pt\\relax\nDescription') in result assert ('\\sphinxurl{https://github.com/sphinx-doc/sphinx}\n' in result) assert ('\\sphinxhref{mailto:sphinx-dev@googlegroups.com}' '{sphinx\\sphinxhyphen{}dev@googlegroups.com}\n') in result @@ -1354,7 +1357,7 @@ def test_latex_index(app, status, warning): '\\index{equation@\\spxentry{equation}}equation:\n' in result) assert ('\n\\index{Einstein@\\spxentry{Einstein}}' '\\index{relativity@\\spxentry{relativity}}' - '\\ignorespaces \nand') in result + '\\ignorespaces \\hskip0pt\\relax\nand') in result assert ('\n\\index{main \\sphinxleftcurlybrace{}@\\spxentry{' 'main \\sphinxleftcurlybrace{}}}\\ignorespaces ' in result) @@ -1403,7 +1406,7 @@ def test_latex_thebibliography(app, status, warning): result = (app.outdir / 'python.tex').read_text() print(result) assert ('\\begin{sphinxthebibliography}{AuthorYe}\n' - '\\bibitem[AuthorYear]{index:authoryear}\n' + '\\bibitem[AuthorYear]{index:authoryear}\\hskip0pt\\relax\n' 'Author, Title, Year\n' '\\end{sphinxthebibliography}\n' in result) assert '\\sphinxcite{index:authoryear}' in result @@ -1447,7 +1450,8 @@ def test_latex_labels(app, status, warning): r'\end{figure}' in result) assert (r'\caption{labeled figure}' '\\label{\\detokenize{index:figure3}}\n' - '\\begin{sphinxlegend}\nwith a legend\n\\end{sphinxlegend}\n' + '\\begin{sphinxlegend}\\hskip0pt\\relax\n' + 'with a legend\n\\end{sphinxlegend}\n' r'\end{figure}' in result) # code-blocks diff --git a/tests/test_markup.py b/tests/test_markup.py index 18c40ec1d4e..aa643cdfcb4 100644 --- a/tests/test_markup.py +++ b/tests/test_markup.py @@ -158,7 +158,8 @@ def get(name): ':pep:`8`', ('

PEP 8

'), - ('\\index{Python Enhancement Proposals@\\spxentry{Python Enhancement Proposals}' + ('\\hskip0pt\\relax\n' + '\\index{Python Enhancement Proposals@\\spxentry{Python Enhancement Proposals}' '!PEP 8@\\spxentry{PEP 8}}\\sphinxhref{http://www.python.org/dev/peps/pep-0008}' '{\\sphinxstylestrong{PEP 8}}') ), @@ -169,7 +170,8 @@ def get(name): ('

' 'PEP 8#id1

'), - ('\\index{Python Enhancement Proposals@\\spxentry{Python Enhancement Proposals}' + ('\\hskip0pt\\relax\n' + '\\index{Python Enhancement Proposals@\\spxentry{Python Enhancement Proposals}' '!PEP 8\\#id1@\\spxentry{PEP 8\\#id1}}\\sphinxhref' '{http://www.python.org/dev/peps/pep-0008\\#id1}' '{\\sphinxstylestrong{PEP 8\\#id1}}') @@ -180,7 +182,8 @@ def get(name): ':rfc:`2324`', ('

RFC 2324

'), - ('\\index{RFC@\\spxentry{RFC}!RFC 2324@\\spxentry{RFC 2324}}' + ('\\hskip0pt\\relax\n' + '\\index{RFC@\\spxentry{RFC}!RFC 2324@\\spxentry{RFC 2324}}' '\\sphinxhref{http://tools.ietf.org/html/rfc2324.html}' '{\\sphinxstylestrong{RFC 2324}}') ), @@ -191,7 +194,8 @@ def get(name): ('

' 'RFC 2324#id1

'), - ('\\index{RFC@\\spxentry{RFC}!RFC 2324\\#id1@\\spxentry{RFC 2324\\#id1}}' + ('\\hskip0pt\\relax\n' + '\\index{RFC@\\spxentry{RFC}!RFC 2324\\#id1@\\spxentry{RFC 2324\\#id1}}' '\\sphinxhref{http://tools.ietf.org/html/rfc2324.html\\#id1}' '{\\sphinxstylestrong{RFC 2324\\#id1}}') ), @@ -201,14 +205,14 @@ def get(name): '``code sample``', ('

' 'code   sample

'), - r'\\sphinxcode{\\sphinxupquote{code sample}}', + r'\\hskip0pt\\relax\n\\sphinxcode{\\sphinxupquote{code sample}}', ), ( # interpolation of arrows in menuselection 'verify', ':menuselection:`a --> b`', ('

a \N{TRIANGULAR BULLET} b

'), - '\\sphinxmenuselection{a \\(\\rightarrow\\) b}', + '\\hskip0pt\\relax\n\\sphinxmenuselection{a \\(\\rightarrow\\) b}', ), ( # interpolation of ampersands in menuselection @@ -216,7 +220,9 @@ def get(name): ':menuselection:`&Foo -&&- &Bar`', ('

Foo ' '-&- Bar

'), - r'\sphinxmenuselection{\sphinxaccelerator{F}oo \sphinxhyphen{}\&\sphinxhyphen{} \sphinxaccelerator{B}ar}', + ('\\hskip0pt\\relax\n' + r'\sphinxmenuselection{\sphinxaccelerator{F}oo \sphinxhyphen{}' + r'\&\sphinxhyphen{} \sphinxaccelerator{B}ar}'), ), ( # interpolation of ampersands in guilabel @@ -224,21 +230,22 @@ def get(name): ':guilabel:`&Foo -&&- &Bar`', ('

Foo ' '-&- Bar

'), - r'\sphinxguilabel{\sphinxaccelerator{F}oo \sphinxhyphen{}\&\sphinxhyphen{} \sphinxaccelerator{B}ar}', + ('\\hskip0pt\\relax\n' + r'\sphinxguilabel{\sphinxaccelerator{F}oo \sphinxhyphen{}\&\sphinxhyphen{} \sphinxaccelerator{B}ar}'), ), ( # no ampersands in guilabel 'verify', ':guilabel:`Foo`', '

Foo

', - r'\sphinxguilabel{Foo}', + '\\hskip0pt\\relax\n\\sphinxguilabel{Foo}', ), ( # kbd role 'verify', ':kbd:`space`', '

space

', - '\\sphinxkeyboard{\\sphinxupquote{space}}', + '\\hskip0pt\\relax\n\\sphinxkeyboard{\\sphinxupquote{space}}', ), ( # kbd role @@ -249,7 +256,7 @@ def get(name): '+' 'X' '

'), - '\\sphinxkeyboard{\\sphinxupquote{Control+X}}', + '\\hskip0pt\\relax\n\\sphinxkeyboard{\\sphinxupquote{Control+X}}', ), ( # kbd role @@ -260,7 +267,8 @@ def get(name): '+' '^' '

'), - '\\sphinxkeyboard{\\sphinxupquote{Alt+\\textasciicircum{}}}', + ('\\hskip0pt\\relax\n' + '\\sphinxkeyboard{\\sphinxupquote{Alt+\\textasciicircum{}}}'), ), ( # kbd role @@ -275,21 +283,24 @@ def get(name): '-' 's' '

'), - '\\sphinxkeyboard{\\sphinxupquote{M\\sphinxhyphen{}x M\\sphinxhyphen{}s}}', + ('\\hskip0pt\\relax\n' + '\\sphinxkeyboard{\\sphinxupquote{M\\sphinxhyphen{}x M\\sphinxhyphen{}s}}'), ), ( # kbd role 'verify', ':kbd:`-`', '

-

', - '\\sphinxkeyboard{\\sphinxupquote{\\sphinxhyphen{}}}', + ('\\hskip0pt\\relax\n' + '\\sphinxkeyboard{\\sphinxupquote{\\sphinxhyphen{}}}'), ), ( # kbd role 'verify', ':kbd:`Caps Lock`', '

Caps Lock

', - '\\sphinxkeyboard{\\sphinxupquote{Caps Lock}}', + ('\\hskip0pt\\relax\n' + '\\sphinxkeyboard{\\sphinxupquote{Caps Lock}}'), ), ( # non-interpolation of dashes in option role @@ -297,14 +308,15 @@ def get(name): ':option:`--with-option`', ('

' '--with-option

$'), - r'\\sphinxcode{\\sphinxupquote{\\sphinxhyphen{}\\sphinxhyphen{}with\\sphinxhyphen{}option}}$', + (r'\\hskip0pt\\relax\n' + r'\\sphinxcode{\\sphinxupquote{\\sphinxhyphen{}\\sphinxhyphen{}with\\sphinxhyphen{}option}}$'), ), ( # verify smarty-pants quotes 'verify', '"John"', '

“John”

', - "“John”", + "\\hskip0pt\\relax\n“John”", ), ( # ... but not in literal text @@ -312,21 +324,21 @@ def get(name): '``"John"``', ('

' '"John"

'), - '\\sphinxcode{\\sphinxupquote{"John"}}', + '\\hskip0pt\\relax\n\\sphinxcode{\\sphinxupquote{"John"}}', ), ( # verify classes for inline roles 'verify', ':manpage:`mp(1)`', '

mp(1)

', - '\\sphinxstyleliteralemphasis{\\sphinxupquote{mp(1)}}', + '\\hskip0pt\\relax\n\\sphinxstyleliteralemphasis{\\sphinxupquote{mp(1)}}', ), ( # correct escaping in normal mode 'verify', 'Γ\\\\∞$', None, - 'Γ\\textbackslash{}\\(\\infty\\)\\$', + '\\hskip0pt\\relax\nΓ\\textbackslash{}\\(\\infty\\)\\$', ), ( # in verbatim code fragments @@ -342,7 +354,7 @@ def get(name): 'verify_re', '`test `_', None, - r'\\sphinxhref{https://www.google.com/~me/}{test}.*', + r'\\hskip0pt\\relax\n\\sphinxhref{https://www.google.com/~me/}{test}.*', ), ( # description list: simple