summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-03 22:06:44 +0000
committerKarl Berry <karl@freefriends.org>2015-07-03 22:06:44 +0000
commit7daf469404428231c8850ce6ebd4a01dda0a3378 (patch)
tree6b9ba2dfa9aaabf54d8bd69d2b0ecae479aa802d
parent229926b078d21f35d3d6a5e2c42449f15fbeeca6 (diff)
sync/doc
git-svn-id: svn://tug.org/texlive/trunk@37747 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl11
-rw-r--r--Master/texmf-dist/scripts/texlive/NEWS4
-rw-r--r--Master/texmf-dist/tex/plain/config/unicode-letters.def8
-rw-r--r--Master/texmf-dist/tex/texinfo/texinfo.tex58
-rw-r--r--Master/tlpkg/doc/releng.txt1
5 files changed, 55 insertions, 27 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 220791f6194..ff2bcbc8132 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,13 +1,13 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 37643 2015-06-23 04:33:46Z preining $
+# $Id: tlmgr.pl 37738 2015-07-02 23:10:09Z karl $
#
# Copyright 2008-2015 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
-my $svnrev = '$Revision: 37643 $';
-my $datrev = '$Date: 2015-06-23 06:33:46 +0200 (Tue, 23 Jun 2015) $';
+my $svnrev = '$Revision: 37738 $';
+my $datrev = '$Date: 2015-07-03 01:10:09 +0200 (Fri, 03 Jul 2015) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -1386,7 +1386,7 @@ sub action_info {
}
if (defined($tag)) {
if (!$remotetlpdb->is_virtual) {
- tlwarn("$prg: specifying implicit tags is not allowed for non-virtual databases!\n");
+ tlwarn("$prg: specifying implicit tags not allowed for non-virtual databases!\n");
$ret |= $F_WARNING;
next;
} else {
@@ -1445,7 +1445,7 @@ sub action_info {
}
# we didn't find a package like this, so use search
info("$prg: cannot find package $pkg, searching for other matches:\n");
- my ($foundfile, $founddesc) = search_tlpdb($remotetlpdb, $pkg, 1, 1, 0);
+ my ($foundfile, $founddesc) = search_tlpdb($remotetlpdb,$pkg,1,1,0);
print "\nPackages containing \`$pkg\' in their title/description:\n";
print $founddesc;
print "\nPackages containing files matching \`$pkg\':\n";
@@ -4958,6 +4958,7 @@ sub check_runfiles {
|README
|cid2code\.txt
|etex\.src
+ |fithesis.*
|kinsoku\.tex
|language\.dat
|language\.def
diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS
index 8f2d31eba0e..0144e9f204b 100644
--- a/Master/texmf-dist/scripts/texlive/NEWS
+++ b/Master/texmf-dist/scripts/texlive/NEWS
@@ -1,6 +1,10 @@
(This file public domain. Originally written by Norbert Preining and
Karl Berry, 2010.)
+<p><b>tlmgr revision 37738 (released 3jul15):</b>
+<li>more accurate error codes, e.g., for paper sizes.
+<li>info searches titles, descriptions, file names, topics if available.
+
<p><b>tlmgr revision 37030 (released 24apr15):</b>
<li>more reliable exit status codes.
<li>add --with-doc and --with-src options for use with install --reinstall,
diff --git a/Master/texmf-dist/tex/plain/config/unicode-letters.def b/Master/texmf-dist/tex/plain/config/unicode-letters.def
index 2ed8bcd5f46..89f004a79aa 100644
--- a/Master/texmf-dist/tex/plain/config/unicode-letters.def
+++ b/Master/texmf-dist/tex/plain/config/unicode-letters.def
@@ -12,7 +12,7 @@
%% MD5 sum C95A5E60B2B527F4E77286F9C9CF09D1
%% which are maintained by the Unicode Consortium.
%%
-%% Generated on 2015-05-11.
+%% Generated on 2015-06-20.
%%
%% Copyright 2014-2015
%% The LaTeX3 Project and any individual authors listed elsewhere
@@ -7288,6 +7288,7 @@
\L 31FD 31FD 31FD %
\L 31FE 31FE 31FE %
\L 31FF 31FF 31FF %
+ \L 3400 3400 3400 %
\L 3401 3401 3401 %
\L 3402 3402 3402 %
\L 3403 3403 3403 %
@@ -13869,6 +13870,7 @@
\L 4DB3 4DB3 4DB3 %
\L 4DB4 4DB4 4DB4 %
\L 4DB5 4DB5 4DB5 %
+ \L 4E00 4E00 4E00 %
\L 4E01 4E01 4E01 %
\L 4E02 4E02 4E02 %
\L 4E03 4E03 4E03 %
@@ -37318,6 +37320,7 @@
\L ABEA ABEA ABEA %
\L ABEC ABEC ABEC %
\L ABED ABED ABED %
+ \L AC00 AC00 AC00 %
\L AC01 AC01 AC01 %
\L AC02 AC02 AC02 %
\L AC03 AC03 AC03 %
@@ -56843,6 +56846,7 @@
\L 1EEB9 1EEB9 1EEB9 %
\L 1EEBA 1EEBA 1EEBA %
\L 1EEBB 1EEBB 1EEBB %
+ \L 20000 20000 20000 %
\L 20001 20001 20001 %
\L 20002 20002 20002 %
\L 20003 20003 20003 %
@@ -99553,6 +99557,7 @@
\L 2A6D4 2A6D4 2A6D4 %
\L 2A6D5 2A6D5 2A6D5 %
\L 2A6D6 2A6D6 2A6D6 %
+ \L 2A700 2A700 2A700 %
\L 2A701 2A701 2A701 %
\L 2A702 2A702 2A702 %
\L 2A703 2A703 2A703 %
@@ -103701,6 +103706,7 @@
\L 2B732 2B732 2B732 %
\L 2B733 2B733 2B733 %
\L 2B734 2B734 2B734 %
+ \L 2B740 2B740 2B740 %
\L 2B741 2B741 2B741 %
\L 2B742 2B742 2B742 %
\L 2B743 2B743 2B743 %
diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index 60951102f3f..f773c90b8d5 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{2015-06-14.15}
+\def\texinfoversion{2015-07-01.07}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -277,6 +277,7 @@
% described on page 260 of The TeXbook. It involves outputting two
% marks for the sectioning macros, one before the section break, and
% one after. I won't pretend I can describe this better than DEK...
+%
\def\domark{%
\toks0=\expandafter{\lastchapterdefs}%
\toks2=\expandafter{\lastsectiondefs}%
@@ -6881,7 +6882,7 @@ end
% typesetting commands (@smallbook, font changes, etc.) have to be done
% beforehand -- and a) we want @copying to be done first in the source
% file; b) letting users define the frontmatter in as flexible order as
-% possible is very desirable.
+% possible is desirable.
%
\def\copying{\checkenv{}\begingroup\scanargctxt\docopying}
\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}}
@@ -7449,6 +7450,12 @@ end
%
% \anythingelse will almost certainly be an error of some kind.
+\def\macrolineargctxt{% used for whole-line arguments without braces
+ \scanctxt
+ \catcode`\{=\other
+ \catcode`\}=\other
+}
+
% \mbodybackslash is the definition of \ in @macro bodies.
% It maps \foo\ => \csname macarg.foo\endcsname => #N
% where N is the macro parameter number.
@@ -7522,12 +7529,14 @@ end
% This makes use of the obscure feature that if the last token of a
% <parameter list> is #, then the preceding argument is delimited by
% an opening brace, and that opening brace is not consumed.
+%
\def\getargs#1{\getargsxxx#1{}}
\def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
\def\getmacname#1 #2\relax{\macname={#1}}
\def\getmacargs#1{\def\argl{#1}}
-% For macro processing make @ a letter so that we can make Texinfo private macro names.
+% For macro processing make @ a letter so that we can make
+% private-to-Texinfo macro names.
\edef\texiatcatcode{\the\catcode`\@}
\catcode `@=11\relax
@@ -7558,6 +7567,7 @@ end
%
% If you compile with TeX (not eTeX), and you have macros with 10 or more
% arguments, no macro can have more than 256 arguments (else error).
+%
\def\parsemargdef#1;{%
\paramno=0\def\paramlist{}%
\let\hash\relax
@@ -7601,7 +7611,6 @@ end
% These two commands read recursive and nonrecursive macro bodies.
% (They're different since rec and nonrec macros end differently.)
%
-
\catcode `\@\texiatcatcode
\long\def\parsemacbody#1@end macro%
{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
@@ -7637,7 +7646,8 @@ end
\fi
}
-%
+% Internal for \getargsval@.
+%
\def\getargvals@@{%
\ifx\paramlist\nilm@
% Some sanity check needed here that \argvaluelist is also empty.
@@ -7681,7 +7691,8 @@ end
}
% Replace arguments by their values in the macro body, and place the result
-% in macro \@tempa
+% in macro \@tempa.
+%
\def\macvalstoargs@{%
% To do this we use the property that token registers that are \the'ed
% within an \edef expand only once. So we are going to place all argument
@@ -7705,8 +7716,9 @@ end
\expandafter\def\expandafter\@tempa\expandafter{\@tempc}%
}
+% Define the named-macro outside of this group and then close this group.
+%
\def\macargexpandinbody@{%
- %% Define the named-macro outside of this group and then close this group.
\expandafter
\endgroup
\macargdeflist@
@@ -7743,14 +7755,17 @@ end
\next
}
-% Save the token stack pointer into macro #1
+% Save the token stack pointer into macro #1:
\def\texisavetoksstackpoint#1{\edef#1{\the\@cclvi}}
-% Restore the token stack pointer from number in macro #1
-\def\texirestoretoksstackpoint#1{\expandafter\mathchardef\expandafter\@cclvi#1\relax}
-% newtoks that can be used non \outer .
+%
+% Restore the token stack pointer from number in macro #1:
+\def\texirestoretoksstackpoint#1{\expandafter\mathchardef
+ \expandafter\@cclvi#1\relax}
+% Variant \newtoks that can be used non-\outer:
\def\texinonouternewtoks{\alloc@ 5\toks \toksdef \@cclvi}
-% Tailing missing arguments are set to empty
+% Tailing missing arguments are set to empty.
+%
\def\setemptyargvalues@{%
\ifx\paramlist\nilm@
\let\next\macargexpandinbody@
@@ -7795,7 +7810,7 @@ end
\noexpand\scanmacro{\temp}}%
\or % 1
\expandafter\xdef\csname\the\macname\endcsname{%
- \bgroup\noexpand\macroargctxt
+ \bgroup
\noexpand\braceorline
\expandafter\noexpand\csname\the\macname xxx\endcsname}%
\expandafter\xdef\csname\the\macname xxx\endcsname##1{%
@@ -7828,7 +7843,7 @@ end
\noexpand\scanmacro{\temp}\egroup}%
\or % 1
\expandafter\xdef\csname\the\macname\endcsname{%
- \bgroup\noexpand\macroargctxt
+ \bgroup
\noexpand\braceorline
\expandafter\noexpand\csname\the\macname xxx\endcsname}%
\expandafter\xdef\csname\the\macname xxx\endcsname##1{%
@@ -7860,19 +7875,20 @@ end
\fi
\fi}
-\catcode `\@\texiatcatcode\relax
+\catcode `\@\texiatcatcode\relax % end private-to-Texinfo catcodes
\def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}}
-% \braceorline decides whether the next nonwhitespace character is a
-% {. If so it reads up to the closing }, if not, it reads the whole
-% line. Whatever was read is then fed to the next control sequence
-% as an argument (by \parsebrace or \parsearg).
+% \braceorline MAC is used for a one-argument macro MAC. It checks
+% whether the next non-whitespace character is a {. It sets the context
+% for reading the argument (slightly different in the two cases). Then,
+% to read the argument, in the whole-line case, it then calls the
+% regular \parsearg MAC; in the lbrace case, it just calls MAC itself.
%
\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
\def\braceorlinexxx{%
- \ifx\nchar\bgroup\else
- \expandafter\parsearg
+ \ifx\nchar\bgroup\macroargctxt
+ \else\macrolineargctxt\expandafter\parsearg
\fi \macnamexxx}
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 6297ce979df..d57f4d21342 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -69,6 +69,7 @@ problems. Then, so things will get redone later as another check:
(and might have to merge back if Master was mistakenly updated):
diff -ru0 --exclude=man --exclude=info \
Build/source/inst/texmf-dist Master/texmf-dist
+for p in *conv hbf2gf; do cp /home/ftp/mirror/rsync.tex.ac.uk/CTAN/language/chinese/CJK/cjk-4.8.4/doc/pdf/$p.pdf $p; done
8. Now, ready to do first update of tlpretest:
force_rebuild=true cron.tl