branch master updated: Fix page break between @verbatim environment and @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 a9aacb0  Fix page break between @verbatim environment and @image
a9aacb0 is described below

commit a9aacb0b39967059b8064ed55363839f8a7a8cdf
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Sep 26 11:27:03 2021 +0100

    Fix page break between @verbatim environment and @image
    
    * doc/texinfo.tex (\image): Do not add an initial \nobreak before
    the image as this blocks a page break after a preceding @verbatim
    environment, causing breaking before the final line of the
    environment instead.  Report from Werner Lemberg.
    * doc/texinfo-tex-test.texi (Images): Add test case.
---
 ChangeLog                 | 10 +++++++++
 doc/texinfo-tex-test.texi | 55 +++++++++++++++++++++++++++++++++++++++++++++++
 doc/texinfo.tex           |  4 ++--
 3 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5104f50..403cc42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2021-09-26  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Fix page break between @verbatim environment and @image
+
+       * doc/texinfo.tex (\image): Do not add an initial \nobreak before
+       the image as this blocks a page break after a preceding @verbatim
+       environment, causing breaking before the final line of the
+       environment instead.  Report from Werner Lemberg.
+       * doc/texinfo-tex-test.texi (Images): Add test case.
+
 2021-09-16  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * tp/Texinfo/XS/parsetexi/end_line.c (parse_line_command_args)
diff --git a/doc/texinfo-tex-test.texi b/doc/texinfo-tex-test.texi
index 32a47a5..d23c228 100644
--- a/doc/texinfo-tex-test.texi
+++ b/doc/texinfo-tex-test.texi
@@ -118,6 +118,61 @@ third third third third third third third third third third
 
 (check no paragraph indent on first paragraph above, after image)
 
+@page
+
+Check page break occurs between example and image
+
+@example
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+line
+@end example
+
+
+@image{image}
+
 @paragraphindent 0
 
 @chapter Macros
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index fdd4fbe..950d3c9 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-08-28.18}
+\def\texinfoversion{2021-09-26.10}
 %
 % Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc.
 %
@@ -9403,7 +9403,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \fi\fi
   %
   \ifimagevmode
-    \nobreak\medskip
+    \medskip
     % 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.