[7205] latin 1 in bookmark strings

[gavinsmith0123]

Revision: 7205
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7205
Author:   gavin
Date:     2016-06-07 19:17:15 +0000 (Tue, 07 Jun 2016)
Log Message:
-----------
latin 1 in bookmark strings

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-06-07 19:04:42 UTC (rev 7204)
+++ trunk/ChangeLog     2016-06-07 19:17:15 UTC (rev 7205)
@@ -1,5 +1,11 @@
 2016-06-07  Gavin Smith  <address@hidden>
+       
+       * doc/texinfo.tex (\dopdfoutline): For display string for PDF 
+       bookmark, check if encoding is Latin-1, and if so, call 
+       \passthroughcharstrue.
 
+2016-06-07  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\pdfmkdest): Call \passthroughcharsfalse in 
        order to use ASCII approximations in destination names.
 

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-06-07 19:04:42 UTC (rev 7204)
+++ trunk/doc/texinfo.tex       2016-06-07 19:17:15 UTC (rev 7205)
@@ -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-06-07.20}
+\def\texinfoversion{2016-06-07.21}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1360,8 +1360,21 @@
       \fi
       %
       % Also escape PDF chars in the display string.
-      \edef\pdfoutlinetext{#1}%
-      \txiescapepdf\pdfoutlinetext
+      \bgroup
+        \ifx \declaredencoding \latone
+          % The PDF format can use an extended form of Latin-1 in bookmark
+          % strings.  See Appendix D of the PDF Reference, Sixth Edition, for
+          % the "PDFDocEncoding".
+          \passthroughcharstrue
+        \fi
+        \ifx \declaredencoding \utfeight
+          % TODO: the PDF format can use UTF-16 in bookmark strings, but the
+          % code for this isn't done yet.
+        \fi
+        \globaldefs=1
+        \edef\pdfoutlinetext{#1}%
+        \txiescapepdf\pdfoutlinetext
+      \egroup
       %
       \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
     }