summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-19 20:46:32 +0000
committerKarl Berry <karl@freefriends.org>2019-09-19 20:46:32 +0000
commitbaf4b7dab9fc6d675d83c88ccfd7ca7824c38355 (patch)
treef0662e22786e1298055567645b110894653667d9 /Master/texmf-dist/tex/latex
parente86345f5dc9769da6df2b57003f79e20506092cd (diff)
l3 (19sep19)
git-svn-id: svn://tug.org/texlive/trunk@52129 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3cctab/l3cctab.sty91
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex45
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3doc.cls8
15 files changed, 123 insertions, 45 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
index 775b61d6fba..4ac839b24e5 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
@@ -20,7 +20,7 @@
%%
%% File: l3benchmark.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3benchmark}{2019-08-25}{}
+\ProvidesExplPackage{l3benchmark}{2019-09-19}{}
{L3 Experimental benchmarking}
\sys_if_engine_luatex:TF
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3cctab/l3cctab.sty b/Master/texmf-dist/tex/latex/l3experimental/l3cctab/l3cctab.sty
index cafae3fb78c..1bff7ecc6fc 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3cctab/l3cctab.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3cctab/l3cctab.sty
@@ -20,7 +20,7 @@
%%
%% File: l3cctab.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3cctab}{2019-08-25}{}
+\ProvidesExplPackage{l3cctab}{2019-09-19}{}
{L3 Experimental category code tables}
\int_new:N \g__cctab_allocate_int
\int_gset:Nn \g__cctab_allocate_int { -1 }
@@ -34,7 +34,7 @@
\__kernel_chk_if_free_cs:N #1
\newcatcodetable #1
}
- \cs_new_protected:Npn \cctab_begin:N #1
+ \cs_new_protected:Npn \__cctab_begin:N #1
{
\seq_gpush:Nx \g__cctab_stack_seq { \tex_the:D \tex_catcodetable:D }
\tex_catcodetable:D #1
@@ -44,7 +44,7 @@
\tex_savecatcodetable:D \g__cctab_stack_int
\tex_catcodetable:D \g__cctab_stack_int
}
- \cs_new_protected:Npn \cctab_end:
+ \cs_new_protected:Npn \__cctab_end:
{
\int_gsub:Nn \g__cctab_stack_int { 2 }
\seq_if_empty:NTF \g__cctab_stack_seq
@@ -55,7 +55,7 @@
\cs_new_protected:Npn \cctab_gset:Nn #1#2
{
\group_begin:
- #2
+ #2 \scan_stop:
\tex_savecatcodetable:D #1
\group_end:
}
@@ -80,14 +80,14 @@
\__cctab_gstore:Nnn #1 { 13 } { 5 }
\__cctab_gstore:Nnn #1 { 32 } { 10 }
\__cctab_gstore:Nnn #1 { 37 } { 14 }
- \int_step_inline:nnn { 64 } { 89 }
+ \int_step_inline:nnn { 65 } { 90 }
{ \__cctab_gstore:Nnn #1 {##1} { 11 } }
\__cctab_gstore:Nnn #1 { 92 } { 0 }
\int_step_inline:nnn { 97 } { 122 }
{ \__cctab_gstore:Nnn #1 {##1} { 11 } }
\__cctab_gstore:Nnn #1 { 127 } { 15 }
}
- \cs_new_protected:Npn \cctab_begin:N #1
+ \cs_new_protected:Npn \__cctab_begin:N #1
{
\int_gadd:Nn \g__cctab_stack_int { 2 }
\int_compare:nNnT \g__cctab_stack_int > \c_max_register_int
@@ -116,7 +116,7 @@
}
\cs_generate_variant:Nn \intarray_new:Nn { c }
\cs_generate_variant:Nn \intarray_gset:Nnn { c }
- \cs_new_protected:Npn \cctab_end:
+ \cs_new_protected:Npn \__cctab_end:
{
\int_step_inline:nn { 256 }
{
@@ -127,13 +127,13 @@
{##1}
}
}
- \int_gsub:Nn \g__cctab_stack_int { 1 }
+ \int_gsub:Nn \g__cctab_stack_int { 2 }
}
\cs_generate_variant:Nn \intarray_item:Nn { c }
\cs_new_protected:Npn \cctab_gset:Nn #1#2
{
\group_begin:
- #2
+ #2 \scan_stop:
\int_step_inline:nn { 256 }
{
\intarray_gset:cnn { g__cctab_ \int_use:N #1 _cctab } {##1}
@@ -142,11 +142,71 @@
\group_end:
}
}
+\cs_generate_variant:Nn \cctab_new:N { c }
+\cs_generate_variant:Nn \cctab_gset:Nn { c }
+\cs_new_protected:Npn \cctab_begin:N #1
+ { \__cctab_chk_if_valid:NT #1 { \__cctab_begin:N #1 } }
+\cs_generate_variant:Nn \cctab_begin:N { c }
+\cs_new_protected:Npn \cctab_end:
+ {
+ \int_compare:nNnTF { \g__cctab_stack_int } = { \c_zero_int }
+ { \__kernel_msg_error:nn { kernel } { cctab-extra-end } }
+ { \__cctab_end: }
+ }
+\prg_new_eq_conditional:NNn \cctab_if_exist:N \cs_if_exist:N
+ { TF , T , F , p }
+\prg_new_eq_conditional:NNn \cctab_if_exist:c \cs_if_exist:c
+ { TF , T , F , p }
+\sys_if_engine_luatex:TF
+ {
+ \prg_new_protected_conditional:Npnn \__cctab_chk_if_valid:N #1
+ { TF , T , F }
+ {
+ \cctab_if_exist:NTF #1
+ {
+ \int_compare:nNnTF {#1-1} < { \e@alloc@ccodetable@count }
+ { \prg_return_true: }
+ {
+ \__kernel_msg_error:nnx { kernel } { invalid-cctab }
+ { \token_to_str:N #1 }
+ \prg_return_false:
+ }
+ }
+ {
+ \__kernel_msg_error:nnx { kernel } { command-not-defined }
+ { \token_to_str:N #1 }
+ \prg_return_false:
+ }
+ }
+ }
+ {
+ \prg_new_protected_conditional:Npnn \__cctab_chk_if_valid:N #1
+ { TF , T , F }
+ {
+ \cctab_if_exist:NTF #1
+ {
+ \cs_if_exist:cTF { g__cctab_ \int_use:N #1 _cctab }
+ { \prg_return_true: }
+ {
+ \__kernel_msg_error:nnx { kernel } { invalid-cctab }
+ { \token_to_str:N #1 }
+ \prg_return_false:
+ }
+ }
+ {
+ \__kernel_msg_error:nnx { kernel } { command-not-defined }
+ { \token_to_str:N #1 }
+ \prg_return_false:
+ }
+ }
+ }
\cs_new_protected:Npn \cctab_const:Nn #1#2
{
\cctab_new:N #1
\cctab_gset:Nn #1 {#2}
}
+\cs_generate_variant:Nn \cctab_const:Nn { c }
+\cctab_new:N \c_initex_cctab
\cctab_const:Nn \c_code_cctab { }
\cctab_const:Nn \c_document_cctab
{
@@ -173,6 +233,19 @@
LaTeX~has~been~asked~to~switch~to~a~new~category~code~table,~
but~there~is~no~more~space~to~do~this!
}
+\__kernel_msg_new:nnnn { kernel } { cctab-extra-end }
+ { Extra~\iow_char:N\\cctab_end:~ignored~\msg_line_context:. }
+ {
+ LaTeX~came~across~a~\iow_char:N\\cctab_end:~without~a~matching~
+ \iow_char:N\\cctab_begin:N.~This~command~will~be~ignored.
+ }
+\__kernel_msg_new:nnnn { kernel } { invalid-cctab }
+ { Invalid~\iow_char:N\\catcode~table. }
+ {
+ You~can~only~switch~to~a~\iow_char:N\\catcode~table~that~is~
+ initialized~using~\iow_char:N\\cctab_new:N~or~
+ \iow_char:N\\cctab_const:Nn.
+ }
%%
%%
%% End of file `l3cctab.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty b/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
index 2af48f55f15..0754374d783 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
@@ -20,7 +20,7 @@
%%
%% File: l3color.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3color}{2019-08-25}{}
+\ProvidesExplPackage{l3color}{2019-09-19}{}
{L3 Experimental color support}
\tl_new:N \l__color_internal_tl
\prg_new_conditional:Npnn \__color_if_defined:n #1 { T, F, TF }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
index b91028c3d68..89ae40473e8 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
@@ -28,7 +28,7 @@
%%
%% File: l3draw.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3draw}{2019-08-25}{}
+\ProvidesExplPackage{l3draw}{2019-09-19}{}
{L3 Experimental core drawing support}
\RequirePackage { l3color }
%% File: l3draw-boxes.dtx
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
index 656410d8554..fcc83b89630 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
@@ -20,7 +20,7 @@
%%
%% File: l3graphics.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3graphics}{2019-08-25}{}
+\ProvidesExplPackage{l3graphics}{2019-09-19}{}
{L3 Experimental graphics inclusion support}
\ior_new:N \l__graphics_tmp_ior
\tl_new:N \l__graphics_tmp_tl
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty b/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty
index 90852e95139..558834dbabf 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty
@@ -20,7 +20,7 @@
%%
%% File: l3pdf.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3pdf}{2019-08-25}{}
+\ProvidesExplPackage{l3pdf}{2019-09-19}{}
{L3 Experimental core PDF support}
\bool_new:N \g__pdf_init_bool
\cs_if_exist:NT \documentclass
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
index caa70c099ae..3658738f3d3 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
@@ -20,7 +20,7 @@
%%
%% File: l3str-format.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3str-format}{2019-08-25}{}
+\ProvidesExplPackage{l3str-format}{2019-09-19}{}
{L3 Experimental string formatting}
\cs_generate_variant:Nn \use:nn { nf }
\cs_generate_variant:Nn \use:nnn { fnf }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty
index 18b14319662..0145cdc39d6 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty
@@ -20,7 +20,7 @@
%%
%% File: l3sys-shell.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3sys-shell}{2019-08-25}{}
+\ProvidesExplPackage{l3sys-shell}{2019-09-19}{}
{L3 Experimental system shell functions}
\cs_new:Npn \__sys_path_to_win:n #1
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
index 29ec2eea2a8..a9ae843c764 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
@@ -20,7 +20,7 @@
%%
%% File: xcoffins.dtx
\RequirePackage{xparse}
-\ProvidesExplPackage{xcoffins}{2019-08-25}{}
+\ProvidesExplPackage{xcoffins}{2019-09-19}{}
{L3 Experimental design level coffins}
\keys_define:nn { coffin }
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index 7fd199e0207..ab6c2517bab 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -32,7 +32,7 @@
}%
\endinput
}
-\ProvidesExplPackage{l3galley}{2019-08-25}{}
+\ProvidesExplPackage{l3galley}{2019-09-19}{}
{L3 Experimental galley code}
\int_new:N \l__galley_tmp_int
\seq_new:N \g__galley_tmpa_seq
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
index 79506e9cda8..db897098a74 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
@@ -20,7 +20,7 @@
%%
%% File: xgalley.dtx
\RequirePackage{xparse}
-\ProvidesExplPackage{xgalley}{2019-08-25}{}
+\ProvidesExplPackage{xgalley}{2019-09-19}{}
{L3 Experimental galley}
\RequirePackage{xparse,xtemplate,l3galley}
\clist_new:N \l__galley_tmpa_clist
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 8ebdd18b374..f3b73e82953 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-09-08}%
+\def\ExplFileDate{2019-09-19}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -27306,24 +27306,28 @@
\bool_lazy_or:nnTF { \sys_if_engine_luatex_p: } { \sys_if_engine_xetex_p: }
{
\group_begin:
- \cs_set_eq:NN \__char_generate:w \tex_Uchar:D
+ \cs_set:Npn \__char_generate_char:n #1
+ { \tex_detokenize:D \tex_expandafter:D { \tex_Uchar:D " #1 } }
\cs_set:Npx \__char_generate:n #1
{
- \sys_if_engine_luatex:TF
+ \exp_not:N \tex_unexpanded:D \exp_not:N \exp_after:wN
{
- \exp_not:N \lua_now:e
+ \sys_if_engine_luatex:TF
{
- l3kernel.charcat
- (
- \exp_not:N \tex_number:D #1 ,
- \exp_not:N \tex_the:D \tex_catcode:D #1
- )
+ \exp_not:N \tex_directlua:D
+ {
+ l3kernel.charcat
+ (
+ \exp_not:N \tex_number:D #1 ,
+ \exp_not:N \tex_the:D \tex_catcode:D #1
+ )
+ }
+ }
+ {
+ \exp_not:N \tex_Ucharcat:D
+ #1 ~
+ \tex_catcode:D #1 ~
}
- }
- {
- \exp_not:N \tex_Ucharcat:D
- #1 ~
- \tex_catcode:D #1 ~
}
}
\ior_open:Nn \g__char_data_ior { UnicodeData.txt }
@@ -27338,7 +27342,7 @@
\cs_set_nopar:Npn \l__char_tmpb_tl {#5}
\reverse_if:N \if_meaning:w \l__char_tmpa_tl \l__char_tmpb_tl
\tl_const:cx
- { c__char_mixed_case_ \__char_generate:w "#1 _tl }
+ { c__char_mixed_case_ \__char_generate_char:n {#1} _tl }
{ \__char_generate:n { "#7 } }
\fi:
\fi:
@@ -27358,7 +27362,7 @@
\reverse_if:N \if_int_compare:w
\char_value_lccode:n {"#1} = "#3 ~
\tl_const:cx
- { c__char_fold_case_ \__char_generate:w "#1 _tl }
+ { c__char_fold_case_ \__char_generate_char:n {#1} _tl }
{ \__char_generate:n { "#3 } }
\fi:
\else:
@@ -27369,7 +27373,7 @@
}
\cs_set_protected:Npn \__char_data_auxii:w #1 ~ #2 ~ #3 ~ #4 \q_stop
{
- \tl_const:cx { c__char_fold_case_ \__char_generate:w "#1 _tl }
+ \tl_const:cx { c__char_fold_case_ \__char_generate_char:n {#1} _tl }
{
\__char_generate:n { "#2 }
\__char_generate:n { "#3 }
@@ -27398,7 +27402,7 @@
{
\tl_if_empty:nF {#4}
{
- \tl_const:cx { c__char_ #2 _case_ \__char_generate:w "#1 _tl }
+ \tl_const:cx { c__char_ #2 _case_ \__char_generate_char:n {#1} _tl }
{
\__char_generate:n { "#3 }
\__char_generate:n { "#4 }
@@ -28873,7 +28877,10 @@
{
\group_begin:
\cs_set:Npn \__tl_tmp:n #1
- { \char_generate:nn {#1} { \char_value_catcode:n {#1} } }
+ {
+ \exp_after:wN \exp_after:wN \exp_after:wN \exp_not:N
+ \char_generate:nn {#1} { \char_value_catcode:n {#1} }
+ }
\tl_const:Nx \c__tl_std_sigma_tl { \__tl_tmp:n { "03C3 } }
\tl_const:Nx \c__tl_final_sigma_tl { \__tl_tmp:n { "03C2 } }
\tl_const:Nx \c__tl_accents_lt_tl
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index f372bfed80a..23864e5470a 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-09-08}%
+\def\ExplFileDate{2019-09-19}%
\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 4e77a316983..07037ec2df5 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-09-08}%
+\def\ExplFileDate{2019-09-19}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
index f2db802a945..4d1b512227b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
@@ -441,11 +441,9 @@
{ Local~config~file~l3doc.cfg~loaded. }
\file_if_exist:nT { l3doc.cfg }
{
- \file_input:nT { l3doc.cfg }
- {
- \cs_if_exist:cF { ExplMakeTitle }
- { \msg_info:nn { l3doc } { input-cfg } }
- }
+ \file_input:n { l3doc.cfg }
+ \cs_if_exist:cF { ExplMakeTitle }
+ { \msg_info:nn { l3doc } { input-cfg } }
}
\ProcessOptions
\LoadClass{article}