[latex3-commits] [git/LaTeX3-latex3-latex2e] TL21-2-kernel-msgs: Use this for some filecontents messages; Also shorten the cont lines by 3 spaces (fed1326a)
Frank Mittelbach
frank.mittelbach at latex-project.org
Wed Jun 9 22:08:09 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : TL21-2-kernel-msgs
Link : https://github.com/latex3/latex2e/commit/fed1326abb480ff670dd04bcb813bd97fe6e0da2
>---------------------------------------------------------------
commit fed1326abb480ff670dd04bcb813bd97fe6e0da2
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Wed Jun 9 22:08:09 2021 +0200
Use this for some filecontents messages;
Also shorten the cont lines by 3 spaces
>---------------------------------------------------------------
fed1326abb480ff670dd04bcb813bd97fe6e0da2
base/ltclass.dtx | 3 ++-
base/lterror.dtx | 2 +-
base/ltfssbas.dtx | 4 ++--
base/testfiles-1run/github-0220.luatex.tlg | 8 ++++----
base/testfiles-1run/github-0220.tlg | 8 ++++----
base/testfiles-legacy/utf8-test-001.tlg | 16 ++++++++--------
base/testfiles/github-0415.luatex.tlg | 4 ++--
base/testfiles/github-0415.tlg | 4 ++--
base/testfiles/github-0415.xetex.tlg | 4 ++--
base/testfiles/tltx003.tlg | 24 ++++++++++++------------
10 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index 9e235e6d..9645b35e 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -2731,9 +2731,10 @@
%
% \changes{v1.0y}{1997/10/10}
% {Use \cs{@gobbletwo}}
+% \changes{v1.4b}{2021/06/09}{Use \cs{@latex at note@no at line} to display the information}
% \begin{macrocode}
\if at filesw%
- \@latex at warning@no at line%
+ \@latex at note@no at line%
{File `\@curr at file' already \filec at ntents@where.\MessageBreak%
Not generating it from this source}%
\let\write\@gobbletwo%
diff --git a/base/lterror.dtx b/base/lterror.dtx
index 67ae532b..2d238aef 100644
--- a/base/lterror.dtx
+++ b/base/lterror.dtx
@@ -458,7 +458,7 @@ Type H <return> for immediate help.}%
%<latexrelease> {\@latex at note}{Display notes}%
\def\@latex at note#1{%
\GenericWarning{%
- \space\space\space\@spaces\@spaces\@spaces
+ \@spaces\@spaces\@spaces
}{%
LaTeX Info: #1%
}%
diff --git a/base/ltfssbas.dtx b/base/ltfssbas.dtx
index b7ef460c..1f30372d 100644
--- a/base/ltfssbas.dtx
+++ b/base/ltfssbas.dtx
@@ -280,12 +280,12 @@
% may have dropped an ``m''. If nothing has changes,
% fine. Otherwise there was a wrong value which is now corrected in
% \cs{reservedb} so we use that and also issue a warning.
-% \changes{v3.2j}{2021/06/09}{Improve warning message}
+% \changes{v3.2j}{2021/06/09}{Improve information message}
% \begin{macrocode}
\edef\reserved at a{#3}%
\series at maybe@drop at one@m\reserved at a\reserved at b
\ifx\reserved at a\reserved at b\else
- \@latex at warning{Font shape #1/#2/#3/#4 has incorrect series
+ \@latex at note{Font shape #1/#2/#3/#4 has incorrect series
value `#3'.\MessageBreak It should not contain an `m'!
Please correct it.\MessageBreak Found}%
\fi
diff --git a/base/testfiles-1run/github-0220.luatex.tlg b/base/testfiles-1run/github-0220.luatex.tlg
index ee78019c..00df82bb 100644
--- a/base/testfiles-1run/github-0220.luatex.tlg
+++ b/base/testfiles-1run/github-0220.luatex.tlg
@@ -8,8 +8,8 @@ Reading the fie ``github 220 input.tex''
This is from file ``github 220 input''.
)
Writing a file with the same name again, should fail:
-LaTeX Warning: File `github 220 input' already exists on the system.
- Not generating it from this source.
+LaTeX Info: File `github 220 input' already exists on the system.
+ Not generating it from this source.
Reading the file ``github 220 input.tex'' (same result)
("./github 220 input.tex"
This is from file ``github 220 input''.
@@ -23,8 +23,8 @@ This is from the third file ``github 220 input''.
)
Writing a file called ``github-0220.sty'', should fail:
github-0220.sty found
-LaTeX Warning: File `github-0220.sty' already exists on the system.
- Not generating it from this source.
+LaTeX Info: File `github-0220.sty' already exists on the system.
+ Not generating it from this source.
./github-0220.sty not found
Writing a file called ``github-0220.sty'' while only looking in the current dir, should succeed:
LaTeX Info: Writing file `././github-0220.sty'.
diff --git a/base/testfiles-1run/github-0220.tlg b/base/testfiles-1run/github-0220.tlg
index 83066867..935f76bd 100644
--- a/base/testfiles-1run/github-0220.tlg
+++ b/base/testfiles-1run/github-0220.tlg
@@ -8,8 +8,8 @@ Reading the fie ``github 220 input.tex''
This is from file ``github 220 input''.
)
Writing a file with the same name again, should fail:
-LaTeX Warning: File `github 220 input' already exists on the system.
- Not generating it from this source.
+LaTeX Info: File `github 220 input' already exists on the system.
+ Not generating it from this source.
Reading the file ``github 220 input.tex'' (same result)
(github 220 input.tex
This is from file ``github 220 input''.
@@ -22,8 +22,8 @@ This is from the third file ``github 220 input''.
)
Writing a file called ``github-0220.sty'', should fail:
github-0220.sty found
-LaTeX Warning: File `github-0220.sty' already exists on the system.
- Not generating it from this source.
+LaTeX Info: File `github-0220.sty' already exists on the system.
+ Not generating it from this source.
./github-0220.sty not found
Writing a file called ``github-0220.sty'' while only looking in the current dir, should succeed:
LaTeX Info: Writing file `././github-0220.sty'.
diff --git a/base/testfiles-legacy/utf8-test-001.tlg b/base/testfiles-legacy/utf8-test-001.tlg
index c1676909..3abdeb18 100644
--- a/base/testfiles-legacy/utf8-test-001.tlg
+++ b/base/testfiles-legacy/utf8-test-001.tlg
@@ -1,13 +1,13 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-LaTeX Warning: File `one two three' already exists on the system.
- Not generating it from this source.
-LaTeX Warning: File `f^^c3^^bc^^c3^^9fe.tex' already exists on the system.
- Not generating it from this source.
-LaTeX Warning: File `f^^c3^^bc^^c3^^9fe^^e2^^82^^ac^^e2^^82^^ac^^e2^^82^^ac.tex' already exists on the system.
- Not generating it from this source.
-LaTeX Warning: File `f^^c3^^bc^^c3^^9fe im sand.tex' already exists on the system.
- Not generating it from this source.
+LaTeX Info: File `one two three' already exists on the system.
+ Not generating it from this source.
+LaTeX Info: File `f^^c3^^bc^^c3^^9fe.tex' already exists on the system.
+ Not generating it from this source.
+LaTeX Info: File `f^^c3^^bc^^c3^^9fe^^e2^^82^^ac^^e2^^82^^ac^^e2^^82^^ac.tex' already exists on the system.
+ Not generating it from this source.
+LaTeX Info: File `f^^c3^^bc^^c3^^9fe im sand.tex' already exists on the system.
+ Not generating it from this source.
(utf8-test-001.aux (f^^c3^^bc^^c3^^9fe^^e2^^82^^ac^^e2^^82^^ac^^e2^^82^^ac.aux)
No file ^^e2^^82^^ac^^e2^^82^^ac^^e2^^82^^ac.aux.
)
diff --git a/base/testfiles/github-0415.luatex.tlg b/base/testfiles/github-0415.luatex.tlg
index 5579830d..ae140161 100644
--- a/base/testfiles/github-0415.luatex.tlg
+++ b/base/testfiles/github-0415.luatex.tlg
@@ -1,6 +1,6 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-LaTeX Warning: File `f^^f6^^f6.tex' already exists on the system.
- Not generating it from this source.
+LaTeX Info: File `f^^f6^^f6.tex' already exists on the system.
+ Not generating it from this source.
LaTeX Warning: Writing or overwriting file `./f^^f6^^f6.tex'.
\openout127 = f^^f6^^f6.tex
diff --git a/base/testfiles/github-0415.tlg b/base/testfiles/github-0415.tlg
index eb1c3f29..45080e56 100644
--- a/base/testfiles/github-0415.tlg
+++ b/base/testfiles/github-0415.tlg
@@ -1,5 +1,5 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-LaTeX Warning: File `f^^c3^^b6^^c3^^b6.tex' already exists on the system.
- Not generating it from this source.
+LaTeX Info: File `f^^c3^^b6^^c3^^b6.tex' already exists on the system.
+ Not generating it from this source.
LaTeX Warning: Writing or overwriting file `./f^^c3^^b6^^c3^^b6.tex'.
diff --git a/base/testfiles/github-0415.xetex.tlg b/base/testfiles/github-0415.xetex.tlg
index 42d34444..d79dd0dc 100644
--- a/base/testfiles/github-0415.xetex.tlg
+++ b/base/testfiles/github-0415.xetex.tlg
@@ -1,5 +1,5 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-LaTeX Warning: File `f^^f6^^f6.tex' already exists on the system.
- Not generating it from this source.
+LaTeX Info: File `f^^f6^^f6.tex' already exists on the system.
+ Not generating it from this source.
LaTeX Warning: Writing or overwriting file `./f^^f6^^f6.tex'.
diff --git a/base/testfiles/tltx003.tlg b/base/testfiles/tltx003.tlg
index 0b0c5a5c..b0641652 100644
--- a/base/testfiles/tltx003.tlg
+++ b/base/testfiles/tltx003.tlg
@@ -9,18 +9,18 @@ Package: {tltx 003}c
Package: {tltx 003}d
Package: {tltx 003}e
Package: {tltx 003}f
-LaTeX Warning: File `tltx003a.sty' already exists on the system.
- Not generating it from this source.
-LaTeX Warning: File `tltx003b.sty' already exists on the system.
- Not generating it from this source.
-LaTeX Warning: File `tltx003c.sty' already exists on the system.
- Not generating it from this source.
-LaTeX Warning: File `tltx003d.sty' already exists on the system.
- Not generating it from this source.
-LaTeX Warning: File `tltx003e.sty' already exists on the system.
- Not generating it from this source.
-LaTeX Warning: File `tltx003f.sty' already exists on the system.
- Not generating it from this source.
+LaTeX Info: File `tltx003a.sty' already exists on the system.
+ Not generating it from this source.
+LaTeX Info: File `tltx003b.sty' already exists on the system.
+ Not generating it from this source.
+LaTeX Info: File `tltx003c.sty' already exists on the system.
+ Not generating it from this source.
+LaTeX Info: File `tltx003d.sty' already exists on the system.
+ Not generating it from this source.
+LaTeX Info: File `tltx003e.sty' already exists on the system.
+ Not generating it from this source.
+LaTeX Info: File `tltx003f.sty' already exists on the system.
+ Not generating it from this source.
a> 1
a> 2
a> 3
More information about the latex3-commits
mailing list.