[latex3-commits] [git/LaTeX3-latex3-latex3] master: Update upTeX test (a6aff4a03)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/a6aff4a039fb9c3ab3f64274e58f4c308a68f7d5

>---------------------------------------------------------------

commit a6aff4a039fb9c3ab3f64274e58f4c308a68f7d5
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat Oct 26 15:55:24 2019 +0100

    Update upTeX test
    
    This aligns with 'new' iftex package and also
    guidance from pTeX devs.


>---------------------------------------------------------------

a6aff4a039fb9c3ab3f64274e58f4c308a68f7d5
 l3kernel/CHANGELOG.md | 4 ++++
 l3kernel/l3sys.dtx    | 9 ++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index d92192c90..4ee2ce732 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Changed
+
+- Update upTeX test to follow guidance from developers
+
 ## [2019-10-24]
 
 ### Changed
diff --git a/l3kernel/l3sys.dtx b/l3kernel/l3sys.dtx
index 709a68b5e..9aebfcc19 100644
--- a/l3kernel/l3sys.dtx
+++ b/l3kernel/l3sys.dtx
@@ -337,10 +337,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 +345,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 }
       }