diff options
| author | Jean-François B <jfbu@free.fr> | 2020-02-26 09:16:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 09:16:33 +0100 |
| commit | 942dbc6be6db6fed580b16e3295d1b408b29cf94 (patch) | |
| tree | 1ba70a20552b49e35c536510b0a2ca699d5d4e6a | |
| parent | ffd980a1b7952648a4a2158703ea4ad99a585180 (diff) | |
| parent | 6eac7901c97c0bb5d1569f2e8d6c5d039ec9334f (diff) | |
| download | sphinx-git-942dbc6be6db6fed580b16e3295d1b408b29cf94.tar.gz | |
Merge pull request #7205 from jfbu/latex_7197
LaTeX, fix \sphinxhref + \includegraphics problem with platex
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | sphinx/texinputs/sphinx.sty | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -16,6 +16,8 @@ Features added Bugs fixed ---------- +* #7197: LaTeX: platex cause error to build image directive with target url + Testing -------- diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty index 3e67b5610..714d98e05 100644 --- a/sphinx/texinputs/sphinx.sty +++ b/sphinx/texinputs/sphinx.sty @@ -1407,7 +1407,8 @@ % \sphinxcode). Sphinx uses \#, \%, \& ... always inside \sphinxhref. \protected\def\sphinxhref#1#2{{% \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 }} % Same for \url. And also \nolinkurl for coherence. |