branch master updated: Fix @defun sentence 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 3cd56e4  Fix @defun sentence spacing
3cd56e4 is described below

commit 3cd56e4c8dbe0a184cf1bd93e138dc6a2abf7aeb
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Aug 10 15:06:39 2021 +0100

    Fix @defun sentence spacing
    
    * doc/texinfo.tex (\printdefunline): Call \plainfrenchspacing.
    Werner Lemberg reported that extra space would appear after a
    '?' in a definition line, which is often used for Lisp dialects
    like Scheme, in particular the documentation of Lilypond.
    * doc/texinfo-tex-test.texi (Definitions): Add example.
---
 ChangeLog                 | 10 ++++++++++
 doc/texinfo-tex-test.texi | 24 ++++++++++++++++++++++++
 doc/texinfo.tex           |  3 ++-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ed4985e..eece96b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2021-08-10  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Fix @defun sentence spacing
+
+       * doc/texinfo.tex (\printdefunline): Call \plainfrenchspacing.
+       Werner Lemberg reported that extra space would appear after a
+       '?' in a definition line, which is often used for Lisp dialects
+       like Scheme, in particular the documentation of Lilypond.
+       * doc/texinfo-tex-test.texi (Definitions): Add example.
+
 2021-08-09  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/LaTeX.pm (_protect_text, _convert):
diff --git a/doc/texinfo-tex-test.texi b/doc/texinfo-tex-test.texi
index 4546694..32a47a5 100644
--- a/doc/texinfo-tex-test.texi
+++ b/doc/texinfo-tex-test.texi
@@ -1649,6 +1649,30 @@ after after after after after after after after
 after after after after after after after after
 
 
+@section Definitions
+
+Check that spacing does not vary after the `?' punctuation on the
+definition line, but spacing does vary inside the definition body and
+afterwards.
+
+@defun foo bar? bar bar
+@defunx foo bar?@: bar bar
+a. b@*
+a.@: b
+@end defun
+
+@noindent
+a. b@*
+a.@: b
+
+@defun foo bar?@: bar bar
+a. b@*
+a.@: b
+@end defun
+
+
+
+
 
 
 
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 89bd602..63d2892 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-25.21}
+\def\texinfoversion{2021-08-10.14}
 %
 % Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc.
 %
@@ -7592,6 +7592,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 %
 \def\printdefunline#1#2{%
   \begingroup
+    \plainfrenchspacing
     % call \deffnheader:
     #1#2 \endheader
     % common ending: