From 6c59b48dc91d784ec936f0e95588057dfc816e5c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 3 Mar 2016 22:50:57 +0000 Subject: sync git-svn-id: svn://tug.org/texlive/trunk@39932 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/texinfo/texinfo.tex | 76 ++++++++----------------------- 1 file changed, 18 insertions(+), 58 deletions(-) (limited to 'Master/texmf-dist/tex/texinfo') diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index 08baf5da257..8416bbaed62 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{2016-02-16.15} +\def\texinfoversion{2016-02-22.15} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -1525,7 +1525,7 @@ 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 + \indexnofonts % For avoiding UTF-16 convert issue of xdvipdfmx 20150315. \makevalueexpandable % In the case of XeTeX, xdvipdfmx converts strings to UTF-16. % Therefore \txiescapepdf is not necessary. @@ -1574,7 +1574,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 + \indexnofonts % For avoiding UTF-16 convert issue of xdvipdfmx 20150315. \setupdatafile % We can have normal brace characters in the PDF outlines, unlike % Texinfo index files. So set that up. @@ -1591,16 +1591,11 @@ output) for that.)} ] \special{pdf:docview << /PageMode /UseOutlines >> } - \openin 1 uptex.tex % upTeX has UTF8-UTF16 cmap - \ifeof 1 - % upTeX does not exist. To use UTF8-UCS2 cmap. - % In this case, non-BMP characters (over U+FFFF) can not be used. - \special{pdf:tounicode UTF8-UCS2} - \else - % upTeX exists. To use UTF8-UTF16 cmap. - % Non-BMP characters (over U+FFFF) can be used. - \special{pdf:tounicode UTF8-UTF16} - \fi + % ``\special{pdf:tounicode ...}'' is not necessary + % because xdvipdfmx converts strings from UTF-8 to UTF-16 without it. + % 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). \fi % @@ -3477,13 +3472,16 @@ end \newif\ifseenauthor \newif\iffinishedtitlepage -% Do an implicit @contents or @shortcontents after @end titlepage if the -% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage. -% -\newif\ifsetcontentsaftertitlepage - \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue -\newif\ifsetshortcontentsaftertitlepage - \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue +% @setcontentsaftertitlepage used to do an implicit @contents or +% @shortcontents after @end titlepage, but it is now obsolete. +\def\setcontentsaftertitlepage{% + \errmessage{@setcontentsaftertitlepage has been removed as a Texinfo + command; move your @contents command if you want the contents + after the title page.}}% +\def\setshortcontentsaftertitlepage{% + \errmessage{@setshortcontentsaftertitlepage has been removed as a Texinfo + command; move your @shortcontents and @contents commands if you + want the contents after the title page.}}% \parseargdef\shorttitlepage{% \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% @@ -3525,20 +3523,6 @@ end % Need this before the \...aftertitlepage checks so that if they are % in effect the toc pages will come out with page numbers. \HEADINGSon - % - % If they want short, they certainly want long too. - \ifsetshortcontentsaftertitlepage - \shortcontents - \contents - \global\let\shortcontents = \relax - \global\let\contents = \relax - \fi - % - \ifsetcontentsaftertitlepage - \contents - \global\let\contents = \relax - \global\let\shortcontents = \relax - \fi } \def\finishtitlepage{% @@ -6371,30 +6355,6 @@ end } -% I don't think this chapter style is supported any more, so I'm not -% updating it with the new noderef stuff. We'll see. --karl, 11aug03. -% -\parseargdef\setchapterstyle{\csname CHAPF#1\endcsname} -% -\def\unnchfopen #1{% - \chapoddpage - \vbox{\chapfonts \raggedtitlesettings #1\par}% - \nobreak\bigskip\nobreak -} -\def\chfopen #1#2{\chapoddpage {\chapfonts -\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% -\par\penalty 5000 % -} -\def\centerchfopen #1{% - \chapoddpage - \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}% - \nobreak\bigskip \nobreak -} -\def\CHAPFopen{% - \global\let\chapmacro=\chfopen - \global\let\centerchapmacro=\centerchfopen} - - % Section titles. These macros combine the section number parts and % call the generic \sectionheading to do the printing. % -- cgit v1.2.3