15 files changed, 47 insertions, 17 deletions

diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index ecd58dad0c8..1db5426d254 100644
--- a/Master/texmf-dist/tex/texinfo/texinfo.tex
+++ b/Master/texmf-dist/tex/texinfo/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/Master/texmf-dist/tex/texinfo/txi-cs.tex b/Master/texmf-dist/tex/texinfo/txi-cs.tex
index ffcedae436a..8f1fec656f4 100644
--- a/Master/texmf-dist/tex/texinfo/txi-cs.tex
+++ b/Master/texmf-dist/tex/texinfo/txi-cs.tex
@@ -1,4 +1,4 @@
-% $Id: txi-cs.tex,v 1.6 2008/10/12 22:18:39 karl Exp $
+% $Id: txi-cs.tex,v 1.7 2008/10/16 17:13:10 karl Exp $
 % txi-cs.tex -- Czech translations for texinfo.tex.
 %
 % Copyright 1999, 2000, 2007, 2008 Free Software Foundation.
@@ -22,6 +22,8 @@
 
 \txisetlanguage{czech}{2}{3}
 
+\plainfrenchspacing
+v
 \gdef\putwordAppendix{Pøílohy}
 \gdef\putwordChapter{Kapitola}
 \gdef\putwordfile{soubor}
diff --git a/Master/texmf-dist/tex/texinfo/txi-de.tex b/Master/texmf-dist/tex/texinfo/txi-de.tex
index b0eeeae07c7..6f399da2d9d 100644
--- a/Master/texmf-dist/tex/texinfo/txi-de.tex
+++ b/Master/texmf-dist/tex/texinfo/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/Master/texmf-dist/tex/texinfo/txi-en.tex b/Master/texmf-dist/tex/texinfo/txi-en.tex
index 8fbd54ef4c0..6d556b17582 100644
--- a/Master/texmf-dist/tex/texinfo/txi-en.tex
+++ b/Master/texmf-dist/tex/texinfo/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/Master/texmf-dist/tex/texinfo/txi-es.tex b/Master/texmf-dist/tex/texinfo/txi-es.tex
index 43b3c27b426..ace59e345d1 100644
--- a/Master/texmf-dist/tex/texinfo/txi-es.tex
+++ b/Master/texmf-dist/tex/texinfo/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/Master/texmf-dist/tex/texinfo/txi-fr.tex b/Master/texmf-dist/tex/texinfo/txi-fr.tex
index f8dae3878cf..4915eaef81f 100644
--- a/Master/texmf-dist/tex/texinfo/txi-fr.tex
+++ b/Master/texmf-dist/tex/texinfo/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}
diff --git a/Master/texmf-dist/tex/texinfo/txi-it.tex b/Master/texmf-dist/tex/texinfo/txi-it.tex
index eff356947cc..06f4f1d6b49 100644
--- a/Master/texmf-dist/tex/texinfo/txi-it.tex
+++ b/Master/texmf-dist/tex/texinfo/txi-it.tex
@@ -1,4 +1,4 @@
-% $Id: txi-it.tex,v 1.6 2008/10/12 22:18:39 karl Exp $
+% $Id: txi-it.tex,v 1.7 2008/10/16 17:13:10 karl Exp $
 % txi-it.tex -- Italian translations for texinfo.tex
 %
 % Copyright 1999, 2007, 2008 Free Software Foundation.
@@ -18,6 +18,8 @@
 
 \txisetlanguage{italian}{2}{2}
 
+\plainfrenchspacing
+
 \gdef\putwordAppendix{Appendice}
 \gdef\putwordChapter{Capitolo}
 \gdef\putwordfile{file}
diff --git a/Master/texmf-dist/tex/texinfo/txi-nb.tex b/Master/texmf-dist/tex/texinfo/txi-nb.tex
index d0104b23cc5..f8bade1c8d4 100644
--- a/Master/texmf-dist/tex/texinfo/txi-nb.tex
+++ b/Master/texmf-dist/tex/texinfo/txi-nb.tex
@@ -1,4 +1,4 @@
-% $Id: txi-nb.tex,v 1.2 2008/10/12 22:18:39 karl Exp $
+% $Id: txi-nb.tex,v 1.3 2008/10/16 17:13:10 karl Exp $
 % txi-it.tex -- Norwegian translations for texinfo.tex (1999-10-29, GNU
 % Texinfo 4.0).
 %
