[latex3-commits] [l3svn] 01/02: Test of -kanji-internal=(sjis|euc) with upTeX
noreply at latex-project.org
noreply at latex-project.org
Fri Sep 11 07:57:12 CEST 2015
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
commit 53eee215437ff748a15448305117c6f9b2fbf965
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Sep 11 06:32:28 2015 +0100
Test of -kanji-internal=(sjis|euc) with upTeX
These format-build settings make it effectively pTeX. Thanks to
Hironori Kitagawa for the information.
---
l3kernel/l3int.dtx | 7 ++++---
l3kernel/l3sys.dtx | 11 ++++++++++-
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
index bdd7708..8b9f0fb 100644
--- a/l3kernel/l3int.dtx
+++ b/l3kernel/l3int.dtx
@@ -1191,11 +1191,12 @@
}
}
\cs_generate_variant:Nn \int_const:Nn { c }
-\if_int_compare:w 0
+\if_int_odd:w 0
\cs_if_exist:NT \luatex_luatexversion:D { 1 }
- \cs_if_exist:NT \uptex_disablecjktoken:D { 1 }
+ \cs_if_exist:NT \uptex_disablecjktoken:D
+ { \if_int_compare:w \ptex_jis:D "2121 = "3000 ~ 1 \fi: }
\cs_if_exist:NT \xetex_XeTeXversion:D { 1 }
- > \c_zero
+ ~
\cs_if_exist:NTF \uptex_disablecjktoken:D
{ \cs_new_eq:NN \@@_constdef:Nw \uptex_kchardef:D }
{ \cs_new_eq:NN \@@_constdef:Nw \tex_chardef:D }
diff --git a/l3kernel/l3sys.dtx b/l3kernel/l3sys.dtx
index 86bf40f..baf4bfc 100755
--- a/l3kernel/l3sys.dtx
+++ b/l3kernel/l3sys.dtx
@@ -109,6 +109,11 @@
% \sys_if_engine_uptex:,
% \sys_if_engine_xetex:
% }
+% 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{}.
% \begin{macrocode}
\clist_map_inline:nn { lua , pdf , p , up , xe }
{
@@ -133,7 +138,11 @@
}
\cs_if_exist:NT \ptex_kanjiskip:D
{
- \cs_if_exist:NTF \uptex_disablecjktoken:D
+ \bool_if:nTF
+ {
+ \cs_if_exist_p:N \uptex_disablecjktoken:D &&
+ \int_compare_p:nNn { \ptex_jis:D "2121 } = { "3000 }
+ }
{
\cs_gset_eq:NN \sys_if_engine_uptex:T \use:n
\cs_gset_eq:NN \sys_if_engine_uptex:F \use_none:n
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list