branch master updated: Avoid suppressing first paragraph indent with an @image.

[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 7642b9b  Avoid suppressing first paragraph indent with an @image.
7642b9b is described below

commit 7642b9b8c150948e62a11c123e90b34794a35988
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Apr 25 21:36:36 2021 +0100

    Avoid suppressing first paragraph indent with an @image.
    
    * doc/texinfo.tex (\imageindent): New macro.
    (\image): Use it.
    * doc/texinfo-tex-test.texi (Paragraph formatting): New section.
    
    Inconsistency between Info and TeX reported by Werner Lemberg.
---
 ChangeLog                 |  10 ++++++++++
 doc/image.pdf             | Bin 0 -> 9670 bytes
 doc/texinfo-tex-test.texi |  29 +++++++++++++++++++++++++++++
 doc/texinfo.tex           |  13 +++++++++++--
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d984cfe..828580f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2021-04-25  Gavin Smith  <gavinsmith0123@gmail.com>
 
+       Avoid suppressing first paragraph indent with an @image.
+       
+       * doc/texinfo.tex (\imageindent): New macro.
+       (\image): Use it.
+       * doc/texinfo-tex-test.texi (Paragraph formatting): New section.
+       
+       Inconsistency between Info and TeX reported by Werner Lemberg.
+
+2021-04-25  Gavin Smith  <gavinsmith0123@gmail.com>
+
        Whitespace after @image
 
        * tp/Texinfo/Convert/Plaintext.pm (_convert): Output any
diff --git a/doc/image.pdf b/doc/image.pdf
new file mode 100644
index 0000000..857cb25
Binary files /dev/null and b/doc/image.pdf differ
diff --git a/doc/texinfo-tex-test.texi b/doc/texinfo-tex-test.texi
index 4b06905..4546694 100644
--- a/doc/texinfo-tex-test.texi
+++ b/doc/texinfo-tex-test.texi
@@ -90,6 +90,35 @@ Test of @acronym{ACRONYM}'s.  {ACRONYM}'s.
 
 @ordf{} @ordm{}
 
+@paragraphindent 3
+@chapter Paragraph formatting
+@section Images
+
+
+@image{image}
+
+first first first first first first first first first first first first
+first first first first first first first first first first first first
+first first first first first first first first first first first first
+first first first first first first first first first first first first
+first first first first first first first first first first first first
+
+second second second second second second second second 
+second second second second second second second second 
+second second second second second second second second 
+second second second second second second second second 
+
+@image{image}
+
+third third third third third third third third third third
+third third third third third third third third third third
+third third third third third third third third third third
+third third third third third third third third third third
+third third third third third third third third third third
+
+(check no paragraph indent on first paragraph above, after image)
+
+@paragraphindent 0
 
 @chapter Macros
 @section Backslashes in macro arguments
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 1c4fc54..89bd602 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{2021-04-08.19}
+\def\texinfoversion{2021-04-25.21}
 %
 % Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc.
 %
@@ -1002,6 +1002,14 @@ where each line of input produces a line of output.}
   \global\everypar = {}%
 }
 
+% leave vertical mode without cancelling any first paragraph indent
+\gdef\imageindent{%
+  \toks0=\everypar
+  \everypar={}%
+  \ptexnoindent
+  \global\everypar=\toks0
+}
+
 
 % @refill is a no-op.
 \let\refill=\relax
@@ -9409,7 +9417,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   % 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 \noindent \fi
+  \ifx\centersub\centerV \else \imageindent \fi
   %
   % Output the image.
   \ifpdf
@@ -11601,3 +11609,4 @@ directory should work if nowhere else does.}
 @c vim:sw=2:
 
 @enablebackslashhack
+