[latex3-commits] [git/LaTeX3-latex3-latex3] master: Avoid combining chars in 8-bit case change test for lt (dedfa06)

Joseph Wright joseph.wright at morningstar2.co.uk
Wed Apr 25 20:47:30 CEST 2018


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

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

commit dedfa0617c58cf2357a3f389c880de13cd2551b8
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Apr 25 19:47:30 2018 +0100

    Avoid combining chars in 8-bit case change test for lt
    
    The trailing combining chars aren't set up for inputenc, which means
    with TL'18 LaTeX2e they are pointing to an error message. That causes
    havoc in the case changer: the older version has them just as chars.
    
    Almost certainly these codepoints can't be used in an 8-bit document as
    the fact they apply *after* the char is not supported by the engine. So
    rather than try to pick up the error, simply adjust the test to stick to
    legitimate input.


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

dedfa0617c58cf2357a3f389c880de13cd2551b8
 l3kernel/testfiles/m3tl013.luatex.tlg |    8 ++++----
 l3kernel/testfiles/m3tl013.lvt        |   28 +++++++++++++++++++++-------
 l3kernel/testfiles/m3tl013.tlg        |   10 ++++------
 l3kernel/testfiles/m3tl013.uptex.tlg  |   10 ++++------
 l3kernel/testfiles/m3tl013.xetex.tlg  |    6 ++++--
 5 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/l3kernel/testfiles/m3tl013.luatex.tlg b/l3kernel/testfiles/m3tl013.luatex.tlg
index 0d7004b..2241491 100644
--- a/l3kernel/testfiles/m3tl013.luatex.tlg
+++ b/l3kernel/testfiles/m3tl013.luatex.tlg
@@ -90,10 +90,10 @@ i̇̀i̇́i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃
 ^^ec^^edĩìíĩj̀j́j̃į̀į́į̃
 ÌÌĨÌÍĨJ̀J́J̃Į̀Į́Į̃
 İ̀İ̀İ̃İ̀İ́İ̃J̇̀J̇́J̇̃Į̇̀Į̇́Į̇̃
-Ìi̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃i̇̀i̇́i̇̃i
-̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃
-İ̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃^^ec^^edĩìíĩj
-̀j́j̃į̀į́į̃
+^^cci̇́i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃
+Ìi̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃
+^^cc^^edĩìíĩj̀j́j̃į̀į́į̃
+İ̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃
 ============================================================
 ============================================================
 TEST 11: Dutch
diff --git a/l3kernel/testfiles/m3tl013.lvt b/l3kernel/testfiles/m3tl013.lvt
index 1b66f37..9a14153 100644
--- a/l3kernel/testfiles/m3tl013.lvt
+++ b/l3kernel/testfiles/m3tl013.lvt
@@ -1,5 +1,5 @@
 %
-% Copyright (C) 2013-2016 LaTeX3 Project
+% Copyright (C) 2013-2018 LaTeX3 Project
 %
 \input{regression-test}
 
@@ -106,16 +106,30 @@
     \tl_mixed_case:n         { ıp~Hulûsi~Özdem }
   }
 
