Merge pull request #7205 from jfbu/latex_7197

LaTeX, fix \sphinxhref + \includegraphics problem with platex
This commit is contained in:
Jean-François B 2020-02-26 09:16:33 +01:00 committed by GitHub
commit 942dbc6be6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -16,6 +16,8 @@ Features added
Bugs fixed Bugs fixed
---------- ----------
* #7197: LaTeX: platex cause error to build image directive with target url
Testing Testing
-------- --------

View File

@ -1407,7 +1407,8 @@
% \sphinxcode). Sphinx uses \#, \%, \& ... always inside \sphinxhref. % \sphinxcode). Sphinx uses \#, \%, \& ... always inside \sphinxhref.
\protected\def\sphinxhref#1#2{{% \protected\def\sphinxhref#1#2{{%
\sphinxunactivateextrasandspace % never do \scantokens with active space! \sphinxunactivateextrasandspace % never do \scantokens with active space!
\endlinechar\m@ne\everyeof{{#2}}% keep catcode regime for #2 % for the \endlinechar business, https://github.com/latex3/latex2e/issues/286
\endlinechar\m@ne\everyeof{{\endlinechar13 #2}}% keep catcode regime for #2
\scantokens{\href{#1}}% normalise it for #1 during \href expansion \scantokens{\href{#1}}% normalise it for #1 during \href expansion
}} }}
% Same for \url. And also \nolinkurl for coherence. % Same for \url. And also \nolinkurl for coherence.