@@ -19,6 +19,8 @@
 
 \txisetlanguage{bokmal}{2}{2}  % used for both bokmal and nynorsk
 
+\plainfrenchspacing
+
 \gdef\putwordAppendix{Vedlegg}
 \gdef\putwordChapter{Kapittel}
 \gdef\putwordfile{fil}
diff --git a/Master/texmf-dist/tex/texinfo/txi-nl.tex b/Master/texmf-dist/tex/texinfo/txi-nl.tex
index dd1967d9808..e5263e18f1c 100644
--- a/Master/texmf-dist/tex/texinfo/txi-nl.tex
+++ b/Master/texmf-dist/tex/texinfo/txi-nl.tex
@@ -1,4 +1,4 @@
-% $Id: txi-nl.tex,v 1.6 2008/10/12 22:18:39 karl Exp $
+% $Id: txi-nl.tex,v 1.7 2008/10/16 17:13:10 karl Exp $
 % txi-nl.tex -- Dutch translations for texinfo.tex.  
 %
 % Copyright 1999, 2007, 2008 Free Software Foundation.
@@ -18,6 +18,8 @@
 
 \txisetlanguage{dutch}{2}{2}
 
+\plainfrenchspacing
+
 \gdef\putwordAppendix{Appendix}
 \gdef\putwordChapter{Hoofdstuk}
 \gdef\putwordfile{bestand}
diff --git a/Master/texmf-dist/tex/texinfo/txi-pl.tex b/Master/texmf-dist/tex/texinfo/txi-pl.tex
index c34cfc6ff36..8a3fef66ad6 100644
--- a/Master/texmf-dist/tex/texinfo/txi-pl.tex
+++ b/Master/texmf-dist/tex/texinfo/txi-pl.tex
@@ -1,4 +1,4 @@
-% $Id: txi-pl.tex,v 1.7 2008/10/12 22:18:39 karl Exp $
+% $Id: txi-pl.tex,v 1.8 2008/10/16 17:13:10 karl Exp $
 % txi-pl.tex -- Polish translations for texinfo.tex.
 %
 % Copyright 2003, 2006, 2007, 2008 Free Software Foundation.
@@ -19,7 +19,9 @@
 % Written by Wojciech Polak <polak@gnu.org> on 29-03-2003.
 % Modified by Staszek Wawrykiewicz <staw@gust.org.pl> on 01-04-2003.
 
-\txisetlanguage{czech}{2}{2}
+\txisetlanguage{polish}{2}{2}
+
+\plainfrenchspacing
 
 \gdef\putwordAppendix{Suplement}
 \gdef\putwordChapter{Rozdzia³}
diff --git a/Master/texmf-dist/tex/texinfo/txi-pt.tex b/Master/texmf-dist/tex/texinfo/txi-pt.tex
index 105bc245d60..4650a4f8208 100644
--- a/Master/texmf-dist/tex/texinfo/txi-pt.tex
+++ b/Master/texmf-dist/tex/texinfo/txi-pt.tex
@@ -1,4 +1,4 @@
-% $Id: txi-pt.tex,v 1.7 2008/10/12 22:18:39 karl Exp $
+% $Id: txi-pt.tex,v 1.8 2008/10/16 17:13:10 karl Exp $
 % txi-pt.tex -- Portuguese translations for texinfo.tex.
 %
 % Copyright 1999, 2007, 2008 Free Software Foundation, Inc.
@@ -20,6 +20,8 @@
 
 \txisetlanguage{portuguese}{2}{3}
 