+\OMIT
+  \tl_set:Nn \l_tmpa_tl { ÌÍĨÌÍĨJ̀J́J̃Į̀Į́Į̃ }
+  \tl_set:Nn \l_tmpb_tl { i̇̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃ }
+  \bool_lazy_or:nnF
+    { \sys_if_engine_luatex_p: }
+    { \sys_if_engine_xetex_p: }
+    {
+      \tl_set:Nn \l_tmpa_tl { ÌÍĨ }
+      \tl_clear:N \l_tmpb_tl
+    }
+\TIMO
+
 \TESTEXP { Lithuanian }
   {
-    \tl_lower_case:nn { lt } { ÌÍĨÌÍĨJ̀J́J̃Į̀Į́Į̃ } \NEWLINE
-    \tl_lower_case:n         { ÌÍĨÌÍĨJ̀J́J̃Į̀Į́Į̃ }
+    \exp_args:NnV \tl_lower_case:nn { lt } \l_tmpa_tl \NEWLINE
+    \exp_args:NV  \tl_lower_case:n         \l_tmpa_tl
     \NEWLINE
-    \tl_upper_case:nn { lt } { i̇̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃ } \NEWLINE
-    \tl_upper_case:n         { i̇̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃ }
+    \exp_args:NnV \tl_upper_case:nn { lt } \l_tmpb_tl \NEWLINE
+    \exp_args:NV  \tl_upper_case:n         \l_tmpb_tl
     \NEWLINE
-    \tl_mixed_case:nn { lt } { i̇̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃ÌÍĨÌÍĨJ̀J́J̃Į̀Į́Į̃ } \NEWLINE
-    \tl_mixed_case:n         { i̇̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃ÌÍĨÌÍĨJ̀J́J̃Į̀Į́Į̃ }
+    \exp_args:NnV \tl_mixed_case:nn { lt } \l_tmpa_tl \NEWLINE
+    \exp_args:NnV \tl_mixed_case:nn { lt } \l_tmpb_tl \NEWLINE
+    \exp_args:NV  \tl_mixed_case:n         \l_tmpa_tl \NEWLINE
+    \exp_args:NV  \tl_mixed_case:n         \l_tmpb_tl
   }
 
 \TESTEXP { Dutch }
diff --git a/l3kernel/testfiles/m3tl013.tlg b/l3kernel/testfiles/m3tl013.tlg
index f57accf..4fd2066 100644
--- a/l3kernel/testfiles/m3tl013.tlg
+++ b/l3kernel/testfiles/m3tl013.tlg
@@ -83,12 +83,10 @@ Rag^^c4^^b1p hul^^c3^^bbsi ^^c3^^b6zdem
 ============================================================
 TEST 10: Lithuanian
 ============================================================
-^^c3^^ac^^c3^^ad^^c4^^a9i^^cc^^80i^^cc^^81i^^cc^^83j^^cc^^80j^^cc^^81j^^cc^^83^^c4^^af^^cc^^80^^c4^^af^^cc^^81^^c4^^af^^cc^^83
-^^c3^^ac^^c3^^ad^^c4^^a9i^^cc^^80i^^cc^^81i^^cc^^83j^^cc^^80j^^cc^^81j^^cc^^83^^c4^^af^^cc^^80^^c4^^af^^cc^^81^^c4^^af^^cc^^83
-I^^cc^^87^^cc^^80I^^cc^^87^^cc^^80I^^cc^^87^^cc^^83I^^cc^^87^^cc^^80I^^cc^^87^^cc^^81I^^cc^^87^^cc^^83J^^cc^^87^^cc^^80J^^cc^^87^^cc^^81J^^cc^^87^^cc^^83^^c4^^ae^^cc^^87^^cc^^80^^c4^^ae^^cc^^87^^cc^^81^^c4^^ae^^cc^^87^^cc^^83
-I^^cc^^87^^cc^^80I^^cc^^87^^cc^^80I^^cc^^87^^cc^^83I^^cc^^87^^cc^^80I^^cc^^87^^cc^^81I^^cc^^87^^cc^^83J^^cc^^87^^cc^^80J^^cc^^87^^cc^^81J^^cc^^87^^cc^^83^^c4^^ae^^cc^^87^^cc^^80^^c4^^ae^^cc^^87^^cc^^81^^c4^^ae^^cc^^87^^cc^^83
-I^^cc^^87^^cc^^80i^^cc^^87^^cc^^80i^^cc^^87^^cc^^83i^^cc^^87^^cc^^80i^^cc^^87^^cc^^81i^^cc^^87^^cc^^83j^^cc^^87^^cc^^80j^^cc^^87^^cc^^81j^^cc^^87^^cc^^83^^c4^^af^^cc^^87^^cc^^80^^c4^^af^^cc^^87^^cc^^81^^c4^^af^^cc^^87^^cc^^83^^c3^^ac^^c3^^ad^^c4^^a9i^^cc^^80i^^cc^^81i^^cc^^83j^^cc^^80j^^cc^^81j^^cc^^83^^c4^^af^^cc^^80^^c4^^af^^cc^^81^^c4^^af^^cc^^83
-I^^cc^^87^^cc^^80i^^cc^^87^^cc^^80i^^cc^^87^^cc^^83i^^cc^^87^^cc^^80i^^cc^^87^^cc^^81i^^cc^^87^^cc^^83j^^cc^^87^^cc^^80j^^cc^^87^^cc^^81j^^cc^^87^^cc^^83^^c4^^af^^cc^^87^^cc^^80^^c4^^af^^cc^^87^^cc^^81^^c4^^af^^cc^^87^^cc^^83^^c3^^ac^^c3^^ad^^c4^^a9i^^cc^^80i^^cc^^81i^^cc^^83j^^cc^^80j^^cc^^81j^^cc^^83^^c4^^af^^cc^^80^^c4^^af^^cc^^81^^c4^^af^^cc^^83
+^^c3^^ac^^c3^^ad^^c4^^a9
+^^c3^^ac^^c3^^ad^^c4^^a9
+^^c3^^8c^^c3^^ad^^c4^^a9
+^^c3^^8c^^c3^^ad^^c4^^a9
 ============================================================
 ============================================================
 TEST 11: Dutch
