From 6962188a7c62735631118a3506e96e6bdc260d88 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 Mar 2019 01:23:54 +0000 Subject: tl-update-auto git-svn-id: svn://tug.org/texlive/trunk@50307 c570f23f-e606-0410-a88d-b1316a301751 --- Master/doc.html | 45 +++++++------ Master/texmf-dist/tex/texinfo/texinfo.tex | 107 ++++++++++++++---------------- Master/tlpkg/installer/config.guess | 42 ++++++++++-- 3 files changed, 111 insertions(+), 83 deletions(-) (limited to 'Master') diff --git a/Master/doc.html b/Master/doc.html index 250a9597864..9dd09e47f04 100644 --- a/Master/doc.html +++ b/Master/doc.html @@ -6432,6 +6432,11 @@ Computer Science thesis class for University of Dortmund fbithesis.pdf. +
  • fbox: +Extended \fbox macro from standard LaTeX +fbox.pdf. +
    • +
  • fcavtex: A thesis class for the FCAV/UNESP (Brazil) basico-principal.pdf, @@ -7225,7 +7230,7 @@ Get first and last words of a page

    G

    -
      +
      1. g-brief: Letter document class @@ -8034,7 +8039,7 @@ Bundle of classes for "La Gazette des Mathematiciens"

        H

        -
          +
          1. h2020proposal: LaTeX class and template for EU H2020 RIA proposal @@ -8404,7 +8409,7 @@ Basic support for multiple languages in Plain TeX

            I

            -
              +
              1. ibycus-babel: Use the Ibycus 4 Greek font with Babel @@ -8837,7 +8842,7 @@ A two-element sans-serif font

                J

                -
                  +
                  1. jablantile: Metafont version of tiles in the style of Slavik Jablan @@ -9005,7 +9010,7 @@ A replacement for LaTeX's verbatim package

                    K

                    -
                      +
                      1. kalendarium: Print dates according to the classical Latin calendar @@ -9432,7 +9437,7 @@ Create Karnaugh maps with LaTeX

                        L

                        -
                          +
                          1. l2picfaq: LaTeX pictures "how-to" (German) @@ -10876,7 +10881,7 @@ Commands to include lilypond scores within a (Lua)LaTeX document

                            M

                            -
                              +
                              1. m-tx: A preprocessor for pmx @@ -12133,7 +12138,7 @@ XeLaTeX template for writing the main body of NSFC proposals

                                N

                                -
                                  +
                                  1. na-box: Arabic-aware version of pas-cours package @@ -12612,7 +12617,7 @@ Support for the journal "North-Western European Journal of Mathematics"

                                    O

                                    -
                                      +
                                      1. oberdiek: A bundle of packages submitted by Heiko Oberdiek @@ -12938,7 +12943,7 @@ Combine LaTeX commands over included graphics

                                        P

                                        -
                                          +
                                          1. padcount: Pad numbers with arbitrary characters @@ -14815,7 +14820,7 @@ Run Python from within a document, typesetting the results

                                            Q

                                            -
                                              +
                                              1. qcircuit: Macros to generate quantum ciruits @@ -14901,7 +14906,7 @@ German translations to the quran package

                                                R

                                                -
                                                  +
                                                  1. raleway: Use Raleway with TeX(-alike) systems @@ -15374,7 +15379,7 @@ Class for Ryerson Unversity Graduate School requirements

                                                    S

                                                    -
                                                      +
                                                      1. sa-tikz: TikZ library to draw switching architectures @@ -16726,7 +16731,7 @@ Format systems of equations

                                                        T

                                                        -
                                                          +
                                                          1. t-angles: Draw tangles, trees, Hopf algebra operations and other pictures @@ -18562,7 +18567,7 @@ Print a typographic grid

                                                            U

                                                            -
                                                              +
                                                              1. uaclasses: University of Arizona thesis and dissertation format @@ -18929,7 +18934,7 @@ University of Washington thesis class

                                                                V

                                                                -
                                                                  +
                                                                  1. vancouver: Bibliographic style file for Biomedical Journals @@ -19133,7 +19138,7 @@ Variable-width multiple text columns

                                                                    W

                                                                    -
                                                                      +
                                                                      1. wadalab: Wadalab (Japanese) font packages @@ -19303,7 +19308,7 @@ Extend LaTeX's cross-reference system

                                                                        X

                                                                        -
                                                                          +
                                                                          1. xargs: Define commands with many optional arguments @@ -19766,7 +19771,7 @@ Tree macros using XY-Pic

                                                                            Y

                                                                            -
                                                                              +
                                                                              1. yafoot: A bundle of miscellaneous footnote packages @@ -19835,7 +19840,7 @@ Many-featured Young tableaux and Young diagrams

                                                                                Z

                                                                                -
                                                                                  +
                                                                                  1. zed-csp: Typesetting Z and CSP format specifications diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index 192284cccc1..4e5ac293af5 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{2019-03-03.15} +\def\texinfoversion{2019-03-07.19} % % Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc. @@ -388,13 +388,7 @@ % before the \shipout runs. % \indexdummies % don't expand commands in the output. - \normalturnoffactive % \ in index entries must not stay \, e.g., if - % the page break happens to be in the middle of an example. - % We don't want .vr (or whatever) entries like this: - % \entry{{\indexbackslash }acronym}{32}{\code {\acronym}} - % "\acronym" won't work when it's read back in; - % it needs to be - % {\code {{\backslashcurfont }acronym} + \turnoffactive \shipout\vbox{% % Do this early so pdf references go to the beginning of the page. \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi @@ -4862,7 +4856,6 @@ end % expansion of Texinfo commands that can appear in an index entry. % \def\indexdummies{% - \escapechar = `\\ % use backslash in output files. \definedummyletter\@% \definedummyletter\ % % @@ -4872,6 +4865,7 @@ end % % Do the redefinitions. \definedummies + \otherbackslash } % Used for the aux and toc files, where @ is the escape character. @@ -5070,11 +5064,9 @@ end \commondummyword\xref } -% This does nothing, but for a time it was recommended to use -% \usebracesinindexestrue to be able to use braces in index entries. - \let\indexlbrace\relax \let\indexrbrace\relax +\let\indexatchar\relax {\catcode`\@=0 \catcode`\\=13 @@ -5108,10 +5100,8 @@ end } \gdef\indexnonalnumreappear{% - \useindexbackslash \let-\normaldash \let<\normalless - \def\@{@}% } } @@ -5255,13 +5245,6 @@ end \fi} \def\indexisfl{fl} -% Output \ as {\indexbackslash}, because \ is an escape character in -% the index files. -\let\indexbackslash=\relax -{\catcode`\@=0 \catcode`\\=\active - @gdef@useindexbackslash{@def\{{@indexbackslash}}} -} - % Definition for writing index entry sort key. { \catcode`\-=13 @@ -5308,6 +5291,8 @@ end \def\rbracechar{{\indexrbrace}}% \let\{=\lbracechar \let\}=\rbracechar + \def\@{{\indexatchar}}% + \def\atchar##1{\@}% % \let\indexsortkey\empty % Execute the segment and throw away the typeset output. This executes @@ -5345,8 +5330,6 @@ end % % Remember, we are within a group. \indexdummies % Must do this here, since \bf, etc expand at this stage - \useindexbackslash % \indexbackslash isn't defined now so it will be output - % as is; and it will print as backslash. % % Split the entry into primary entry and any subentries, and get the index % sort key. @@ -5479,14 +5462,10 @@ end \plainfrenchspacing \everypar = {}% don't want the \kern\-parindent from indentation suppression. % - % See if the index file exists and is nonempty. - % Change catcode of @ here so that if the index file contains - % \initial {@} - % as its first line, TeX doesn't complain about mismatched braces - % (because it thinks @} is a control sequence). - \catcode`\@ = 12 % See comment in \requireopenindexfile. \def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi + % + % See if the index file exists and is nonempty. \openin 1 \jobname.\indexname s \ifeof 1 % \enddoublecolumns gets confused if there is no text in the index, @@ -5496,8 +5475,6 @@ end \putwordIndexNonexistent \typeout{No file \jobname.\indexname s.}% \else - \catcode`\\ = 0 - % % If the index file exists but is empty, then \openin leaves \ifeof % false. We have to make TeX try to read something from the file, so % it can discover if there is anything in it. @@ -5505,29 +5482,7 @@ end \ifeof 1 \putwordIndexIsEmpty \else - % Index files are almost Texinfo source, but we use \ as the escape - % character. It would be better to use @, but that's too big a change - % to make right now. - \def\indexbackslash{\ttbackslash}% - \let\indexlbrace\{ % Likewise, set these sequences for braces - \let\indexrbrace\} % used in the sort key. - \begindoublecolumns - \let\dotheinsertentrybox\dotheinsertentryboxwithpenalty - % - % Read input from the index file line by line. - \loopdo - \ifeof1 \else - \read 1 to \nextline - \fi - % - \indexinputprocessing - \thisline - % - \ifeof1\else - \let\thisline\nextline - \repeat - %% - \enddoublecolumns + \expandafter\printindexzz\thisline\relax\relax\finish% \fi \fi \closein 1 @@ -5535,6 +5490,40 @@ end \def\loopdo#1\repeat{\def\body{#1}\loopdoxxx} \def\loopdoxxx{\let\next=\relax\body\let\next=\loopdoxxx\fi\next} +% If the index file starts with a backslash, forgo reading the index +% file altogether. If somebody upgrades texinfo.tex they may still have +% old index files using \ as the escape character. Reading this would +% at best lead to typesetting garbage, at worst a TeX syntax error. +\def\printindexzz#1#2\finish{% + % NB this won't work if the index file starts with a group... + \uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1 + \message{skipping sorted index file}% + (Skipped sorted index file in obsolete format) + \else + \printindexzzz + \fi +} + +\def\printindexzzz{% + \begindoublecolumns + \let\dotheinsertentrybox\dotheinsertentryboxwithpenalty + % + % Read input from the index file line by line. + \loopdo + \ifeof1 \else + \read 1 to \nextline + \fi + % + \indexinputprocessing + \thisline + % + \ifeof1\else + \let\thisline\nextline + \repeat + %% + \enddoublecolumns +} + \def\indexinputprocessing{% \ifeof1 \let\firsttoken\relax @@ -5554,12 +5543,18 @@ end \catcode`\|=13 \catcode`\<=13 \catcode`\>=13 \catcode`\+=13 \catcode`\"=13 \catcode`\$=3 \gdef\initialglyphs{% + % special control sequences used in the index sort key + \let\indexlbrace\{% + \let\indexrbrace\}% + \let\indexatchar\@% + % % Some changes for non-alphabetic characters. Using the glyphs from the % math fonts looks more consistent than the typewriter font used elsewhere % for these characters. - \def\indexbackslash{\math{\backslash}}% - \let\\=\indexbackslash + \uccode`\~=`\\ \uppercase{\def~{\math{\backslash}}} % + % In case @\ is used for backslash + \uppercase{\let\\=~} % Can't get bold backslash so don't use bold forward slash \catcode`\/=13 \def/{{\secrmnotbold \normalslash}}% diff --git a/Master/tlpkg/installer/config.guess b/Master/tlpkg/installer/config.guess index f05137db451..79d1317f52b 100755 --- a/Master/tlpkg/installer/config.guess +++ b/Master/tlpkg/installer/config.guess @@ -985,22 +985,50 @@ EOF exit ;; mips:Linux:*:* | mips64:Linux:*:*) set_cc_for_build + IS_GLIBC=0 + test x"${LIBC}" = xgnu && IS_GLIBC=1 sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel + #undef mips64 + #undef mips64el + #if ${IS_GLIBC} && defined(_ABI64) + LIBCABI=gnuabi64 + #else + #if ${IS_GLIBC} && defined(_ABIN32) + LIBCABI=gnuabin32 + #else + LIBCABI=${LIBC} + #endif + #endif + + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa64r6 + #else + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa32r6 + #else + #if defined(__mips64) + CPU=mips64 + #else + CPU=mips + #endif + #endif + #endif + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + MIPS_ENDIAN=el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + MIPS_ENDIAN= #else - CPU= + MIPS_ENDIAN= #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" - test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`" + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -- cgit v1.2.3