+\plainnonfrenchspacing
+
 \gdef\putwordAppendix{Ap\^endice}
 \gdef\putwordChapter{Cap\'\ptexi tulo}
 \gdef\putwordfile{Data}
diff --git a/Master/texmf-dist/tex/texinfo/txi-ru.tex b/Master/texmf-dist/tex/texinfo/txi-ru.tex
index 43fa2a4bcbc..3c1ca8b48dd 100644
--- a/Master/texmf-dist/tex/texinfo/txi-ru.tex
+++ b/Master/texmf-dist/tex/texinfo/txi-ru.tex
@@ -1,4 +1,4 @@
-% $Id: txi-ru.tex,v 1.3 2008/10/12 22:18:40 karl Exp $
+% $Id: txi-ru.tex,v 1.4 2008/10/16 17:13:10 karl Exp $
 % txi-ru.tex -- Russian translations for texinfo.tex. 
 %
 % Copyright 2005, 2007, 2008 Free Software Foundation.
@@ -20,6 +20,8 @@
 
 \txisetlanguage{russian}{2}{2}
 
+\plainfrenchspacing
+
 \gdef\putwordAppendix{ðÒÉÌÏÖÅÎÉÅ}
 \gdef\putwordChapter{çÌÁ×Á}
 \gdef\putwordfile{ÆÁÊÌ}
diff --git a/Master/texmf-dist/tex/texinfo/txi-sr.tex b/Master/texmf-dist/tex/texinfo/txi-sr.tex
index 8536ed7a376..28ce72af9fa 100644
--- a/Master/texmf-dist/tex/texinfo/txi-sr.tex
+++ b/Master/texmf-dist/tex/texinfo/txi-sr.tex
@@ -1,4 +1,4 @@
-% $Id: txi-sr.tex,v 1.3 2008/10/12 22:18:40 karl Exp $
+% $Id: txi-sr.tex,v 1.4 2008/10/16 17:13:10 karl Exp $
 % txi-src.tex -- Serbian-latin translation for texinfo.tex.
 %
 % Copyright 2005, 2007, 2008 Free Software Foundation.
@@ -20,6 +20,8 @@
 
 \txisetlanguage{serbian}{2}{2}
 
+\plainfrenchspacing
+
 \gdef\putwordAppendix{Prilog}
 \gdef\putwordChapter{Glava}
 \gdef\putwordfile{datoteka}
diff --git a/Master/texmf-dist/tex/texinfo/txi-tr.tex b/Master/texmf-dist/tex/texinfo/txi-tr.tex
index 6042877f02c..c1354f84d39 100644
--- a/Master/texmf-dist/tex/texinfo/txi-tr.tex
+++ b/Master/texmf-dist/tex/texinfo/txi-tr.tex
@@ -1,4 +1,4 @@
-% $Id: txi-tr.tex,v 1.8 2008/10/12 22:18:40 karl Exp $
+% $Id: txi-tr.tex,v 1.9 2008/10/16 17:13:10 karl Exp $
 % txi-tr.tex -- Turkish translations for texinfo.tex.
 %
 % Copyright 2003, 2007, 2008 Free Software Foundation, Inc.
@@ -20,6 +20,8 @@
 
 \txisetlanguage{turkish}{2}{2}
 
+\plainfrenchspacing
+
 \gdef\putwordAppendix{Ek}
 \gdef\putwordChapter{Kesim}
 \gdef\putwordfile{dosya}
diff --git a/Master/texmf-dist/tex/texinfo/txi-uk.tex b/Master/texmf-dist/tex/texinfo/txi-uk.tex
index 5db6c92f5e5..269ae714cb5 100644
--- a/Master/texmf-dist/tex/texinfo/txi-uk.tex
+++ b/Master/texmf-dist/tex/texinfo/txi-uk.tex
@@ -1,4 +1,4 @@
-% $Id: txi-uk.tex,v 1.3 2008/10/12 22:18:40 karl Exp $
+% $Id: txi-uk.tex,v 1.4 2008/10/16 17:13:10 karl Exp $
 % txi-uk.tex -- Ukrainian translations for texinfo.tex.
 %
 % Copyright 2005, 2007, 2008 Free Software Foundation.
@@ -20,6 +20,8 @@
 
 \txisetlanguage{ukrainian}{2}{2}
 
+\plainfrenchspacing
+
 \gdef\putwordAppendix{äÏÄÁÔÏË}
 \gdef\putwordChapter{òÏÚĦÌ}
 \gdef\putwordfile{ÆÁÊÌ}