branch master updated: Index commands do not end paragraphs

[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 f12de7a5b3 Index commands do not end paragraphs
f12de7a5b3 is described below

commit f12de7a5b383bed0ea29ee34c427679e0f8b9658
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Mar 21 07:03:56 2023 +0000

    Index commands do not end paragraphs
    
    * doc/texinfo.tex (\doindex, \docodeindex): Do not use \indexpar.
    (\indexpar): Remove.
    
    This reverts change on 2023-02-19.  It caused problems for the
    Lilypond manuals -- report from Werner.
---
 ChangeLog       | 10 ++++++++++
 NEWS            |  2 +-
 doc/texinfo.tex | 16 +++-------------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d3e17329c..46c4e1df07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-03-21  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Index commands do not end paragraphs
+
+       * doc/texinfo.tex (\doindex, \docodeindex): Do not use \indexpar.
+       (\indexpar): Remove.
+
+       This reverts change on 2023-02-19.  It caused problems for the
+       Lilypond manuals -- report from Werner.
+
 2023-03-19  Gavin Smith <gavinsmith0123@gmail.com>
 
        * README-hacking: Update
diff --git a/NEWS b/NEWS
index a5e7809070..fe9c5c02df 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ See the manual for detailed information.
 * Language
  . new generic definition commands, @defblock and @defline, that do not
    automatically create index entries
- . index commands end paragraphs
+ . index commands end paragraphs (revert this change)
  . @cartouche takes an argument to specify the cartouche title
 
 * texi2any
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 167e260e40..0b8b87c959 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{2023-03-13.20}
+\def\texinfoversion{2023-03-21.06}
 %
 % Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc.
 %
@@ -4102,7 +4102,6 @@ $$%
     \nobreak\kern\dimen0
     \endgroup
     \itemxneedsnegativevskiptrue
-    \penalty 10021 % for \indexpar
   \fi
 }
 
@@ -4219,7 +4218,6 @@ $$%
    % We can be in inner vertical mode in a footnote, although an
    % @itemize looks awful there.
   }%
-  \penalty 10021 % for \indexpar
   \flushcr
 }
 
@@ -4784,17 +4782,11 @@ $$%
 % and it is the two-letter name of the index.
 
 \def\doindex#1{\edef\indexname{#1}\parsearg\doindexxxx}
-\def\doindexxxx #1{\indexpar\doind{\indexname}{#1}}
+\def\doindexxxx #1{\doind{\indexname}{#1}}
 
 % like the previous two, but they put @code around the argument.
 \def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx}
-\def\docodeindexxxx #1{\indexpar\docind{\indexname}{#1}}
-
-% End any open paragraph, unless we are immediately after @item in
-% @itemize or @enumerate.
-\def\indexpar{%
-\ifnum\lastpenalty=10021 \else\endgraf\fi
-}
+\def\docodeindexxxx #1{\docind{\indexname}{#1}}
 
 
 % \definedummyword defines \#1 as \string\#1\space, thus effectively
@@ -5351,9 +5343,7 @@ $$%
 % ..., ready, GO:
 %
 \def\safewhatsit#1{\ifhmode
-  \whatsitpenalty = \lastpenalty
   #1%
-  \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi
  \else
   % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
   \whatsitskip = \lastskip