From c1aed27c7fc6f9315d2d617e39a3dddabfae491a Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Fri, 17 Oct 2008 00:11:59 +0200
Subject: [PATCH] Again update of texinfo files from CVS.

Frenchspacing is now set according to the language.
---
 tex/texinfo.tex | 6 ++++--
 tex/txi-de.tex  | 4 +++-
 tex/txi-en.tex  | 4 +++-
 tex/txi-es.tex  | 4 +++-
 tex/txi-fr.tex  | 4 +++-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tex/texinfo.tex b/tex/texinfo.tex
index ecd58dad0c..1db5426d25 100644
--- a/tex/texinfo.tex
+++ b/tex/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{2008-10-12.17}
+\def\texinfoversion{2008-10-16.09}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -6175,6 +6175,7 @@ end
 \def\doverbatiminclude#1{%
   {%
     \makevalueexpandable
+    \def\@{@}% we want to use \indexnofonts, but then verbatim ends prematurely
     \setupverbatim
     \input #1
     \afterenvbreak
@@ -7762,10 +7763,11 @@ end
     \ifeof 1
       \documentlanguagetrywithoutunderscore{#1_\finish}%
     \else
+      \globaldefs = 1  % everything in the txi-LL files needs to persist
       \input txi-#1.tex
     \fi
     \closein 1
-  \endgroup
+  \endgroup % end raw TeX
 \endgroup}
 }
 %
diff --git a/tex/txi-de.tex b/tex/txi-de.tex
index b0eeeae07c..6f399da2d9 100644
--- a/tex/txi-de.tex
+++ b/tex/txi-de.tex
@@ -1,4 +1,4 @@
-% $Id: txi-de.tex,v 1.8 2008/10/12 22:18:39 karl Exp $
+% $Id: txi-de.tex,v 1.9 2008/10/16 17:13:10 karl Exp $
 % txi-de.tex -- German translations for texinfo.tex.
 %
 % Copyright 1999, 2007, 2008 Free Software Foundation, Inc.
@@ -20,6 +20,8 @@
 
 \txisetlanguage{ngerman}{2}{2}
 
+\plainfrenchspacing
+
 % german translation of the used words.
 % Don't use checking because if it is our turn they have
 % been defined.
diff --git a/tex/txi-en.tex b/tex/txi-en.tex
index 8fbd54ef4c..6d556b1758 100644
--- a/tex/txi-en.tex
+++ b/tex/txi-en.tex
@@ -1,4 +1,4 @@
-% $Id: txi-en.tex,v 1.6 2008/10/12 22:18:39 karl Exp $
+% $Id: txi-en.tex,v 1.7 2008/10/16 17:13:10 karl Exp $
 % txi.en.tex -- English non-translations for texinfo.tex.  This is read
 % when a source document says @documentlanguage en (which might happen
 % after another @documentlanguage).  The actual values are the same as
@@ -21,6 +21,8 @@
 
 \txisetlanguage{USenglish}{2}{3}
 
+\plainnonfrenchspacing
+
 \gdef\putwordAppendix{Appendix}
 \gdef\putwordChapter{Chapter}
 \gdef\putwordfile{file}
diff --git a/tex/txi-es.tex b/tex/txi-es.tex
index 43b3c27b42..ace59e345d 100644
--- a/tex/txi-es.tex
+++ b/tex/txi-es.tex
@@ -1,4 +1,4 @@
-% $Id: txi-es.tex,v 1.5 2008/10/12 22:18:39 karl Exp $
+% $Id: txi-es.tex,v 1.6 2008/10/16 17:13:10 karl Exp $
 % txi-es.tex -- Spanish translations for texinfo.tex.
 %
 % Copyright (C) 1999, 2007, 2008 by Adrian Perez Jorge.
@@ -20,6 +20,8 @@
 
 \txisetlanguage{spanish}{2}{2}
 
+\plainfrenchspacing
+
 \gdef\putwordAppendix{Ap\'endice}
 \gdef\putwordChapter{Cap\'{\char16{}}tulo}
 \gdef\putwordfile{archivo}
diff --git a/tex/txi-fr.tex b/tex/txi-fr.tex
index f8dae3878c..4915eaef81 100644
--- a/tex/txi-fr.tex
+++ b/tex/txi-fr.tex
@@ -1,4 +1,4 @@
-% $Id: txi-fr.tex,v 1.6 2008/10/12 22:18:39 karl Exp $
+% $Id: txi-fr.tex,v 1.7 2008/10/16 17:13:10 karl Exp $
 % txi-fr.tex -- French translations for texinfo.tex.
 %
 % Copyright (C) 1999, 2007, 2008 Free Software Foundation.
@@ -23,6 +23,8 @@
 
 \txisetlanguage{french}{2}{2}
 
+\plainfrenchspacing
+
 \gdef\putwordAppendix{Annexe}
 \gdef\putwordChapter{Chapitre}
 \gdef\putwordfile{fichier}
-- 
2.39.2