[latex3-commits] [git/latex3] master: Also test ptex and uptex in l3kernel-extras (see #420) (ea02d53)
Bruno Le Floch
bruno at le-floch.fr
Tue Nov 28 22:41:12 CET 2017
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/ea02d53822ab00d643ada8423104c80ca2adf5cb
>---------------------------------------------------------------
commit ea02d53822ab00d643ada8423104c80ca2adf5cb
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Tue Nov 28 16:41:12 2017 -0500
Also test ptex and uptex in l3kernel-extras (see #420)
>---------------------------------------------------------------
ea02d53822ab00d643ada8423104c80ca2adf5cb
l3trial/l3kernel-extras/build.lua | 2 +-
l3trial/l3kernel-extras/l3kernel-extras.dtx | 123 ++++++++++----------
.../testfiles/m3kernel-extras000.ptex.tlg | 7 ++
.../testfiles/m3kernel-extras000.uptex.tlg | 7 ++
.../testfiles/m3kernel-extras006.luatex.tlg | 18 +--
.../testfiles/m3kernel-extras006.ptex.tlg | 79 +++++++++++++
.../testfiles/m3kernel-extras006.tlg | 18 +--
.../testfiles/m3kernel-extras006.uptex.tlg | 79 +++++++++++++
.../testfiles/m3kernel-extras006.xetex.tlg | 18 +--
9 files changed, 254 insertions(+), 97 deletions(-)
diff --git a/l3trial/l3kernel-extras/build.lua b/l3trial/l3kernel-extras/build.lua
index cdeb571..553c60e 100644
--- a/l3trial/l3kernel-extras/build.lua
+++ b/l3trial/l3kernel-extras/build.lua
@@ -14,7 +14,7 @@ maindir = "../.."
dofile(maindir .. "/build-config.lua")
-- Non-standard settings (have to be after build-config)
-checkengines = {"pdftex", "xetex", "luatex"}
+-- checkengines = {"pdftex", "xetex", "luatex"}
-- Find and run the build system
kpse.set_program_name("kpsewhich")
diff --git a/l3trial/l3kernel-extras/l3kernel-extras.dtx b/l3trial/l3kernel-extras/l3kernel-extras.dtx
index 8e0992c..1f52dae 100644
--- a/l3trial/l3kernel-extras/l3kernel-extras.dtx
+++ b/l3trial/l3kernel-extras/l3kernel-extras.dtx
@@ -1047,7 +1047,7 @@
}
\tl_put_right:Nx \l__char_internal_tl
{
- \int_compare:nTF { \tex_delcode:D \l__char_code_int = -1 }
+ \int_compare:nTF { \tex_delcode:D \l__char_code_int < 0 }
{ \\ not ~ a ~ delimiter }
{
\\ delimiter ~ code \
@@ -1055,72 +1055,77 @@
}
}
\__char_if_in_font:nNTF \l__char_code_int \tex_font:D
- {
- \tl_put_right:Nx \l__char_internal_tl
- {
- \\ size ~ in ~ current ~ font:
- \iow_newline: \ \ \ \
- ht~\tex_the:D \etex_fontcharht:D \tex_font:D \l__char_code_int , \
- wd~\tex_the:D \etex_fontcharwd:D \tex_font:D \l__char_code_int , \
- dp~\tex_the:D \etex_fontchardp:D \tex_font:D \l__char_code_int , \
- ic~\tex_the:D \etex_fontcharic:D \tex_font:D \l__char_code_int
- }
- }
+ { \__char_show_in_font: }
{
\tl_put_right:Nx \l__char_internal_tl
{ \\ not ~ in ~ current ~ font }
}
- \int_compare:nF { \__char_show_code:n { ef } = 0 }
- {
- \tl_put_right:Nx \l__char_internal_tl
- {
- \\ expansion ~ factor \
- \__char_show_code:n { ef }
- }
- }
- \bool_lazy_and:nnF
- { \__char_show_p:n { lp } }
- { \__char_show_p:n { rp } }
- {
- \tl_put_right:Nx \l__char_internal_tl
- {
- \\ protrusion: \
- left ~ margin ~ \__char_show_code:n { lp } , \
- right ~ margin ~ \__char_show_code:n { rp }
- }
- }
- \bool_lazy_all:nF
- {
- { \__char_show_p:n { knbs } }
- { \__char_show_p:n { stbs } }
- { \__char_show_p:n { shbs } }
- }
- {
- \tl_put_right:Nx \l__char_internal_tl
- {
- \\ bscodes: \
- \__char_show_code:n { knbs } \
- plus ~ \__char_show_code:n { stbs } \
- minus ~ \__char_show_code:n { shbs }
- }
- }
- \bool_lazy_and:nnF
- { \__char_show_p:n { knbc } }
- { \__char_show_p:n { knac } }
- {
- \tl_put_right:Nx \l__char_internal_tl
- {
- \\ knccodes: \
- before ~ \__char_show_code:n { knbc } , \
- after ~ \__char_show_code:n { knac }
- }
- }
- \tl_put_right:Nx \l__char_internal_tl
- { \\ tagcode ~ \__char_show_code:n { tag } }
\__msg_show_pre:nnnnnn { LaTeX/kernel } { show-char } {#1} { } { } { }
\__msg_show_wrap:n { \l__char_internal_tl }
\group_end:
}
+\cs_new_protected:Npn \__char_show_in_font:
+ {
+ \tl_put_right:Nx \l__char_internal_tl
+ {
+ \\ size ~ in ~ current ~ font:
+ \iow_newline: \ \ \ \
+ ht~\tex_the:D \etex_fontcharht:D \tex_font:D \l__char_code_int , \
+ wd~\tex_the:D \etex_fontcharwd:D \tex_font:D \l__char_code_int , \
+ dp~\tex_the:D \etex_fontchardp:D \tex_font:D \l__char_code_int , \
+ ic~\tex_the:D \etex_fontcharic:D \tex_font:D \l__char_code_int
+ }
+ \int_compare:nF { \__char_show_code:n { ef } = 0 }
+ {
+ \tl_put_right:Nx \l__char_internal_tl
+ {
+ \\ expansion ~ factor \
+ \__char_show_code:n { ef }
+ }
+ }
+ \bool_lazy_and:nnF
+ { \__char_show_p:n { lp } }
+ { \__char_show_p:n { rp } }
+ {
+ \tl_put_right:Nx \l__char_internal_tl
+ {
+ \\ protrusion: \
+ left ~ margin ~ \__char_show_code:n { lp } , \
+ right ~ margin ~ \__char_show_code:n { rp }
+ }
+ }
+ \bool_lazy_all:nF
+ {
+ { \__char_show_p:n { knbs } }
+ { \__char_show_p:n { stbs } }
+ { \__char_show_p:n { shbs } }
+ }
+ {
+ \tl_put_right:Nx \l__char_internal_tl
+ {
+ \\ bscodes: \
+ \__char_show_code:n { knbs } \
+ plus ~ \__char_show_code:n { stbs } \
+ minus ~ \__char_show_code:n { shbs }
+ }
+ }
+ \bool_lazy_and:nnF
+ { \__char_show_p:n { knbc } }
+ { \__char_show_p:n { knac } }
+ {
+ \tl_put_right:Nx \l__char_internal_tl
+ {
+ \\ knccodes: \
+ before ~ \__char_show_code:n { knbc } , \
+ after ~ \__char_show_code:n { knac }
+ }
+ }
+ \int_compare:nF { \__char_show_code:n { tag } = 0 }
+ {
+ \tl_put_right:Nx \l__char_internal_tl
+ { \\ tagcode ~ \__char_show_code:n { tag } }
+ }
+ }
\cs_new:Npn \__char_show_p:n #1
{ \int_compare_p:n { \__char_show_code:n {#1} = 0 } }
\cs_new:Npn \__char_show_code:n #1
diff --git a/l3trial/l3kernel-extras/testfiles/m3kernel-extras000.ptex.tlg b/l3trial/l3kernel-extras/testfiles/m3kernel-extras000.ptex.tlg
new file mode 100644
index 0000000..005532a
--- /dev/null
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras000.ptex.tlg
@@ -0,0 +1,7 @@
+This is a generated file for the LaTeX (2e + expl3) validation system.
+Don't change this file in any respect.
+Author: Bruno Le Floch
+(l3kernel-extras.sty
+\l__char_code_int=\count194
+\l__tl_replace_int=\count195
+)
diff --git a/l3trial/l3kernel-extras/testfiles/m3kernel-extras000.uptex.tlg b/l3trial/l3kernel-extras/testfiles/m3kernel-extras000.uptex.tlg
new file mode 100644
index 0000000..18d2a22
--- /dev/null
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras000.uptex.tlg
@@ -0,0 +1,7 @@
+This is a generated file for the LaTeX (2e + expl3) validation system.
+Don't change this file in any respect.
+Author: Bruno Le Floch
+(l3kernel-extras.sty
+\l__char_code_int=\count192
+\l__tl_replace_int=\count193
+)
diff --git a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg
index abf6f44..ad186eb 100644
--- a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg
@@ -18,8 +18,7 @@ The character 'a' has character code 97, and properties
> not a delimiter
> size in current font:
ht 4.30554pt, wd 5.00002pt, dp 0.0pt, ic 0.0pt
-> expansion factor 1000
-> tagcode 0.
+> expansion factor 1000.
<recently read> }
l. ... }
The character '.' has character code 46, and properties
@@ -31,8 +30,7 @@ The character '.' has character code 46, and properties
> delimiter code "0
> size in current font:
ht 1.05554pt, wd 2.77779pt, dp 0.0pt, ic 0.0pt
-> expansion factor 1000
-> tagcode 0.
+> expansion factor 1000.
<recently read> }
l. ... }
The character '(' has character code 40, and properties
@@ -44,8 +42,7 @@ The character '(' has character code 40, and properties
> delimiter code "28300
> size in current font:
ht 7.5pt, wd 3.8889pt, dp 2.5pt, ic 0.0pt
-> expansion factor 1000
-> tagcode 0.
+> expansion factor 1000.
<recently read> }
l. ... }
============================================================
@@ -59,8 +56,7 @@ The character 'a' has character code 97, and properties
> space factor 1000
> math code "1E00061
> not a delimiter
-> not in current font
-> tagcode -1.
+> not in current font.
<recently read> }
l. ... }
The character '.' has character code 46, and properties
@@ -70,8 +66,7 @@ The character '.' has character code 46, and properties
> space factor 3000
> math code "100003A
> delimiter code "0
-> not in current font
-> tagcode -1.
+> not in current font.
<recently read> }
l. ... }
The character '(' has character code 40, and properties
@@ -81,8 +76,7 @@ The character '(' has character code 40, and properties
> space factor 1000
> math code "800028
> delimiter code "28300
-> not in current font
-> tagcode -1.
+> not in current font.
<recently read> }
l. ... }
============================================================
diff --git a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.ptex.tlg b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.ptex.tlg
new file mode 100644
index 0000000..67776b5
--- /dev/null
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.ptex.tlg
@@ -0,0 +1,79 @@
+This is a generated file for the LaTeX (2e + expl3) validation system.
+Don't change this file in any respect.
+Author: Bruno Le Floch
+============================================================
+TEST 1: char_category_name
+============================================================
+escape, group_begin, group_end, math_toggle, alignment, end_line, parameter, math_superscript, letter, ignore, space, letter, other, active, comment, invalid,
+============================================================
+============================================================
+TEST 2: char_show
+============================================================
+The character 'a' has character code 97, and properties
+> category letter (11)
+> lowercase a (97)
+> uppercase A (65)
+> space factor 1000
+> math code "7161
+> not a delimiter
+> size in current font:
+ ht 4.30554pt, wd 5.00002pt, dp 0.0pt, ic 0.0pt.
+<recently read> }
+l. ... }
+The character '.' has character code 46, and properties
+> category other (12)
+> lowercase . (0)
+> uppercase . (0)
+> space factor 3000
+> math code "13A
+> delimiter code "0
+> size in current font:
+ ht 1.05554pt, wd 2.77779pt, dp 0.0pt, ic 0.0pt.
+<recently read> }
+l. ... }
+The character '(' has character code 40, and properties
+> category other (12)
+> lowercase ( (0)
+> uppercase ( (0)
+> space factor 1000
+> math code "4028
+> delimiter code "28300
+> size in current font:
+ ht 7.5pt, wd 3.8889pt, dp 2.5pt, ic 0.0pt.
+<recently read> }
+l. ... }
+============================================================
+============================================================
+TEST 3: char_show in nullfont
+============================================================
+The character 'a' has character code 97, and properties
+> category letter (11)
+> lowercase a (97)
+> uppercase A (65)
+> space factor 1000
+> math code "7161
+> not a delimiter
+> not in current font.
+<recently read> }
+l. ... }
+The character '.' has character code 46, and properties
+> category other (12)
+> lowercase . (0)
+> uppercase . (0)
+> space factor 3000
+> math code "13A
+> delimiter code "0
+> not in current font.
+<recently read> }
+l. ... }
+The character '(' has character code 40, and properties
+> category other (12)
+> lowercase ( (0)
+> uppercase ( (0)
+> space factor 1000
+> math code "4028
+> delimiter code "28300
+> not in current font.
+<recently read> }
+l. ... }
+============================================================
diff --git a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg
index fef48dd..c7751d2 100644
--- a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg
@@ -31,8 +31,7 @@ The character '.' has character code 46, and properties
> delimiter code "0
> size in current font:
ht 1.05554pt, wd 2.77779pt, dp 0.0pt, ic 0.0pt
-> expansion factor 1000
-> tagcode 0.
+> expansion factor 1000.
<recently read> }
l. ... }
The character '(' has character code 40, and properties
@@ -44,8 +43,7 @@ The character '(' has character code 40, and properties
> delimiter code "28300
> size in current font:
ht 7.5pt, wd 3.8889pt, dp 2.5pt, ic 0.0pt
-> expansion factor 1000
-> tagcode 0.
+> expansion factor 1000.
<recently read> }
l. ... }
============================================================
@@ -59,9 +57,7 @@ The character 'a' has character code 97, and properties
> space factor 1000
> math code "7161
> not a delimiter
-> not in current font
-> expansion factor 1000
-> tagcode -1.
+> not in current font.
<recently read> }
l. ... }
The character '.' has character code 46, and properties
@@ -71,9 +67,7 @@ The character '.' has character code 46, and properties
> space factor 3000
> math code "13A
> delimiter code "0
-> not in current font
-> expansion factor 1000
-> tagcode -1.
+> not in current font.
<recently read> }
l. ... }
The character '(' has character code 40, and properties
@@ -83,9 +77,7 @@ The character '(' has character code 40, and properties
> space factor 1000
> math code "4028
> delimiter code "28300
-> not in current font
-> expansion factor 1000
-> tagcode -1.
+> not in current font.
<recently read> }
l. ... }
============================================================
diff --git a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.uptex.tlg b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.uptex.tlg
new file mode 100644
index 0000000..67776b5
--- /dev/null
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.uptex.tlg
@@ -0,0 +1,79 @@
+This is a generated file for the LaTeX (2e + expl3) validation system.
+Don't change this file in any respect.
+Author: Bruno Le Floch
+============================================================
+TEST 1: char_category_name
+============================================================
+escape, group_begin, group_end, math_toggle, alignment, end_line, parameter, math_superscript, letter, ignore, space, letter, other, active, comment, invalid,
+============================================================
+============================================================
+TEST 2: char_show
+============================================================
+The character 'a' has character code 97, and properties
+> category letter (11)
+> lowercase a (97)
+> uppercase A (65)
+> space factor 1000
+> math code "7161
+> not a delimiter
+> size in current font:
+ ht 4.30554pt, wd 5.00002pt, dp 0.0pt, ic 0.0pt.
+<recently read> }
+l. ... }
+The character '.' has character code 46, and properties
+> category other (12)
+> lowercase . (0)
+> uppercase . (0)
+> space factor 3000
+> math code "13A
+> delimiter code "0
+> size in current font:
+ ht 1.05554pt, wd 2.77779pt, dp 0.0pt, ic 0.0pt.
+<recently read> }
+l. ... }
+The character '(' has character code 40, and properties
+> category other (12)
+> lowercase ( (0)
+> uppercase ( (0)
+> space factor 1000
+> math code "4028
+> delimiter code "28300
+> size in current font:
+ ht 7.5pt, wd 3.8889pt, dp 2.5pt, ic 0.0pt.
+<recently read> }
+l. ... }
+============================================================
+============================================================
+TEST 3: char_show in nullfont
+============================================================
+The character 'a' has character code 97, and properties
+> category letter (11)
+> lowercase a (97)
+> uppercase A (65)
+> space factor 1000
+> math code "7161
+> not a delimiter
+> not in current font.
+<recently read> }
+l. ... }
+The character '.' has character code 46, and properties
+> category other (12)
+> lowercase . (0)
+> uppercase . (0)
+> space factor 3000
+> math code "13A
+> delimiter code "0
+> not in current font.
+<recently read> }
+l. ... }
+The character '(' has character code 40, and properties
+> category other (12)
+> lowercase ( (0)
+> uppercase ( (0)
+> space factor 1000
+> math code "4028
+> delimiter code "28300
+> not in current font.
+<recently read> }
+l. ... }
+============================================================
diff --git a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg
index 678bae6..67776b5 100644
--- a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg
@@ -17,8 +17,7 @@ The character 'a' has character code 97, and properties
> math code "7161
> not a delimiter
> size in current font:
- ht 4.30554pt, wd 5.00002pt, dp 0.0pt, ic 0.0pt
-> tagcode 0.
+ ht 4.30554pt, wd 5.00002pt, dp 0.0pt, ic 0.0pt.
<recently read> }
l. ... }
The character '.' has character code 46, and properties
@@ -29,8 +28,7 @@ The character '.' has character code 46, and properties
> math code "13A
> delimiter code "0
> size in current font:
- ht 1.05554pt, wd 2.77779pt, dp 0.0pt, ic 0.0pt
-> tagcode 0.
+ ht 1.05554pt, wd 2.77779pt, dp 0.0pt, ic 0.0pt.
<recently read> }
l. ... }
The character '(' has character code 40, and properties
@@ -41,8 +39,7 @@ The character '(' has character code 40, and properties
> math code "4028
> delimiter code "28300
> size in current font:
- ht 7.5pt, wd 3.8889pt, dp 2.5pt, ic 0.0pt
-> tagcode 0.
+ ht 7.5pt, wd 3.8889pt, dp 2.5pt, ic 0.0pt.
<recently read> }
l. ... }
============================================================
@@ -56,8 +53,7 @@ The character 'a' has character code 97, and properties
> space factor 1000
> math code "7161
> not a delimiter
-> not in current font
-> tagcode 0.
+> not in current font.
<recently read> }
l. ... }
The character '.' has character code 46, and properties
@@ -67,8 +63,7 @@ The character '.' has character code 46, and properties
> space factor 3000
> math code "13A
> delimiter code "0
-> not in current font
-> tagcode 0.
+> not in current font.
<recently read> }
l. ... }
The character '(' has character code 40, and properties
@@ -78,8 +73,7 @@ The character '(' has character code 40, and properties
> space factor 1000
> math code "4028
> delimiter code "28300
-> not in current font
-> tagcode 0.
+> not in current font.
<recently read> }
l. ... }
============================================================
More information about the latex3-commits
mailing list