[latex3-commits] [git/LaTeX3-latex3-latex3] split-pdfmode: Rename xdvipdfmx backend to xetex (ccfbf7449)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Aug 30 21:07:55 CEST 2020
Repository : https://github.com/latex3/latex3
On branch : split-pdfmode
Link : https://github.com/latex3/latex3/commit/ccfbf7449a9ecbbfbbd47a87550762a3f4f43613
>---------------------------------------------------------------
commit ccfbf7449a9ecbbfbbd47a87550762a3f4f43613
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Aug 30 20:07:55 2020 +0100
Rename xdvipdfmx backend to xetex
>---------------------------------------------------------------
ccfbf7449a9ecbbfbbd47a87550762a3f4f43613
l3backend/CHANGELOG.md | 4 +++
l3backend/l3backend-basics.dtx | 22 ++++++-------
l3backend/l3backend-box.dtx | 4 +--
l3backend/l3backend-color.dtx | 14 ++++-----
l3backend/l3backend-draw.dtx | 36 +++++++++++-----------
l3backend/l3backend-graphics.dtx | 14 ++++-----
l3backend/l3backend-pdf.dtx | 8 ++---
l3backend/l3backend.ins | 14 ++++-----
l3kernel/CHANGELOG.md | 1 +
l3kernel/expl3.dtx | 7 +++--
l3kernel/l3sys.dtx | 7 +++--
l3kernel/testfiles/d3dvipdfmx.xetex.tlg | 8 ++---
l3kernel/testfiles/d3dvips.xetex.tlg | 8 ++---
l3kernel/testfiles/d3pdfmode.xetex.tlg | 8 ++---
.../{d3xdvipdfmx.luatex.tlg => d3xetex.luatex.tlg} | 0
.../testfiles/{d3xdvipdfmx.lvt => d3xetex.lvt} | 0
.../{d3xdvipdfmx.ptex.tlg => d3xetex.ptex.tlg} | 0
.../testfiles/{d3xdvipdfmx.tlg => d3xetex.tlg} | 0
.../{d3xdvipdfmx.uptex.tlg => d3xetex.uptex.tlg} | 0
.../{d3xdvipdfmx.xetex.tlg => d3xetex.xetex.tlg} | 4 +--
l3kernel/testfiles/m3expl001.xetex.tlg | 4 +--
l3kernel/testfiles/m3expl002.xetex.tlg | 4 +--
l3kernel/testfiles/m3expl003.xetex.tlg | 4 +--
l3kernel/testfiles/m3expl004.xetex.tlg | 4 +--
l3kernel/testfiles/m3expl006.xetex.tlg | 4 +--
l3kernel/testfiles/m3expl007.xetex.tlg | 4 +--
26 files changed, 95 insertions(+), 88 deletions(-)
diff --git a/l3backend/CHANGELOG.md b/l3backend/CHANGELOG.md
index 6d9dbaab1..237394cfd 100644
--- a/l3backend/CHANGELOG.md
+++ b/l3backend/CHANGELOG.md
@@ -6,6 +6,10 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+### Changed
+- Split `pdfmode` driver into pdfTeX- and LuaTeX-specific files
+- Renamed `xdvipdfmx` backend files to `xetex`
+
## [2020-08-07]
### Changed
diff --git a/l3backend/l3backend-basics.dtx b/l3backend/l3backend-basics.dtx
index 8ed46f68a..2c5d53af1 100644
--- a/l3backend/l3backend-basics.dtx
+++ b/l3backend/l3backend-basics.dtx
@@ -89,10 +89,10 @@
{l3backend-pdftex.def}{2020-08-07}{}
{L3 backend support: PDF output (pdfTeX)}
%</pdftex>
-%<*xdvipdfmx>
- {l3backend-xdvipdfmx.def}{2020-08-07}{}
- {L3 backend support: xdvipdfmx}
-%</xdvipdfmx>
+%<*xetex>
+ {l3backend-xetex.def}{2020-08-07}{}
+ {L3 backend support: XeTeX}
+%</xetex>
% \end{macrocode}
%
% The order of the backend code here is such that we get somewhat logical
@@ -101,9 +101,9 @@
% are shared are
% \begin{itemize}
% \item Color support is either \texttt{dvips}-like or \LuaTeX{}/pdfTeX{}-like.
-% \item \LuaTeX{}/pdfTeX{} and \texttt{(x)dvipdfmx} share drawing routines.
-% \item \texttt{xdvipdfmx} is largely the same as \texttt{dvipdfmx} so
-% takes most of the same code.
+% \item \LuaTeX{}/pdfTeX{} and \texttt{dvipdfmx}/\XeTeX{} share drawing routines.
+% \item \XeTeX{} is the same as \texttt{dvipdfmx} other than image size
+% extraction so takes most of the same code.
% \end{itemize}
%
% \begin{macro}
@@ -312,13 +312,13 @@
% \subsection{\texttt{dvipdfmx} backend}
%
% \begin{macrocode}
-%<*dvipdfmx|xdvipdfmx>
+%<*dvipdfmx|xetex>
% \end{macrocode}
%
% The \texttt{dvipdfmx} shares code with the PDF mode one (using the common
-% section to this file) but also with \texttt{xdvipdfmx}. The latter is close
+% section to this file) but also with \XeTeX{}. The latter is close
% to identical to \texttt{dvipdfmx} and so all of the code here is extracted
-% for both backends, with some \texttt{clean up} for \texttt{xdvipdfmx} as
+% for both backends, with some \texttt{clean up} for \XeTeX{} as
% required.
%
% \begin{macro}{\__kernel_backend_literal_pdf:n, \__kernel_backend_literal_pdf:x}
@@ -351,7 +351,7 @@
% \end{macro}
%
% \begin{macrocode}
-%</dvipdfmx|xdvipdfmx>
+%</dvipdfmx|xetex>
% \end{macrocode}
%
% \subsection{\texttt{dvisvgm} backend}
diff --git a/l3backend/l3backend-box.dtx b/l3backend/l3backend-box.dtx
index 3614b2521..a657d5ec7 100644
--- a/l3backend/l3backend-box.dtx
+++ b/l3backend/l3backend-box.dtx
@@ -253,7 +253,7 @@
% \subsection{\texttt{dvipdfmx} backend}
%
% \begin{macrocode}
-%<*dvipdfmx|xdvipdfmx>
+%<*dvipdfmx|xetex>
% \end{macrocode}
%
% \begin{macro}{\@@_backend_clip:N}
@@ -327,7 +327,7 @@
% \end{macro}
%
% \begin{macrocode}
-%</dvipdfmx|xdvipdfmx>
+%</dvipdfmx|xetex>
% \end{macrocode}
%
% \subsection{\texttt{dvisvgm} backend}
diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index 94b711ee1..73ce0193b 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -64,14 +64,14 @@
% one directly linked to drawings (or rather the split between filling
% and stroking). General color is relatively easy to handle: we have a color
% stack available with all modern drivers, and can use that.
-% Whilst \texttt{(x)dvipdfmx} does have its own approach to color specials,
+% Whilst \texttt{dvipdfmx}/\XeTeX{} does have its own approach to color specials,
% it is easier to use \texttt{dvips}-like ones for all cases except direct
% PDF output.
%
% \subsection{\texttt{dvips}-style}
%
% \begin{macrocode}
-%<*dvisvgm|dvipdfmx|dvips|xdvipdfmx>
+%<*dvisvgm|dvipdfmx|dvips|xetex>
% \end{macrocode}
%
% \begin{macro}{\@@_backend_pickup:N}
@@ -148,7 +148,7 @@
% \end{macro}
%
% \begin{macrocode}
-%</dvisvgm|dvipdfmx|dvips|xdvipdfmx>
+%</dvisvgm|dvipdfmx|dvips|xetex>
% \end{macrocode}
%
% \subsection{\LuaTeX{} and \pdfTeX{}}
@@ -263,13 +263,13 @@
%
% \subsection{Fill and stroke color}
%
-% Here, \texttt{(x)dvipdfmx} follows \LuaTeX{} and \pdfTeX{},
+% Here, \texttt{dvipdfmx}/\XeTeX{} follows \LuaTeX{} and \pdfTeX{},
% while for \texttt{dvips}
% we have to manage fill and stroke color ourselves. We also handle
% \texttt{dvisvgm} independently, as there we can create SVG directly.
%
% \begin{macrocode}
-%<*dvipdfmx|luatex|pdftex|xdvipdfmx>
+%<*dvipdfmx|luatex|pdftex|xetex>
% \end{macrocode}
%
% \begin{macro}
@@ -281,7 +281,7 @@
% \@@_backend_stroke_gray:n ,
% \@@_backend_stroke_rgb:n
% }
-% Drawing (fill/stroke) color is handled in \texttt{(x)dvipdfmx} in the
+% Drawing (fill/stroke) color is handled in \texttt{dvipdfmx}/\XeTeX{} in the
% same way as \LuaTeX{}/\pdfTeX{}. We use the same approach as earlier, except the
% color stack is not involved so the generic direct PDF operation is used.
% There is no worry about the nature of strokes: everything is handled
@@ -316,7 +316,7 @@
% \end{macro}
%
% \begin{macrocode}
-%</dvipdfmx|luatex|pdftex|xdvipdfmx>
+%</dvipdfmx|luatex|pdftex|xetex>
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/l3backend/l3backend-draw.dtx b/l3backend/l3backend-draw.dtx
index bb964d83e..0e0d3987e 100644
--- a/l3backend/l3backend-draw.dtx
+++ b/l3backend/l3backend-draw.dtx
@@ -339,7 +339,7 @@
% In \texttt{dvips}, keeping the transformations in line with the engine
% is unfortunately not possible for scaling and rotations: even if we
% decompose the matrix into those operations, there is still no backend
-% tracking (\emph{cf.}~\texttt{(x)dvipdfmx}). Thus we take the shortest
+% tracking (\emph{cf.}~\texttt{dvipdfmx}/\XeTeX{}). Thus we take the shortest
% path available and simply dump the matrix as given.
% \begin{macrocode}
\cs_new_protected:Npn \@@_backend_cm:nnnn #1#2#3#4
@@ -393,13 +393,13 @@
%</dvips>
% \end{macrocode}
%
-% \subsection{\LuaTeX{}, \pdfTeX{} and \texttt{(x)dvipdfmx}}
+% \subsection{\LuaTeX{}, \pdfTeX{}, \texttt{dvipdfmx} and \XeTeX{}}
%
-% \LuaTeX{}, \pdfTeX{} and \texttt{(x)dvipdfmx} directly produce PDF output
+% \LuaTeX{}, \pdfTeX{}, \texttt{dvipdfmx} and \XeTeX{} directly produce PDF output
% and understand a shared set of specials for drawing commands.
%
% \begin{macrocode}
-%<*dvipdfmx|luatex|pdftex|xdvipdfmx>
+%<*dvipdfmx|luatex|pdftex|xetex>
% \end{macrocode}
%
% \subsubsection{Drawing}
@@ -575,12 +575,12 @@
%
% \begin{macro}{\@@_backend_cm:nnnn}
% \begin{macro}{\@@_backend_cm_aux:nnnn}
-% Another split here between \LuaTeX{}/pdfTeX{} and \texttt{(x)dvipdfmx}.
+% Another split here between \LuaTeX{}/pdfTeX{} and \texttt{dvipdfmx}/\XeTeX{}.
% In the former, we have a direct method to maintain alignment: the backend
-% can use a matrix itself. For \texttt{(x)dvipdfmx}, we can to decompose the
+% can use a matrix itself. For \texttt{dvipdfmx}/\XeTeX{}, we can to decompose the
% matrix into rotations and a scaling, then use those operations as they
% are handled by the backend. (There is backend support for matrix operations in
-% \texttt{(x)dvipdfmx}, but as a matched pair so not suitable for the
+% \texttt{dvipdfmx}/\XeTeX{}, but as a matched pair so not suitable for the
% \enquote{stand alone} transformation set up here.)
% \begin{macrocode}
\cs_new_protected:Npn \@@_backend_cm:nnnn #1#2#3#4
@@ -588,12 +588,12 @@
%<*luatex|pdftex>
\__kernel_backend_matrix:n { #1 ~ #2 ~ #3 ~ #4 }
%</luatex|pdftex>
-%<*dvipdfmx|xdvipdfmx>
+%<*dvipdfmx|xetex>
\@@_backend_cm_decompose:nnnnN {#1} {#2} {#3} {#4}
\@@_backend_cm_aux:nnnn
-%</dvipdfmx|xdvipdfmx>
+%</dvipdfmx|xetex>
}
-%<*dvipdfmx|xdvipdfmx>
+%<*dvipdfmx|xetex>
\cs_new_protected:Npn \@@_backend_cm_aux:nnnn #1#2#3#4
{
\__kernel_backend_literal:x
@@ -617,7 +617,7 @@
{ \fp_eval:n { round ( -#4 , 5 ) } }
}
}
-%</dvipdfmx|xdvipdfmx>
+%</dvipdfmx|xetex>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -677,7 +677,7 @@
% way of specifying a transformation matrix exchanges where one would
% normally expect $B$ and $C$ to be.
% \begin{macrocode}
-%<*dvipdfmx|xdvipdfmx>
+%<*dvipdfmx|xetex>
\cs_new_protected:Npn \@@_backend_cm_decompose:nnnnN #1#2#3#4#5
{
\use:x
@@ -720,7 +720,7 @@
{ #5 {#1} {#2} {#3} {#4} }
{ #5 {#1} {#3} {#2} {#4} }
}
-%</dvipdfmx|xdvipdfmx>
+%</dvipdfmx|xetex>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -739,21 +739,21 @@
%<*luatex|pdftex>
\@@_backend_cm:nnnn {#2} {#3} {#4} {#5}
%</luatex|pdftex>
-%<*dvipdfmx|xdvipdfmx>
+%<*dvipdfmx|xetex>
\__kernel_backend_literal:n
{ pdf:btrans~matrix~ #2 ~ #3 ~ #4 ~ #5 ~ 0 ~ 0 }
-%</dvipdfmx|xdvipdfmx>
+%</dvipdfmx|xetex>
\hbox_overlap_right:n { \box_use:N #1 }
-%<*dvipdfmx|xdvipdfmx>
+%<*dvipdfmx|xetex>
\__kernel_backend_literal:n { pdf:etrans }
-%</dvipdfmx|xdvipdfmx>
+%</dvipdfmx|xetex>
\__kernel_backend_scope_end:
}
% \end{macrocode}
% \end{macro}
%
% \begin{macrocode}
-%</dvipdfmx|luatex|pdftex|xdvipdfmx>
+%</dvipdfmx|luatex|pdftex|xetex>
% \end{macrocode}
%
% \subsection{\texttt{dvisvgm} backend}
diff --git a/l3backend/l3backend-graphics.dtx b/l3backend/l3backend-graphics.dtx
index 571c7db69..3f0b1b14d 100644
--- a/l3backend/l3backend-graphics.dtx
+++ b/l3backend/l3backend-graphics.dtx
@@ -280,7 +280,7 @@
% \subsection{\texttt{dvipdfmx} backend}
%
% \begin{macrocode}
-%<*dvipdfmx|xdvipdfmx>
+%<*dvipdfmx|xetex>
% \end{macrocode}
%
% \begin{macro}
@@ -326,7 +326,7 @@
% \begin{macro}{\@@_backend_include_auxii:nnn, \@@_backend_include_auxii:xnn}
% \begin{macro}{\@@_backend_include_auxiii:nnn}
% The special syntax depends on the file type. There is a difference in
-% how PDF graphics are best handled between |dvipdfmx| and |xdvipdfmx|: for
+% how PDF graphics are best handled between |dvipdfmx| and \XeTeX{}: for
% the latter it is better to use the primitive route. The relevant code for
% that is included later in this file.
% \begin{macrocode}
@@ -425,13 +425,13 @@
% \end{macro}
%
% \begin{macrocode}
-%</dvipdfmx|xdvipdfmx>
+%</dvipdfmx|xetex>
% \end{macrocode}
%
-% \subsection{\texttt{xdvipdfmx} backend}
+% \subsection{\XeTeX{} backend}
%
% \begin{macrocode}
-%<*xdvipdfmx>
+%<*xetex>
% \end{macrocode}
%
% \subsubsection{Images}
@@ -448,7 +448,7 @@
% \begin{macro}{\@@_backend_getbb_auxiv:nnNnn, \@@_backend_getbb_auxiv:VnNnn}
% \begin{macro}{\@@_backend_getbb_auxv:nNnn, \@@_backend_getbb_auxv:nNnn}
% \begin{macro}[EXP]{\@@_backend_getbb_pagebox:w}
-% For \texttt{xdvipdfmx}, there are two primitives that allow us to obtain
+% For \XeTeX{}, there are two primitives that allow us to obtain
% the bounding box without needing \texttt{extractbb}. The only complexity
% is passing the various minor variations to a common core process. The
% \XeTeX{} primitive omits the text |box| from the page box specification,
@@ -536,7 +536,7 @@
% \end{macro}
%
% \begin{macrocode}
-%</xdvipdfmx>
+%</xetex>
% \end{macrocode}
%
% \subsection{\texttt{dvisvgm} backend}
diff --git a/l3backend/l3backend-pdf.dtx b/l3backend/l3backend-pdf.dtx
index b93af93c9..0c3f78a38 100644
--- a/l3backend/l3backend-pdf.dtx
+++ b/l3backend/l3backend-pdf.dtx
@@ -1205,7 +1205,7 @@
% \subsection{\texttt{dvipdfmx} backend}
%
% \begin{macrocode}
-%<*dvipdfmx|xdvipdfmx>
+%<*dvipdfmx|xetex>
% \end{macrocode}
%
% \begin{macro}{\@@_backend:n, \@@_backend:x}
@@ -1331,7 +1331,7 @@
% \end{macro}
%
% \begin{macro}[EXP]{\@@_backend_pageobject_ref:n}
-% Page references are easy in \texttt{(x)dvipdfmx}.
+% Page references are easy in \texttt{dvipdfmx}/\XeTeX{}.
% \begin{macrocode}
\cs_new:Npn \@@_backend_pageobject_ref:n #1
{ @page #1 }
@@ -1341,7 +1341,7 @@
% \subsubsection{Annotations}
%
% \begin{variable}{\g_@@_landscape_bool}
-% There is a bug in \texttt{(x)dvipdfmx} which means annotations do
+% There is a bug in \texttt{dvipdfmx}/\XeTeX{} which means annotations do
% not rotate. As such, we need to know if landscape is active.
% \begin{macrocode}
\bool_new:N \g_@@_landscape_bool
@@ -1565,7 +1565,7 @@
% \end{macro}
%
% \begin{macrocode}
-%</dvipdfmx|xdvipdfmx>
+%</dvipdfmx|xetex>
% \end{macrocode}
%
% \subsection{\texttt{dvisvgm} backend}
diff --git a/l3backend/l3backend.ins b/l3backend/l3backend.ins
index 30e892109..3babb97da 100644
--- a/l3backend/l3backend.ins
+++ b/l3backend/l3backend.ins
@@ -120,14 +120,14 @@ and all files in that bundle must be distributed together.
}
\generate
{
- \file{l3backend-xdvipdfmx.def}
+ \file{l3backend-xetex.def}
{
- \from{l3backend-basics.dtx} {package,xdvipdfmx}
- \from{l3backend-color.dtx} {package,xdvipdfmx}
- \from{l3backend-box.dtx} {package,xdvipdfmx}
- \from{l3backend-draw.dtx} {package,xdvipdfmx}
- \from{l3backend-graphics.dtx}{package,xdvipdfmx}
- \from{l3backend-pdf.dtx} {package,xdvipdfmx}
+ \from{l3backend-basics.dtx} {package,xetex}
+ \from{l3backend-color.dtx} {package,xetex}
+ \from{l3backend-box.dtx} {package,xetex}
+ \from{l3backend-draw.dtx} {package,xetex}
+ \from{l3backend-graphics.dtx}{package,xetex}
+ \from{l3backend-pdf.dtx} {package,xetex}
}
}
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 813fd9fee..e89da07c1 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -9,6 +9,7 @@ this project uses date-based 'snapshot' version identifiers.
### Changed
- Backend setting for direct PDF output
+- Backend setting for XeTeX support
### Deprecated
- Backend setting `pdfmode`
diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index 04ab1052c..7f25acbad 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -926,10 +926,11 @@
% \item[dvisvgm] Use the \texttt{dvisvgm} driver.
% \item[luatex] Use the direct PDF output mode of \LuaTeX{}
% \item[pdftex] Use the direct PDF output mode of \pdfTeX{}
-% \item[xdvipdfmx] Use the \texttt{xdvipdfmx} driver (\XeTeX{} only).
+% \item[xetex] Use the \XeTeX{} version of the \texttt{dvipdfmx} driver.
% \end{itemize}
% For historical reasons, there is also \texttt{pdfmode} as an equivalent of
-% \texttt{luatex} or \texttt{pdftex}, but this is deprecated.
+% \texttt{luatex} or \texttt{pdftex}, and \texttt{xdvipdfmx} as
+% an equivalent to \texttt{xetex}, but these are deprecated
%
% \DescribeOption{suppress-backend-headers}
% The \texttt{suppress-backend-headers} option suppresses loading of
@@ -1405,7 +1406,7 @@
\keys_define:nn { sys }
{
backend .choices:nn =
- { dvipdfmx , dvips , dvisvgm , luatex , pdftex , pdfmode , xdvipdfmx }
+ { dvipdfmx , dvips , dvisvgm , luatex , pdftex , pdfmode , xdvipdfmx , xetex }
{ \sys_load_backend:n {#1} } ,
check-declarations .code:n =
{
diff --git a/l3kernel/l3sys.dtx b/l3kernel/l3sys.dtx
index fd1176c00..f6c8cf4bd 100644
--- a/l3kernel/l3sys.dtx
+++ b/l3kernel/l3sys.dtx
@@ -415,12 +415,13 @@
\str_case:VnF #1
{
{ dvisvgm } { }
- { xdvipdfmx } { }
+ { xdvipdfmx } { \tl_gset:Nn #1 { xetex } }
+ { xetex } { }
}
{
\__kernel_msg_error:nnxx { sys } { wrong-backend }
- #1 { xdvipdfmx }
- \tl_gset:Nn #1 { xdvipdfmx }
+ #1 { xetex }
+ \tl_gset:Nn #1 { xetex }
}
}
{
diff --git a/l3kernel/testfiles/d3dvipdfmx.xetex.tlg b/l3kernel/testfiles/d3dvipdfmx.xetex.tlg
index 07bfe6e63..ceca79b23 100644
--- a/l3kernel/testfiles/d3dvipdfmx.xetex.tlg
+++ b/l3kernel/testfiles/d3dvipdfmx.xetex.tlg
@@ -5,15 +5,15 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
(l3debug.def
File: l3debug.def ....-..-.. L3 Debugging support
)
-! LaTeX3 Error: Backend request inconsistent with engine: using 'xdvipdfmx'
+! LaTeX3 Error: Backend request inconsistent with engine: using 'xetex'
(LaTeX3) backend.
For immediate help type H <return>.
...
l. ...\keys_set:nV { sys } \l__expl_options_clist
You have requested backend 'dvipdfmx', but this is not suitable for use with
-the active engine. LaTeX3 will use the 'xdvipdfmx' backend instead.
-(l3backend-xdvipdfmx.def
-File: l3backend-xdvipdfmx.def ....-..-.. L3 backend support: xdvipdfmx
+the active engine. LaTeX3 will use the 'xetex' backend instead.
+(l3backend-xetex.def
+File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/d3dvips.xetex.tlg b/l3kernel/testfiles/d3dvips.xetex.tlg
index 14aab308f..e7a725c2d 100644
--- a/l3kernel/testfiles/d3dvips.xetex.tlg
+++ b/l3kernel/testfiles/d3dvips.xetex.tlg
@@ -5,15 +5,15 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
(l3debug.def
File: l3debug.def ....-..-.. L3 Debugging support
)
-! LaTeX3 Error: Backend request inconsistent with engine: using 'xdvipdfmx'
+! LaTeX3 Error: Backend request inconsistent with engine: using 'xetex'
(LaTeX3) backend.
For immediate help type H <return>.
...
l. ...\keys_set:nV { sys } \l__expl_options_clist
You have requested backend 'dvips', but this is not suitable for use with the
-active engine. LaTeX3 will use the 'xdvipdfmx' backend instead.
-(l3backend-xdvipdfmx.def
-File: l3backend-xdvipdfmx.def ....-..-.. L3 backend support: xdvipdfmx
+active engine. LaTeX3 will use the 'xetex' backend instead.
+(l3backend-xetex.def
+File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/d3pdfmode.xetex.tlg b/l3kernel/testfiles/d3pdfmode.xetex.tlg
index b611acd74..dfcd0a3b7 100644
--- a/l3kernel/testfiles/d3pdfmode.xetex.tlg
+++ b/l3kernel/testfiles/d3pdfmode.xetex.tlg
@@ -5,15 +5,15 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
(l3debug.def
File: l3debug.def ....-..-.. L3 Debugging support
)
-! LaTeX3 Error: Backend request inconsistent with engine: using 'xdvipdfmx'
+! LaTeX3 Error: Backend request inconsistent with engine: using 'xetex'
(LaTeX3) backend.
For immediate help type H <return>.
...
l. ...\keys_set:nV { sys } \l__expl_options_clist
You have requested backend 'pdfmode', but this is not suitable for use with
-the active engine. LaTeX3 will use the 'xdvipdfmx' backend instead.
-(l3backend-xdvipdfmx.def
-File: l3backend-xdvipdfmx.def ....-..-.. L3 backend support: xdvipdfmx
+the active engine. LaTeX3 will use the 'xetex' backend instead.
+(l3backend-xetex.def
+File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/d3xdvipdfmx.luatex.tlg b/l3kernel/testfiles/d3xetex.luatex.tlg
similarity index 100%
rename from l3kernel/testfiles/d3xdvipdfmx.luatex.tlg
rename to l3kernel/testfiles/d3xetex.luatex.tlg
diff --git a/l3kernel/testfiles/d3xdvipdfmx.lvt b/l3kernel/testfiles/d3xetex.lvt
similarity index 100%
rename from l3kernel/testfiles/d3xdvipdfmx.lvt
rename to l3kernel/testfiles/d3xetex.lvt
diff --git a/l3kernel/testfiles/d3xdvipdfmx.ptex.tlg b/l3kernel/testfiles/d3xetex.ptex.tlg
similarity index 100%
rename from l3kernel/testfiles/d3xdvipdfmx.ptex.tlg
rename to l3kernel/testfiles/d3xetex.ptex.tlg
diff --git a/l3kernel/testfiles/d3xdvipdfmx.tlg b/l3kernel/testfiles/d3xetex.tlg
similarity index 100%
rename from l3kernel/testfiles/d3xdvipdfmx.tlg
rename to l3kernel/testfiles/d3xetex.tlg
diff --git a/l3kernel/testfiles/d3xdvipdfmx.uptex.tlg b/l3kernel/testfiles/d3xetex.uptex.tlg
similarity index 100%
rename from l3kernel/testfiles/d3xdvipdfmx.uptex.tlg
rename to l3kernel/testfiles/d3xetex.uptex.tlg
diff --git a/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg b/l3kernel/testfiles/d3xetex.xetex.tlg
similarity index 99%
rename from l3kernel/testfiles/d3xdvipdfmx.xetex.tlg
rename to l3kernel/testfiles/d3xetex.xetex.tlg
index 5ce37967d..45926b5f9 100644
--- a/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg
+++ b/l3kernel/testfiles/d3xetex.xetex.tlg
@@ -4,8 +4,8 @@ Don't change this file in any respect.
Package: expl3 ....-..-.. L3 programming layer (loader)
(l3debug.def
File: l3debug.def ....-..-.. L3 Debugging support
-) (l3backend-xdvipdfmx.def
-File: l3backend-xdvipdfmx.def ....-..-.. L3 backend support: xdvipdfmx
+) (l3backend-xetex.def
+File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index b85f91a2a..f525d0198 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -15,8 +15,8 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_backend_str on line ...
-(l3backend-xdvipdfmx.def
-File: l3backend-xdvipdfmx.def ....-..-.. L3 backend support: xdvipdfmx
+(l3backend-xetex.def
+File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
Defining \__kernel_backend_literal:e on line ...
Defining \__kernel_backend_literal:n on line ...
Defining \__kernel_backend_literal:x on line ...
diff --git a/l3kernel/testfiles/m3expl002.xetex.tlg b/l3kernel/testfiles/m3expl002.xetex.tlg
index c1efce115..2bd7e5c4b 100644
--- a/l3kernel/testfiles/m3expl002.xetex.tlg
+++ b/l3kernel/testfiles/m3expl002.xetex.tlg
@@ -4,8 +4,8 @@ Don't change this file in any respect.
Package: expl3 ....-..-.. L3 programming layer (loader)
(l3debug.def
File: l3debug.def ....-..-.. L3 Debugging support
-) (l3backend-xdvipdfmx.def
-File: l3backend-xdvipdfmx.def ....-..-.. L3 backend support: xdvipdfmx
+) (l3backend-xetex.def
+File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index b85f91a2a..f525d0198 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -15,8 +15,8 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_backend_str on line ...
-(l3backend-xdvipdfmx.def
-File: l3backend-xdvipdfmx.def ....-..-.. L3 backend support: xdvipdfmx
+(l3backend-xetex.def
+File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
Defining \__kernel_backend_literal:e on line ...
Defining \__kernel_backend_literal:n on line ...
Defining \__kernel_backend_literal:x on line ...
diff --git a/l3kernel/testfiles/m3expl004.xetex.tlg b/l3kernel/testfiles/m3expl004.xetex.tlg
index e0265d3d5..ee1682bb6 100644
--- a/l3kernel/testfiles/m3expl004.xetex.tlg
+++ b/l3kernel/testfiles/m3expl004.xetex.tlg
@@ -2,8 +2,8 @@ This is a generated file for the LaTeX (2e + expl3) validation system.
Don't change this file in any respect.
(expl3.sty
Package: expl3 ....-..-.. L3 programming layer (loader)
-(l3backend-xdvipdfmx.def
-File: l3backend-xdvipdfmx.def ....-..-.. L3 backend support: xdvipdfmx
+(l3backend-xetex.def
+File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/m3expl006.xetex.tlg b/l3kernel/testfiles/m3expl006.xetex.tlg
index 6304a9ade..3113e86bb 100644
--- a/l3kernel/testfiles/m3expl006.xetex.tlg
+++ b/l3kernel/testfiles/m3expl006.xetex.tlg
@@ -3,8 +3,8 @@ Don't change this file in any respect.
Author: Bruno Le Floch and Joseph Wright
(expl3.sty
Package: expl3 ....-..-.. L3 programming layer (loader)
-(l3backend-xdvipdfmx.def
-File: l3backend-xdvipdfmx.def ....-..-.. L3 backend support: xdvipdfmx
+(l3backend-xetex.def
+File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/m3expl007.xetex.tlg b/l3kernel/testfiles/m3expl007.xetex.tlg
index b3a4aacf8..649e2d811 100644
--- a/l3kernel/testfiles/m3expl007.xetex.tlg
+++ b/l3kernel/testfiles/m3expl007.xetex.tlg
@@ -3,8 +3,8 @@ Don't change this file in any respect.
Author: Phelype Oleinik
(expl3.sty
Package: expl3 ....-..-.. L3 programming layer (loader)
-(l3backend-xdvipdfmx.def
-File: l3backend-xdvipdfmx.def ....-..-.. L3 backend support: xdvipdfmx
+(l3backend-xetex.def
+File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
More information about the latex3-commits
mailing list.