[latex3-commits] [git/LaTeX3-latex3-latex3] master: Always call driver color reset to pop stack (63fdc01)
Joseph Wright
joseph.wright at morningstar2.co.uk
Wed Feb 28 10:03:34 CET 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/63fdc014e81412ef0a4222336e7cd471a1394c45
>---------------------------------------------------------------
commit 63fdc014e81412ef0a4222336e7cd471a1394c45
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed Feb 28 09:03:34 2018 +0000
Always call driver color reset to pop stack
This didn't show up in the kernel, but we were never
restoring the stack in l3color!
>---------------------------------------------------------------
63fdc014e81412ef0a4222336e7cd471a1394c45
l3experimental/l3color/testfiles/m3color001.ptex.tlg | 8 ++++++++
l3experimental/l3color/testfiles/m3color001.tlg | 8 ++++++++
l3experimental/l3color/testfiles/m3color001.uptex.tlg | 8 ++++++++
l3experimental/l3color/testfiles/m3color001.xetex.tlg | 8 ++++++++
l3kernel/l3color-base.dtx | 6 ++++--
5 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/l3experimental/l3color/testfiles/m3color001.ptex.tlg b/l3experimental/l3color/testfiles/m3color001.ptex.tlg
index ba68c92..16a754f 100644
--- a/l3experimental/l3color/testfiles/m3color001.ptex.tlg
+++ b/l3experimental/l3color/testfiles/m3color001.ptex.tlg
@@ -127,6 +127,7 @@ TEST 7: Selecting colors
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -138,6 +139,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -149,6 +151,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -160,6 +163,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -175,6 +179,7 @@ TEST 8: Fixing the model
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -186,6 +191,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -197,6 +203,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -208,6 +215,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
diff --git a/l3experimental/l3color/testfiles/m3color001.tlg b/l3experimental/l3color/testfiles/m3color001.tlg
index 40b95c4..0141eb0 100644
--- a/l3experimental/l3color/testfiles/m3color001.tlg
+++ b/l3experimental/l3color/testfiles/m3color001.tlg
@@ -127,6 +127,7 @@ TEST 7: Selecting colors
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\pdfcolorstack 0 pop
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -138,6 +139,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\pdfcolorstack 0 pop
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -149,6 +151,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\pdfcolorstack 0 pop
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -160,6 +163,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\pdfcolorstack 0 pop
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -175,6 +179,7 @@ TEST 8: Fixing the model
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\pdfcolorstack 0 pop
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -186,6 +191,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\pdfcolorstack 0 pop
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -197,6 +203,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\pdfcolorstack 0 pop
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -208,6 +215,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\pdfcolorstack 0 pop
! OK.
<argument> \l_tmpa_box
l. ... }
diff --git a/l3experimental/l3color/testfiles/m3color001.uptex.tlg b/l3experimental/l3color/testfiles/m3color001.uptex.tlg
index ba68c92..16a754f 100644
--- a/l3experimental/l3color/testfiles/m3color001.uptex.tlg
+++ b/l3experimental/l3color/testfiles/m3color001.uptex.tlg
@@ -127,6 +127,7 @@ TEST 7: Selecting colors
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -138,6 +139,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -149,6 +151,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -160,6 +163,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -175,6 +179,7 @@ TEST 8: Fixing the model
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -186,6 +191,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -197,6 +203,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -208,6 +215,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
diff --git a/l3experimental/l3color/testfiles/m3color001.xetex.tlg b/l3experimental/l3color/testfiles/m3color001.xetex.tlg
index ba68c92..16a754f 100644
--- a/l3experimental/l3color/testfiles/m3color001.xetex.tlg
+++ b/l3experimental/l3color/testfiles/m3color001.xetex.tlg
@@ -127,6 +127,7 @@ TEST 7: Selecting colors
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -138,6 +139,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -149,6 +151,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -160,6 +163,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -175,6 +179,7 @@ TEST 8: Fixing the model
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -186,6 +191,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -197,6 +203,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
@@ -208,6 +215,7 @@ l. ... }
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 o
+.\special{color pop}
! OK.
<argument> \l_tmpa_box
l. ... }
diff --git a/l3kernel/l3color-base.dtx b/l3kernel/l3color-base.dtx
index b3e88c1..5edf058 100644
--- a/l3kernel/l3color-base.dtx
+++ b/l3kernel/l3color-base.dtx
@@ -147,7 +147,6 @@
\driver_color_pickup:N \l_@@_current_tl
%</package>
\@@_select:V \l_@@_current_tl
- \group_insert_after:N \driver_color_reset:
}
% \end{macrocode}
% \end{macro}
@@ -161,7 +160,10 @@
% higher-level experimental material.
% \begin{macrocode}
\cs_new_protected:Npn \@@_select:n #1
- { \@@_select:w #1 \q_stop }
+ {
+ \@@_select:w #1 \q_stop
+ \group_insert_after:N \driver_color_reset:
+ }
\cs_generate_variant:Nn \@@_select:n { V }
\cs_new_protected:Npn \@@_select:w #1 ~ #2 \q_stop
{ \use:c { @@_select_ #1 :w } #2 \q_stop }
More information about the latex3-commits
mailing list