summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-10 23:29:10 +0000
committerKarl Berry <karl@freefriends.org>2017-02-10 23:29:10 +0000
commitd12b5fe6d47c6b6188b48f5a442dc625b1eea5b1 (patch)
treea5bc026f17eac7f835275add9e1b4ab1b6e6519e /Master/texmf-dist/source/latex/l3kernel
parent8e54a5b67ae2ca6fd34f9e2ddb28e00e3454453b (diff)
l3 (10feb17)
git-svn-id: svn://tug.org/texlive/trunk@43183 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/expl3.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3doc.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx39
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3oldmodules.dtx20
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3sort.dtx4
5 files changed, 51 insertions, 20 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
index 433338287d3..7f7774db5e5 100644
--- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
@@ -23,8 +23,8 @@
%<*driver|generic|package>
\def\ExplFileName{expl3}%
\def\ExplFileDescription{L3 programming layer}%
-\def\ExplFileDate{2017/02/07}%
-\def\ExplFileVersion{6846}%
+\def\ExplFileDate{2017/02/10}%
+\def\ExplFileVersion{6878}%
%</driver|generic|package>
%<*driver>
\documentclass[full]{l3doc}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
index fc90688aa63..c1f0e04c7aa 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
@@ -62,7 +62,7 @@ Do not distribute a modified version of this file.
%
%<*driver|class>
\RequirePackage{expl3,xparse,calc}
-\GetIdInfo$Id: l3doc.dtx 6839 2017-02-06 18:52:08Z bruno $
+\GetIdInfo$Id: l3doc.dtx 6847 2017-02-07 15:05:44Z bruno $
{L3 Experimental documentation class}
%</driver|class>
%
@@ -2159,7 +2159,7 @@ Do not distribute a modified version of this file.
% \begin{macrocode}
\cs_new_protected:Npn \@@_deprecated_on:n #1
{
- \@@_date_compare:nNnT {#1} < { \tex_year:D / \tex_month:D / \tex_day:D }
+ \@@_date_compare:nNnT {#1} < { \tex_year:D - \tex_month:D - \tex_day:D }
{
\msg_error:nnxx { l3doc } { deprecated-function }
{ \tl_to_str:N \l_@@_macro_argument_tl } {#1}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
index 1936b34f888..5fe3aaac4d9 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3fp-parse.dtx Copyright (C) 2011-2016 The LaTeX3 Project
+%% File: l3fp-parse.dtx Copyright (C) 2011-2017 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
@@ -22,7 +22,7 @@
%
%<*driver>
\documentclass[full]{l3doc}
-\GetIdInfo$Id: l3fp-parse.dtx 6805 2016-12-28 22:15:52Z joseph $
+\GetIdInfo$Id: l3fp-parse.dtx 6877 2017-02-10 03:59:09Z bruno $
{L3 Floating-point expression parsing}
\begin{document}
\DocInput{\jobname.dtx}
@@ -836,11 +836,14 @@
% \@@_parse_one_register_auxii:wwwNw,
% \@@_parse_one_register_int:www,
% \@@_parse_one_register_mu:www,
-% \@@_parse_one_register_dim:ww
+% \@@_parse_one_register_dim:ww,
+% \@@_parse_one_register_wd:w,
+% \@@_parse_one_register_wd:Nw,
% }
% This is called whenever~|#2| is a control sequence other than
-% \cs{scan_stop:} in meaning. We assume that it is a register, but
-% carefully unpacking it with \cs{tex_the:D} within braces. First, we
+% \cs{scan_stop:} in meaning. We special-case \tn{wd}, \tn{ht}, \tn{dp}
+% (see later) and otherwise assume that it is a register, but
+% carefully unpack it with \cs{tex_the:D} within braces. First, we
% find the exponent following~|#2|. Then we unpack~|#2| with
% \cs{tex_the:D}, and the \texttt{auxii} auxiliary distinguishes
% integer registers from dimensions/skips from muskips, according to
@@ -859,6 +862,9 @@
\exp_after:wN \@@_parse_infix_after_operand:NwN
\exp_after:wN #1
\exp:w \exp_end_continue_f:w
+ \if_meaning:w \box_wd:N #2 \@@_parse_one_register_wd:w \fi:
+ \if_meaning:w \box_ht:N #2 \@@_parse_one_register_wd:w \fi:
+ \if_meaning:w \box_dp:N #2 \@@_parse_one_register_wd:w \fi:
\exp_after:wN \@@_parse_one_register_aux:Nw
\exp_after:wN #2
\__int_value:w
@@ -896,6 +902,27 @@
\__int_value:w \__dim_eval:w #1 pt ;
}
% \end{macrocode}
+% The \tn{wd}, \tn{dp}, \tn{ht} primitives expect an integer argument.
+% We abuse the exponent parser to find the integer argument: simply
+% include the exponent marker~|e|. Once that \enquote{exponent} is
+% found, use \cs{tex_the:D} to find the box dimension and then copy
+% what we did for dimensions.
+% \begin{macrocode}
+\cs_new:Npn \@@_parse_one_register_wd:w
+ #1#2 \exp_after:wN #3#4 \@@_parse_expand:w
+ {
+ #1
+ \exp_after:wN \@@_parse_one_register_wd:Nw
+ #4 \@@_parse_expand:w e
+ }
+\cs_new:Npn \@@_parse_one_register_wd:Nw #1#2 ;
+ {
+ \exp_after:wN \@@_from_dim_test:ww
+ \exp_after:wN 0 \exp_after:wN ,
+ \__int_value:w \__dim_eval:w
+ \exp_after:wN \use:n \exp_after:wN { \tex_the:D #1 #2 } ;
+ }
+% \end{macrocode}
% \end{macro}
%
% \begin{macro}[aux, EXP]{\@@_parse_one_digit:NN}
@@ -1584,7 +1611,7 @@
% \begin{macro}[aux, rEXP]
% {\@@_parse_exponent:N, \@@_parse_exponent_aux:N}
% This function should be called within an \cs{__int_value:w}
-% expansion (or within an integer expression. It leaves digits of the
+% expansion (or within an integer expression). It leaves digits of the
% exponent behind it in the input stream, and terminates the expansion
% with a semicolon. If there is no~|e|, leave an exponent of~$0$. If
% there is an~|e|, expand the next token to run some tests on it. The
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3oldmodules.dtx b/Master/texmf-dist/source/latex/l3kernel/l3oldmodules.dtx
index e081a5b3ce5..ddd243e7fe3 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3oldmodules.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3oldmodules.dtx
@@ -21,7 +21,7 @@
% for those people who are interested.
%
%<*driver|oldmodules>
-\def\ExplFileDate{2014/09/06}
+\def\ExplFileDate{2017/02/10}
%</driver|oldmodules>
%<*driver>
\documentclass[full]{l3doc}
@@ -44,7 +44,7 @@
%
%
% \date{Released \ExplFileDate}
-
+%
% \maketitle
%
% \section{Introduction}
@@ -127,18 +127,22 @@
\typeout{** }
\typeout{** Package \old@liii@module@name\space is obsolete and has been removed!}
\typeout{** }
-\typeout{** Its functionality is now only provided as part of in the expl3 package}
+\typeout{** Its functionality is now only provided as part of the expl3 package.}
\typeout{** }
-\typeout{** After showing you an error message you can hit <return> we will continue}
-\typeout{** for now by loading expl3 for you. However, at some point in the future}
-\typeout{** the old packages will be removed.}
+%<!l3sort>\typeout{** After showing you an error message you can hit <return> we will continue}
+%<!l3sort>\typeout{** for now by loading expl3 for you. However, the old packages will be}
+%<!l3sort>\typeout{** removed entirely at the end of 2017.}
+%<l3sort>\typeout{** The old packages will be removed entirely at the end of 2018.}
\typeout{** }
\typeout{** Therefore, please replace '\string\usepackage{\old@liii@module@name}'}
\typeout{** with '\string\usepackage{expl3}' in your documents as soon as possible.}
\typeout{** }
\typeout{*******************************************************************}
-\PackageError\old@liii@module@name{This package is obsolete ---
- use 'expl3' instead}\@ehc
+%<!l3sort>\PackageError
+%<l3sort>\PackageWarning
+ \old@liii@module@name{This package is obsolete ---
+ use 'expl3' instead}
+%<!l3sort> \@ehc
% \end{macrocode}
% Finally load \texttt{expl3} so that the user can continue for now.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
index a732120976c..265ae84fc05 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
@@ -24,7 +24,7 @@
\documentclass[full]{l3doc}
%</driver>
%<*driver|package>
-\GetIdInfo$Id: l3sort.dtx 6842 2017-02-06 21:51:22Z joseph $
+\GetIdInfo$Id: l3sort.dtx 6847 2017-02-07 15:05:44Z bruno $
{L3 Sorting functions}
%</driver|package>
%<*driver>
@@ -1083,7 +1083,7 @@
%
% \subsection{Deprecated functions}
%
-% \begin{macro}[deprecated = 2017-02-06]{\sort_ordered:, \sort_reversed:}
+% \begin{macro}[deprecated = 2018-12-31]{\sort_ordered:, \sort_reversed:}
% These functions were renamed for consistency.
% \begin{macrocode}
\cs_new_eq:NN \sort_ordered: \sort_return_same: