summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2021-01-31 18:10:50 +0900
committerGitHub <noreply@github.com>2021-01-31 18:10:50 +0900
commit76bbaf73893ee18f4b4d7642ed456f932ed0f261 (patch)
tree3cebca66ebac6ba831e722a700ea6362e72897be
parentaebfbbb532d2f887d3a372454be639f864c1690a (diff)
parent567cc4fb7b6372d286533b6b9a88f454081ed351 (diff)
downloadsphinx-git-3.4.x.tar.gz
Merge pull request #8797 from jfbu/latex_sphinxsafeincludegraphics_corebug3.4.x
Latex sphinxsafeincludegraphics corebug
-rw-r--r--CHANGES2
-rw-r--r--sphinx/texinputs/sphinx.sty2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index bbf710f02..b57c28f33 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,8 @@ Bugs fixed
* #8655: autodoc: Failed to generate document if target module contains an
object that raises an exception on ``hasattr()``
* C, ``expr`` role should start symbol lookup in the current scope.
+* #8796: LaTeX: potentially critical low level TeX coding mistake has gone
+ unnoticed so far
Testing
--------
diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index 4b637a9ec..08cf14db7 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -737,7 +737,7 @@
\AtBeginDocument{\spx@image@maxheight\textheight}
% box scratch register
-\newdimen\spx@image@box
+\newbox\spx@image@box
\newcommand*{\sphinxsafeincludegraphics}[2][]{%
% #1 contains possibly width=, height=, but no scale= since 1.8.4
\setbox\spx@image@box\hbox{\includegraphics[#1,draft]{#2}}%