[latex3-commits] [git/LaTeX3-latex3-latex2e] hotfix/gh453: fix for #453 (change was forgotten in 2020-02-02) (1166ab4e)
Frank Mittelbach
frank.mittelbach at latex-project.org
Thu Dec 10 15:57:17 CET 2020
Repository : https://github.com/latex3/latex2e
On branch : hotfix/gh453
Link : https://github.com/latex3/latex2e/commit/1166ab4e59a1db96cbd93242c2766e1107882a40
>---------------------------------------------------------------
commit 1166ab4e59a1db96cbd93242c2766e1107882a40
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Thu Dec 10 15:57:17 2020 +0100
fix for #453 (change was forgotten in 2020-02-02)
>---------------------------------------------------------------
1166ab4e59a1db96cbd93242c2766e1107882a40
base/changes.txt | 6 ++++++
base/ltfssbas.dtx | 22 +++++++++++++++++++++-
.../testfiles/github-0453.lvt | 8 ++++----
base/testfiles/github-0453.tlg | 5 +++++
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 6 ++++++
.../tlb-latexrelease-rollback-003-often.tlg | 6 ++++++
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 6 ++++++
base/testfiles/tlb-rollback-004-often.luatex.tlg | 3 +++
base/testfiles/tlb-rollback-004-often.tlg | 3 +++
base/testfiles/tlb-rollback-004-often.xetex.tlg | 3 +++
10 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index 2fef6e39..6fb59111 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -10,6 +10,12 @@ are not part of the distribution.
All changes above are only part of the development branch for the next release.
================================================================================
+2020-12-10 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltfssbas.dtx (subsection{Macros for the user}):
+ Drop ``m'' if the series value is a member of a fixed list
+ and issue warning if doing it (gh/453)
+
2020-11-24 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* latexrelease.ins:
diff --git a/base/ltfssbas.dtx b/base/ltfssbas.dtx
index 4a6afca3..46c2c626 100644
--- a/base/ltfssbas.dtx
+++ b/base/ltfssbas.dtx
@@ -35,7 +35,7 @@
%
%
\ProvidesFile{ltfssbas.dtx}
- [2020/02/27 v3.2g LaTeX Kernel (NFSS Basic Macros)]
+ [2020/12/10 v3.2h LaTeX Kernel (NFSS Basic Macros)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -891,12 +891,32 @@
% series and shape which is not desired if we intend to use an
% explicit font shape!
% \changes{v3.2e}{2019/12/17}{Don't call \cs{fontseries} or \cs{fontshape}}
+% \changes{v3.2h}{2020/12/10}{Drop ``m'' if the series value is a member
+% of a fixed list and issue warning if doing it (gh/453)}
% \begin{macrocode}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2020/02/02}%
+%<latexrelease> {\usefont}{Drop m in usefont}%
\DeclareRobustCommand\usefont[4]{\fontencoding{#1}%
\edef\f at family{#2}%
\edef\f at series{#3}%
+ \series at maybe@drop at one@m\f at series\f at series
\edef\f at shape{#4}\selectfont
\ignorespaces}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease> {\usefont}{Drop m in usefont}%
+%<latexrelease>
+%<latexrelease>\DeclareRobustCommand\usefont[4]{\fontencoding{#1}%
+%<latexrelease> \edef\f at family{#2}%
+%<latexrelease> \edef\f at series{#3}%
+%<latexrelease> \edef\f at shape{#4}\selectfont
+%<latexrelease> \ignorespaces}
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
% \end{macrocode}
% \end{macro}
%
diff --git a/required/amsmath/testfiles/tlb-amsmath-load.lvt b/base/testfiles/github-0453.lvt
similarity index 72%
copy from required/amsmath/testfiles/tlb-amsmath-load.lvt
copy to base/testfiles/github-0453.lvt
index fe720de4..3ff4baaa 100644
--- a/required/amsmath/testfiles/tlb-amsmath-load.lvt
+++ b/base/testfiles/github-0453.lvt
@@ -1,11 +1,11 @@
\documentclass{article}
+
\input{test2e}
-\START
+\begin{document}
-\usepackage{amsmath}
+\START
-\begin{document}
+\usefont{T1}{lmr}{bm}{it} X
\END
-
diff --git a/base/testfiles/github-0453.tlg b/base/testfiles/github-0453.tlg
new file mode 100644
index 00000000..85473b20
--- /dev/null
+++ b/base/testfiles/github-0453.tlg
@@ -0,0 +1,5 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+LaTeX Font Info: Trying to load font information for T1+lmr on input line ....
+LaTeX Font Warning: Font shape `T1/lmr/b/it' in size <10> not available
+(Font) Font shape `T1/lmr/b/sl' tried instead on input line ...
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index e3e0f0a1..b9284f6c 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -136,6 +136,9 @@ Skipping: [....-..-..] Maybe drop one m on input line ...
Applying: [....-..-..] Maybe drop one m on input line ....
Skipping: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
Applying: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
+Skipping: [....-..-..] Drop m in usefont on input line ....
+Applying: [....-..-..] Drop m in usefont on input line ....
+LaTeX Info: Redefining \usefont on input line ....
Skipping: [....-..-..] Loading .fd files on input line ....
Applying: [....-..-..] Loading .fd files on input line ....
Skipping: [....-..-..] Provide family substituation on input line ....
@@ -585,6 +588,9 @@ Skipping: [....-..-..] Maybe drop one m on input line ...
Applying: [....-..-..] Maybe drop one m on input line ....
Applying: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
Already applied: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
+Skipping: [....-..-..] Drop m in usefont on input line ....
+Applying: [....-..-..] Drop m in usefont on input line ....
+LaTeX Info: Redefining \usefont on input line ....
Skipping: [....-..-..] Loading .fd files on input line ....
Applying: [....-..-..] Loading .fd files on input line ....
Skipping: [....-..-..] Provide family substituation on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index b965a8b5..982c0f9c 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -130,6 +130,9 @@ Skipping: [....-..-..] Maybe drop one m on input line ...
Applying: [....-..-..] Maybe drop one m on input line ....
Skipping: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
Applying: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
+Skipping: [....-..-..] Drop m in usefont on input line ....
+Applying: [....-..-..] Drop m in usefont on input line ....
+LaTeX Info: Redefining \usefont on input line ....
Skipping: [....-..-..] Loading .fd files on input line ....
Applying: [....-..-..] Loading .fd files on input line ....
Skipping: [....-..-..] Provide family substituation on input line ....
@@ -569,6 +572,9 @@ Skipping: [....-..-..] Maybe drop one m on input line ...
Applying: [....-..-..] Maybe drop one m on input line ....
Applying: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
Already applied: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
+Skipping: [....-..-..] Drop m in usefont on input line ....
+Applying: [....-..-..] Drop m in usefont on input line ....
+LaTeX Info: Redefining \usefont on input line ....
Skipping: [....-..-..] Loading .fd files on input line ....
Applying: [....-..-..] Loading .fd files on input line ....
Skipping: [....-..-..] Provide family substituation on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index 0948147e..875dc27c 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -130,6 +130,9 @@ Skipping: [....-..-..] Maybe drop one m on input line ...
Applying: [....-..-..] Maybe drop one m on input line ....
Skipping: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
Applying: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
+Skipping: [....-..-..] Drop m in usefont on input line ....
+Applying: [....-..-..] Drop m in usefont on input line ....
+LaTeX Info: Redefining \usefont on input line ....
Skipping: [....-..-..] Loading .fd files on input line ....
Applying: [....-..-..] Loading .fd files on input line ....
Skipping: [....-..-..] Provide family substituation on input line ....
@@ -578,6 +581,9 @@ Skipping: [....-..-..] Maybe drop one m on input line ...
Applying: [....-..-..] Maybe drop one m on input line ....
Applying: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
Already applied: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
+Skipping: [....-..-..] Drop m in usefont on input line ....
+Applying: [....-..-..] Drop m in usefont on input line ....
+LaTeX Info: Redefining \usefont on input line ....
Skipping: [....-..-..] Loading .fd files on input line ....
Applying: [....-..-..] Loading .fd files on input line ....
Skipping: [....-..-..] Provide family substituation on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 176259e5..4e805452 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -164,6 +164,9 @@ Applying: [....-..-..] Maybe drop one m on input line ...
Already applied: [....-..-..] Maybe drop one m on input line ....
Applying: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
Already applied: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
+Applying: [....-..-..] Drop m in usefont on input line ....
+LaTeX Info: Redefining \usefont on input line ....
+Already applied: [....-..-..] Drop m in usefont on input line ....
Applying: [....-..-..] Loading .fd files on input line ....
Already applied: [....-..-..] Loading .fd files on input line ....
Applying: [....-..-..] Provide family substituation on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index 244fac38..5fb3a509 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -153,6 +153,9 @@ Applying: [....-..-..] Maybe drop one m on input line ...
Already applied: [....-..-..] Maybe drop one m on input line ....
Applying: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
Already applied: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
+Applying: [....-..-..] Drop m in usefont on input line ....
+LaTeX Info: Redefining \usefont on input line ....
+Already applied: [....-..-..] Drop m in usefont on input line ....
Applying: [....-..-..] Loading .fd files on input line ....
Already applied: [....-..-..] Loading .fd files on input line ....
Applying: [....-..-..] Provide family substituation on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index 97353c67..835f5454 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -153,6 +153,9 @@ Applying: [....-..-..] Maybe drop one m on input line ...
Already applied: [....-..-..] Maybe drop one m on input line ....
Applying: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
Already applied: [....-..-..] Arbitrary units in \DeclareMathSizes on input line ....
+Applying: [....-..-..] Drop m in usefont on input line ....
+LaTeX Info: Redefining \usefont on input line ....
+Already applied: [....-..-..] Drop m in usefont on input line ....
Applying: [....-..-..] Loading .fd files on input line ....
Already applied: [....-..-..] Loading .fd files on input line ....
Applying: [....-..-..] Provide family substituation on input line ....
More information about the latex3-commits
mailing list.