summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/expl3.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/expl3.dtx35
1 files changed, 11 insertions, 24 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
index b0dbaa76993..753aeb0ec53 100644
--- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
@@ -36,8 +36,8 @@
%<*driver|generic|package>
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2015/09/11}
-\def\ExplFileVersion{6002}
+\def\ExplFileDate{2015/09/27}
+\def\ExplFileVersion{6111}
%</driver|generic|package>
%<*driver>
\documentclass[full]{l3doc}
@@ -427,6 +427,10 @@
% \item[seq] sequence: a data-type used to implement lists (with
% access at both ends) and stacks;
% \item[skip] \enquote{rubber} lengths;
+% \item[str] \TeX{} strings: a special case of |tl| in which all
+% characters have category \enquote{other} (catcode~$12$),
+% other than spaces which are category \enquote{space}
+% (catcode~$10$);
% \item[tl] \enquote{token list variables}: placeholders for token lists.
% \end{description}
% When the \meta{type} and \meta{module} are identical (as often happens in
@@ -1286,7 +1290,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[int, TF]{\__expl_if_pdf:}
% \begin{variable}[int]{\l__expl_driver_tl}
% \begin{variable}[int]{\l__expl_native_drivers_bool}
% With the code now loaded, options can be handled using a real key--value
@@ -1302,21 +1305,6 @@
active~engine.~LaTeX3~will~use~the~'#2'~driver~instead.
}
\tl_new:N \l__expl_driver_tl
-\bool_if:nTF
- {
- \cs_if_exist_p:N \pdftex_pdfoutput:D
- && \int_compare_p:nNn \pdftex_pdfoutput:D > \c_zero
- }
- {
- \cs_new_eq:NN \__expl_if_pdf:T \use:n
- \cs_new_eq:NN \__expl_if_pdf:F \use_none:n
- \cs_new_eq:NN \__expl_if_pdf:TF \use_i:nn
- }
- {
- \cs_new_eq:NN \__expl_if_pdf:T \use_none:n
- \cs_new_eq:NN \__expl_if_pdf:F \use:n
- \cs_new_eq:NN \__expl_if_pdf:TF \use_ii:nn
- }
\keys_define:nn { expl }
{
driver .choice:,
@@ -1327,7 +1315,7 @@
\sys_if_engine_xetex:TF
{ xdvipdfmx }
{
- \__expl_if_pdf:TF
+ \sys_if_output_pdf:TF
{ pdfmode }
{
\bool_if:nTF
@@ -1351,7 +1339,7 @@
\tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
}
{
- \__expl_if_pdf:T
+ \sys_if_output_pdf:T
{
\__msg_kernel_error:nnnn { expl } { wrong-driver }
{ dvipdfmx } { pdfmode }
@@ -1369,7 +1357,7 @@
\tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
}
{
- \__expl_if_pdf:T
+ \sys_if_output_pdf:T
{
\__msg_kernel_error:nnnn { expl } { wrong-driver }
{ dvips } { pdfmode }
@@ -1389,7 +1377,7 @@
\tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
}
{
- \__expl_if_pdf:F
+ \sys_if_output_pdf:F
{
\__msg_kernel_error:nnnn { expl } { wrong-driver }
{ pdfmode } { dvips }
@@ -1402,7 +1390,7 @@
\tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
\sys_if_engine_xetex:F
{
- \__expl_if_pdf:TF
+ \sys_if_output_pdf:TF
{
\__msg_kernel_error:nnnn { expl } { wrong-driver }
{ xdvipdfmx } { pdfmode }
@@ -1433,7 +1421,6 @@
% \end{macrocode}
% \end{variable}
% \end{variable}
-% \end{macro}
%
% \begin{variable}[int]{\c__expl_def_ext_tl}
% Set up to load Unicode data for various string/text manipulations.