[7277] fix @synindex

[gavinsmith0123]

Revision: 7277
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7277
Author:   gavin
Date:     2016-07-30 16:37:45 +0000 (Sat, 30 Jul 2016)
Log Message:
-----------
fix @synindex

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-07-28 14:02:30 UTC (rev 7276)
+++ trunk/ChangeLog     2016-07-30 16:37:45 UTC (rev 7277)
@@ -1,6 +1,14 @@
+2016-07-30  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\dosynindex): Call \requireopenindexfile so 
+       that we copy a working file descriptor for the index.  Remove code
+       that closes the file for the index getting redefined.  Fixes 
+       broken @synindex and @syncodeindex commands, reported by
+       Ralph Schleicher.
+
 2016-07-28  Masamichi Hosoda  <address@hidden>
 
-       * doc/texinfo.tex:
+       * doc/texinfo.tex
        (\pdfdest, \dopdfoutline, \pdflink, \xrefX):
        Fix XeTeX PDF destination name for consistent with pdfTeX.
 

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2016-07-28 14:02:30 UTC (rev 7276)
+++ trunk/NEWS  2016-07-30 16:37:45 UTC (rev 7277)
@@ -24,6 +24,8 @@
     less likely to be installed.
   . Use of user-defined macros in the text of an index entry is more
     reliable when the text contains Texinfo @-commands.
+  . @synindex and @syncodeindex have been fixed (broken in the last
+    release).
   . Support added for native UTF-8 support with XeTeX and LuaTeX.
   . Support of PDF output with XeTeX improved.
   . You can use a new file doc/texinfo-ja.tex for Texinfo documents in

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-07-28 14:02:30 UTC (rev 7276)
+++ trunk/doc/texinfo.tex       2016-07-30 16:37:45 UTC (rev 7277)
@@ -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{2016-07-28.13}
+\def\texinfoversion{2016-07-30.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4773,14 +4773,7 @@
 % #1 is \doindex or \docodeindex, #2 the index getting redefined (foo),
 % #3 the target index (bar).
 \def\dosynindex#1#2#3{%
-  % Only do \closeout if we haven't already done it, else we'll end up
-  % closing the target index.
-  \expandafter \ifx\csname donesynindex#2\endcsname \relax
-    % The \closeout helps reduce unnecessary open files; the limit on the
-    % Acorn RISC OS is a mere 16 files.
-    \expandafter\closeout\csname#2indfile\endcsname
-    \expandafter\let\csname donesynindex#2\endcsname = 1
-  \fi
+  \requireopenindexfile{#3}%
   % redefine \fooindfile:
   \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
   \expandafter\let\csname#2indfile\endcsname=\temp