branch master updated: @image top page margin

[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 6a2d4134cd @image top page margin
6a2d4134cd is described below

commit 6a2d4134cdb453b140e4d8d222e6704cda8cf641
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Feb 16 20:19:02 2022 +0000

    @image top page margin
    
    * doc/texinfo.tex (\image): Wrap image in a \vtop in order to
    make the top margin close to correct in case an image appears
    at the top of a page.  Remove or change some comments.
    
    Report from Werner Lemberg.
---
 ChangeLog       | 10 ++++++++++
 doc/texinfo.tex | 19 +++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d0c6423b0b..6ac799562a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-02-16  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       @image top page margin
+
+       * doc/texinfo.tex (\image): Wrap image in a \vtop in order to
+       make the top margin close to correct in case an image appears
+       at the top of a page.  Remove or change some comments.
+
+       Report from Werner Lemberg.
+
 2022-02-14  Patrice Dumas  <pertusus@free.fr>
 
        A different work around for generated Texinfo file problem
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index e66b7daa73..5dbbd6596a 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,9 +3,9 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2022-01-16.13}
+\def\texinfoversion{2022-02-16.13}
 %
-% Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc.
+% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -9383,13 +9383,12 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \catcode`\^^M = 5     % in case we're inside an example
   \normalturnoffactive  % allow _ et al. in names
   \makevalueexpandable
-  % If the image is by itself, center it.
   \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 herev
+    \vbox\bgroup % vbox has better behavior than vtop here
   \fi\fi
   %
   \ifimagevmode
@@ -9397,11 +9396,14 @@ might help (with 'rm \jobname.?? \jobname.??s')%
     % Usually we'll have text after the image which will insert
     % \parskip glue, so insert it here too to equalize the space
     % above and below.
-    \nobreak\vskip\parskip
-    \nobreak
+    \vskip\parskip
+    %
+    % Place image in a \vtop for a top page margin that is (close to) correct,
+    % as \topskip glue is relative to the first baseline.
+    \vtop\bgroup\hrule height 0pt\vskip-\parskip
   \fi
   %
-  % Leave vertical mode so that indentation from an enclosing
+  % 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.
@@ -9430,8 +9432,9 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \fi
   %
   \ifimagevmode
+    \egroup
     \medskip  % space after a standalone image
-  \fi  
+  \fi
   \ifx\centersub\centerV \egroup \fi
 \endgroup}