[latex3-commits] [git/LaTeX3-latex3-latex2e] main: Update l3backend to 2021-03-18 (c1e26c71)
Joseph Wright
joseph.wright at morningstar2.co.uk
Thu Mar 18 18:20:51 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : main
Link : https://github.com/latex3/latex2e/commit/c1e26c71c1d4332c9e657018c4b56abf56e32f2b
>---------------------------------------------------------------
commit c1e26c71c1d4332c9e657018c4b56abf56e32f2b
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Mar 18 17:20:51 2021 +0000
Update l3backend to 2021-03-18
>---------------------------------------------------------------
c1e26c71c1d4332c9e657018c4b56abf56e32f2b
texmf/tex/latex/l3backend/l3backend-dvipdfmx.def | 53 +++++++++---------------
texmf/tex/latex/l3backend/l3backend-dvips.def | 2 +-
texmf/tex/latex/l3backend/l3backend-dvisvgm.def | 2 +-
texmf/tex/latex/l3backend/l3backend-luatex.def | 2 +-
texmf/tex/latex/l3backend/l3backend-pdftex.def | 2 +-
texmf/tex/latex/l3backend/l3backend-xetex.def | 53 +++++++++---------------
6 files changed, 44 insertions(+), 70 deletions(-)
diff --git a/texmf/tex/latex/l3backend/l3backend-dvipdfmx.def b/texmf/tex/latex/l3backend/l3backend-dvipdfmx.def
index b05710c7..50d8f889 100644
--- a/texmf/tex/latex/l3backend/l3backend-dvipdfmx.def
+++ b/texmf/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-18}{}
{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,13 @@
{ 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 at pdfcolorstack } { \c__color_backend_main_stack_int }
+ }
+ \cs_gset_protected:Npn \__kernel_backend_scope_end:
+ {
+ \__kernel_backend_literal:n { x:grestore }
+ \__kernel_backend_literal:n
+ { pdfcolorstack ~ \g__color_backend_stack_int current }
}
}
\int_compare:nNnF \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
@@ -722,31 +732,8 @@
{ @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
diff --git a/texmf/tex/latex/l3backend/l3backend-dvips.def b/texmf/tex/latex/l3backend/l3backend-dvips.def
index 1e47603f..34fa5392 100644
--- a/texmf/tex/latex/l3backend/l3backend-dvips.def
+++ b/texmf/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-18}{}
{L3 backend support: dvips}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
diff --git a/texmf/tex/latex/l3backend/l3backend-dvisvgm.def b/texmf/tex/latex/l3backend/l3backend-dvisvgm.def
index 078970ec..866c9879 100644
--- a/texmf/tex/latex/l3backend/l3backend-dvisvgm.def
+++ b/texmf/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-18}{}
{L3 backend support: dvisvgm}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
diff --git a/texmf/tex/latex/l3backend/l3backend-luatex.def b/texmf/tex/latex/l3backend/l3backend-luatex.def
index 235eaa02..d2525609 100644
--- a/texmf/tex/latex/l3backend/l3backend-luatex.def
+++ b/texmf/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-18}{}
{L3 backend support: PDF output (LuaTeX)}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
diff --git a/texmf/tex/latex/l3backend/l3backend-pdftex.def b/texmf/tex/latex/l3backend/l3backend-pdftex.def
index 93ba0c8e..0e1228fb 100644
--- a/texmf/tex/latex/l3backend/l3backend-pdftex.def
+++ b/texmf/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-18}{}
{L3 backend support: PDF output (pdfTeX)}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
diff --git a/texmf/tex/latex/l3backend/l3backend-xetex.def b/texmf/tex/latex/l3backend/l3backend-xetex.def
index b4603d6f..aba2e2bc 100644
--- a/texmf/tex/latex/l3backend/l3backend-xetex.def
+++ b/texmf/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-18}{}
{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,13 @@
{ 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 at pdfcolorstack } { \c__color_backend_main_stack_int }
+ }
+ \cs_gset_protected:Npn \__kernel_backend_scope_end:
+ {
+ \__kernel_backend_literal:n { x:grestore }
+ \__kernel_backend_literal:n
+ { pdfcolorstack ~ \g__color_backend_stack_int current }
}
}
\int_compare:nNnF \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
@@ -768,31 +778,8 @@
{ @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
More information about the latex3-commits
mailing list.