From 9f17086841fde8608f98e75e460cb9fa48ae78ae Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 29 May 2019 23:38:33 +0000 Subject: tl-update-auto git-svn-id: svn://tug.org/texlive/trunk@51268 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/build-aux/config.guess | 10 +++++----- Build/source/build-aux/texinfo.tex | 17 ++++++++++++++--- 2 files changed, 19 insertions(+), 8 deletions(-) (limited to 'Build/source/build-aux') diff --git a/Build/source/build-aux/config.guess b/Build/source/build-aux/config.guess index 4cd9454b35c..b40e17b1379 100755 --- a/Build/source/build-aux/config.guess +++ b/Build/source/build-aux/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2019 Free Software Foundation, Inc. -timestamp='2019-04-28' +timestamp='2019-05-28' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1325,11 +1325,11 @@ EOF echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ diff --git a/Build/source/build-aux/texinfo.tex b/Build/source/build-aux/texinfo.tex index ccd112941ac..53f2fc4835b 100644 --- a/Build/source/build-aux/texinfo.tex +++ b/Build/source/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{2019-04-12.13} +\def\texinfoversion{2019-05-18.15} % % Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc. % @@ -4952,6 +4952,8 @@ end \definedummyword\sup \definedummyword\textdegree % + \definedummyword\subentry + % % We want to disable all macros so that they are not expanded by \write. \macrolist \let\value\dummyvalue @@ -5224,10 +5226,10 @@ end } \def\indexwriteseealso#1{ - \gdef\pagenumbertext{@seealso{#1}}% + \gdef\pagenumbertext{\string\seealso{#1}}% } \def\indexwriteseeentry#1{ - \gdef\pagenumbertext{@seeentry{#1}}% + \gdef\pagenumbertext{\string\seeentry{#1}}% } % The default definitions @@ -5315,6 +5317,15 @@ end % the current value of \escapechar. \def\escapeisbackslash{\escapechar=`\\} +% Use \ in index files by default. texi2dvi didn't support @ as as the escape +% character (as it checked for "\entry" in the files, and not "@entry"). When +% the new version of texi2dvi has had a chance to become more prevalent, then +% the escape character can change back to @ again. This should be an easy +% change to make now because both @ and \ are only used as escape characters in +% index files, never standing for themselves. +% +\set txiindexescapeisbackslash + % Write the entry in \indextext to the index file. % \def\doindwrite{% -- cgit v1.2.3