summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3kernel/l3sys.dtx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-10-28 03:00:48 +0000
committerNorbert Preining <norbert@preining.info>2019-10-28 03:00:48 +0000
commit25a647b97ef526aefcc75269dd19c46dbe3ae4c1 (patch)
tree6c8ba7a1b2344e47fe00d881805987be5923702d /macros/latex/contrib/l3kernel/l3sys.dtx
parent874b3a98f7af65cb9aed61dc81891548a4013ba9 (diff)
CTAN sync 201910280300
Diffstat (limited to 'macros/latex/contrib/l3kernel/l3sys.dtx')
-rw-r--r--macros/latex/contrib/l3kernel/l3sys.dtx34
1 files changed, 18 insertions, 16 deletions
diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx
index 709a68b5e3..6a00e95889 100644
--- a/macros/latex/contrib/l3kernel/l3sys.dtx
+++ b/macros/latex/contrib/l3kernel/l3sys.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-24}
+% \date{Released 2019-10-27}
%
% \maketitle
%
@@ -51,11 +51,12 @@
%
% \section{The name of the job}
%
-% \begin{variable}[added = 2015-09-19]{\c_sys_jobname_str}
+% \begin{variable}[added = 2015-09-19, updated = 2019-10-27]{\c_sys_jobname_str}
% Constant that gets the \enquote{job name} assigned when \TeX{} starts.
% \begin{texnote}
-% This copies the contents of the primitive \tn{jobname}. It is a constant
-% that is set by \TeX{} and should not be overwritten by the package.
+% This copies the contents of the primitive \tn{jobname}. For technical
+% reasons, the string here is not of the same internal form as other,
+% but may be manipulated using normal string functions.
% \end{texnote}
% \end{variable}
%
@@ -337,10 +338,7 @@
% }
% \begin{variable}{\c_sys_engine_str}
% Set up the engine tests on the basis exactly one test should be true.
-% Mainly a case of looking for the appropriate marker primitive. For
-% \upTeX{}, there is a complexity in that setting |-kanji-internal=sjis|
-% or |-kanji-internal=euc| effective makes it more like \pTeX{}. In those
-% cases we therefore report \pTeX{} rather than \upTeX{}.
+% Mainly a case of looking for the appropriate marker primitive.
% \begin{macrocode}
\str_const:Nx \c_sys_engine_str
{
@@ -348,9 +346,7 @@
\cs_if_exist:NT \tex_pdftexversion:D { pdftex }
\cs_if_exist:NT \tex_kanjiskip:D
{
- \bool_lazy_and:nnTF
- { \cs_if_exist_p:N \tex_disablecjktoken:D }
- { \int_compare_p:nNn { \tex_jis:D "2121 } = { "3000 } }
+ \cs_if_exist:NTF \tex_enablecjktoken:D
{ uptex }
{ ptex }
}
@@ -608,12 +604,16 @@
% \subsubsection{The name of the job}
%
% \begin{variable}{\c_sys_jobname_str}
-% Inherited from the \LaTeX3 name for the primitive: this needs to
-% actually contain the text of the job name rather than the name of
-% the primitive, of course.
+% Inherited from the \LaTeX3 name for the primitive. This \emph{has} to be
+% the primitive as it's set in \tn{everyjob}. If the user does
+% \begin{verbatim}
+% pdflatex \input some-file-name
+% \end{verbatim}
+% then \tn{everyjob} is inserted \emph{before} \tn{jobname} is changed form
+% |texput|, and thus we would have the wrong result.
% \begin{macrocode}
\@@_everyjob:n
- { \str_const:Nx \c_sys_jobname_str { \tex_jobname:D } }
+ { \cs_new_eq:NN \c_sys_jobname_str \tex_jobname:D }
% \end{macrocode}
% \end{variable}
%
@@ -753,9 +753,11 @@
% \subsubsection{Held over from \pkg{l3file}}
%
% \begin{variable}{\g_file_curr_name_str}
+% See comments about \cs{c_sys_jobname_str}: here, as soon as there is
+% file input/output, things get \enquote{tided up}.
% \begin{macrocode}
\@@_everyjob:n
- { \str_gset:Nx \g_file_curr_name_str { \tex_jobname:D } }
+ { \cs_gset_eq:NN \g_file_curr_name_str \tex_jobname:D }
% \end{macrocode}
% \end{variable}
%