[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: updated code for #291 to match PL5 changes; fixed testfiles (including babel update to 3.40 (23b7244e)
Frank Mittelbach
frank.mittelbach at latex-project.org
Fri Feb 28 11:08:20 CET 2020
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/23b7244e806dc0f676db0221d6fc68031a2d5578
>---------------------------------------------------------------
commit 23b7244e806dc0f676db0221d6fc68031a2d5578
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Fri Feb 28 11:08:20 2020 +0100
updated code for #291 to match PL5 changes;
fixed testfiles (including babel update to 3.40
>---------------------------------------------------------------
23b7244e806dc0f676db0221d6fc68031a2d5578
base/ltfssaxes.dtx | 10 +++-
base/ltfssbas.dtx | 2 +-
base/ltfssini.dtx | 15 +++---
base/testfiles-search/github-0273.luatex.tlg | 26 +++++------
base/testfiles-search/github-0273.lvt | 22 ++++-----
base/testfiles-search/github-0273.tlg | 63 ++++++--------------------
base/testfiles-search/github-0273.xetex.tlg | 63 ++++++--------------------
base/testfiles-search/tlb-nfssaxes-001.lvt | 68 ++++++++++++++--------------
base/testfiles-search/tlb-nfssaxes-001.tlg | 62 ++++++++++++-------------
9 files changed, 132 insertions(+), 199 deletions(-)
diff --git a/base/ltfssaxes.dtx b/base/ltfssaxes.dtx
index 02a49a31..5f7813e3 100644
--- a/base/ltfssaxes.dtx
+++ b/base/ltfssaxes.dtx
@@ -849,7 +849,7 @@
% \changes{v1.0d}{2020/02/27}{Drop ``m'' only in a specific set of values (gh/293)}
% \begin{macrocode}
\edef\f at series{#1}%
- \expandafter\series at maybe@drop at one@m\expandafter{\f at series}\f at series
+ \series at maybe@drop at one@m\f at series\f at series
}
% \end{macrocode}
% \end{macro}
@@ -865,7 +865,13 @@
% \changes{v1.0d}{2020/02/27}{Drop ``m'' in certain values from a
% fixed list (gh/293)}
% \begin{macrocode}
-\def\series at maybe@drop at one@m#1#2{%
+\def\series at maybe@drop at one@m#1{%
+ \expandafter\series at maybe@drop at one@m at x\expandafter{#1}}
+% \end{macrocode}
+%
+% \begin{macrocode}
+
+\def\series at maybe@drop at one@m at x#1#2{%
% \end{macrocode}
% The code below is an inline version of the \cs{in@} macro without
% the group, so that it works in \cs{accent}.
diff --git a/base/ltfssbas.dtx b/base/ltfssbas.dtx
index f51d742d..5715106c 100644
--- a/base/ltfssbas.dtx
+++ b/base/ltfssbas.dtx
@@ -282,7 +282,7 @@
% \cs{reservedb} so we use that and also issue a warning.
% \begin{macrocode}
\edef\reserved at a{#3}%
- \expandafter\series at maybe@drop at one@m\expandafter{#3}\reserved at b
+ \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 declaration has incorrect series
value `#3'.\MessageBreak It should not contain an `m'!
diff --git a/base/ltfssini.dtx b/base/ltfssini.dtx
index 7bc1d2f5..8cfdd372 100644
--- a/base/ltfssini.dtx
+++ b/base/ltfssini.dtx
@@ -399,8 +399,8 @@
% \changes{v3.1j}{2020/02/25}{Drop surplus ``m'' from \cs{bfdef at ult}
% and \cs{mddef at ult} (gh/291)}
% \begin{macrocode}
- \edef\bfdef at ult{\expandafter\series at drop@one at m\bfdefault mm\series at drop@one at m}%
- \edef\mddef at ult{\expandafter\series at drop@one at m\mddefault mm\series at drop@one at m}%
+ \series at maybe@drop at one@m\bfdefault\bfdef at ult
+ \series at maybe@drop at one@m\mddefault\mddef at ult
\edef\famdef at ult{\familydefault}%
}
% \end{macrocode}
@@ -733,8 +733,7 @@
% \cs{target at series@value} (gh/291)}
% \begin{macrocode}
% \let\f at series\target at series@value
- \edef\f at series{\expandafter\series at drop@one at m
- \target at series@value mm\series at drop@one at m}%
+ \series at maybe@drop at one@m\target at series@value\f at series
\fi
\fi
\fi
@@ -802,8 +801,8 @@
% \changes{v3.1j}{2020/02/25}{Drop surplus ``m'' from \cs{reserved at d}
% (gh/291)}
% \begin{macrocode}
- \edef\reserved at d{\expandafter\expandafter\expandafter
- \series at drop@one at m\csname mdseries@#1\endcsname mm\series at drop@one at m}%
+ \expandafter\series at maybe@drop at one@m
+ \csname mdseries@#1\endcsname\reserved at d
\ifx\reserved at d\f at series
%<+debug> \series at change@debug{mdseries@#1 matched -> \reserved at b}%
\let\target at series@value\reserved at b
@@ -813,8 +812,8 @@
% \changes{v3.1j}{2020/02/25}{Drop surplus ``m'' from \cs{reserved at d}
% (gh/291)}
% \begin{macrocode}
- \edef\reserved at d{\expandafter\expandafter\expandafter
- \series at drop@one at m\csname bfseries@#1\endcsname mm\series at drop@one at m}%
+ \expandafter\series at maybe@drop at one@m
+ \csname bfseries@#1\endcsname\reserved at d
\ifx\reserved at d\f at series
%<+debug> \series at change@debug{bfseries@#1 matched -> \reserved at c}%
\let\target at series@value\reserved at c
diff --git a/base/testfiles-search/github-0273.luatex.tlg b/base/testfiles-search/github-0273.luatex.tlg
index 5d2895ad..f0b3d350 100644
--- a/base/testfiles-search/github-0273.luatex.tlg
+++ b/base/testfiles-search/github-0273.luatex.tlg
@@ -1,15 +1,15 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-\latinencoding -> undefined
-\@fontenc at load@list -> macro:->\@elt {TU}
+\latinencoding -> undefined (undefined)
+\@fontenc at load@list -> macro:->\@elt {TU} ()
(fontenc.sty
Package: fontenc ....-..-.. v... Standard LaTeX package
(t2aenc.def
File: t2aenc.def ....-..-.. v... Cyrillic encoding definition file
)
LaTeX Font Info: Trying to load font information for T2A+cmr on input line ....
-\latinencoding -> undefined
-\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}
+\latinencoding -> undefined (undefined)
+\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A} ()
(fontenc.sty
Package: fontenc ....-..-.. v... Standard LaTeX package
(../ly1enc.def
@@ -19,12 +19,12 @@ File: ly1enc.def ....-..-.. v... TeX 'n ANSI encoding (DPC/KB)
File: t2benc.def ....-..-.. v... Cyrillic encoding definition file
)
LaTeX Font Info: Trying to load font information for T2B+cmr on input line ....
-\latinencoding -> undefined
-\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}\@elt {LY1,T2B}
+\latinencoding -> undefined (undefined)
+\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}\@elt {LY1,T2B} ()
(../babel.sty
-Package: babel ....-..-.. 3.39 The Babel package
+Package: babel ....-..-.. 3.40 The Babel package
(../switch.def
-File: switch.def ....-..-.. 3.39 Babel switching mechanism
+File: switch.def ....-..-.. 3.40 Babel switching mechanism
)
(../luababel.def
\bbl at readstream=\read...
@@ -117,7 +117,7 @@ Package babel Info: Non-standard hyphenation setup on input line ....
(../french.ldf
Language: french ....-..-.. v... French support from the babel system
(../babel.def
-File: babel.def ....-..-.. 3.39 Babel common definitions
+File: babel.def ....-..-.. 3.40 Babel common definitions
\babel at savecnt=\count...
\U at D=\dimen...
(../luababel.def
@@ -172,7 +172,7 @@ tex)))) (../scalefnt.sty)
Package: keyval ....-..-.. v... key=value parser (DPC)
\KV at toks@=\toks...
)
-\latinencoding -> macro:->T2B
-\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}\@elt {LY1,T2B}
-\latinencoding -> macro:->OT1
-\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}\@elt {LY1,T2B}
+\latinencoding -> macro:->T2B (LY1 maybe, why is this T2B?)
+\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}\@elt {LY1,T2B} ()
+\latinencoding -> macro:->T1 (T1 why not LY1?)
+\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}\@elt {LY1,T2B} ()
diff --git a/base/testfiles-search/github-0273.lvt b/base/testfiles-search/github-0273.lvt
index 90156305..cb9e2c4f 100644
--- a/base/testfiles-search/github-0273.lvt
+++ b/base/testfiles-search/github-0273.lvt
@@ -1,35 +1,35 @@
\documentclass{article}
-\newcommand\display[1]{\typeout{\string#1 -> \meaning#1}}
+\newcommand\display[2]{\typeout{\string#1 -> \meaning#1 (#2)}}
\input{test2e}
\START
\makeatletter
-\display\latinencoding
-\display\@fontenc at load@list
+\display\latinencoding{undefined}
+\display\@fontenc at load@list{}
\usepackage[T1,T2A]{fontenc}
-\display\latinencoding
-\display\@fontenc at load@list
+\display\latinencoding{undefined}
+\display\@fontenc at load@list{}
\usepackage[LY1,T2B]{fontenc}
-\display\latinencoding
-\display\@fontenc at load@list
+\display\latinencoding{undefined}
+\display\@fontenc at load@list{}
\usepackage[french,russian]{babel}
-\display\latinencoding
-\display\@fontenc at load@list
+\display\latinencoding{LY1 maybe, why is this T2B?}
+\display\@fontenc at load@list{}
\OMIT
\begin{document}
\TIMO
-\display\latinencoding
-\display\@fontenc at load@list
+\display\latinencoding{T1 why not LY1?}
+\display\@fontenc at load@list{}
\END
diff --git a/base/testfiles-search/github-0273.tlg b/base/testfiles-search/github-0273.tlg
index 9790b7b5..cbce59ce 100644
--- a/base/testfiles-search/github-0273.tlg
+++ b/base/testfiles-search/github-0273.tlg
@@ -1,7 +1,7 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-\latinencoding -> undefined
-\@fontenc at load@list -> macro:->\@elt {T1,OT1}
+\latinencoding -> undefined (undefined)
+\@fontenc at load@list -> macro:->\@elt {T1,OT1} ()
(fontenc.sty
Package: fontenc ....-..-.. v... Standard LaTeX package
(t2aenc.def
@@ -208,8 +208,8 @@ File: t2aenc.dfu ....-..-.. v... UTF-8 support for inputenc
defining Unicode char U+FB06 (decimal 64262)
))
LaTeX Font Info: Trying to load font information for T2A+cmr on input line ....
-\latinencoding -> undefined
-\@fontenc at load@list -> macro:->\@elt {T1,OT1}\@elt {T1,T2A}
+\latinencoding -> undefined (undefined)
+\@fontenc at load@list -> macro:->\@elt {T1,OT1}\@elt {T1,T2A} ()
(fontenc.sty
Package: fontenc ....-..-.. v... Standard LaTeX package
(../ly1enc.def
@@ -541,17 +541,17 @@ File: t2benc.dfu ....-..-.. v... UTF-8 support for inputenc
defining Unicode char U+FB06 (decimal 64262)
))
LaTeX Font Info: Trying to load font information for T2B+cmr on input line ....
-\latinencoding -> undefined
-\@fontenc at load@list -> macro:->\@elt {T1,OT1}\@elt {T1,T2A}\@elt {LY1,T2B}
+\latinencoding -> undefined (undefined)
+\@fontenc at load@list -> macro:->\@elt {T1,OT1}\@elt {T1,T2A}\@elt {LY1,T2B} ()
(../babel.sty
-Package: babel ....-..-.. 3.39 The Babel package
+Package: babel ....-..-.. 3.40 The Babel package
(../switch.def
-File: switch.def ....-..-.. 3.39 Babel switching mechanism
+File: switch.def ....-..-.. 3.40 Babel switching mechanism
)
(../french.ldf
Language: french ....-..-.. v... French support from the babel system
(../babel.def
-File: babel.def ....-..-.. 3.39 Babel common definitions
+File: babel.def ....-..-.. 3.40 Babel common definitions
(../language.def)
\babel at savecnt=\count...
\U at D=\dimen...
@@ -559,39 +559,11 @@ File: babel.def ....-..-.. 3.39 Babel common definitions
\bbl at readstream=\read...
\bbl at dirlevel=\count...
)
-! Undefined control sequence.
-\adddialect ...##2####3####4{}\fi }\bbl at languages
- \endgroup
-l. ...\ifdefined\l at french \else \FB at nopatterns
- \fi
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
Package babel Warning: No hyphenation patterns were preloaded for
(babel) the language `French' into the format.
(babel) Please, configure your TeX system to add them and
(babel) rebuild the format. Now I will use the patterns
(babel) preloaded for \language=nohyphenation instead on input line ....
-! Undefined control sequence.
-\adddialect ...##2####3####4{}\fi }\bbl at languages
- \endgroup
-l. ... \adddialect\l at acadian\l at french
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
-! Undefined control sequence.
-\adddialect ...##2####3####4{}\fi }\bbl at languages
- \endgroup
-l. ... \adddialect\l at canadien\l at french
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
\FB at nonchar=\count...
Package babel Info: Making : an active character on input line ....
Package babel Info: Making ; an active character on input line ....
@@ -620,15 +592,6 @@ Package babel Warning: No hyphenation patterns were preloaded for
(babel) Please, configure your TeX system to add them and
(babel) rebuild the format. Now I will use the patterns
(babel) preloaded for \language=nohyphenation instead on input line ....
-! Undefined control sequence.
-\adddialect ...##2####3####4{}\fi }\bbl at languages
- \endgroup
-l. ... \adddialect\l at russian0
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
Package babel Info: Making " an active character on input line ....
Package babel Info: Default for \cyrdash is provided on input line ....
)) (../scalefnt.sty)
@@ -636,7 +599,7 @@ Package babel Info: Default for \cyrdash is provided on input line ....
Package: keyval ....-..-.. v... key=value parser (DPC)
\KV at toks@=\toks...
)
-\latinencoding -> macro:->T2B
-\@fontenc at load@list -> macro:->\@elt {T1,OT1}\@elt {T1,T2A}\@elt {LY1,T2B}
-\latinencoding -> macro:->OT1
-\@fontenc at load@list -> macro:->\@elt {T1,OT1}\@elt {T1,T2A}\@elt {LY1,T2B}
+\latinencoding -> macro:->T2B (LY1 maybe, why is this T2B?)
+\@fontenc at load@list -> macro:->\@elt {T1,OT1}\@elt {T1,T2A}\@elt {LY1,T2B} ()
+\latinencoding -> macro:->T1 (T1 why not LY1?)
+\@fontenc at load@list -> macro:->\@elt {T1,OT1}\@elt {T1,T2A}\@elt {LY1,T2B} ()
diff --git a/base/testfiles-search/github-0273.xetex.tlg b/base/testfiles-search/github-0273.xetex.tlg
index b70a4bd2..8cbffdbd 100644
--- a/base/testfiles-search/github-0273.xetex.tlg
+++ b/base/testfiles-search/github-0273.xetex.tlg
@@ -1,15 +1,15 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-\latinencoding -> undefined
-\@fontenc at load@list -> macro:->\@elt {TU}
+\latinencoding -> undefined (undefined)
+\@fontenc at load@list -> macro:->\@elt {TU} ()
(fontenc.sty
Package: fontenc ....-..-.. v... Standard LaTeX package
(t2aenc.def
File: t2aenc.def ....-..-.. v... Cyrillic encoding definition file
)
LaTeX Font Info: Trying to load font information for T2A+cmr on input line ....
-\latinencoding -> undefined
-\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}
+\latinencoding -> undefined (undefined)
+\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A} ()
(fontenc.sty
Package: fontenc ....-..-.. v... Standard LaTeX package
(../ly1enc.def
@@ -19,17 +19,17 @@ File: ly1enc.def ....-..-.. v... TeX 'n ANSI encoding (DPC/KB)
File: t2benc.def ....-..-.. v... Cyrillic encoding definition file
)
LaTeX Font Info: Trying to load font information for T2B+cmr on input line ....
-\latinencoding -> undefined
-\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}\@elt {LY1,T2B}
+\latinencoding -> undefined (undefined)
+\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}\@elt {LY1,T2B} ()
(../babel.sty
-Package: babel ....-..-.. 3.39 The Babel package
+Package: babel ....-..-.. 3.40 The Babel package
(../switch.def
-File: switch.def ....-..-.. 3.39 Babel switching mechanism
+File: switch.def ....-..-.. 3.40 Babel switching mechanism
)
(../french.ldf
Language: french ....-..-.. v... French support from the babel system
(../babel.def
-File: babel.def ....-..-.. 3.39 Babel common definitions
+File: babel.def ....-..-.. 3.40 Babel common definitions
(../language.def)
\babel at savecnt=\count...
\U at D=\dimen...
@@ -38,39 +38,11 @@ File: babel.def ....-..-.. 3.39 Babel common definitions
\bbl at readstream=\read...
\bbl at dirlevel=\count...
)
-! Undefined control sequence.
-\adddialect ...##2####3####4{}\fi }\bbl at languages
- \endgroup
-l. ...\ifdefined\l at french \else \FB at nopatterns
- \fi
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
Package babel Warning: No hyphenation patterns were preloaded for
(babel) the language `French' into the format.
(babel) Please, configure your TeX system to add them and
(babel) rebuild the format. Now I will use the patterns
(babel) preloaded for \language=nohyphenation instead on input line ....
-! Undefined control sequence.
-\adddialect ...##2####3####4{}\fi }\bbl at languages
- \endgroup
-l. ... \adddialect\l at acadian\l at french
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
-! Undefined control sequence.
-\adddialect ...##2####3####4{}\fi }\bbl at languages
- \endgroup
-l. ... \adddialect\l at canadien\l at french
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
\FB at nonchar=\count...
Package french.ldf Info: No need for active punctuation characters
(french.ldf) with this version of XeTeX!
@@ -105,15 +77,6 @@ Package babel Warning: No hyphenation patterns were preloaded for
(babel) Please, configure your TeX system to add them and
(babel) rebuild the format. Now I will use the patterns
(babel) preloaded for \language=nohyphenation instead on input line ....
-! Undefined control sequence.
-\adddialect ...##2####3####4{}\fi }\bbl at languages
- \endgroup
-l. ... \adddialect\l at russian0
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
Package babel Info: Making " an active character on input line ....
Package babel Info: Default for \cyrdash is provided on input line ....
)) (../scalefnt.sty)
@@ -121,7 +84,7 @@ Package babel Info: Default for \cyrdash is provided on input line ....
Package: keyval ....-..-.. v... key=value parser (DPC)
\KV at toks@=\toks...
)
-\latinencoding -> macro:->T2B
-\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}\@elt {LY1,T2B}
-\latinencoding -> macro:->OT1
-\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}\@elt {LY1,T2B}
+\latinencoding -> macro:->T2B (LY1 maybe, why is this T2B?)
+\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}\@elt {LY1,T2B} ()
+\latinencoding -> macro:->T1 (T1 why not LY1?)
+\@fontenc at load@list -> macro:->\@elt {TU}\@elt {T1,T2A}\@elt {LY1,T2B} ()
diff --git a/base/testfiles-search/tlb-nfssaxes-001.lvt b/base/testfiles-search/tlb-nfssaxes-001.lvt
index e5ca2fe5..53599ce1 100644
--- a/base/testfiles-search/tlb-nfssaxes-001.lvt
+++ b/base/testfiles-search/tlb-nfssaxes-001.lvt
@@ -5,8 +5,9 @@
\def\testseries#1{\showresult{series}{\fontseries{#1}}}
-\def\testshape#1{\showresult{shape}{\fontshape{#1}}}
-\def\showresult#1#2{#2\typeout{\string#2 -> \csname f@#1\endcsname}}
+\def\testshape#1#2{\showresult{shape}{\fontshape{#1}}{#2}}
+\def\showresult#1#2#3{#2\typeout{\string#2 ->
+ \csname f@#1\endcsname \space (should be #3)}}
@@ -20,54 +21,55 @@
\typeout{=========== Testing standard shape declarations LM ==========}
Test
-\showresult{shape}\upshape after upshape
-\showresult{shape}\scshape after scshape
-\showresult{shape}\itshape after itshape
-\showresult{shape}\upshape after upshape
-\showresult{shape}\upshape after upshape % no change any longer
-\showresult{shape}\ulcshape after ulcshape
-\showresult{shape}\slshape after slshape
-\showresult{shape}\scshape after scshape
-\showresult{shape}\upshape after upshape
-\showresult{shape}\ulcshape after ulcshape
+\showresult{shape}\upshape{n} after upshape
+\showresult{shape}\scshape{sc} after scshape
+\showresult{shape}\itshape{scsl after trying scit} after itshape
+\showresult{shape}\upshape{sc} after upshape
+\showresult{shape}\upshape{n} after upshape
+\showresult{shape}\ulcshape{n} after ulcshape
+\showresult{shape}\slshape{sl} after slshape
+\showresult{shape}\scshape{scsl} after scshape
+\showresult{shape}\upshape{sc} after upshape
+\showresult{shape}\ulcshape{n} after ulcshape
\typeout{=========== Testing standard shape declarations CM ==========}
\fontfamily{cmr}\selectfont
-\showresult{shape}\upshape after upshape
-\showresult{shape}\itshape after itshape
-\showresult{shape}\scshape after scshape % should try scit/scsl then sc
-\showresult{shape}\slshape after slshape % should try scsl/scit then sl
-\showresult{shape}\ulcshape after ulcshape % no change
-\showresult{shape}\upshape after upshape
+\showresult{shape}\upshape{n} after upshape
+\showresult{shape}\itshape{it} after itshape
+\showresult{shape}\scshape{sc after trying scsl/scit} after scshape
+\showresult{shape}\slshape{sl after trying scsl/scit} after slshape
+\showresult{shape}\ulcshape{sl} after ulcshape % no change
+\showresult{shape}\upshape{n} after upshape
\typeout{=========== Testing low-level \string\fontshape\space declarations ==========}
Testing \verb=\fontshape=
-\testshape{n} \selectfont after fontshape ``{n}''
-\testshape{sc} \selectfont after fontshape ``{sc}''
-\testshape{it} \selectfont after fontshape ``{it}''
-\testshape{sl} \selectfont after fontshape ``{sl}''
-\testshape{n} \selectfont after fontshape ``{n}''
-\testshape{ulc} \selectfont after fontshape ``{ulc}''
+\testshape{n}{n} \selectfont after fontshape ``{n}''
+\testshape{sc}{sc} \selectfont after fontshape ``{sc}''
+\testshape{it}{it after trying scit} \selectfont after fontshape ``{it}''
+\testshape{sl}{sl} \selectfont after fontshape ``{sl}''
+\testshape{n}{n} \selectfont after fontshape ``{n}''
+\testshape{ulc}{n} \selectfont after fontshape ``{ulc}''
\typeout{=========== Testing low-level \string\fontseries\space declarations ==========}
Testing \verb=\fontseries=
-\testseries{bx} \selectfont after ``{bx}''
-\testseries{l} \selectfont after ``{l}''
-\testseries{c} \selectfont after ``{c}'' % lc doesn't exist
-\testseries{m} \selectfont after ``{m} ``
-\testseries{c} \selectfont after ``{c} ``
-\testseries{b} \selectfont after ``{b}''
-\testseries{bx} \selectfont after ``{bx}''
-\testseries{foo} \selectfont after ``{foo}''
-\testseries{m} \selectfont after ``{m}''
+\testseries{bx}{bx} \selectfont after ``{bx}''
+\testseries{l}{l after trying lx (even though l doesn't exist either - found later)}
+ \selectfont after ``{l}''
+\testseries{c}{l after trying lc} \selectfont after ``{c}''
+\testseries{m}{m} \selectfont after ``{m} ``
+\testseries{c}{m after trying c} \selectfont after ``{c} ``
+\testseries{b}{b} \selectfont after ``{b}''
+\testseries{bx}{bx} \selectfont after ``{bx}''
+\testseries{foo}{foo even though it doesn't exist} \selectfont after ``{foo}''
+\testseries{m}{m} \selectfont after ``{m}''
\END
diff --git a/base/testfiles-search/tlb-nfssaxes-001.tlg b/base/testfiles-search/tlb-nfssaxes-001.tlg
index a022df3c..8a7c677e 100644
--- a/base/testfiles-search/tlb-nfssaxes-001.tlg
+++ b/base/testfiles-search/tlb-nfssaxes-001.tlg
@@ -2,55 +2,55 @@ 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 ....
=========== Testing standard shape declarations LM ==========
-\upshape -> n
-\scshape -> sc
+\upshape -> n (should be n)
+\scshape -> sc (should be sc)
LaTeX Font Warning: Font shape `T1/lmr/m/scit' undefined
(Font) using `T1/lmr/m/scsl' instead on input line ....
-\itshape -> scsl
-\upshape -> sc
-\upshape -> sc
-\ulcshape -> n
-\slshape -> sl
-\scshape -> scsl
-\upshape -> sc
-\ulcshape -> n
+\itshape -> scsl (should be scsl after trying scit)
+\upshape -> sc (should be sc)
+\upshape -> n (should be n)
+\ulcshape -> n (should be n)
+\slshape -> sl (should be sl)
+\scshape -> scsl (should be scsl)
+\upshape -> sc (should be sc)
+\ulcshape -> n (should be n)
=========== Testing standard shape declarations CM ==========
-\upshape -> n
-\itshape -> it
+\upshape -> n (should be n)
+\itshape -> it (should be it)
LaTeX Font Warning: Font shape `T1/cmr/m/scit' undefined
(Font) using `T1/cmr/m/sc' instead on input line ....
-\scshape -> sc
+\scshape -> sc (should be sc after trying scsl/scit)
LaTeX Font Warning: Font shape `T1/cmr/m/scsl' undefined
(Font) using `T1/cmr/m/sl' instead on input line ....
-\slshape -> sl
-\ulcshape -> sl
-\upshape -> n
+\slshape -> sl (should be sl after trying scsl/scit)
+\ulcshape -> sl (should be sl)
+\upshape -> n (should be n)
=========== Testing low-level \fontshape declarations ==========
-\fontshape{n} -> n
-\fontshape{sc} -> sc
+\fontshape{n} -> n (should be n)
+\fontshape{sc} -> sc (should be sc)
LaTeX Font Warning: Font shape `T1/cmr/m/scit' undefined
(Font) using `T1/cmr/m/it' instead on input line ....
-\fontshape{it} -> it
-\fontshape{sl} -> sl
-\fontshape{n} -> n
-\fontshape{ulc} -> n
+\fontshape{it} -> it (should be it after trying scit)
+\fontshape{sl} -> sl (should be sl)
+\fontshape{n} -> n (should be n)
+\fontshape{ulc} -> n (should be n)
=========== Testing low-level \fontseries declarations ==========
-\fontseries{bx} -> bx
+\fontseries{bx} -> bx (should be bx)
LaTeX Font Warning: Font shape `T1/cmr/lx/n' undefined
(Font) using `T1/cmr/l/n' instead on input line ....
-\fontseries{l} -> l
+\fontseries{l} -> l (should be l after trying lx (even though l doesn't exist either - found later))
LaTeX Font Warning: Font shape `T1/cmr/l/n' undefined
(Font) using `T1/cmr/m/n' instead on input line ....
LaTeX Font Warning: Font shape `T1/cmr/lc/n' undefined
(Font) using `T1/cmr/l/n' instead on input line ....
-\fontseries{c} -> l
-\fontseries{m} -> m
+\fontseries{c} -> l (should be l after trying lc)
+\fontseries{m} -> m (should be m)
LaTeX Font Warning: Font shape `T1/cmr/c/n' undefined
(Font) using `T1/cmr/m/n' instead on input line ....
-\fontseries{c} -> m
-\fontseries{b} -> b
-\fontseries{bx} -> bx
-\fontseries{foo} -> foo
+\fontseries{c} -> m (should be m after trying c)
+\fontseries{b} -> b (should be b)
+\fontseries{bx} -> bx (should be bx)
+\fontseries{foo} -> foo (should be foo even though it doesn't exist)
LaTeX Font Warning: Font shape `T1/cmr/foo/n' undefined
(Font) using `T1/cmr/m/n' instead on input line ....
-\fontseries{m} -> m
+\fontseries{m} -> m (should be m)
More information about the latex3-commits
mailing list.