summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjfbu <jfbu@free.fr>2020-02-23 08:53:37 +0100
committerjfbu <jfbu@free.fr>2020-02-23 08:57:53 +0100
commit6eac7901c97c0bb5d1569f2e8d6c5d039ec9334f (patch)
treefa8e9bb24d1e12c5ca14e0e845777844bacbe69d
parent5f1c0b5430a292837f40a2f01ebff2e30193dd02 (diff)
downloadsphinx-git-6eac7901c97c0bb5d1569f2e8d6c5d039ec9334f.tar.gz
LaTeX, fix \sphinxhref + \includegraphics problem with platex
Upstream issue: https://github.com/latex3/latex2e/issues/286 Fixes #7197
-rw-r--r--CHANGES2
-rw-r--r--sphinx/texinputs/sphinx.sty3
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 73ef4405a..ae8a74f36 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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.