diff --git a/l3kernel/testfiles/m3tl013.uptex.tlg b/l3kernel/testfiles/m3tl013.uptex.tlg
index 4ff0a6e..33e1674 100644
--- a/l3kernel/testfiles/m3tl013.uptex.tlg
+++ b/l3kernel/testfiles/m3tl013.uptex.tlg
@@ -86,12 +86,10 @@ Ragıp hul^^fbsi ^^f6zdem
 ============================================================
 TEST 10: Lithuanian
 ============================================================
-^^ec^^edĩìíĩj̀j́j̃į̀į́į̃
-^^ec^^edĩìíĩj̀j́j̃į̀į́į̃
-İ̀İ̀İ̃İ̀İ́İ̃J̇̀J̇́J̇̃Į̇̀Į̇́Į̇̃
-İ̀İ̀İ̃İ̀İ́İ̃J̇̀J̇́J̇̃Į̇̀Į̇́Į̇̃
-İ̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃^^ec^^edĩìíĩj̀j́j̃į̀į́į̃
-İ̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃^^ec^^edĩìíĩj̀j́j̃į̀į́į̃
+^^ec^^edĩ
+^^ec^^edĩ
+^^cc^^edĩ
+^^cc^^edĩ
 ============================================================
 ============================================================
 TEST 11: Dutch
diff --git a/l3kernel/testfiles/m3tl013.xetex.tlg b/l3kernel/testfiles/m3tl013.xetex.tlg
index c33a725..5715436 100644
--- a/l3kernel/testfiles/m3tl013.xetex.tlg
+++ b/l3kernel/testfiles/m3tl013.xetex.tlg
@@ -87,8 +87,10 @@ i̇̀i̇́i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃
 ^^ec^^edĩìíĩj̀j́j̃į̀į́į̃
 ÌÌĨÌÍĨJ̀J́J̃Į̀Į́Į̃
 İ̀İ̀İ̃İ̀İ́İ̃J̇̀J̇́J̇̃Į̇̀Į̇́Į̇̃
-Ìi̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃i̇̀i̇́i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃
-İ̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃^^ec^^edĩìíĩj̀j́j̃į̀į́į̃
+^^cci̇́i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃
+Ìi̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃
+^^cc^^edĩìíĩj̀j́j̃į̀į́į̃
+İ̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃
 ============================================================
 ============================================================
 TEST 11: Dutch





More information about the latex3-commits mailing list