summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-05-07 19:54:29 +0000
committerKarl Berry <karl@freefriends.org>2019-05-07 19:54:29 +0000
commit55f179ed21bc5f0b33d07082310b5c6711891fcb (patch)
treef76dd9e243d189e83560c95b09efbbef5188f66a /Master/texmf-dist/tex/latex/l3kernel
parent874a1c81cef02ef6271a1e6f84e269406ed5c5d1 (diff)
l3kernel (7may19)
git-svn-id: svn://tug.org/texlive/trunk@51037 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex16
-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/l3dvipdfmx.def20
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvips.def8
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def5
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def24
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def20
8 files changed, 36 insertions, 61 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 82d11da2357..0bd3c4c3f10 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -64,7 +64,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2019-05-05}%
+\def\ExplFileDate{2019-05-07}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -10130,7 +10130,11 @@
{ Inconsistent~local/global~assignment }
{
\c__msg_coding_error_text_tl
- \if:w l #2 Local \else: Global \fi: \ %
+ \if:w l #2 Local
+ \else:
+ \if:w g #2 Global \else: Constant \fi:
+ \fi:
+ \ %
assignment~to~a~
\if:w l #1 local
\else:
@@ -12535,6 +12539,14 @@
{ \exp_args:No \__keys_multichoices_make:nn #1 }
\cs_new_protected:cpn { \c__keys_props_root_tl .multichoices:xn } #1
{ \exp_args:Nx \__keys_multichoices_make:nn #1 }
+\cs_new_protected:cpn { \c__keys_props_root_tl .muskip_set:N } #1
+ { \__keys_variable_set:NnnN #1 { muskip } { } n }
+\cs_new_protected:cpn { \c__keys_props_root_tl .muskip_set:c } #1
+ { \__keys_variable_set:cnnN {#1} { muskip } { } n }
+\cs_new_protected:cpn { \c__keys_props_root_tl .muskip_gset:N } #1
+ { \__keys_variable_set:NnnN #1 { muskip } { g } n }
+\cs_new_protected:cpn { \c__keys_props_root_tl .muskip_gset:c } #1
+ { \__keys_variable_set:cnnN {#1} { muskip } { g } n }
\cs_new_protected:cpn { \c__keys_props_root_tl .prop_put:N } #1
{ \__keys_prop_put:Nn #1 { } }
\cs_new_protected:cpn { \c__keys_props_root_tl .prop_put:c } #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index e4401cb552c..a9a82d7acf7 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-05-05}%
+\def\ExplFileDate{2019-05-07}%
\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 d017eb98e2e..677f47de59d 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-05-05}%
+\def\ExplFileDate{2019-05-07}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
index 97bde0a30b9..bed26918ee0 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
@@ -435,8 +435,6 @@
}
}
%% File: l3drivers-pdf.dtx
-\tl_const:Nn \c__driver_pdf_AR_fix_tl
- { /Ff ~ 65537 /FT /Btn /Subtype /Widget }
\box_new:N \l__driver_pdf_tmp_box
\cs_new_protected:Npx \__driver_pdf:n #1
{ \__driver_literal:n { pdf: #1 } }
@@ -504,14 +502,6 @@
{ \bool_gset_false:N \g__driver_landscape_bool }
}
}
-\cs_new_protected:Npx \__driver_pdf_AR_fix:
- {
- \__driver_pdf:n
- {
- ann ~ width ~ 3pt ~ height ~ 3pt ~ depth ~ 0pt
- << \c__driver_pdf_AR_fix_tl >>
- }
- }
\int_new:N \g__driver_pdf_annotation_int
\cs_new_protected:Npn \driver_pdf_annotation:nnnn #1#2#3#4
{
@@ -530,7 +520,6 @@
}
\cs_new_protected:Npn \__driver_pdf_annotation:nnnn #1#2#3#4
{
- \__driver_pdf_AR_fix:
\int_gincr:N \g__driver_pdf_object_int
\int_gset_eq:NN \g__driver_pdf_annotation_int \g__driver_pdf_object_int
\__driver_pdf:x
@@ -548,7 +537,6 @@
{ \__driver_pdf_link_begin:n {#1#2} }
\cs_new_protected:Npn \__driver_pdf_link_begin:n #1
{
- \__driver_pdf_AR_fix:
\__driver_pdf:n
{
bann
@@ -617,9 +605,11 @@
}
\cs_new_protected:Npn \driver_pdf_compresslevel:n #1
{ \__driver_literal:x { dvipdfmx:config~z~ \int_eval:n {#1} } }
-\cs_new_protected:Npn \driver_pdf_objects_enable: { }
-\cs_new_protected:Npn \driver_pdf_objects_disable:
- { \__driver_literal:n { dvipdfmx:config~C~0x40 } }
+\cs_new_protected:Npn \driver_pdf_compress_objects:n #1
+ {
+ \str_if_eq:nnF {#1} { true }
+ { \__driver_literal:n { dvipdfmx:config~C~0x40 } }
+ }
\cs_new_protected:Npn \driver_pdf_version_major:n #1
{
\cs_gset:Npx \driver_pdf_version_major: { \int_eval:n {#1} }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
index ee2d45c8aa1..ad9d6d9adca 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
@@ -416,8 +416,6 @@
\cs_new_protected:Npn \__driver_image_include_eps:n #1
{ \__driver_literal:n { PSfile = #1 } }
%% File: l3drivers-pdf.dtx
-\tl_const:Nn \c__driver_pdf_AR_fix_tl
- { /Ff ~ 65537 /FT /Btn /Subtype /Widget }
\box_new:N \l__driver_pdf_tmp_box
\cs_new_protected:Npn \__driver_pdfmark:n #1
{ \__driver_postscript:n { mark #1 ~ pdfmark } }
@@ -917,8 +915,7 @@
\__driver_pdfmark:x
{
/_objdef { driver.obj \int_use:N \g__driver_pdf_object_int }
- driver.rect ~
- \c__driver_pdf_AR_fix_tl
+ driver.rect
/ANN
}
}
@@ -1164,8 +1161,7 @@
\group_end:
}
\cs_new_protected:Npn \driver_pdf_compresslevel:n #1 { }
-\cs_new_protected:Npn \driver_pdf_objects_enable: { }
-\cs_new_protected:Npn \driver_pdf_objects_disable: { }
+\cs_new_protected:Npn \driver_pdf_compress_objects:n #1 { }
\cs_new_protected:Npn \driver_pdf_version_major_gset:n #1 { }
\cs_new_protected:Npn \driver_pdf_version_minor_gset:n #1 { }
\cs_new:Npn \driver_pdf_version_major: { -1 }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
index ffb86659911..fc22d5d3a8d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
@@ -467,8 +467,6 @@
\cs_new:Npn \__driver_image_include_bitmap_quote:w #1 " #2 " #3 \q_stop
{ " #2 " }
%% File: l3drivers-pdf.dtx
-\tl_const:Nn \c__driver_pdf_AR_fix_tl
- { /Ff ~ 65537 /FT /Btn /Subtype /Widget }
\box_new:N \l__driver_pdf_tmp_box
\cs_new_protected:Npn \driver_pdf_catalog_gput:nn #1#2 { }
\cs_new_protected:Npn \driver_pdf_info_gput:nn #1#2 { }
@@ -476,8 +474,7 @@
\cs_new:Npn \driver_pdf_object_ref:n #1 { }
\cs_new_protected:Npn \driver_pdf_object_write:nn #1#2 { }
\cs_new_protected:Npn \driver_pdf_compresslevel:n #1 { }
-\cs_new_protected:Npn \driver_pdf_objects_enable: { }
-\cs_new_protected:Npn \driver_pdf_objects_disable: { }
+\cs_new_protected:Npn \driver_pdf_compress_objects:n #1 { }
\cs_new_protected:Npn \driver_pdf_version_major_gset:n #1 { }
\cs_new_protected:Npn \driver_pdf_version_minor_gset:n #1 { }
\cs_new:Npn \driver_pdf_version_major: { -1 }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
index c555f97578d..1ebc92eb4bb 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
@@ -422,20 +422,9 @@
\cs_new_eq:NN \__driver_image_include_pdf:n \__driver_image_include_jpg:n
\cs_new_eq:NN \__driver_image_include_png:n \__driver_image_include_jpg:n
%% File: l3drivers-pdf.dtx
-\tl_const:Nn \c__driver_pdf_AR_fix_tl
- { /Ff ~ 65537 /FT /Btn /Subtype /Widget }
\box_new:N \l__driver_pdf_tmp_box
-\cs_new_protected:Npx \__driver_pdf_AR_fix:
- {
- \cs_if_exist:NTF \tex_pdfextension:D
- { \tex_pdfextension:D annot ~ }
- { \tex_pdfannot:D }
- width ~ 3pt ~ height ~ 3pt ~ depth ~ 0pt
- { \c__driver_pdf_AR_fix_tl }
- }
\cs_new_protected:Npx \driver_pdf_annotation:nnnn #1#2#3#4
{
- \__driver_pdf_AR_fix:
\cs_if_exist:NTF \tex_pdfextension:D
{ \tex_pdfextension:D annot ~ }
{ \tex_pdfannot:D }
@@ -458,7 +447,6 @@
{ \__driver_pdf_link_begin:nnnw {#1} { user } {#2} }
\cs_new_protected:Npx \__driver_pdf_link_begin:nnnw #1#2#3
{
- \__driver_pdf_AR_fix:
\cs_if_exist:NTF \tex_pdfextension:D
{ \tex_pdfextension:D startlink ~ }
{ \tex_pdfstartlink:D }
@@ -596,11 +584,13 @@
{ \tex_pdfvariable:D compresslevel }
\exp_not:N \int_value:w \exp_not:N \int_eval:n {#1} \scan_stop:
}
-\cs_new_protected:Npn \driver_pdf_objects_enable:
- { \__driver_pdf_objectlevel:n { 2 } }
-\cs_new_protected:Npn \driver_pdf_objects_disable:
- { \__driver_pdf_objectlevel:n { 0 } }
-\cs_new_protected:Npx \__driver_pdf_objectlevel:n #1
+\cs_new_protected:Npn \driver_pdf_compress_objects:n #1
+ {
+ \str_if_eq:nnTF {#1} { true }
+ { \__driver_pdf_objcompresslevel:n { 2 } }
+ { \__driver_pdf_objcompresslevel:n { 0 } }
+ }
+\cs_new_protected:Npx \__driver_pdf_objcompresslevel:n #1
{
\cs_if_exist:NTF \tex_pdfobjcompresslevel:D
{ \tex_pdfobjcompresslevel:D }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
index a9046507c11..7fc986ec327 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
@@ -478,8 +478,6 @@
\__driver_image_getbb_auxiv:VnNnn \l_image_pagebox_tl
}
%% File: l3drivers-pdf.dtx
-\tl_const:Nn \c__driver_pdf_AR_fix_tl
- { /Ff ~ 65537 /FT /Btn /Subtype /Widget }
\box_new:N \l__driver_pdf_tmp_box
\cs_new_protected:Npx \__driver_pdf:n #1
{ \__driver_literal:n { pdf: #1 } }
@@ -547,14 +545,6 @@
{ \bool_gset_false:N \g__driver_landscape_bool }
}
}
-\cs_new_protected:Npx \__driver_pdf_AR_fix:
- {
- \__driver_pdf:n
- {
- ann ~ width ~ 3pt ~ height ~ 3pt ~ depth ~ 0pt
- << \c__driver_pdf_AR_fix_tl >>
- }
- }
\int_new:N \g__driver_pdf_annotation_int
\cs_new_protected:Npn \driver_pdf_annotation:nnnn #1#2#3#4
{
@@ -573,7 +563,6 @@
}
\cs_new_protected:Npn \__driver_pdf_annotation:nnnn #1#2#3#4
{
- \__driver_pdf_AR_fix:
\int_gincr:N \g__driver_pdf_object_int
\int_gset_eq:NN \g__driver_pdf_annotation_int \g__driver_pdf_object_int
\__driver_pdf:x
@@ -591,7 +580,6 @@
{ \__driver_pdf_link_begin:n {#1#2} }
\cs_new_protected:Npn \__driver_pdf_link_begin:n #1
{
- \__driver_pdf_AR_fix:
\__driver_pdf:n
{
bann
@@ -660,9 +648,11 @@
}
\cs_new_protected:Npn \driver_pdf_compresslevel:n #1
{ \__driver_literal:x { dvipdfmx:config~z~ \int_eval:n {#1} } }
-\cs_new_protected:Npn \driver_pdf_objects_enable: { }
-\cs_new_protected:Npn \driver_pdf_objects_disable:
- { \__driver_literal:n { dvipdfmx:config~C~0x40 } }
+\cs_new_protected:Npn \driver_pdf_compress_objects:n #1
+ {
+ \str_if_eq:nnF {#1} { true }
+ { \__driver_literal:n { dvipdfmx:config~C~0x40 } }
+ }
\cs_new_protected:Npn \driver_pdf_version_major:n #1
{
\cs_gset:Npx \driver_pdf_version_major: { \int_eval:n {#1} }