summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-03-02 21:55:18 +0000
committerKarl Berry <karl@freefriends.org>2021-03-02 21:55:18 +0000
commitc1cf4474e0c7498a3a6acab71e4c17803f235f75 (patch)
tree2ac03f2adf1f65feb3922364df4ab0104cf8cf40 /Master/texmf-dist/tex/latex
parent039db66bfaba704375a9543c918d1118770e42e3 (diff)
l3backend (2mar21)
git-svn-id: svn://tug.org/texlive/trunk@58060 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def47
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def47
6 files changed, 32 insertions, 70 deletions
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
index b05710c7175..b736a792bd2 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvipdfmx.def}{2021-02-18}{}
+ {l3backend-dvipdfmx.def}{2021-03-02}{}
{L3 backend support: dvipdfmx}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -100,17 +100,20 @@
{
\int_gincr:N \exp_not:N \g__color_backend_stack_int
\int_const:Nn #1 { \exp_not:N \g__color_backend_stack_int }
- \cs_if_exist:NTF \AtBeginDvi
- { \exp_not:N \AtBeginDvi }
- { \exp_not:N \use:n }
+ \use:x
{
- \__kernel_backend_literal:x
+ \cs_if_exist:NTF \AtBeginDvi
+ { \exp_not:N \AtBeginDvi }
+ { \exp_not:N \use:n }
{
- pdfcolorstackinit ~
- \exp_not:N \int_use:N \exp_not:N \g__color_backend_stack_int
- \c_space_tl
- \exp_not:N \tl_if_blank:nF {#2} { #2 ~ }
- (#3)
+ \__kernel_backend_literal:n
+ {
+ pdfcolorstackinit ~
+ \exp_not:N \int_use:N \exp_not:N \g__color_backend_stack_int
+ \c_space_tl
+ \exp_not:N \tl_if_blank:nF {#2} { #2 ~ }
+ (#3)
+ }
}
}
}
@@ -124,6 +127,7 @@
{ page ~ direct } { 0 ~ g ~ 0 ~ G }
\int_set_eq:NN \l__color_backend_stack_int
\c__color_backend_main_stack_int
+ \int_const:cn { main@pdfcolorstack } { \c__color_backend_main_stack_int }
}
}
\int_compare:nNnF \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
@@ -722,32 +726,9 @@
{ @pdf.obj \int_use:N \g__pdf_backend_object_int }
\cs_new:Npn \__pdf_backend_pageobject_ref:n #1
{ @page #1 }
-\bool_new:N \g__pdf_landscape_bool
-\cs_if_exist:NT \landscape
- {
- \tl_put_right:Nn \landscape
- { \bool_gset_true:N \g__pdf_landscape_bool }
- \tl_put_left:Nn \endlandscape
- { \bool_gset_false:N \g__pdf_landscape_bool }
- }
\int_new:N \g__pdf_backend_annotation_int
\cs_new_protected:Npn \__pdf_backend_annotation:nnnn #1#2#3#4
{
- \bool_if:NTF \g__pdf_landscape_bool
- {
- \box_move_up:nn {#2}
- {
- \vbox:n
- {
- \__pdf_backend_annotation_aux:nnnn
- { #2 + #3 } {#1} { 0pt } {#4}
- }
- }
- }
- { \__pdf_backend_annotation_aux:nnnn {#1} {#2} {#3} {#4} }
- }
-\cs_new_protected:Npn \__pdf_backend_annotation_aux:nnnn #1#2#3#4
- {
\int_gincr:N \g__pdf_backend_object_int
\int_gset_eq:NN \g__pdf_backend_annotation_int \g__pdf_backend_object_int
\__pdf_backend:x
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
index 1e47603f763..a772aeeaacf 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvips.def}{2021-02-18}{}
+ {l3backend-dvips.def}{2021-03-02}{}
{L3 backend support: dvips}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
index 078970ec7c9..86f2e1e0d7b 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvisvgm.def}{2021-02-18}{}
+ {l3backend-dvisvgm.def}{2021-03-02}{}
{L3 backend support: dvisvgm}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
index 235eaa023e3..befcb6fffd6 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-luatex.def}{2021-02-18}{}
+ {l3backend-luatex.def}{2021-03-02}{}
{L3 backend support: PDF output (LuaTeX)}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
index 93ba0c8ef3d..5226e4e5c5f 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-pdftex.def}{2021-02-18}{}
+ {l3backend-pdftex.def}{2021-03-02}{}
{L3 backend support: PDF output (pdfTeX)}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
index b4603d6f1b2..9784de396bd 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-xetex.def}{2021-02-18}{}
+ {l3backend-xetex.def}{2021-03-02}{}
{L3 backend support: XeTeX}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -100,17 +100,20 @@
{
\int_gincr:N \exp_not:N \g__color_backend_stack_int
\int_const:Nn #1 { \exp_not:N \g__color_backend_stack_int }
- \cs_if_exist:NTF \AtBeginDvi
- { \exp_not:N \AtBeginDvi }
- { \exp_not:N \use:n }
+ \use:x
{
- \__kernel_backend_literal:x
+ \cs_if_exist:NTF \AtBeginDvi
+ { \exp_not:N \AtBeginDvi }
+ { \exp_not:N \use:n }
{
- pdfcolorstackinit ~
- \exp_not:N \int_use:N \exp_not:N \g__color_backend_stack_int
- \c_space_tl
- \exp_not:N \tl_if_blank:nF {#2} { #2 ~ }
- (#3)
+ \__kernel_backend_literal:n
+ {
+ pdfcolorstackinit ~
+ \exp_not:N \int_use:N \exp_not:N \g__color_backend_stack_int
+ \c_space_tl
+ \exp_not:N \tl_if_blank:nF {#2} { #2 ~ }
+ (#3)
+ }
}
}
}
@@ -124,6 +127,7 @@
{ page ~ direct } { 0 ~ g ~ 0 ~ G }
\int_set_eq:NN \l__color_backend_stack_int
\c__color_backend_main_stack_int
+ \int_const:cn { main@pdfcolorstack } { \c__color_backend_main_stack_int }
}
}
\int_compare:nNnF \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
@@ -768,32 +772,9 @@
{ @pdf.obj \int_use:N \g__pdf_backend_object_int }
\cs_new:Npn \__pdf_backend_pageobject_ref:n #1
{ @page #1 }
-\bool_new:N \g__pdf_landscape_bool
-\cs_if_exist:NT \landscape
- {
- \tl_put_right:Nn \landscape
- { \bool_gset_true:N \g__pdf_landscape_bool }
- \tl_put_left:Nn \endlandscape
- { \bool_gset_false:N \g__pdf_landscape_bool }
- }
\int_new:N \g__pdf_backend_annotation_int
\cs_new_protected:Npn \__pdf_backend_annotation:nnnn #1#2#3#4
{
- \bool_if:NTF \g__pdf_landscape_bool
- {
- \box_move_up:nn {#2}
- {
- \vbox:n
- {
- \__pdf_backend_annotation_aux:nnnn
- { #2 + #3 } {#1} { 0pt } {#4}
- }
- }
- }
- { \__pdf_backend_annotation_aux:nnnn {#1} {#2} {#3} {#4} }
- }
-\cs_new_protected:Npn \__pdf_backend_annotation_aux:nnnn #1#2#3#4
- {
\int_gincr:N \g__pdf_backend_object_int
\int_gset_eq:NN \g__pdf_backend_annotation_int \g__pdf_backend_object_int
\__pdf_backend:x