[7302] XeTeX PDF destination name

[trueroad]

Revision: 7302
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7302
Author:   trueroad
Date:     2016-08-04 14:29:21 +0000 (Thu, 04 Aug 2016)
Log Message:
-----------
XeTeX PDF destination name

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-08-03 21:42:56 UTC (rev 7301)
+++ trunk/ChangeLog     2016-08-04 14:29:21 UTC (rev 7302)
@@ -1,3 +1,9 @@
+2016-08-04  Masamichi Hosoda  <address@hidden>
+
+       * doc/texinfo.tex (\pdfmkdest, \dopdfoutline, \xrefX):
+       Change the method of destination name switching
+       Unicode or ASCII for XeTeX.
+
 2016-08-03  Gavin Smith  <address@hidden>
 
        * doc/texinfo-tex-test.texi (Test of index widow elimination):

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-08-03 21:42:56 UTC (rev 7301)
+++ trunk/doc/texinfo.tex       2016-08-04 14:29:21 UTC (rev 7302)
@@ -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-08-03.21}
+\def\texinfoversion{2016-08-04.14}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1616,13 +1616,15 @@
     % We have to set dummies so commands such as @code, and characters
     % such as \, aren't expanded when present in a section title.
     \indexnofonts
+    \makevalueexpandable
+    \turnoffactive
     \iftxiuseunicodedestname
-      \def\pdfdestname{#1}% Pass through Unicode characters.
+      % Pass through Unicode characters.
     \else
-      \edef\pdfdestname{#1}% Replace Unicode characters with ASCII.
+      % Use ASCII approximations in destination names.
+      \passthroughcharsfalse
     \fi
-    \turnoffactive
-    \makevalueexpandable
+    \def\pdfdestname{#1}%
     \txiescapepdf\pdfdestname
     \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
   }}
@@ -1632,25 +1634,26 @@
   \def\linkcolor{\rgbBlack}
   \def\endlink{\setcolor{\maincolor}\pdfendlink}
   %
-  \def\dopdfoutline#1#2#3#4{%
+  \def\dopdfoutline#1#2#3#4{{%
+    \turnoffactive
+    % Always use Unicode characters in title texts.
+    \def\pdfoutlinetext{#1}%
+    \txiescapepdf\pdfoutlinetext
     \iftxiuseunicodedestname
-      \def\pdfoutlinedest{#3}% Pass through Unicode characters.
+      % Pass through Unicode characters.
     \else
-      \edef\pdfoutlinedest{#3}% Replace Unicode characters with ASCII.
+      % Use ASCII approximations in destination names.
+      \passthroughcharsfalse
     \fi
+    \def\pdfoutlinedest{#3}%
     \ifx\pdfoutlinedest\empty
       \def\pdfoutlinedest{#4}%
     \fi
-    {
-      \turnoffactive
-      \txiescapepdf\pdfoutlinedest
-      \edef\pdfoutlinetext{#1}%
-      \txiescapepdf\pdfoutlinetext
-      %
-      \special{pdf:out [-] #2 << /Title (\pdfoutlinetext) /A
-        << /S /GoTo /D (\pdfoutlinedest) >> >> }%
-    }
-  }
+    \txiescapepdf\pdfoutlinedest
+    %
+    \special{pdf:out [-] #2 << /Title (\pdfoutlinetext) /A
+      << /S /GoTo /D (\pdfoutlinedest) >> >> }%
+  }}
   %
   \def\pdfmakeoutlines{%
     \begingroup
@@ -8885,19 +8888,21 @@
       % For XeTeX
       {\indexnofonts
        \makevalueexpandable
+       \turnoffactive
+       % This expands tokens, so do it after making catcode changes, so _
+       % etc. don't get their TeX definitions.  This ignores all spaces in
+       % #4, including (wrongly) those in the middle of the filename.
+       \getfilename{#4}%
        %
        % This (wrongly) does not take account of leading or trailing
        % spaces in #1, which should be ignored.
        \iftxiuseunicodedestname
-         \def\pdfxrefdest{#1}% Pass through Unicode characters.
+         % Pass through Unicode characters.
        \else
-         \edef\pdfxrefdest{#1}% Replace Unicode characters with ASCII.
+         % Use ASCII approximations in destination names.
+         \passthroughcharsfalse
        \fi
-       \turnoffactive
-       % This expands tokens, so do it after making catcode changes, so _
-       % etc. don't get their TeX definitions.  This ignores all spaces in
-       % #4, including (wrongly) those in the middle of the filename.
-       \getfilename{#4}%
+       \def\pdfxrefdest{#1}%
        %
        \ifx\pdfxrefdest\empty
          \def\pdfxrefdest{Top}% no empty targets