[latex3-commits] [latex2e-public] r1426 - additional \leavevmode

[noreply at latex-project.org]

Author: carlisle
Date: 2017-03-17 15:33:39 +0100 (Fri, 17 Mar 2017)
New Revision: 1426

Modified:
   trunk/required/graphics/changes.txt
   trunk/required/graphics/graphics.dtx
Log:
additional \leavevmode

Modified: trunk/required/graphics/changes.txt
===================================================================
--- trunk/required/graphics/changes.txt	2017-03-17 13:26:03 UTC (rev 1425)
+++ trunk/required/graphics/changes.txt	2017-03-17 14:33:39 UTC (rev 1426)
@@ -4,6 +4,12 @@
 are not part of the distribution.
 =======================================================================
 
+2017-03-17  David Carlisle  <latex-bugs at latex-project.org>
+
+	* graphics.dtx: add \leavevmode to \includegraphics
+	so that \everypar is cleared. (The \leavevmode in \Gin at setfile is
+	too late for this use, but has been left for compatibility.)
+
 2016-12-23  David Carlisle  <latex-bugs at latex-project.org>
 
 	* grfguide.tex: fix the a.ps example file to match the Bounding box

Modified: trunk/required/graphics/graphics.dtx
===================================================================
--- trunk/required/graphics/graphics.dtx	2017-03-17 13:26:03 UTC (rev 1425)
+++ trunk/required/graphics/graphics.dtx	2017-03-17 14:33:39 UTC (rev 1426)
@@ -2,7 +2,7 @@
 % \iffalse
 %
 %% graphics.dtx Copyright (C) 1994      David Carlisle Sebastian Rahtz
-%%              Copyright (C) 1995--2016 David Carlisle, LaTeX3 Project
+%%              Copyright (C) 1995--2017 David Carlisle, LaTeX3 Project
 %%
 %% This file is part of the Standard LaTeX `Graphics Bundle'.
 %% It may be distributed under the terms of the LaTeX Project Public
@@ -19,7 +19,7 @@
 %<driver> \ProvidesFile{graphics.drv}
 % \fi
 %         \ProvidesFile{graphics.dtx}
-          [2016/10/09 v1.0u  Standard LaTeX Graphics (DPC,SPQR)]
+          [2017/03/17 v1.1a  Standard LaTeX Graphics (DPC,SPQR)]
 %
 % \iffalse
 %<*driver>
@@ -859,9 +859,19 @@
 %  \end{macro}
 %
 % \begin{macro}{\includegraphics}
+% \changes{v1.1a}{2017/03/17}
+% {\cs{leavevmode} added before the group in \cs{Gin at iii} so that
+% settings in \cs{everypar} are cleared)
 % Top level command for the standard interface, just look for a |*|.
 %    \begin{macrocode}
 \def\includegraphics{%
+%    \end{macrocode}
+% Clear |\everypar| before starting a group.
+%    \begin{macrocode}
+  \leavevmode
+%    \end{macrocode}
+%
+%    \begin{macrocode}
   \@ifstar
     {\Gin at cliptrue\Gin at i}%
     {\Gin at clipfalse\Gin at i}}