From: Karl Berry Date: Tue, 22 Mar 2016 16:15:36 +0000 (-0700) Subject: update from texinfo X-Git-Tag: v1.0~6784 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=1d4ee40d209d7a7c2a7c96c1469050eddc6cce2e;p=gnulib.git update from texinfo --- diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index a93c5a4e43..9437a4d3e3 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/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{2016-03-22.07} +\def\texinfoversion{2016-03-22.15} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -1515,8 +1515,22 @@ output) for that.)} % % For XeTeX % +\newif\iftxiuseunicodedestname \ifx\XeTeXrevision\thisisundefined \else + % + % XeTeX version check + % + \ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99995}>-1 + % XeTeX 0.99995+ contains xdvipdfmx 20160307+. + % It can handle Unicode destination name for PDF. + \txiuseunicodedestnametrue + \else + % XeTeX < 0.99995 can not handle Unicode destination name for PDF + % because xdvipdfmx 20150315 has UTF-16 convert issue. + % It fixed by xdvipdfmx 20160106 (TeX Live SVN r39753). + \txiuseunicodedestnamefalse + \fi % % PDF outline support % @@ -1528,15 +1542,25 @@ output) for that.)} \def\pdfmkdest#1{{% % We have to set dummies so commands such as @code, and characters % such as \, aren't expanded when present in a section title. - \indexnofonts % For avoiding UTF-16 convert issue of xdvipdfmx 20150315. + \indexnofonts + \iftxiuseunicodedestname + \def\pdfdestname{#1}% Pass through Unicode characters. + \else + \edef\pdfdestname{#1}% Replace Unicode characters to ASCII. + \fi + \turnoffactive \makevalueexpandable % In the case of XeTeX, xdvipdfmx converts strings to UTF-16. % Therefore \txiescapepdf is not necessary. - \safewhatsit{\pdfdest name{#1} xyz}% + \safewhatsit{\pdfdest name{\pdfdestname} xyz}% }} % \def\dopdfoutline#1#2#3#4{% - \edef\pdfoutlinedest{#3}% + \iftxiuseunicodedestname + \def\pdfoutlinedest{#3}% Pass through Unicode characters. + \else + \edef\pdfoutlinedest{#3}% Replace Unicode characters to ASCII. + \fi \ifx\pdfoutlinedest\empty \def\pdfoutlinedest{#4}% \fi @@ -1577,7 +1601,7 @@ output) for that.)} % In the case of XeTeX, xdvipdfmx converts strings to UTF-16. % Therefore, the encoding and the language may not be considered. % - \indexnofonts % For avoiding UTF-16 convert issue of xdvipdfmx 20150315. + \indexnofonts \setupdatafile % We can have normal brace characters in the PDF outlines, unlike % Texinfo index files. So set that up. @@ -1599,6 +1623,28 @@ output) for that.)} % However, due to UTF-16 convert issue of xdvipdfmx 20150315, % ``\special{pdf:dest ...}'' can not handle non-ASCII strings. % It fixed by xdvipdfmx 20160106 (TeX Live SVN r39753). +% + % make a live url in pdf output. + \def\pdfurl#1{% + \begingroup + % it seems we really need yet another set of dummies; have not + % tried to figure out what each command should do in the context + % of @url. for now, just make @/ a no-op, that's the only one + % people have actually reported a problem with. + % + \normalturnoffactive + \def\@{@}% + \let\/=\empty + \makevalueexpandable + % do we want to go so far as to use \indexnofonts instead of just + % special-casing \var here? + \def\var##1{##1}% + % + \leavevmode\setcolor{\urlcolor}% + \special{pdf:bann << /Border [0 0 0] + /Subtype /Link /A << /S /URI /URI (#1) >> >>}% + \endgroup} + \def\endlink{\setcolor{\maincolor}\special{pdf:eann}} % % % @image support