branch master updated: * doc/texinfo.tex (\frenchspacing): Only change \sfcode if setting is changing, by using a conditional.

[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 8e195746da * doc/texinfo.tex (\frenchspacing): Only change \sfcode if 
setting is changing, by using a conditional.
8e195746da is described below

commit 8e195746da57d003edf39aa066f2ec3b317bf257
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Sep 25 13:53:35 2022 +0100

    * doc/texinfo.tex (\frenchspacing): Only change \sfcode if
    setting is changing, by using a conditional.
---
 ChangeLog       |  5 +++++
 doc/texinfo.tex | 23 ++++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1758d3bbdf..f1c94a66d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-09-25  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex (\frenchspacing): Only change \sfcode if
+       setting is changing, by using a conditional.
+
 2022-09-25  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * doc/texinfo.texi (Menu Example): Change menu marker from
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 10d70f4c19..7ad6244b8e 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -4,7 +4,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2022-09-25.09}
+\def\texinfoversion{2022-09-25.12}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -2821,20 +2821,29 @@ end
 \def\nohyphenation{\hyphenchar\font = -1  \aftergroup\restorehyphenation}
 \def\restorehyphenation{\hyphenchar\font = `- }
 
+\newif\iffrenchspacing
+\frenchspacingfalse
+
 % Set sfcode to normal for the chars that usually have another value.
 % Can't use plain's \frenchspacing because it uses the `\x notation, and
 % sometimes \x has an active definition that messes things up.
 %
 \catcode`@=11
   \def\plainfrenchspacing{%
-    \sfcode`\.=\@m \sfcode`\?=\@m \sfcode`\!=\@m
-    \sfcode`\:=\@m \sfcode`\;=\@m \sfcode`\,=\@m
-    \def\endofsentencespacefactor{1000}% for @. and friends
+    \iffrenchspacing\else
+      \frenchspacingtrue
+      \sfcode`\.=\@m \sfcode`\?=\@m \sfcode`\!=\@m
+      \sfcode`\:=\@m \sfcode`\;=\@m \sfcode`\,=\@m
+      \def\endofsentencespacefactor{1000}% for @. and friends
+    \fi
   }
   \def\plainnonfrenchspacing{%
-    \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
-    \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
-    \def\endofsentencespacefactor{3000}% for @. and friends
+    \iffrenchspacing
+      \frenchspacingfalse
+       \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
+       \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
+       \def\endofsentencespacefactor{3000}% for @. and friends
+    \fi
   }
 \catcode`@=\other
 \def\endofsentencespacefactor{3000}% default