[latex3-commits] [l3svn] branch master updated: Add \file_input_end:
noreply at latex-project.org
noreply at latex-project.org
Fri Jul 7 10:33:52 CEST 2017
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
The following commit(s) were added to refs/heads/master by this push:
new 768bee0 Add \file_input_end:
768bee0 is described below
commit 768bee02a64df25957d115b96bb72b8e38f678cc
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Jul 7 09:33:28 2017 +0100
Add \file_input_end:
---
l3kernel/l3candidates.dtx | 21 ++++++++
l3kernel/testfiles/m3expl001.luatex.tlg | 1 +
l3kernel/testfiles/m3expl001.ptex.tlg | 1 +
l3kernel/testfiles/m3expl001.tlg | 1 +
l3kernel/testfiles/m3expl001.uptex.tlg | 1 +
l3kernel/testfiles/m3expl001.xetex.tlg | 1 +
l3kernel/testfiles/m3expl003.luatex.tlg | 1 +
l3kernel/testfiles/m3expl003.ptex.tlg | 1 +
l3kernel/testfiles/m3expl003.tlg | 1 +
l3kernel/testfiles/m3expl003.uptex.tlg | 1 +
l3kernel/testfiles/m3expl003.xetex.tlg | 1 +
l3kernel/testfiles/m3file001.lvt | 7 +++
l3kernel/testfiles/m3file001.tlg | 83 +++++++++++++++++++++++++++++--
13 files changed, 118 insertions(+), 3 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 66c7f2f..c3385db 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -219,6 +219,20 @@
% an error if the file is not found, in contrast to \cs{file_input:n}.
% \end{function}
%
+% \begin{function}[added = 2017-07-07]{\file_input_end:}
+% \begin{syntax}
+% \cs{file_input_end:}
+% \end{syntax}
+% Ends the reading of a file started by \cs{file_input:n} or similar before
+% the end of the file is reached. Where the file reading is being terminated
+% due to an error, \cs{msg_critical:nn(nn)} should be preferred.
+% \begin{texnote}
+% This function must be used on a line on its own: \TeX{} reads files
+% line-by-line and so any additional tokens in the \enquote{current} line
+% will still be read.
+% \end{texnote}
+% \end{function}
+%
% \section{Additions to \pkg{l3int}}
%
% \begin{function}[EXP, added = 2016-12-06]{\int_rand:nn}
@@ -1540,6 +1554,13 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\file_input_end:}
+% A simple rename.
+% \begin{macrocode}
+\cs_new_eq:NN \file_input_end: \tex_endinput:D
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{Additions to \pkg{l3int}}
%
% \begin{macrocode}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 1b78a4a..4eecdee 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5407,6 +5407,7 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nT on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_if_exist_input:nTF on line ...
+Defining \file_input_end: on line ...
Defining \int_rand:nn on line ...
Defining \__int_rand:ww on line ...
Defining \__int_rand_narrow:nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 4a74bbe..3e2de8f 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5397,6 +5397,7 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nT on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_if_exist_input:nTF on line ...
+Defining \file_input_end: on line ...
Defining \int_rand:nn on line ...
Defining \__int_rand:ww on line ...
Defining \__int_rand_narrow:nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index cf9f208..e27d27f 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5397,6 +5397,7 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nT on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_if_exist_input:nTF on line ...
+Defining \file_input_end: on line ...
Defining \int_rand:nn on line ...
Defining \__int_rand:ww on line ...
Defining \__int_rand_narrow:nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 71baab2..1fe5e0f 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5395,6 +5395,7 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nT on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_if_exist_input:nTF on line ...
+Defining \file_input_end: on line ...
Defining \int_rand:nn on line ...
Defining \__int_rand:ww on line ...
Defining \__int_rand_narrow:nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 9553d00..f9d7a19 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5385,6 +5385,7 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nT on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_if_exist_input:nTF on line ...
+Defining \file_input_end: on line ...
Defining \int_rand:nn on line ...
Defining \msg_expandable_error:nnnnnn on line ...
Defining \msg_expandable_error:nnnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 6bca929..04b45c2 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5408,6 +5408,7 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nT on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_if_exist_input:nTF on line ...
+Defining \file_input_end: on line ...
Defining \int_rand:nn on line ...
Defining \__int_rand:ww on line ...
Defining \__int_rand_narrow:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 551ed70..5187479 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5398,6 +5398,7 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nT on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_if_exist_input:nTF on line ...
+Defining \file_input_end: on line ...
Defining \int_rand:nn on line ...
Defining \__int_rand:ww on line ...
Defining \__int_rand_narrow:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index f4ea536..ee47d6b 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5398,6 +5398,7 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nT on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_if_exist_input:nTF on line ...
+Defining \file_input_end: on line ...
Defining \int_rand:nn on line ...
Defining \__int_rand:ww on line ...
Defining \__int_rand_narrow:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 37c4af5..af3f91f 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5396,6 +5396,7 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nT on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_if_exist_input:nTF on line ...
+Defining \file_input_end: on line ...
Defining \int_rand:nn on line ...
Defining \__int_rand:ww on line ...
Defining \__int_rand_narrow:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index f26796c..cdce8e6 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5386,6 +5386,7 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nT on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_if_exist_input:nTF on line ...
+Defining \file_input_end: on line ...
Defining \int_rand:nn on line ...
Defining \msg_expandable_error:nnnnnn on line ...
Defining \msg_expandable_error:nnnnn on line ...
diff --git a/l3kernel/testfiles/m3file001.lvt b/l3kernel/testfiles/m3file001.lvt
index f68aa63..6860b47 100644
--- a/l3kernel/testfiles/m3file001.lvt
+++ b/l3kernel/testfiles/m3file001.lvt
@@ -74,6 +74,13 @@
\file_if_exist_input:nTF { NotAFile.xxx.yyy.zzz } \ERROR \FALSE
}
+\TEST { Ending~file_input }
+ {
+ \vbox_set:Nn \l_tmpa_box
+ { \file_input:n { filetest-endinput.txt } }
+ \box_show:N \l_tmpa_box
+ }
+
\TEST { File~name~parsing }
{
\OMIT
diff --git a/l3kernel/testfiles/m3file001.tlg b/l3kernel/testfiles/m3file001.tlg
index 4f41d76..bcd5b55 100644
--- a/l3kernel/testfiles/m3file001.tlg
+++ b/l3kernel/testfiles/m3file001.tlg
@@ -68,7 +68,83 @@ TRUE
FALSE
============================================================
============================================================
-TEST 5: File name parsing
+TEST 5: Ending file_input
+============================================================
+(filetest-endinput.txt)
+> \box57=
+\vbox(6.94444+1.94444)x469.75499
+.\hbox(6.94444+1.94444)x469.75499, glue set 199.44902fil
+..\hbox(0.0+0.0)x20.0
+..\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 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 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 i
+..\OT1/cmr/m/n/10 s
+..\glue 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 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 b
+..\kern-0.27779
+..\OT1/cmr/m/n/10 y
+..\glue 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 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 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 3.33333 plus 1.66666 minus 1.11111
+..\OT1/cmr/m/n/10 i
+..\OT1/cmr/m/n/10 t
+..\glue 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: ""
@@ -93,7 +169,7 @@ Path: "/", Name: "", Ext: "."
Path: "/", Name: " ", Ext: ""
============================================================
============================================================
-TEST 6: File listing
+TEST 7: File listing
============================================================
> File List <
minimal.cls
@@ -105,10 +181,11 @@ expl3.sty
expl3-code.tex
l3pdfmode.def
filetest.txt
+filetest-endinput.txt
.............
============================================================
============================================================
-TEST 7: File name quoting
+TEST 8: File name quoting
============================================================
> \l_tmpa_str=foo.bar.
<recently read> }
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list