branch master updated: @center @image spacing

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 1da03b96b5 @center @image spacing
1da03b96b5 is described below

commit 1da03b96b53b1e06aa83e4bc4f1db050e39333fa
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Oct 1 11:52:10 2022 +0100

    @center @image spacing
    
    * doc/texinfo.tex (\image): Separate out the code for
    @center @image more.  Attempt to fix spacing before @center
    @image.  Report from Werner.
---
 ChangeLog       |  8 ++++++++
 doc/texinfo.tex | 27 +++++++++++----------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25c0579c31..fb7c9f85f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-10-01  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       @center @image spacing
+
+       * doc/texinfo.tex (\image): Separate out the code for
+       @center @image more.  Attempt to fix spacing before @center
+       @image.  Report from Werner.
+
 2022-10-01  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add spaces attribute
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index e4b8f379f6..163e20a926 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2022-09-26.17}
+\def\texinfoversion{2022-10-01.10}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -9351,13 +9351,6 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \makevalueexpandable
   \ifvmode
     \imagevmodetrue
-  \else \ifx\centersub\centerV
-    % for @center @image, we need a vbox so we can have our vertical space
-    \imagevmodetrue
-    \vbox\bgroup % vbox has better behavior than vtop here
-  \fi\fi
-  %
-  \ifimagevmode
     \medskip
     % Usually we'll have text after the image which will insert
     % \parskip glue, so insert it here too to equalize the space
@@ -9369,14 +9362,16 @@ might help (with 'rm \jobname.?? \jobname.??s')%
     \vtop\bgroup \kern -\capheight \vskip-\parskip
   \fi
   %
-  % Enter horizontal mode so that indentation from an enclosing
-  %  environment such as @quotation is respected.
-  % However, if we're at the top level, we don't want the
-  %  normal paragraph indentation.
-  % On the other hand, if we are in the case of @center @image, we don't
-  %  want to start a paragraph, which will create a hsize-width box and
-  %  eradicate the centering.
-  \ifx\centersub\centerV \else \imageindent \fi
+  \ifx\centersub\centerV
+    % For @center @image, enter vertical mode and add vertical space
+    \vbox\bgroup\medskip\vskip\parskip
+  \else
+    % Enter horizontal mode so that indentation from an enclosing
+    %  environment such as @quotation is respected.
+    % However, if we're at the top level, we don't want the
+    %  normal paragraph indentation.
+    \imageindent
+  \fi
   %
   % Output the image.
   \ifpdf