texlive[51881] Master/texmf-dist: l3kernel (14aug19)
commits+karl at tug.org
commits+karl at tug.org
Wed Aug 14 22:53:00 CEST 2019
Revision: 51881
http://tug.org/svn/texlive?view=revision&revision=51881
Author: karl
Date: 2019-08-14 22:53:00 +0200 (Wed, 14 Aug 2019)
Log Message:
-----------
l3kernel (14aug19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/l3kernel/README.md
trunk/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
trunk/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3obsolete.txt
trunk/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex
trunk/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/source3.tex
trunk/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3final.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3str.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md 2019-08-14 20:53:00 UTC (rev 51881)
@@ -7,8 +7,22 @@
## [Unreleased]
+## [2019-08-14]
+
+### Deprecated
+
+- `\c_term_ior`
+
+### Fixed
+
+- Coffin pole intersection in some cases (see #605)
+
## [2019-07-25]
+### Fixed
+
+- Loading for `expl3` with plain TeX
+
## [2019-07-01]
### Added
@@ -436,7 +450,8 @@
- Step functions have been added for dim variables,
e.g. `\dim_step_inline:nnnn`
-[Unreleased]: https://github.com/latex3/latex3/compare/2019-07-25...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2019-08-14...HEAD
+[2019-08-14]: https://github.com/latex3/latex3/compare/2019-07-25...2019-08-14
[2019-07-25]: https://github.com/latex3/latex3/compare/2019-07-01...2019-07-25
[2019-07-01]: https://github.com/latex3/latex3/compare/2019-05-28...2019-07-01
[2019-05-28]: https://github.com/latex3/latex3/compare/2019-05-09...2019-05-28
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/README.md 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/README.md 2019-08-14 20:53:00 UTC (rev 51881)
@@ -1,7 +1,7 @@
LaTeX3 Programming Conventions
==============================
-Release 2019-07-25
+Release 2019-08-14
Overview
--------
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.tex 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.tex 2019-08-14 20:53:00 UTC (rev 51881)
@@ -54,7 +54,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2019-07-25}
+\date{Released 2019-08-14}
\pagenumbering{roman}
\maketitle
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3obsolete.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/l3obsolete.txt 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/l3obsolete.txt 2019-08-14 20:53:00 UTC (rev 51881)
@@ -46,6 +46,7 @@
\c_two_hundred_fifty_six 2019
\c_one_thousand 2019
\c_ten_thousand 2019
+\c_term_ior 2020
\etex_....:D 2019
\hbox_unpack_clear:c 2020
\hbox_unpack_clear:N 2020
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex 2019-08-14 20:53:00 UTC (rev 51881)
@@ -32,7 +32,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2019-07-25}
+\date{Released 2019-08-14}
\begin{document}
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex 2019-08-14 20:53:00 UTC (rev 51881)
@@ -32,7 +32,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2019-07-25}
+\date{Released 2019-08-14}
\newcommand{\TF}{\textit{(TF)}}
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex 2019-08-14 20:53:00 UTC (rev 51881)
@@ -32,7 +32,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2019-07-25}
+\date{Released 2019-08-14}
\newcommand{\TF}{\textit{(TF)}}
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/source3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/source3.tex 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/source3.tex 2019-08-14 20:53:00 UTC (rev 51881)
@@ -53,7 +53,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2019-07-25}
+\date{Released 2019-08-14}
\pagenumbering{roman}
\maketitle
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/expl3.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/expl3.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -23,7 +23,7 @@
% for those people who are interested.
%
%<*driver|generic|package>
-\def\ExplFileDate{2019-07-25}%
+\def\ExplFileDate{2019-08-14}%
%</driver|generic|package>
%<*driver>
\documentclass[full]{l3doc}
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3box.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3box.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
@@ -464,12 +464,12 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_@@_slope_x_fp}
-% \begin{variable}{\l_@@_slope_y_fp}
+% \begin{variable}{\l_@@_slope_A_fp}
+% \begin{variable}{\l_@@_slope_B_fp}
% Used for calculations of intersections.
% \begin{macrocode}
-\fp_new:N \l_@@_slope_x_fp
-\fp_new:N \l_@@_slope_y_fp
+\fp_new:N \l_@@_slope_A_fp
+\fp_new:N \l_@@_slope_B_fp
% \end{macrocode}
% \end{variable}
% \end{variable}
@@ -1123,7 +1123,7 @@
%
% \begin{macro}{\@@_calculate_intersection:Nnn}
% \begin{macro}{\@@_calculate_intersection:nnnnnnnn}
-% \begin{macro}{\@@_calculate_intersection_aux:nnnnnN}
+% \begin{macro}{\@@_calculate_intersection:nnnnnn}
% The lead off in finding intersections is to recover the two poles
% and then hand off to the auxiliary for the actual calculation. There
% may of course not be an intersection, for which an error trap is
@@ -1159,7 +1159,7 @@
\cs_new_protected:Npn \@@_calculate_intersection:nnnnnnnn
#1#2#3#4#5#6#7#8
{
- \dim_compare:nNnTF {#3} = { \c_zero_dim }
+ \dim_compare:nNnTF {#3} = \c_zero_dim
% \end{macrocode}
% The case where the first pole is vertical. So the $x$-component
% of the interaction is at $a$. There is then a test on the
@@ -1173,17 +1173,23 @@
% The second pole may still be horizontal, in which case the
% $y$-component of the intersection is $b'$. If not,
% \[
-% y = \frac{d'}{c'} \left ( x - a' \right ) + b'
+% y = \frac{d'}{c'} \left ( a - a' \right ) + b'
% \]
-% with the $x$-component already known to be |#1|. This calculation
-% is done as a generalised auxiliary.
+% with the $x$-component already known to be |#1|.
% \begin{macrocode}
{
- \dim_compare:nNnTF {#8} = \c_zero_dim
- { \dim_set:Nn \l_@@_y_dim {#6} }
+ \dim_set:Nn \l_@@_y_dim
{
- \@@_calculate_intersection_aux:nnnnnN
- {#1} {#5} {#6} {#7} {#8} \l_@@_y_dim
+ \dim_compare:nNnTF {#8} = \c_zero_dim
+ {#6}
+ {
+ \fp_to_dim:n
+ {
+ ( \dim_to_fp:n {#8} / \dim_to_fp:n {#7} )
+ * ( \dim_to_fp:n {#1} - \dim_to_fp:n {#5} )
+ + \dim_to_fp:n {#6}
+ }
+ }
}
}
}
@@ -1199,118 +1205,82 @@
\dim_compare:nNnTF {#8} = { \c_zero_dim }
{ \bool_set_true:N \l_@@_error_bool }
{
- \dim_compare:nNnTF {#7} = \c_zero_dim
- { \dim_set:Nn \l_@@_x_dim {#5} }
% \end{macrocode}
-% The formula for the case where the second pole is neither horizontal
-% nor vertical is
+% Now we deal with the case where the second pole may be vertical, or
+% if not we have
% \[
-% x = \frac{c'}{d'} \left ( y - b' \right ) + a'
+% x = \frac{c'}{d'} \left ( b - b' \right ) + a'
% \]
% which is again handled by the same auxiliary.
% \begin{macrocode}
+ \dim_set:Nn \l_@@_x_dim
{
- \@@_calculate_intersection_aux:nnnnnN
- {#2} {#6} {#5} {#8} {#7} \l_@@_x_dim
+ \dim_compare:nNnTF {#7} = \c_zero_dim
+ {#5}
+ {
+ \fp_to_dim:n
+ {
+ ( \dim_to_fp:n {#7} / \dim_to_fp:n {#8} )
+ * ( \dim_to_fp:n {#4} - \dim_to_fp:n {#6} )
+ + \dim_to_fp:n {#5}
+ }
+ }
}
}
}
% \end{macrocode}
-% The first pole is neither horizontal nor vertical. This still leaves
-% the second pole, which may be a special case. For those possibilities,
-% the calculations are the same as above with the first and second poles
-% interchanged.
+% The first pole is neither horizontal nor vertical. To avoid even
+% more complexity, we now work out both slopes and pass to an auxiliary.
% \begin{macrocode}
{
- \dim_compare:nNnTF {#7} = \c_zero_dim
+ \use:x
{
- \dim_set:Nn \l_@@_x_dim {#5}
- \@@_calculate_intersection_aux:nnnnnN
- {#5} {#1} {#2} {#3} {#4} \l_@@_y_dim
+ \@@_calculate_intersection:nnnnnn
+ { \dim_to_fp:n {#4} / \dim_to_fp:n {#3} }
+ { \dim_to_fp:n {#8} / \dim_to_fp:n {#7} }
}
- {
- \dim_compare:nNnTF {#8} = \c_zero_dim
- {
- \dim_set:Nn \l_@@_y_dim {#6}
- \@@_calculate_intersection_aux:nnnnnN
- {#6} {#2} {#1} {#4} {#3} \l_@@_x_dim
- }
-% \end{macrocode}
-% If none of the special cases apply then there is still a need to
-% check that there is a unique intersection between the two pole. This
-% is the case if they have different slopes.
-% \begin{macrocode}
- {
- \fp_set:Nn \l_@@_slope_x_fp
- { \dim_to_fp:n {#4} / \dim_to_fp:n {#3} }
- \fp_set:Nn \l_@@_slope_y_fp
- { \dim_to_fp:n {#8} / \dim_to_fp:n {#7} }
- \fp_compare:nNnTF
- \l_@@_slope_x_fp = \l_@@_slope_y_fp
- { \bool_set_true:N \l_@@_error_bool }
-% \end{macrocode}
-% All of the tests pass, so there is the full complexity of the
-% calculation:
-% \[
-% x = \frac { a ( d / c ) - a' ( d' / c' ) - b + b' }
-% { ( d / c ) - ( d' / c' ) }
-% \]
-% and noting that the two ratios are already worked out from the test
-% just performed. There is quite a bit of shuffling from dimensions to
-% floating points in order to do the work. The $y$-values is then
-% worked out using the standard auxiliary starting from the
-% $x$-position.
-% \begin{macrocode}
- {
- \dim_set:Nn \l_@@_x_dim
- {
- \fp_to_dim:n
- {
- (
- \dim_to_fp:n {#1} *
- \l_@@_slope_x_fp
- - ( \dim_to_fp:n {#5} *
- \l_@@_slope_y_fp )
- - \dim_to_fp:n {#2}
- + \dim_to_fp:n {#6}
- )
- /
- (
- \l_@@_slope_x_fp -
- \l_@@_slope_y_fp
- )
- }
- }
- \@@_calculate_intersection_aux:nnnnnN
- { \l_@@_x_dim }
- {#5} {#6} {#8} {#7} \l_@@_y_dim
- }
- }
- }
+ {#1} {#2} {#5} {#6}
}
}
}
% \end{macrocode}
-% The formula for finding the intersection point is in most cases the
-% same. The formula here is
+% Assuming the two poles are not parallel, then the intersection point is
+% found in two steps. First we find the $x$-value with
% \[
-% \#6 = \#4 \cdot \left( \frac { \#1 - \#2 } { \#5 } \right)\#3
+% x = \frac { sa - s'a' - b + b' }{ s - s' }
% \]
-% Thus |#4| and |#5| should be the directions of the pole while
-% |#2| and |#3| are co-ordinates.
+% and then finding the $y$-value with
+% \[
+% y = s ( x - a ) + b
+% \]
% \begin{macrocode}
-\cs_new_protected:Npn \@@_calculate_intersection_aux:nnnnnN
- #1#2#3#4#5#6
+\cs_set_protected:Npn \@@_calculate_intersection:nnnnnn #1#2#3#4#5#6
{
- \dim_set:Nn #6
+ \fp_compare:nNnTF {#1} = {#2}
+ { \bool_set_true:N \l_@@_error_bool }
{
- \fp_to_dim:n
+ \dim_set:Nn \l_@@_x_dim
{
- \dim_to_fp:n {#4} *
- ( \dim_to_fp:n {#1} - \dim_to_fp:n {#2} ) /
- \dim_to_fp:n {#5}
- + \dim_to_fp:n {#3}
+ \fp_to_dim:n
+ {
+ (
+ #1 * \dim_to_fp:n {#3}
+ - #2 * \dim_to_fp:n {#5}
+ - \dim_to_fp:n {#4}
+ + \dim_to_fp:n {#6}
+ )
+ /
+ ( #1 - #2 )
+ }
}
+ \dim_set:Nn \l_@@_y_dim
+ {
+ \fp_to_dim:n
+ {
+ #1 * ( \l_@@_x_dim - \dim_to_fp:n {#3} )
+ + \dim_to_fp:n {#4}
+ }
+ }
}
}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
@@ -927,7 +927,16 @@
% \end{macrocode}
% \end{macro}
%
+% \subsection{Deprecated \pkg{l3file} functions}
+%
+% \begin{macro}[EXP, deprecated = 2021-07-01]{\c_term_ior}
% \begin{macrocode}
+\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { -1 }
+\cs_new_protected:Npn \c_term_ior { -1 \scan_stop: }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
%</initex|package>
% \end{macrocode}
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -79,7 +79,7 @@
%
% \title{The \cls{l3doc} class}
% \author{\Team}
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
% \maketitle
% \tableofcontents
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3file.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3file.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
@@ -166,7 +166,7 @@
%
% Reading from files and reading from the terminal are separate processes in
% \pkg{expl3}. The functions \cs{ior_get:NN} and \cs{ior_str_get:NN}, and their
-% branching equivalents, are designed to work with files.
+% branching equivalents, are designed to work with \emph{files}.
%
% \begin{function}[noTF, added = 2012-06-24, updated = 2019-03-23]{\ior_get:NN}
% \begin{syntax}
@@ -174,7 +174,7 @@
% \cs{ior_get:NNTF} \meta{stream} \meta{token list variable} \meta{true code} \meta{false code}
% \end{syntax}
% Function that reads one or more lines (until an equal number of left
-% and right braces are found) from the input \meta{stream} and stores
+% and right braces are found) from the file input \meta{stream} and stores
% the result locally in the \meta{token list} variable.
% The material read from the \meta{stream} is tokenized by \TeX{}
% according to the category codes and \tn{endlinechar} in force when
@@ -215,7 +215,7 @@
% \cs{ior_str_get:NN} \meta{stream} \meta{token list variable}
% \cs{ior_str_get:NNTF} \meta{stream} \meta{token list variable} \meta{true code} \meta{false code}
% \end{syntax}
-% Function that reads one line from the input \meta{stream} and stores
+% Function that reads one line from the file input \meta{stream} and stores
% the result locally in the \meta{token list} variable.
% The material is read from the \meta{stream} as a series of tokens with
% category code $12$ (other), with the exception of space
@@ -327,7 +327,7 @@
% \cs{ior_if_eof_p:N} \meta{stream} \\
% \cs{ior_if_eof:NTF} \meta{stream} \Arg{true code} \Arg{false code}
% \end{syntax}
-% Tests if the end of a \meta{stream} has been reached during a reading
+% Tests if the end of a file \meta{stream} has been reached during a reading
% operation. The test also returns a \texttt{true} value if
% the \meta{stream} is not open.
% \end{function}
@@ -511,15 +511,6 @@
%
% \subsection{Constant input--output streams, and variables}
%
-% \begin{variable}{\c_term_ior}
-% Constant input stream for reading from the terminal. Reading from this
-% stream using \cs{ior_get:NN} or similar results in a prompt from
-% \TeX{} of the form
-% \begin{verbatim}
-% <tl>=
-% \end{verbatim}
-% \end{variable}
-%
% \begin{variable}[added = 2017-12-11]{\g_tmpa_ior, \g_tmpb_ior}
% Scratch input stream for global use. These are never used by
% the kernel code, and so are safe for use with any \LaTeX3-defined
@@ -784,12 +775,12 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\c_term_ior}
+% \begin{variable}{\c_@@_term_ior}
% Reading from the terminal (with a prompt) is done using a positive
% but non-existent stream number. Unlike writing, there is no concept
% of reading from the log.
% \begin{macrocode}
-\int_const:Nn \c_term_ior { 16 }
+\int_const:Nn \c_@@_term_ior { 16 }
% \end{macrocode}
% \end{variable}
%
@@ -850,7 +841,7 @@
% Reserving a new stream is done by defining the name as equal to using the
% terminal.
% \begin{macrocode}
-\cs_new_protected:Npn \ior_new:N #1 { \cs_new_eq:NN #1 \c_term_ior }
+\cs_new_protected:Npn \ior_new:N #1 { \cs_new_eq:NN #1 \c_@@_term_ior }
\cs_generate_variant:Nn \ior_new:N { c }
% \end{macrocode}
% \end{macro}
@@ -971,13 +962,13 @@
% \begin{macrocode}
\cs_new_protected:Npn \ior_close:N #1
{
- \int_compare:nT { -1 < #1 < \c_term_ior }
+ \int_compare:nT { -1 < #1 < \c_@@_term_ior }
{
\tex_closein:D #1
\prop_gremove:NV \g_@@_streams_prop #1
\seq_if_in:NVF \g_@@_streams_seq #1
{ \seq_gpush:NV \g_@@_streams_seq #1 }
- \cs_gset_eq:NN #1 \c_term_ior
+ \cs_gset_eq:NN #1 \c_@@_term_ior
}
}
\cs_generate_variant:Nn \ior_close:N { c }
@@ -1029,7 +1020,7 @@
{
\cs_if_exist:NTF #1
{
- \int_compare:nTF { -1 < #1 < \c_term_ior }
+ \int_compare:nTF { -1 < #1 < \c_@@_term_ior }
{
\if_eof:w #1
\prg_return_true:
@@ -1094,10 +1085,10 @@
% \end{macro}
% \end{macro}
%
-% \begin{variable}{\c_@@_term_ior}
+% \begin{variable}{\c_@@_term_noprompt_ior}
% For reading without a prompt.
% \begin{macrocode}
-\int_const:Nn \c_@@_term_ior { -1 }
+\int_const:Nn \c_@@_term_noprompt_ior { -1 }
% \end{macrocode}
% \end{variable}
%
@@ -1114,8 +1105,8 @@
\group_begin:
\tex_escapechar:D = -1 \scan_stop:
\tl_if_blank:nTF {#2}
+ { \exp_args:NNc #1 \c_@@_term_noprompt_ior }
{ \exp_args:NNc #1 \c_@@_term_ior }
- { \exp_args:NNc #1 \c_term_ior }
{#2}
\exp_args:NNNv \group_end:
\tl_set:Nn #3 {#2}
@@ -1699,7 +1690,7 @@
\cs_new_protected:Npn \iow_wrap:nnnN #1#2#3#4
{
\group_begin:
-%<package> \use:c { conditionally at traceoff }
+%<package> \cs_if_exist_use:N \conditionally at traceoff
\int_set:Nn \tex_escapechar:D { -1 }
\cs_set:Npx \{ { \token_to_str:N \{ }
\cs_set:Npx \# { \token_to_str:N \# }
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3final.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3final.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3final.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
% \maketitle
%
% \begin{documentation}
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
% \maketitle
%
% \begin{documentation}
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3int.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3int.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
@@ -1306,7 +1306,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_use:nnnnnnn #1#2#3#4#5#6#7
{
-%<package> \use:c { conditionally at traceoff }
+%<package> \cs_if_exist_use:N \conditionally at traceoff
\msg_if_exist:nnTF {#2} {#3}
{
\@@_class_chk_exist:nT {#1}
@@ -1324,7 +1324,7 @@
}
}
{ \__kernel_msg_error:nnxx { kernel } { message-unknown } {#2} {#3} }
-%<package> \use:c { conditionally at traceon }
+%<package> \cs_if_exist_use:N \conditionally at traceon
}
\cs_new_protected:Npn \@@_use_code: { }
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3names.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3names.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3str.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3str.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3str.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3token.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3token.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx 2019-08-14 20:53:00 UTC (rev 51881)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-25}
+% \date{Released 2019-08-14}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex 2019-08-14 20:53:00 UTC (rev 51881)
@@ -65,7 +65,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2019-07-25}%
+\def\ExplFileDate{2019-08-14}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -9739,7 +9739,7 @@
\seq_new:N \l__msg_class_loop_seq
\cs_new_protected:Npn \__msg_use:nnnnnnn #1#2#3#4#5#6#7
{
- \use:c { conditionally at traceoff }
+ \cs_if_exist_use:N \conditionally at traceoff
\msg_if_exist:nnTF {#2} {#3}
{
\__msg_class_chk_exist:nT {#1}
@@ -9757,7 +9757,7 @@
}
}
{ \__kernel_msg_error:nnxx { kernel } { message-unknown } {#2} {#3} }
- \use:c { conditionally at traceon }
+ \cs_if_exist_use:N \conditionally at traceon
}
\cs_new_protected:Npn \__msg_use_code: { }
\cs_new_protected:Npn \__msg_use_redirect_name:n #1
@@ -10283,7 +10283,7 @@
\cs_generate_variant:Nn \__kernel_msg_expandable_error:nnn { nnf }
%% File: l3file.dtx
\tl_new:N \l__ior_internal_tl
-\int_const:Nn \c_term_ior { 16 }
+\int_const:Nn \c__ior_term_ior { 16 }
\seq_new:N \g__ior_streams_seq
\tl_new:N \l__ior_stream_tl
\prop_new:N \g__ior_streams_prop
@@ -10300,7 +10300,7 @@
{
\prop_gput:Nnn \g__ior_streams_prop {#1} { Reserved~by~format }
}
-\cs_new_protected:Npn \ior_new:N #1 { \cs_new_eq:NN #1 \c_term_ior }
+\cs_new_protected:Npn \ior_new:N #1 { \cs_new_eq:NN #1 \c__ior_term_ior }
\cs_generate_variant:Nn \ior_new:N { c }
\ior_new:N \g_tmpa_ior
\ior_new:N \g_tmpb_ior
@@ -10349,13 +10349,13 @@
}
\cs_new_protected:Npn \ior_close:N #1
{
- \int_compare:nT { -1 < #1 < \c_term_ior }
+ \int_compare:nT { -1 < #1 < \c__ior_term_ior }
{
\tex_closein:D #1
\prop_gremove:NV \g__ior_streams_prop #1
\seq_if_in:NVF \g__ior_streams_seq #1
{ \seq_gpush:NV \g__ior_streams_seq #1 }
- \cs_gset_eq:NN #1 \c_term_ior
+ \cs_gset_eq:NN #1 \c__ior_term_ior
}
}
\cs_generate_variant:Nn \ior_close:N { c }
@@ -10376,7 +10376,7 @@
{
\cs_if_exist:NTF #1
{
- \int_compare:nTF { -1 < #1 < \c_term_ior }
+ \int_compare:nTF { -1 < #1 < \c__ior_term_ior }
{
\if_eof:w #1
\prg_return_true:
@@ -10421,7 +10421,7 @@
\prg_return_true:
}
}
-\int_const:Nn \c__ior_term_ior { -1 }
+\int_const:Nn \c__ior_term_noprompt_ior { -1 }
\cs_new_protected:Npn \ior_get_term:nN #1#2
{ \__ior_get_term:NnN \__ior_get:NN {#1} #2 }
\cs_new_protected:Npn \ior_str_get_term:nN #1#2
@@ -10431,8 +10431,8 @@
\group_begin:
\tex_escapechar:D = -1 \scan_stop:
\tl_if_blank:nTF {#2}
+ { \exp_args:NNc #1 \c__ior_term_noprompt_ior }
{ \exp_args:NNc #1 \c__ior_term_ior }
- { \exp_args:NNc #1 \c_term_ior }
{#2}
\exp_args:NNNv \group_end:
\tl_set:Nn #3 {#2}
@@ -10661,7 +10661,7 @@
\cs_new_protected:Npn \iow_wrap:nnnN #1#2#3#4
{
\group_begin:
- \use:c { conditionally at traceoff }
+ \cs_if_exist_use:N \conditionally at traceoff
\int_set:Nn \tex_escapechar:D { -1 }
\cs_set:Npx \{ { \token_to_str:N \{ }
\cs_set:Npx \# { \token_to_str:N \# }
@@ -25813,8 +25813,8 @@
H = { 0pt } { 0pt } { 1000pt } { 0pt } ,
T = { 0pt } { 0pt } { 1000pt } { 0pt } ,
}
-\fp_new:N \l__coffin_slope_x_fp
-\fp_new:N \l__coffin_slope_y_fp
+\fp_new:N \l__coffin_slope_A_fp
+\fp_new:N \l__coffin_slope_B_fp
\bool_new:N \l__coffin_error_bool
\dim_new:N \l__coffin_offset_x_dim
\dim_new:N \l__coffin_offset_y_dim
@@ -26220,17 +26220,24 @@
\cs_new_protected:Npn \__coffin_calculate_intersection:nnnnnnnn
#1#2#3#4#5#6#7#8
{
- \dim_compare:nNnTF {#3} = { \c_zero_dim }
+ \dim_compare:nNnTF {#3} = \c_zero_dim
{
\dim_set:Nn \l__coffin_x_dim {#1}
\dim_compare:nNnTF {#7} = \c_zero_dim
{ \bool_set_true:N \l__coffin_error_bool }
{
- \dim_compare:nNnTF {#8} = \c_zero_dim
- { \dim_set:Nn \l__coffin_y_dim {#6} }
+ \dim_set:Nn \l__coffin_y_dim
{
- \__coffin_calculate_intersection_aux:nnnnnN
- {#1} {#5} {#6} {#7} {#8} \l__coffin_y_dim
+ \dim_compare:nNnTF {#8} = \c_zero_dim
+ {#6}
+ {
+ \fp_to_dim:n
+ {
+ ( \dim_to_fp:n {#8} / \dim_to_fp:n {#7} )
+ * ( \dim_to_fp:n {#1} - \dim_to_fp:n {#5} )
+ + \dim_to_fp:n {#6}
+ }
+ }
}
}
}
@@ -26241,77 +26248,59 @@
\dim_compare:nNnTF {#8} = { \c_zero_dim }
{ \bool_set_true:N \l__coffin_error_bool }
{
- \dim_compare:nNnTF {#7} = \c_zero_dim
- { \dim_set:Nn \l__coffin_x_dim {#5} }
+ \dim_set:Nn \l__coffin_x_dim
{
- \__coffin_calculate_intersection_aux:nnnnnN
- {#2} {#6} {#5} {#8} {#7} \l__coffin_x_dim
- }
- }
- }
- {
- \dim_compare:nNnTF {#7} = \c_zero_dim
- {
- \dim_set:Nn \l__coffin_x_dim {#5}
- \__coffin_calculate_intersection_aux:nnnnnN
- {#5} {#1} {#2} {#3} {#4} \l__coffin_y_dim
- }
- {
- \dim_compare:nNnTF {#8} = \c_zero_dim
- {
- \dim_set:Nn \l__coffin_y_dim {#6}
- \__coffin_calculate_intersection_aux:nnnnnN
- {#6} {#2} {#1} {#4} {#3} \l__coffin_x_dim
- }
- {
- \fp_set:Nn \l__coffin_slope_x_fp
- { \dim_to_fp:n {#4} / \dim_to_fp:n {#3} }
- \fp_set:Nn \l__coffin_slope_y_fp
- { \dim_to_fp:n {#8} / \dim_to_fp:n {#7} }
- \fp_compare:nNnTF
- \l__coffin_slope_x_fp = \l__coffin_slope_y_fp
- { \bool_set_true:N \l__coffin_error_bool }
+ \dim_compare:nNnTF {#7} = \c_zero_dim
+ {#5}
{
- \dim_set:Nn \l__coffin_x_dim
+ \fp_to_dim:n
{
- \fp_to_dim:n
- {
- (
- \dim_to_fp:n {#1} *
- \l__coffin_slope_x_fp
- - ( \dim_to_fp:n {#5} *
- \l__coffin_slope_y_fp )
- - \dim_to_fp:n {#2}
- + \dim_to_fp:n {#6}
- )
- /
- (
- \l__coffin_slope_x_fp -
- \l__coffin_slope_y_fp
- )
- }
+ ( \dim_to_fp:n {#7} / \dim_to_fp:n {#8} )
+ * ( \dim_to_fp:n {#4} - \dim_to_fp:n {#6} )
+ + \dim_to_fp:n {#5}
}
- \__coffin_calculate_intersection_aux:nnnnnN
- { \l__coffin_x_dim }
- {#5} {#6} {#8} {#7} \l__coffin_y_dim
}
}
}
}
+ {
+ \use:x
+ {
+ \__coffin_calculate_intersection:nnnnnn
+ { \dim_to_fp:n {#4} / \dim_to_fp:n {#3} }
+ { \dim_to_fp:n {#8} / \dim_to_fp:n {#7} }
+ }
+ {#1} {#2} {#5} {#6}
+ }
}
}
-\cs_new_protected:Npn \__coffin_calculate_intersection_aux:nnnnnN
- #1#2#3#4#5#6
+\cs_set_protected:Npn \__coffin_calculate_intersection:nnnnnn #1#2#3#4#5#6
{
- \dim_set:Nn #6
+ \fp_compare:nNnTF {#1} = {#2}
+ { \bool_set_true:N \l__coffin_error_bool }
{
- \fp_to_dim:n
+ \dim_set:Nn \l__coffin_x_dim
{
- \dim_to_fp:n {#4} *
- ( \dim_to_fp:n {#1} - \dim_to_fp:n {#2} ) /
- \dim_to_fp:n {#5}
- + \dim_to_fp:n {#3}
+ \fp_to_dim:n
+ {
+ (
+ #1 * \dim_to_fp:n {#3}
+ - #2 * \dim_to_fp:n {#5}
+ - \dim_to_fp:n {#4}
+ + \dim_to_fp:n {#6}
+ )
+ /
+ ( #1 - #2 )
+ }
}
+ \dim_set:Nn \l__coffin_y_dim
+ {
+ \fp_to_dim:n
+ {
+ #1 * ( \l__coffin_x_dim - \dim_to_fp:n {#3} )
+ + \dim_to_fp:n {#4}
+ }
+ }
}
}
\fp_new:N \l__coffin_sin_fp
@@ -29663,6 +29652,8 @@
\cs_new:Npn \token_get_arg_spec:N { \cs_argument_spec:N }
\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \cs_replacement_spec:N }
\cs_new:Npn \token_get_replacement_spec:N { \cs_replacement_spec:N }
+\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { -1 }
+\cs_new_protected:Npn \c_term_ior { -1 \scan_stop: }
%%
%%
%% End of file `expl3-code.tex'.
Modified: trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex 2019-08-14 20:53:00 UTC (rev 51881)
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2019-07-25}%
+\def\ExplFileDate{2019-08-14}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\def\tempa{LaTeX2e}%
Modified: trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.sty 2019-08-14 20:52:07 UTC (rev 51880)
+++ trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.sty 2019-08-14 20:53:00 UTC (rev 51881)
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2019-07-25}%
+\def\ExplFileDate{2019-08-14}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
More information about the tex-live-commits
mailing list