[latex3-commits] [git/LaTeX3-latex3-latex3] master: Always create \g__file_internal_ior (4d072f6)
Joseph Wright
joseph.wright at morningstar2.co.uk
Fri Apr 6 15:04:07 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/4d072f6f1670e731ea7f533e26471b861d2b08a9
>---------------------------------------------------------------
commit 4d072f6f1670e731ea7f533e26471b861d2b08a9
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Apr 6 13:37:37 2018 +0100
Always create \g__file_internal_ior
This avoids some issues in test files.
Also means that we are in a known state.
>---------------------------------------------------------------
4d072f6f1670e731ea7f533e26471b861d2b08a9
l3kernel/l3unicode.dtx | 14 +-
l3kernel/testfiles/m3expl001.ptex.tlg | 2 +
l3kernel/testfiles/m3expl001.tlg | 2 +
l3kernel/testfiles/m3expl001.uptex.tlg | 2 +
l3kernel/testfiles/m3expl002.ptex.tlg | 1 +
l3kernel/testfiles/m3expl002.tlg | 1 +
l3kernel/testfiles/m3expl002.uptex.tlg | 1 +
l3kernel/testfiles/m3expl003.ptex.tlg | 2 +
l3kernel/testfiles/m3expl003.tlg | 2 +
l3kernel/testfiles/m3expl003.uptex.tlg | 2 +
l3kernel/testfiles/m3expl004.ptex.tlg | 1 +
l3kernel/testfiles/m3expl004.tlg | 1 +
l3kernel/testfiles/m3expl004.uptex.tlg | 1 +
l3kernel/testfiles/m3expl006.ptex.tlg | 1 +
l3kernel/testfiles/m3expl006.tlg | 1 +
l3kernel/testfiles/m3expl006.uptex.tlg | 1 +
l3kernel/testfiles/m3file001.luatex.tlg | 236 -------------------------------
l3kernel/testfiles/m3file001.ptex.tlg | 1 -
l3kernel/testfiles/m3file001.tlg | 1 -
l3kernel/testfiles/m3file001.uptex.tlg | 1 -
l3kernel/testfiles/m3file002.luatex.tlg | 160 ---------------------
l3kernel/testfiles/m3file002.tlg | 1 -
l3kernel/testfiles/m3file002.xetex.tlg | 160 ---------------------
l3kernel/testfiles/m3iow001.luatex.tlg | 1 -
l3kernel/testfiles/m3iow001.tlg | 1 -
l3kernel/testfiles/m3iow001.uptex.tlg | 1 -
l3kernel/testfiles/m3iow001.xetex.tlg | 1 -
l3kernel/testfiles/m3token004.tlg | 1 -
l3kernel/testfiles/m3token004.xetex.tlg | 1 -
29 files changed, 30 insertions(+), 571 deletions(-)
diff --git a/l3kernel/l3unicode.dtx b/l3kernel/l3unicode.dtx
index c197e19..342893f 100644
--- a/l3kernel/l3unicode.dtx
+++ b/l3kernel/l3unicode.dtx
@@ -69,16 +69,17 @@
% one-to-one situations and does not fully handle for example case folding.
%
% As only the data needs to remain at the end of this process, everything
-% is set up inside a group.
+% is set up inside a group. The only thing that is outside is creating a
+% stream: they are global anyway and it is best to force a stream for
+% all engines.
% \begin{macrocode}
+\ior_new:N \g_@@_data_ior
\bool_lazy_or:nnTF { \sys_if_engine_luatex_p: } { \sys_if_engine_xetex_p: }
{
\group_begin:
% \end{macrocode}
-% Set up a stream for reading the data files and set up a private copy of the
-% char-generation primitive.
+% Set up a private copy of the char-generation primitive.
% \begin{macrocode}
- \ior_new:N \g_@@_data_ior
\cs_set_eq:NN \@@_generate:w \utex_char:D
% \begin{macrocode}
% Parse the main Unicode data file for title case exceptions (the one-to-one
@@ -200,7 +201,8 @@
% set up required. As case changing can only be applied to bytes, and
% they have to be in the ASCII range, we define a series of data stores
% to represent them, and the data are used such that only these are
-% ever case-changed.
+% ever case-changed. We do open and close one file to force allocation of
+% a read: this keeps all engines in line.
% \begin{macrocode}
{
\group_begin:
@@ -215,6 +217,8 @@
\@@_tmp:NN
AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz
? \q_recursion_tail \q_recursion_stop
+ \ior_open:Nn \g_@@_data_ior { UnicodeData.txt }
+ \ior_close:N \g_@@_data_ior
\group_end:
}
% \end{macrocode}
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index bf56f36..a7f24ee 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5505,6 +5505,7 @@ Defining \lua_shipout:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \g__char_data_ior on line ...
Defining \c__char_upper_case_a_tl on line ...
Defining \c__char_lower_case_A_tl on line ...
Defining \c__char_fold_case_A_tl on line ...
@@ -5583,6 +5584,7 @@ Defining \c__char_fold_case_Y_tl on line ...
Defining \c__char_upper_case_z_tl on line ...
Defining \c__char_lower_case_Z_tl on line ...
Defining \c__char_fold_case_Z_tl on line ...
+\g__file_internal_ior=\read...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 9e7250e..802497d 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5505,6 +5505,7 @@ Defining \lua_shipout:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \g__char_data_ior on line ...
Defining \c__char_upper_case_a_tl on line ...
Defining \c__char_lower_case_A_tl on line ...
Defining \c__char_fold_case_A_tl on line ...
@@ -5583,6 +5584,7 @@ Defining \c__char_fold_case_Y_tl on line ...
Defining \c__char_upper_case_z_tl on line ...
Defining \c__char_lower_case_Z_tl on line ...
Defining \c__char_fold_case_Z_tl on line ...
+\g__file_internal_ior=\read...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index e656bbe..2083b38 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5503,6 +5503,7 @@ Defining \lua_shipout:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \g__char_data_ior on line ...
Defining \c__char_upper_case_a_tl on line ...
Defining \c__char_lower_case_A_tl on line ...
Defining \c__char_fold_case_A_tl on line ...
@@ -5581,6 +5582,7 @@ Defining \c__char_fold_case_Y_tl on line ...
Defining \c__char_upper_case_z_tl on line ...
Defining \c__char_lower_case_Z_tl on line ...
Defining \c__char_fold_case_Z_tl on line ...
+\g__file_internal_ior=\read...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl002.ptex.tlg b/l3kernel/testfiles/m3expl002.ptex.tlg
index 01ed624..1b74373 100644
--- a/l3kernel/testfiles/m3expl002.ptex.tlg
+++ b/l3kernel/testfiles/m3expl002.ptex.tlg
@@ -135,6 +135,7 @@ Don't change this file in any respect.
\l__coffin_display_offset_dim=\dimen...
\l__coffin_display_x_dim=\dimen...
\l__coffin_display_y_dim=\dimen...
+\g__file_internal_ior=\read...
\l__coffin_bounding_shift_dim=\dimen...
\l__coffin_left_corner_dim=\dimen...
\l__coffin_right_corner_dim=\dimen...
diff --git a/l3kernel/testfiles/m3expl002.tlg b/l3kernel/testfiles/m3expl002.tlg
index fa525a8..6701ac5 100644
--- a/l3kernel/testfiles/m3expl002.tlg
+++ b/l3kernel/testfiles/m3expl002.tlg
@@ -135,6 +135,7 @@ Don't change this file in any respect.
\l__coffin_display_offset_dim=\dimen...
\l__coffin_display_x_dim=\dimen...
\l__coffin_display_y_dim=\dimen...
+\g__file_internal_ior=\read...
\l__coffin_bounding_shift_dim=\dimen...
\l__coffin_left_corner_dim=\dimen...
\l__coffin_right_corner_dim=\dimen...
diff --git a/l3kernel/testfiles/m3expl002.uptex.tlg b/l3kernel/testfiles/m3expl002.uptex.tlg
index b240fd0..b03cc03 100644
--- a/l3kernel/testfiles/m3expl002.uptex.tlg
+++ b/l3kernel/testfiles/m3expl002.uptex.tlg
@@ -133,6 +133,7 @@ Don't change this file in any respect.
\l__coffin_display_offset_dim=\dimen...
\l__coffin_display_x_dim=\dimen...
\l__coffin_display_y_dim=\dimen...
+\g__file_internal_ior=\read...
\l__coffin_bounding_shift_dim=\dimen...
\l__coffin_left_corner_dim=\dimen...
\l__coffin_right_corner_dim=\dimen...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index bf56f36..a7f24ee 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5505,6 +5505,7 @@ Defining \lua_shipout:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \g__char_data_ior on line ...
Defining \c__char_upper_case_a_tl on line ...
Defining \c__char_lower_case_A_tl on line ...
Defining \c__char_fold_case_A_tl on line ...
@@ -5583,6 +5584,7 @@ Defining \c__char_fold_case_Y_tl on line ...
Defining \c__char_upper_case_z_tl on line ...
Defining \c__char_lower_case_Z_tl on line ...
Defining \c__char_fold_case_Z_tl on line ...
+\g__file_internal_ior=\read...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 9e7250e..802497d 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5505,6 +5505,7 @@ Defining \lua_shipout:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \g__char_data_ior on line ...
Defining \c__char_upper_case_a_tl on line ...
Defining \c__char_lower_case_A_tl on line ...
Defining \c__char_fold_case_A_tl on line ...
@@ -5583,6 +5584,7 @@ Defining \c__char_fold_case_Y_tl on line ...
Defining \c__char_upper_case_z_tl on line ...
Defining \c__char_lower_case_Z_tl on line ...
Defining \c__char_fold_case_Z_tl on line ...
+\g__file_internal_ior=\read...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index e656bbe..2083b38 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5503,6 +5503,7 @@ Defining \lua_shipout:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \g__char_data_ior on line ...
Defining \c__char_upper_case_a_tl on line ...
Defining \c__char_lower_case_A_tl on line ...
Defining \c__char_fold_case_A_tl on line ...
@@ -5581,6 +5582,7 @@ Defining \c__char_fold_case_Y_tl on line ...
Defining \c__char_upper_case_z_tl on line ...
Defining \c__char_lower_case_Z_tl on line ...
Defining \c__char_fold_case_Z_tl on line ...
+\g__file_internal_ior=\read...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl004.ptex.tlg b/l3kernel/testfiles/m3expl004.ptex.tlg
index 01ed624..1b74373 100644
--- a/l3kernel/testfiles/m3expl004.ptex.tlg
+++ b/l3kernel/testfiles/m3expl004.ptex.tlg
@@ -135,6 +135,7 @@ Don't change this file in any respect.
\l__coffin_display_offset_dim=\dimen...
\l__coffin_display_x_dim=\dimen...
\l__coffin_display_y_dim=\dimen...
+\g__file_internal_ior=\read...
\l__coffin_bounding_shift_dim=\dimen...
\l__coffin_left_corner_dim=\dimen...
\l__coffin_right_corner_dim=\dimen...
diff --git a/l3kernel/testfiles/m3expl004.tlg b/l3kernel/testfiles/m3expl004.tlg
index fa525a8..6701ac5 100644
--- a/l3kernel/testfiles/m3expl004.tlg
+++ b/l3kernel/testfiles/m3expl004.tlg
@@ -135,6 +135,7 @@ Don't change this file in any respect.
\l__coffin_display_offset_dim=\dimen...
\l__coffin_display_x_dim=\dimen...
\l__coffin_display_y_dim=\dimen...
+\g__file_internal_ior=\read...
\l__coffin_bounding_shift_dim=\dimen...
\l__coffin_left_corner_dim=\dimen...
\l__coffin_right_corner_dim=\dimen...
diff --git a/l3kernel/testfiles/m3expl004.uptex.tlg b/l3kernel/testfiles/m3expl004.uptex.tlg
index b240fd0..b03cc03 100644
--- a/l3kernel/testfiles/m3expl004.uptex.tlg
+++ b/l3kernel/testfiles/m3expl004.uptex.tlg
@@ -133,6 +133,7 @@ Don't change this file in any respect.
\l__coffin_display_offset_dim=\dimen...
\l__coffin_display_x_dim=\dimen...
\l__coffin_display_y_dim=\dimen...
+\g__file_internal_ior=\read...
\l__coffin_bounding_shift_dim=\dimen...
\l__coffin_left_corner_dim=\dimen...
\l__coffin_right_corner_dim=\dimen...
diff --git a/l3kernel/testfiles/m3expl006.ptex.tlg b/l3kernel/testfiles/m3expl006.ptex.tlg
index 6ddb96e..d9f79bf 100644
--- a/l3kernel/testfiles/m3expl006.ptex.tlg
+++ b/l3kernel/testfiles/m3expl006.ptex.tlg
@@ -136,6 +136,7 @@ Author: Bruno Le Floch and Joseph Wright
\l__coffin_display_offset_dim=\dimen...
\l__coffin_display_x_dim=\dimen...
\l__coffin_display_y_dim=\dimen...
+\g__file_internal_ior=\read...
\l__coffin_bounding_shift_dim=\dimen...
\l__coffin_left_corner_dim=\dimen...
\l__coffin_right_corner_dim=\dimen...
diff --git a/l3kernel/testfiles/m3expl006.tlg b/l3kernel/testfiles/m3expl006.tlg
index c2fbcab..71195fc 100644
--- a/l3kernel/testfiles/m3expl006.tlg
+++ b/l3kernel/testfiles/m3expl006.tlg
@@ -136,6 +136,7 @@ Author: Bruno Le Floch and Joseph Wright
\l__coffin_display_offset_dim=\dimen...
\l__coffin_display_x_dim=\dimen...
\l__coffin_display_y_dim=\dimen...
+\g__file_internal_ior=\read...
\l__coffin_bounding_shift_dim=\dimen...
\l__coffin_left_corner_dim=\dimen...
\l__coffin_right_corner_dim=\dimen...
diff --git a/l3kernel/testfiles/m3expl006.uptex.tlg b/l3kernel/testfiles/m3expl006.uptex.tlg
index 716bc53..9bb66ed 100644
--- a/l3kernel/testfiles/m3expl006.uptex.tlg
+++ b/l3kernel/testfiles/m3expl006.uptex.tlg
@@ -134,6 +134,7 @@ Author: Bruno Le Floch and Joseph Wright
\l__coffin_display_offset_dim=\dimen...
\l__coffin_display_x_dim=\dimen...
\l__coffin_display_y_dim=\dimen...
+\g__file_internal_ior=\read...
\l__coffin_bounding_shift_dim=\dimen...
\l__coffin_left_corner_dim=\dimen...
\l__coffin_right_corner_dim=\dimen...
diff --git a/l3kernel/testfiles/m3file001.luatex.tlg b/l3kernel/testfiles/m3file001.luatex.tlg
deleted file mode 100644
index 7bc116b..0000000
--- a/l3kernel/testfiles/m3file001.luatex.tlg
+++ /dev/null
@@ -1,236 +0,0 @@
-This is a generated file for the LaTeX (2e + expl3) validation system.
-Don't change this file in any respect.
-Author: Joseph Wright
-============================================================
-TEST 1: If file exists (expect F/F/T/T/T/T/F/F)
-============================================================
-FALSE
-FALSE
-FALSE
-TRUE
-FALSE
-TRUE
-FALSE
-FALSE
-============================================================
-============================================================
-TEST 2: Getting the full name of files
-============================================================
-> \l_A_tl=filetest.txt.
-> \l_A_tl=filetest.txt.
-> \l_A_tl=.
-============================================================
-============================================================
-TEST 3: Loading a file
-============================================================
-(filetest.txt) (filetest.txt)
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/file-not-found"
-!
-! File 'NotAFile.xxx.yyy.zzz' not found.
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| The requested file could not be found in the current directory, in the TeX
-| search path or in the LaTeX search path.
-|...............................................
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/file-not-found"
-!
-! File 'NotAFile.xxx.yyy.zzz' not found.
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| The requested file could not be found in the current directory, in the TeX
-| search path or in the LaTeX search path.
-|...............................................
-============================================================
-============================================================
-TEST 4: Loading a file conditionally
-============================================================
-(filetest.txt) (filetest.txt)
-FALSE
-============================================================
-============================================================
-TEST 5: Ending file_input
-============================================================
-(filetest-endinput.txt)
-> \box...=
-\vbox(6.94444+1.94444)x469.75499, direction TLT
-.\hbox(6.94444+1.94444)x469.75499, glue set 199.44902fil, direction TLT
-..\localpar
-...\localinterlinepenalty=0
-...\localbrokenpenalty=0
-...\localleftbox=null
-...\localrightbox=null
-..\hbox(0.0+0.0)x20.0, direction TLT
-..\OT1/cmr/m/n/10 T
-..\OT1/cmr/m/n/10 h
-..\OT1/cmr/m/n/10 i
-..\OT1/cmr/m/n/10 s
-..\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-..\OT1/cmr/m/n/10 ^^L (ligature fi)
-..\OT1/cmr/m/n/10 l
-..\OT1/cmr/m/n/10 e
-..\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-..\OT1/cmr/m/n/10 i
-..\OT1/cmr/m/n/10 s
-..\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-..\OT1/cmr/m/n/10 n
-..\OT1/cmr/m/n/10 e
-..\OT1/cmr/m/n/10 e
-..\OT1/cmr/m/n/10 d
-..\OT1/cmr/m/n/10 e
-..\OT1/cmr/m/n/10 d
-..\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-..\OT1/cmr/m/n/10 b
-..\kern-0.27779
-..\OT1/cmr/m/n/10 y
-..\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-..\OT1/cmr/m/n/10 m
-..\OT1/cmr/m/n/10 3
-..\OT1/cmr/m/n/10 ^^L (ligature fi)
-..\OT1/cmr/m/n/10 l
-..\OT1/cmr/m/n/10 e
-..\OT1/cmr/m/n/10 0
-..\OT1/cmr/m/n/10 0
-..\OT1/cmr/m/n/10 1
-..\OT1/cmr/m/n/10 .
-..\OT1/cmr/m/n/10 l
-..\OT1/cmr/m/n/10 v
-..\OT1/cmr/m/n/10 t
-..\OT1/cmr/m/n/10 :
-..\glue(\spaceskip) 4.44444 plus 3.33331 minus 0.55556
-..\OT1/cmr/m/n/10 P
-..\OT1/cmr/m/n/10 l
-..\OT1/cmr/m/n/10 e
-..\OT1/cmr/m/n/10 a
-..\OT1/cmr/m/n/10 s
-..\OT1/cmr/m/n/10 e
-..\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-..\OT1/cmr/m/n/10 l
-..\OT1/cmr/m/n/10 e
-..\OT1/cmr/m/n/10 a
-..\kern-0.27779
-..\OT1/cmr/m/n/10 v
-..\kern-0.27779
-..\OT1/cmr/m/n/10 e
-..\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-..\OT1/cmr/m/n/10 i
-..\OT1/cmr/m/n/10 t
-..\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-..\OT1/cmr/m/n/10 a
-..\OT1/cmr/m/n/10 l
-..\OT1/cmr/m/n/10 o
-..\OT1/cmr/m/n/10 n
-..\OT1/cmr/m/n/10 e
-..\OT1/cmr/m/n/10 !
-..\penalty 10000
-..\glue(\parfillskip) 0.0 plus 1.0fil
-..\glue(\rightskip) 0.0
-! OK.
-<argument> \l_tmpa_box
-l. ... }
-============================================================
-============================================================
-TEST 6: File name parsing
-============================================================
-Path: "", Name: "", Ext: ""
-Path: "", Name: " ", Ext: ""
-Path: "", Name: "", Ext: "."
-Path: "/", Name: "", Ext: ""
-Path: "", Name: "test", Ext: ""
-Path: "", Name: "test", Ext: ".tex"
-Path: "", Name: "test", Ext: ".tex"
-Path: "", Name: "test.file", Ext: ".tex"
-Path: "", Name: "test file", Ext: ".tex"
-Path: "", Name: " test file", Ext: ".tex"
-Path: "", Name: " test file", Ext: ".tex"
-Path: "bar", Name: "test", Ext: ".tex"
-Path: "bar/baz", Name: "test", Ext: ".tex"
-Path: "bar/baz bob", Name: "test", Ext: ".tex"
-Path: "/", Name: "test", Ext: ".tex"
-Path: "/baz", Name: "", Ext: ""
-Path: "/bar/baz bob", Name: "test", Ext: ".tex"
-Path: "bar/baz bob", Name: "test", Ext: ".tex"
-Path: "//baz", Name: "...a.b", Ext: "."
-Path: "/", Name: "", Ext: "."
-Path: "/", Name: " ", Ext: ""
-============================================================
-============================================================
-TEST 7: File listing
-============================================================
-> File List <
-minimal.cls
-regression-test
-regression-test.cfg
-fontenc.sty
-ot1enc.def
-expl3.sty
-expl3-code.tex
-l3pdfmode.def
-filetest.txt
-filetest-endinput.txt
-.............
-============================================================
-============================================================
-TEST 8: File name quoting
-============================================================
-> \l_tmpa_str=foo.bar.
-<recently read> }
-l. ... }
-> \l_tmpa_str=foo.bar.
-<recently read> }
-l. ... }
-> \l_tmpa_str=foo.bar.
-<recently read> }
-l. ... }
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/unbalanced-quote-in-filename"
-!
-! Unbalanced quotes in file name '"foo."bar"'.
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| File names must contain balanced numbers of quotes (").
-|...............................................
-> \l_tmpa_str=foo.bar.
-<recently read> }
-l. ... }
-> \l_tmpa_str="foo .bar".
-<recently read> }
-l. ... }
-> \l_tmpa_str="foo .bar".
-<recently read> }
-l. ... }
-============================================================
-============================================================
-TEST 9: Getting file information
-============================================================
-TRUE
-> \l_tmpa_str=.
-<recently read> }
-l. ... }
-> \l_tmpa_str=.
-<recently read> }
-l. ... }
-TRUE
-> \l_tmpa_str=.
-<recently read> }
-l. ... }
-============================================================
diff --git a/l3kernel/testfiles/m3file001.ptex.tlg b/l3kernel/testfiles/m3file001.ptex.tlg
index 45f3729..8045756 100644
--- a/l3kernel/testfiles/m3file001.ptex.tlg
+++ b/l3kernel/testfiles/m3file001.ptex.tlg
@@ -4,7 +4,6 @@ Author: Joseph Wright
============================================================
TEST 1: If file exists (expect F/F/T/T/T/T/F/F)
============================================================
-\g__file_internal_ior=\read...
FALSE
FALSE
FALSE
diff --git a/l3kernel/testfiles/m3file001.tlg b/l3kernel/testfiles/m3file001.tlg
index 02dd635..3c24693 100644
--- a/l3kernel/testfiles/m3file001.tlg
+++ b/l3kernel/testfiles/m3file001.tlg
@@ -4,7 +4,6 @@ Author: Joseph Wright
============================================================
TEST 1: If file exists (expect F/F/T/T/T/T/F/F)
============================================================
-\g__file_internal_ior=\read...
FALSE
FALSE
FALSE
diff --git a/l3kernel/testfiles/m3file001.uptex.tlg b/l3kernel/testfiles/m3file001.uptex.tlg
index 7a9764d..e3ec9be 100644
--- a/l3kernel/testfiles/m3file001.uptex.tlg
+++ b/l3kernel/testfiles/m3file001.uptex.tlg
@@ -4,7 +4,6 @@ Author: Joseph Wright
============================================================
TEST 1: If file exists (expect F/F/T/T/T/T/F/F)
============================================================
-\g__file_internal_ior=\read...
FALSE
FALSE
FALSE
diff --git a/l3kernel/testfiles/m3file002.luatex.tlg b/l3kernel/testfiles/m3file002.luatex.tlg
deleted file mode 100644
index 2de1870..0000000
--- a/l3kernel/testfiles/m3file002.luatex.tlg
+++ /dev/null
@@ -1,160 +0,0 @@
-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: Set tl from a file
-============================================================
-(filetest.txt)
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/local-global"
-!
-! Inconsistent local/global assignment
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| This is a coding error.
-|
-| Global assignment to a local variable '\l_A_tl'.
-|...............................................
-(filetest.txt) (filetest.txt)
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/local-global"
-!
-! Inconsistent local/global assignment
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| This is a coding error.
-|
-| Global assignment to a local variable '\l_C_tl'.
-|...............................................
-|\ExplSyntaxOff Thisfileisneededbym3file001.lvt
-m3ior001.lvtandm3ior002.lvt:Pleaseleaveitalone!\ExplSyntaxOn |
-|\ExplSyntaxOff This file is needed by m3file001.lvt
- m3ior001.lvt and m3ior002.lvt: Please leave it alone! \ExplSyntaxOn |
-|\ExplSyntaxOff This file is needed by m3file001.lvt
- m3ior001.lvt and m3ior002.lvt:Please leave it alone!\ExplSyntaxOn |
-============================================================
-============================================================
-TEST 2: Set tl from a file with expansion
-============================================================
-(filetest.txt)
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/local-global"
-!
-! Inconsistent local/global assignment
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| This is a coding error.
-|
-| Global assignment to a local variable '\l_A_tl'.
-|...............................................
-(filetest.txt) (filetest.txt)
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/local-global"
-!
-! Inconsistent local/global assignment
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| This is a coding error.
-|
-| Global assignment to a local variable '\l_C_tl'.
-|...............................................
-|\ExplSyntaxOff Thisfileisneededbym3file001.lvt
-m3ior001.lvtandm3ior002.lvt:Pleaseleaveitalone!\ExplSyntaxOn |
-|\ExplSyntaxOff This file is needed by m3file001.lvt
- m3ior001.lvt and m3ior002.lvt: Please leave it alone! \ExplSyntaxOn |
-|\ExplSyntaxOff /
-This file is needed by m3file001.lvt
- m3ior001.lvt and m3ior002.lvt:/
-Please leave it alone!/
-\ExplSyntaxOn /
-|
-============================================================
-============================================================
-TEST 3: Set tl from inexistent file
-============================================================
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/file-not-found"
-!
-! File 'NotAFile.xxx.yyy.zzz' not found.
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| The requested file could not be found in the current directory, in the TeX
-| search path or in the LaTeX search path.
-|...............................................
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/file-not-found"
-!
-! File 'NotAFile.xxx.yyy.zzz' not found.
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| The requested file could not be found in the current directory, in the TeX
-| search path or in the LaTeX search path.
-|...............................................
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/file-not-found"
-!
-! File 'NotAFile.xxx.yyy.zzz' not found.
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| The requested file could not be found in the current directory, in the TeX
-| search path or in the LaTeX search path.
-|...............................................
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/file-not-found"
-!
-! File 'NotAFile.xxx.yyy.zzz' not found.
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| The requested file could not be found in the current directory, in the TeX
-| search path or in the LaTeX search path.
-|...............................................
-|A|
-============================================================
diff --git a/l3kernel/testfiles/m3file002.tlg b/l3kernel/testfiles/m3file002.tlg
index 3c8bdcd..2de1870 100644
--- a/l3kernel/testfiles/m3file002.tlg
+++ b/l3kernel/testfiles/m3file002.tlg
@@ -4,7 +4,6 @@ Author: Bruno Le Floch
============================================================
TEST 1: Set tl from a file
============================================================
-\g__file_internal_ior=\read...
(filetest.txt)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
diff --git a/l3kernel/testfiles/m3file002.xetex.tlg b/l3kernel/testfiles/m3file002.xetex.tlg
deleted file mode 100644
index 2de1870..0000000
--- a/l3kernel/testfiles/m3file002.xetex.tlg
+++ /dev/null
@@ -1,160 +0,0 @@
-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: Set tl from a file
-============================================================
-(filetest.txt)
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/local-global"
-!
-! Inconsistent local/global assignment
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| This is a coding error.
-|
-| Global assignment to a local variable '\l_A_tl'.
-|...............................................
-(filetest.txt) (filetest.txt)
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/local-global"
-!
-! Inconsistent local/global assignment
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| This is a coding error.
-|
-| Global assignment to a local variable '\l_C_tl'.
-|...............................................
-|\ExplSyntaxOff Thisfileisneededbym3file001.lvt
-m3ior001.lvtandm3ior002.lvt:Pleaseleaveitalone!\ExplSyntaxOn |
-|\ExplSyntaxOff This file is needed by m3file001.lvt
- m3ior001.lvt and m3ior002.lvt: Please leave it alone! \ExplSyntaxOn |
-|\ExplSyntaxOff This file is needed by m3file001.lvt
- m3ior001.lvt and m3ior002.lvt:Please leave it alone!\ExplSyntaxOn |
-============================================================
-============================================================
-TEST 2: Set tl from a file with expansion
-============================================================
-(filetest.txt)
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/local-global"
-!
-! Inconsistent local/global assignment
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| This is a coding error.
-|
-| Global assignment to a local variable '\l_A_tl'.
-|...............................................
-(filetest.txt) (filetest.txt)
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/local-global"
-!
-! Inconsistent local/global assignment
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| This is a coding error.
-|
-| Global assignment to a local variable '\l_C_tl'.
-|...............................................
-|\ExplSyntaxOff Thisfileisneededbym3file001.lvt
-m3ior001.lvtandm3ior002.lvt:Pleaseleaveitalone!\ExplSyntaxOn |
-|\ExplSyntaxOff This file is needed by m3file001.lvt
- m3ior001.lvt and m3ior002.lvt: Please leave it alone! \ExplSyntaxOn |
-|\ExplSyntaxOff /
-This file is needed by m3file001.lvt
- m3ior001.lvt and m3ior002.lvt:/
-Please leave it alone!/
-\ExplSyntaxOn /
-|
-============================================================
-============================================================
-TEST 3: Set tl from inexistent file
-============================================================
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/file-not-found"
-!
-! File 'NotAFile.xxx.yyy.zzz' not found.
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| The requested file could not be found in the current directory, in the TeX
-| search path or in the LaTeX search path.
-|...............................................
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/file-not-found"
-!
-! File 'NotAFile.xxx.yyy.zzz' not found.
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| The requested file could not be found in the current directory, in the TeX
-| search path or in the LaTeX search path.
-|...............................................
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/file-not-found"
-!
-! File 'NotAFile.xxx.yyy.zzz' not found.
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| The requested file could not be found in the current directory, in the TeX
-| search path or in the LaTeX search path.
-|...............................................
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! LaTeX error: "kernel/file-not-found"
-!
-! File 'NotAFile.xxx.yyy.zzz' not found.
-!
-! See the LaTeX3 documentation for further information.
-!
-! For immediate help type H <return>.
-!...............................................
-l. ... }
-|'''''''''''''''''''''''''''''''''''''''''''''''
-| The requested file could not be found in the current directory, in the TeX
-| search path or in the LaTeX search path.
-|...............................................
-|A|
-============================================================
diff --git a/l3kernel/testfiles/m3iow001.luatex.tlg b/l3kernel/testfiles/m3iow001.luatex.tlg
index 1d1ffef..4c8e967 100644
--- a/l3kernel/testfiles/m3iow001.luatex.tlg
+++ b/l3kernel/testfiles/m3iow001.luatex.tlg
@@ -85,7 +85,6 @@ TEST 8: Write at shipout
============================================================
TEST 9: Close iow
============================================================
-\g__file_internal_ior=\read...
(testwrite.log) (testwrite.log
test
)
diff --git a/l3kernel/testfiles/m3iow001.tlg b/l3kernel/testfiles/m3iow001.tlg
index aa153c1..78a7f3a 100644
--- a/l3kernel/testfiles/m3iow001.tlg
+++ b/l3kernel/testfiles/m3iow001.tlg
@@ -85,7 +85,6 @@ TEST 8: Write at shipout
============================================================
TEST 9: Close iow
============================================================
-\g__file_internal_ior=\read...
(testwrite.log) (testwrite.log
test
)
diff --git a/l3kernel/testfiles/m3iow001.uptex.tlg b/l3kernel/testfiles/m3iow001.uptex.tlg
index b35e67b..7a46214 100644
--- a/l3kernel/testfiles/m3iow001.uptex.tlg
+++ b/l3kernel/testfiles/m3iow001.uptex.tlg
@@ -85,7 +85,6 @@ TEST 8: Write at shipout
============================================================
TEST 9: Close iow
============================================================
-\g__file_internal_ior=\read...
(testwrite.log) (testwrite.log
test
)
diff --git a/l3kernel/testfiles/m3iow001.xetex.tlg b/l3kernel/testfiles/m3iow001.xetex.tlg
index dfd7e62..6f17cc1 100644
--- a/l3kernel/testfiles/m3iow001.xetex.tlg
+++ b/l3kernel/testfiles/m3iow001.xetex.tlg
@@ -85,7 +85,6 @@ TEST 8: Write at shipout
============================================================
TEST 9: Close iow
============================================================
-\g__file_internal_ior=\read...
(testwrite.log) (testwrite.log
test
)
diff --git a/l3kernel/testfiles/m3token004.tlg b/l3kernel/testfiles/m3token004.tlg
index 841e3cf..e7f0123 100644
--- a/l3kernel/testfiles/m3token004.tlg
+++ b/l3kernel/testfiles/m3token004.tlg
@@ -10,7 +10,6 @@ T \end
============================================================
TEST 2: token_if_primitive, with usual escapechar
============================================================
-\g__file_internal_ior=\read...
(l3names.def - end tex_end:D everydisplay everymath input underline
tracingfonts)
============================================================
diff --git a/l3kernel/testfiles/m3token004.xetex.tlg b/l3kernel/testfiles/m3token004.xetex.tlg
index 899dbf7..cf0a2d8 100644
--- a/l3kernel/testfiles/m3token004.xetex.tlg
+++ b/l3kernel/testfiles/m3token004.xetex.tlg
@@ -10,7 +10,6 @@ T \end
============================================================
TEST 2: token_if_primitive, with usual escapechar
============================================================
-\g__file_internal_ior=\read...
(l3names.def - end tex_end:D everydisplay everymath input underline
pdfmapfile pdfmapline tracingfonts)
============================================================
More information about the latex3-commits
mailing list