l3kernel (14aug19)

git-svn-id: svn://tug.org/texlive/trunk@51881 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 68 insertions, 77 deletions

diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 2b4a79cce64..3f68d30e8b9 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -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@traceoff }
+    \cs_if_exist_use:N \conditionally@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@traceon }
+    \cs_if_exist_use:N \conditionally@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@traceoff }
+      \cs_if_exist_use:N \conditionally@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,76 +26248,58 @@
             \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
+          {
+            \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
           {
-            \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 * ( \l__coffin_x_dim - \dim_to_fp:n {#3} )
+                + \dim_to_fp:n {#4}
+              }
           }
       }
   }
@@ -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'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index 757dba9cd39..39282cf677f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
@@ -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}%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index fb6ac8f87c3..6c57f37fa8c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -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}
   [%