diff options
author | Karl Berry <karl@freefriends.org> | 2013-10-09 00:17:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-10-09 00:17:30 +0000 |
commit | 6ae8f0974768da24d4bcfff401e0f660c0b9fb5d (patch) | |
tree | 7d30ffa224cef20b8d5bcc4a4a6dfee90e4ca148 /Master/texmf-dist/source | |
parent | ad8c0db83542b88b7a3d63af382ccc630df38d03 (diff) |
l3 (8oct13)
git-svn-id: svn://tug.org/texlive/trunk@31865 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
12 files changed, 63 insertions, 36 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx index 56754ad3f02..5d8df5a44fc 100644 --- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx @@ -49,8 +49,8 @@ %<*driver|package> \def\ExplFileName{expl3} \def\ExplFileDescription{L3 Experimental code bundle wrapper} -\def\ExplFileDate{2013/07/28} -\def\ExplFileVersion{4582} +\def\ExplFileDate{2013/10/08} +\def\ExplFileVersion{4594} %</driver|package> %<*driver> \documentclass[full]{l3doc} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx index d238f97b31f..7d8e9696470 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3expan.dtx Copyright (C) 1990-2012 The LaTeX3 project +%% File: l3expan.dtx Copyright (C) 1990-2013 The LaTeX3 project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3bootstrap} -\GetIdInfo$Id: l3expan.dtx 4565 2013-07-24 08:21:51Z joseph $ +\GetIdInfo$Id: l3expan.dtx 4584 2013-08-17 15:37:05Z joseph $ {L3 Argument expansion} %</driver|package> %<*driver> @@ -257,7 +257,7 @@ % \cs{exp_args:NV} \meta{function} \meta{variable} % \end{syntax} % This function absorbs two arguments (the names of the \meta{function} and -% the the \meta{variable}). The content of the \meta{variable} are recovered +% the \meta{variable}). The content of the \meta{variable} are recovered % and placed inside braces into the input stream \emph{after} reinsertion % of the \meta{function}. Thus the \meta{function} may take more than % one argument: all others will be left unchanged. @@ -654,7 +654,7 @@ % % \begin{variable}{\l_@@_internal_tl} % This scratch token list variable is defined in \pkg{l3basics}, as it -% is needed \enquote{early}. This is just a reminder that that is the +% is needed \enquote{early}. This is just a reminder that is the % case! % \end{variable} % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx index 3e2f06dacce..a20994ed5d5 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3bootstrap} -\GetIdInfo$Id: l3file.dtx 4581 2013-07-28 08:38:50Z joseph $ +\GetIdInfo$Id: l3file.dtx 4591 2013-08-29 20:29:36Z joseph $ {L3 File and I/O operations} %</driver|package> %<*driver> @@ -253,7 +253,23 @@ % \meta{stream} is not open, input is requested from the terminal. % The material read from the \meta{stream} will be tokenized by % \TeX{} according to the category codes in force when the function -% is used. +% is used. Note that any blank lines will be converted to the token +% \cs{par}. Therefore, if skipping blank lines is requires a test such as +% \begin{verbatim} +% \ior_get:NN \l_my_stream \l_tmpa_tl +% \tl_set:Nn \l_tmpb_tl { \par } +% \tl_if_eq:NNF \l_tmpa_tl \l_tmpb_tl +% ... +% \end{verbatim} +% may be used. Also notice that if multiple lines are read to match braces +% then the resulting token list will contain \cs{par} tokens. As normal +% \TeX{} tokenization is in force, any lines which do not end in a comment +% character (usually |%|) will have the line ending converted to a space, +% so for example input +% \begin{verbatim} +% a b c +% \end{verbatim} +% will result in a token list |a b c |. % \begin{texnote} % This protected macro expands to the \TeX{} primitive \tn{read} % along with the |to| keyword. @@ -262,14 +278,24 @@ % % \begin{function}[added = 2012-06-24, updated = 2012-07-31]{\ior_get_str:NN} % \begin{syntax} -% \cs{ior_get_str:NN} \meta{stream} \meta{token list variable} -% \end{syntax} +% \cs{ior_get_str:NN} \meta{stream} \meta{token list variable +% \end{syntax}} % Function that reads one line from the input \meta{stream} and stores % the result locally in the \meta{token list} variable. If the % \meta{stream} is not open, input is requested from the terminal. % The material is read from the \meta{stream} as a series of tokens with % category code $12$ (other), with the exception of space % characters which are given category code $10$ (space). +% Multiple whitespace characters are retained by this process. It will +% always only read one line and any blank lines in the input +% will result in the \meta{token list variable} being empty. Unlike +% \cs{ior_get:NN}, line ends do not receive any special treatment. Thus +% input +% \begin{verbatim} +% a b c +% \end{verbatim} +% will result in a token list |a b c| with the letters |a|, |b|, and |c| +% having category code~12. % \begin{texnote} % This protected macro is a wrapper around the \eTeX{} primitive % \tn{readline}. However, the end-line character normally added by diff --git a/Master/texmf-dist/source/latex/l3kernel/l3final.dtx b/Master/texmf-dist/source/latex/l3kernel/l3final.dtx index b368842dae3..8f1d56ce04f 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3final.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3final.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3final.dtx Copyright (C) 1990-2012 The LaTeX3 Project +%% File: l3final.dtx Copyright (C) 1990-2013 The LaTeX3 Project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3bootstrap} -\GetIdInfo$Id: l3final.dtx 4364 2012-12-12 20:30:39Z joseph $ +\GetIdInfo$Id: l3final.dtx 4586 2013-08-22 08:09:53Z joseph $ {L3 Experimental format finalisation} %</driver|package> %<*driver> @@ -82,7 +82,7 @@ % % \begin{macro}{\par} % \TeX{} has a nasty habit of inserting a command with the name \cs{par} -% so we had better make sure that that command at least has a definition. +% so we had better make sure that \cs{par} has a definition. % \begin{macrocode} \cs_set_eq:NN \par \tex_par:D % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx index dc764e54ab1..34f0a220acd 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx @@ -36,7 +36,7 @@ % %<*driver> \RequirePackage{l3bootstrap} -\GetIdInfo$Id: l3fp-trig.dtx 4339 2012-11-24 19:16:43Z joseph $ +\GetIdInfo$Id: l3fp-trig.dtx 4593 2013-10-07 13:32:35Z bruno $ {L3 Floating-point trigonometric functions} \documentclass[full]{l3doc} \begin{document} @@ -385,8 +385,9 @@ % \cs{@@_trig_large:www} are a leading block of up to $5$ digits, % three brace groups of $4$ digits each, and the exponent, decremented % at each step. The multiple of $2\pi$ to subtract is estimated as -% $\lfloor |#1| / 6283\rfloor$ (the formula chosen always gives a -% non-negative integer). The subtraction has a form similar to our +% $\lfloor |#1| / 6283.3\rfloor$ (the formula chosen always gives a +% non-negative integer, strictly less than the actual ratio by $2\pi$). +% The subtraction has a form similar to our % usual multiplications (see \pkg{l3fp-basics} or % \pkg{l3fp-extended}). Once the exponent reaches $0$, we are done % subtracting $2\pi$, and we call \cs{@@_trig_octant_loop:nnnnnw} to do @@ -398,7 +399,7 @@ { \if_meaning:w 0 #3 \@@_trig_large_break:w \fi: \exp_after:wN \@@_trig_large_o:wnnnn - \int_use:N \__int_eval:w ( #1 - 3141 ) / 6283 ; + \int_use:N \__int_eval:w ( #10 - 31416 ) / 62833 ; {#1} #2 \exp_after:wN ; \int_use:N \__int_eval:w \c_minus_one + #3; diff --git a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx index de6e4d72b6a..17b33143769 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3bootstrap} -\GetIdInfo$Id: l3int.dtx 4581 2013-07-28 08:38:50Z joseph $ +\GetIdInfo$Id: l3int.dtx 4583 2013-08-02 19:14:35Z joseph $ {L3 Integers} %</driver|package> %<*driver> @@ -572,7 +572,7 @@ % \int_to_alph:n { 27 } % \end{verbatim} % is converted to |aa|. For conversions using other alphabets, use -% \cs{int_convert_to_symbols:nnn} to define an alphabet-specific +% \cs{int_to_symbols:nnn} to define an alphabet-specific % function. The basic \cs{int_to_alph:n} and \cs{int_to_Alph:n} % functions should not be modified. % \end{function} @@ -594,7 +594,7 @@ % \begin{verbatim} % \cs_new:Npn \int_to_alph:n #1 % { -% \int_convert_to_symbols:nnn {#1} { 26 } +% \int_to_symbols:nnn {#1} { 26 } % { % { 1 } { a } % { 2 } { b } diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx index 60e96a8351d..a7d11916a65 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3bootstrap} -\GetIdInfo$Id: l3prg.dtx 4581 2013-07-28 08:38:50Z joseph $ +\GetIdInfo$Id: l3prg.dtx 4587 2013-08-25 21:30:10Z joseph $ {L3 Control structures} %</driver|package> %<*driver> @@ -738,7 +738,7 @@ % \TestMissing % {This function is also implicitly tested with all other conditionals!} % These are all defined in \pkg{l3basics}, as they are needed -% \enquote{early}. This is just a reminder that that is the case! +% \enquote{early}. This is just a reminder! % \end{macro} % \end{macro} % \end{macro} @@ -1634,7 +1634,7 @@ % \begin{macro}{\@@_break_point:Nn} % \begin{macro}{\@@_map_break:Nn} % These are defined in \pkg{l3basics}, as they are needed -% \enquote{early}. This is just a reminder that that is the case! +% \enquote{early}. This is just a reminder that is the case! % \end{macro} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx index a9eb3dc4376..d7bfa2428e7 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3bootstrap} -\GetIdInfo$Id: l3tl.dtx 4581 2013-07-28 08:38:50Z joseph $ +\GetIdInfo$Id: l3tl.dtx 4592 2013-09-16 21:11:41Z joseph $ {L3 Token lists} %</driver|package> %<*driver> @@ -486,7 +486,7 @@ % token count $1$ according to \cs{tl_count:n}. % \end{function} % -% \begin{function}[added = 2013-07-24, EXP, TF]{\tl_case:Nnn, \tl_case:cnn} +% \begin{function}[added = 2013-07-24, EXP, TF]{\tl_case:Nn, \tl_case:cn} % \begin{syntax} % \cs{tl_case:NnTF} \meta{test token list variable} \\ % ~~"{" \\ diff --git a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx index 0b0024d2003..7132a1f40c0 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3bootstrap} -\GetIdInfo$Id: l3token.dtx 4581 2013-07-28 08:38:50Z joseph $ +\GetIdInfo$Id: l3token.dtx 4587 2013-08-25 21:30:10Z joseph $ {L3 Experimental token manipulation} %</driver|package> %<*driver> @@ -1154,7 +1154,7 @@ % \begin{macro}{\token_to_meaning:N, \token_to_meaning:c} % \begin{macro}{\token_to_str:N, \token_to_str:c} % These are all defined in \pkg{l3basics}, as they are needed -% \enquote{early}. This is just a reminder that that is the case! +% \enquote{early}. This is just a reminder! % \end{macro} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx index 3e32750aeeb..9f20d8785c3 100644 --- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx +++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx @@ -37,8 +37,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\RequirePackage{expl3}[2013/07/28] -%<package>\@ifpackagelater{expl3}{2013/07/28} +\RequirePackage{expl3}[2013/10/08] +%<package>\@ifpackagelater{expl3}{2013/10/08} %<package> {} %<package> {% %<package> \PackageError{l3keys2e}{Support package l3kernel too old} @@ -50,7 +50,7 @@ %<package> }% %<package> \endinput %<package> } -\GetIdInfo$Id: l3keys2e.dtx 4582 2013-07-28 08:57:13Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 4595 2013-10-08 16:36:09Z joseph $ {LaTeX2e option processing using LaTeX3 keys} %</driver|package> %<*driver> diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx index a51b54ea376..c1183085b35 100644 --- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx @@ -41,8 +41,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\RequirePackage{expl3}[2013/07/28] -%<package>\@ifpackagelater{expl3}{2013/07/28} +\RequirePackage{expl3}[2013/10/08] +%<package>\@ifpackagelater{expl3}{2013/10/08} %<package> {} %<package> {% %<package> \PackageError{xparse}{Support package l3kernel too old} @@ -54,7 +54,7 @@ %<package> }% %<package> \endinput %<package> } -\GetIdInfo$Id: xparse.dtx 4582 2013-07-28 08:57:13Z joseph $ +\GetIdInfo$Id: xparse.dtx 4594 2013-10-08 06:34:37Z joseph $ {L3 Experimental document command parser} %</driver|package> %<*driver> diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx index 6455094ead6..cc794171893 100644 --- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx @@ -41,8 +41,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\RequirePackage{expl3}[2013/07/28] -%<package>\@ifpackagelater{expl3}{2013/07/28} +\RequirePackage{expl3}[2013/10/08] +%<package>\@ifpackagelater{expl3}{2013/10/08} %<package> {} %<package> {% %<package> \PackageError{xtemplate}{Support package l3kernel too old} @@ -54,7 +54,7 @@ %<package> }% %<package> \endinput %<package> } -\GetIdInfo$Id: xtemplate.dtx 4582 2013-07-28 08:57:13Z joseph $ +\GetIdInfo$Id: xtemplate.dtx 4594 2013-10-08 06:34:37Z joseph $ {L3 Experimental prototype document functions} %</driver|package> %<*driver> |