From c4ebca25b9936a50399f6223fdb2477f1685b30b Mon Sep 17 00:00:00 2001 From: Frank Mittelbach Date: Sun, 15 Dec 2024 10:34:23 +0100 Subject: [PATCH] ssc mappings (#1582) * typo * rollback tests and documentation for #1581 * correct docs after review * better align rule change arguments in the source * Revert "better align rule change arguments in the source" This reverts commit 47b167eeb9a90c7bc9fbd51d7439bdaf5214706b. --- base/changes.txt | 6 + base/doc/ltnews41.tex | 22 ++ base/ltfssaxes.dtx | 289 +++++++++++++++--- .../lthooks-rollback-args.tlg | 3 + base/testfiles/github-0479-often.luatex.tlg | 3 + base/testfiles/github-0479-often.tlg | 3 + base/testfiles/github-0479-often.xetex.tlg | 3 + ...latexrelease-rollback-003-often.luatex.tlg | 6 + .../tlb-latexrelease-rollback-003-often.tlg | 6 + ...-latexrelease-rollback-003-often.xetex.tlg | 6 + ...atexrelease-rollback-2020-10-01.luatex.tlg | 3 + .../tlb-latexrelease-rollback-2020-10-01.tlg | 3 + ...latexrelease-rollback-2020-10-01.xetex.tlg | 3 + ...atexrelease-rollback-2021-06-01.luatex.tlg | 3 + .../tlb-latexrelease-rollback-2021-06-01.tlg | 3 + ...latexrelease-rollback-2021-06-01.xetex.tlg | 3 + ...atexrelease-rollback-2021-11-15.luatex.tlg | 3 + .../tlb-latexrelease-rollback-2021-11-15.tlg | 3 + ...latexrelease-rollback-2021-11-15.xetex.tlg | 3 + ...atexrelease-rollback-2022-06-01.luatex.tlg | 3 + .../tlb-latexrelease-rollback-2022-06-01.tlg | 3 + ...latexrelease-rollback-2022-06-01.xetex.tlg | 3 + ...atexrelease-rollback-2022-11-01.luatex.tlg | 3 + .../tlb-latexrelease-rollback-2022-11-01.tlg | 3 + ...latexrelease-rollback-2022-11-01.xetex.tlg | 3 + ...atexrelease-rollback-2023-06-01.luatex.tlg | 3 + .../tlb-latexrelease-rollback-2023-06-01.tlg | 3 + ...latexrelease-rollback-2023-06-01.xetex.tlg | 3 + ...atexrelease-rollback-2023-11-01.luatex.tlg | 3 + .../tlb-latexrelease-rollback-2023-11-01.tlg | 3 + ...latexrelease-rollback-2023-11-01.xetex.tlg | 3 + ...atexrelease-rollback-2024-06-01.luatex.tlg | 3 + .../tlb-latexrelease-rollback-2024-06-01.tlg | 3 + ...latexrelease-rollback-2024-06-01.xetex.tlg | 3 + ...atexrelease-rollback-2024-11-01.luatex.tlg | 3 + .../tlb-latexrelease-rollback-2024-11-01.tlg | 3 + ...latexrelease-rollback-2024-11-01.xetex.tlg | 3 + .../tlb-rollback-004-often.luatex.tlg | 3 + base/testfiles/tlb-rollback-004-often.tlg | 3 + .../tlb-rollback-004-often.xetex.tlg | 3 + base/testfiles/tlb-rollback-005.luatex.tlg | 3 + base/testfiles/tlb-rollback-005.tlg | 3 + base/testfiles/tlb-rollback-005.xetex.tlg | 3 + base/update-rollback-tests.sh | 4 +- 44 files changed, 407 insertions(+), 43 deletions(-) diff --git a/base/changes.txt b/base/changes.txt index 86137063e..326d96f08 100644 --- a/base/changes.txt +++ b/base/changes.txt @@ -6,6 +6,12 @@ to completeness or accuracy and it contains some references to files that are not part of the distribution. ================================================================================ +2024-12-11 Frank Mittelbach + + * ltfssaxes.dtx (subsection{Mapping rules for shape combinations}): + Add ssc shape change rules (gh/1581) + Also took the opportunity to provide better fallbacks for sw shape. + 2024-12-10 Yukai Chou * ltxref.dtx (subsection{Cross Referencing}) Replace \@tempa with \reserved@a in \Ref (gh/1579) diff --git a/base/doc/ltnews41.tex b/base/doc/ltnews41.tex index ee1914c56..146720a6a 100644 --- a/base/doc/ltnews41.tex +++ b/base/doc/ltnews41.tex @@ -270,6 +270,28 @@ \subsection{Logging text command and symbol declarations} % \githubissue{1242} +\subsection{Supporting the \texttt{ssc} and \texttt{sw} shapes} + +The \texttt{ssc} shape (spaced small capitals) is supported in +\LaTeX{} through the commands \cs{sscshape} and \cs{textssc}. However, +until this release there where no font shape change rules defined for +this admittely seldom available shape, so that +\begin{verbatim} + \sscshape\itshape +\end{verbatim} +changed unconditionally to \texttt{it} (italics) rather than to +\texttt{sscit} (spaced small italic capitals). Thanks to Michael +Ummels, the missing declarations have now been added so that shape +changes in font families that support spaced small capitals work +properly. + +At the same time we took the opportunity to improve the fallbacks for +the \texttt{sw} (swash) shapes, which are accessible through the +commands \cs{swshape} or \cs{textsw}. If an \texttt{sw} combination is +not available, the rules now try to replace \texttt{sw} with +\texttt{it} rather than falling back to \texttt{n}. +% +\githubissue{1581} \section{Bug fixes} diff --git a/base/ltfssaxes.dtx b/base/ltfssaxes.dtx index 56506a976..29b08b828 100644 --- a/base/ltfssaxes.dtx +++ b/base/ltfssaxes.dtx @@ -35,7 +35,7 @@ % % \ProvidesFile{ltfssaxes.dtx} - [2024/11/19 v1.0j LaTeX Kernel (NFSS Axes handing)] + [2024/12/11 v1.0k LaTeX Kernel (NFSS Axes handing)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -1096,10 +1096,12 @@ % that is desirable), essentially building in an ``sc'' % axis. % +% \changes{v1.0k}{2024/12/11}{Reorganized the rollback data} +% % \begin{macrocode} %<*2ekernel|latexrelease> %\IncludeInRelease{2020/02/02}% -% {\DeclareFontShapeChangeRule}{Font shape change rules}% +% {\ulcshape}{Font shape change rules}% % \end{macrocode} % % @@ -1175,14 +1177,24 @@ % \begin{macro}{\sscshape} % \begin{macro}{\textssc} % \begin{macro}{\sscdefault} -% New command to select spaced small capitals. This is only here -% because \texttt{fontaxes} offered it. There isn't a single free -% font that supports it. However, some commercial ones do, so we -% offer it so that at some point \texttt{fontaxes} could be -% retired. +% +% New commands to select spaced small capitals. There isn't a +% single free font that supports it. However, some commercial ones +% do, so we offer it. It is possible to produce spaced small +% capitals from normal small capitals in OTF fonts using +% \texttt{otftotfm} with calls such as +%\begin{verbatim} +% otftotfm -e TEXMF/fonts/enc/dvips/base/texnansx.enc \ +% SourceSerifPro-Regular.ttf -fkern -fliga --feature=smcp \ +% --letterspacing=80 SourceSerifPro-Regular-ssc-LY1 +%\end{verbatim} % -% So far there aren't any rules for it---probably there should be -% some putting it in the same category as \texttt{sc}. +% Michael Ummels kindly prepared the necessary rules for +% \texttt{ssc} ages ago, but until recently they managed to hide +% deep down in my inbox. I finally got around to integrating them +% (with a few changes) and I also took the opportunity to +% rationalize (a bit) the rules for the only other uncommon shape, +% \texttt{sw}. % \begin{macrocode} \DeclareRobustCommand\sscshape {\not@math@alphabet\sscshape\relax @@ -1195,26 +1207,75 @@ % \end{macro} % % +% Supporting rollback \ldots +% \begin{macrocode} +% +%\EndIncludeInRelease +%\IncludeInRelease{0000/00/00}% +% {\ulcshape}{Font shape change rules}% +% +%\let\DeclareFontShapeChangeRule\@undefined +%\let\ulcshape\@undefined +%\let\ulcdefault\@undefined +%\let\swshape\@undefined +%\let\swdefault\@undefined +%\let\sscshape\@undefined +%\let\sscdefault\@undefined +% +%\EndIncludeInRelease +%<*2ekernel> +% \end{macrocode} +% % % \subsection{Mapping rules for shape combinations} % % Many of the entries are commented out as we will get that result % without any entry. % \begin{macrocode} +% +%<*2ekernel|latexrelease> +%\IncludeInRelease{2025/06/01}% +% {\DeclareFontShapeChangeRule}{Rules for ssc and sw}% +% %\DeclareFontShapeChangeRule {n}{n} {n} {} \DeclareFontShapeChangeRule {n}{it} {it} {sl} \DeclareFontShapeChangeRule {n}{sl} {sl} {it} -%\DeclareFontShapeChangeRule {n}{sw} {sw} {} +% \end{macrocode} +% If \texttt{sw} is requested but not available (not many font +% families offer it) we try to fallback to \texttt{it} instead of +% \texttt{sw}. That isn't always perfect, because some swash shapes +% are actually upright, but it is only a fallback and most of the +% time it would be better than \texttt{n}. +% \changes{v1.0k}{2024/12/11}{Rationalize \texttt{sw} shape change +% rules (gh/1581)} +% \begin{macrocode} +\DeclareFontShapeChangeRule {n}{sw} {sw} {it} %\DeclareFontShapeChangeRule {n}{sc} {sc} {} \DeclareFontShapeChangeRule {n}{ulc} {n} {} -\DeclareFontShapeChangeRule {n}{up} {n} {} +\DeclareFontShapeChangeRule {n}{up} {n} {} +% \end{macrocode} +% For the \texttt{ssc} shape we make the following general +% assumptions: if \texttt{ssc}\meta{X} exists then +% \texttt{sc}\meta{X} and \meta{X} also exist in the font. If the +% \texttt{ssc}\meta{X} shape doesn't exist but the user had asked +% for \texttt{ssc} we try to replace it by \texttt{sc} because we +% then assume that the current font family simply doesn't have any +% \texttt{ssc} shapes. However, if we are already in some +% \texttt{ssc} shape and a shape change is requested we know that at +% least some \texttt{ssc} shapes exist for the current font family, +% so rather than falling back to some \texttt{sc} shape we try to stay +% within \texttt{ssc} shapes in a fallback situation. +% \changes{v1.0k}{2024/12/11}{Add \texttt{ssc} shape change +% rules (gh/1581)} +% \begin{macrocode} +\DeclareFontShapeChangeRule {n}{ssc} {ssc} {sc} % \end{macrocode} % % \begin{macrocode} %\DeclareFontShapeChangeRule {it}{n} {n} {} %\DeclareFontShapeChangeRule {it}{it} {it} {} \DeclareFontShapeChangeRule {it}{sl} {sl} {it} -%\DeclareFontShapeChangeRule {it}{sw} {sw} {} +\DeclareFontShapeChangeRule {it}{sw} {sw} {it} % \end{macrocode} % If neither \texttt{scit} nor \texttt{scsl} exist then \texttt{sc} % will be used as a fallback albeit with a log entry, so except for @@ -1222,32 +1283,35 @@ % \begin{macrocode} \DeclareFontShapeChangeRule {it}{sc} {scit} {scsl} \DeclareFontShapeChangeRule {it}{ulc} {it} {} -\DeclareFontShapeChangeRule {it}{up} {n} {} +\DeclareFontShapeChangeRule {it}{up} {n} {} +\DeclareFontShapeChangeRule {it}{ssc} {sscit} {scit} % \end{macrocode} % % \begin{macrocode} %\DeclareFontShapeChangeRule {sl}{n} {n} {} \DeclareFontShapeChangeRule {sl}{it} {it} {sl} %\DeclareFontShapeChangeRule {sl}{sl} {sl} {} -%\DeclareFontShapeChangeRule {sl}{sw} {sw} {} +\DeclareFontShapeChangeRule {sl}{sw} {sw} {it} \DeclareFontShapeChangeRule {sl}{sc} {scsl} {scit} \DeclareFontShapeChangeRule {sl}{ulc} {sl} {} -\DeclareFontShapeChangeRule {sl}{up} {n} {} +\DeclareFontShapeChangeRule {sl}{up} {n} {} +\DeclareFontShapeChangeRule {sl}{ssc} {sscsl} {scsl} % \end{macrocode} % % \begin{macrocode} %\DeclareFontShapeChangeRule {sc}{n} {n} {} \DeclareFontShapeChangeRule {sc}{it} {scit} {scsl} \DeclareFontShapeChangeRule {sc}{sl} {scsl} {scit} -\DeclareFontShapeChangeRule {sc}{sw} {scsw} {sw} +\DeclareFontShapeChangeRule {sc}{sw} {scsw} {scit} %\DeclareFontShapeChangeRule {sc}{sc} {sc} {} -\DeclareFontShapeChangeRule {sc}{ulc} {n} {} +\DeclareFontShapeChangeRule {sc}{ulc} {n} {} % \end{macrocode} % -% The next rule might be a bit surprising and rightly so. Correct -% would be that \texttt{sc} is not affected by \texttt{up}, i.e., -% remains \texttt{sc} as showed in the commented out rule. However, -% for nearly three decades commands such as \cs{sc} or +% The next rule might be a bit surprising, and rightly so. +% It would be more correct if \text{sc} +% were not affected by \texttt{up}, so that it +% remains \texttt{sc} as shown in the commented out rule. However, +% for nearly three decades commands such as \cs{upshape} or % \cs{textup} changed small caps back to the ``normal'' shape. So % for backward compatibility we keep that behavior. % @@ -1262,34 +1326,39 @@ % \begin{macrocode} %\DeclareFontShapeChangeRule {sc}{up} {sc} {} \DeclareFontShapeChangeRule {sc}{up} {n} {} +%\DeclareFontShapeChangeRule {sc}{ssc} {ssc} {} % \end{macrocode} % % \begin{macrocode} %\DeclareFontShapeChangeRule {scit}{n} {n} {} \DeclareFontShapeChangeRule {scit}{it} {scit} {} \DeclareFontShapeChangeRule {scit}{sl} {scsl} {scit} -\DeclareFontShapeChangeRule {scit}{sw} {scsw} {sc} % or scit? +\DeclareFontShapeChangeRule {scit}{sw} {scsw} {scit} \DeclareFontShapeChangeRule {scit}{sc} {scit} {} \DeclareFontShapeChangeRule {scit}{ulc} {it} {} -\DeclareFontShapeChangeRule {scit}{up} {sc} {} % \end{macrocode} -% The previous rule assumes that if \texttt{scit} exists then +% The next rule assumes that if \texttt{scit} exists then % \texttt{it} exists as well. If not, the mechanism will save -% \texttt{ulc} in \cs{f@series} which most certainly doesn't +% \texttt{ulc} in \cs{f@series}, which most certainly doesn't % exist. So when a font is later selected that would result in a % substitution (so no harm done really). Alternatively, we could in % this case use \texttt{n} as alternative, which may be a bit % faster, but such a setup would be so weird in the first place % that this isn't worth the effort. -% +% \begin{macrocode} +\DeclareFontShapeChangeRule {scit}{up} {sc} {} +\DeclareFontShapeChangeRule {scit}{ssc}{sscit}{scit} +% \end{macrocode} +% % \begin{macrocode} %\DeclareFontShapeChangeRule {scsl}{n} {n} {} \DeclareFontShapeChangeRule {scsl}{it} {scit} {scsl} \DeclareFontShapeChangeRule {scsl}{sl} {scsl} {} -\DeclareFontShapeChangeRule {scsl}{sw} {scsw} {sc} % or scsl? +\DeclareFontShapeChangeRule {scsl}{sw} {scsw} {scsl} \DeclareFontShapeChangeRule {scsl}{sc} {scsl} {} \DeclareFontShapeChangeRule {scsl}{ulc} {sl} {} -\DeclareFontShapeChangeRule {scsl}{up} {sc} {} +\DeclareFontShapeChangeRule {scsl}{up} {sc} {} +\DeclareFontShapeChangeRule {scsl}{ssc} {sscsl} {scsl} % \end{macrocode} % % \begin{macrocode} @@ -1299,7 +1368,8 @@ \DeclareFontShapeChangeRule {scsw}{sw} {scsw} {} \DeclareFontShapeChangeRule {scsw}{sc} {scsw} {} \DeclareFontShapeChangeRule {scsw}{ulc} {sw} {} -\DeclareFontShapeChangeRule {scsw}{up} {sc} {} +\DeclareFontShapeChangeRule {scsw}{up} {sc} {} +\DeclareFontShapeChangeRule {scsw}{ssc} {sscsw} {scsw} % \end{macrocode} % % \begin{macrocode} @@ -1307,30 +1377,167 @@ %\DeclareFontShapeChangeRule {sw}{it} {it} {} %\DeclareFontShapeChangeRule {sw}{sl} {sl} {} %\DeclareFontShapeChangeRule {sw}{sw} {sw} {} -\DeclareFontShapeChangeRule {sw}{sc} {scsw} {} +\DeclareFontShapeChangeRule {sw}{sc} {scsw} {scit} \DeclareFontShapeChangeRule {sw}{ulc} {sw} {} -\DeclareFontShapeChangeRule {sw}{up} {n} {} +\DeclareFontShapeChangeRule {sw}{up} {n} {} +\DeclareFontShapeChangeRule {sw}{ssc} {sscsw} {scsw} +% \end{macrocode} +% +% \begin{macrocode} +%\DeclareFontShapeChangeRule {ssc}{n} {n} {} +\DeclareFontShapeChangeRule {ssc}{it} {sscit} {sscsl} +\DeclareFontShapeChangeRule {ssc}{sl} {sscsl} {sscit} +\DeclareFontShapeChangeRule {ssc}{sw} {sscsw} {sscit} +\DeclareFontShapeChangeRule {ssc}{sc} {sc} {} +%\DeclareFontShapeChangeRule {ssc}{ssc} {ssc} {} +\DeclareFontShapeChangeRule {ssc}{ulc} {n} {} +% \end{macrocode} +% We implement the same logic as for \texttt{sc}, see above. The +% \texttt{ssc} shape doesn 't to care for 30 years of history, but +% it would be surprising is \cs{sscshape}\cs{upshape} would work +% differently to \cs{scshape}\cs{upshape}. +% \begin{macrocode} +%\DeclareFontShapeChangeRule {ssc}{up} {ssc} {} +\DeclareFontShapeChangeRule {ssc}{up} {n} {} +% \end{macrocode} +% +% \begin{macrocode} +%\DeclareFontShapeChangeRule {sscit}{n} {n} {} +\DeclareFontShapeChangeRule {sscit}{it} {sscit} {} +\DeclareFontShapeChangeRule {sscit}{sl} {sscsl} {sscit} +\DeclareFontShapeChangeRule {sscit}{sw} {sscsw} {sscit} +\DeclareFontShapeChangeRule {sscit}{ssc} {sscit} {} +\DeclareFontShapeChangeRule {sscit}{sc} {scit} {} +\DeclareFontShapeChangeRule {sscit}{ulc} {it} {} +\DeclareFontShapeChangeRule {sscit}{up} {ssc} {} +% \end{macrocode} +% +% \begin{macrocode} +%\DeclareFontShapeChangeRule {sscsl}{n} {n} {} +\DeclareFontShapeChangeRule {sscsl}{it} {sscit} {sscsl} +\DeclareFontShapeChangeRule {sscsl}{sl} {sscsl} {} +\DeclareFontShapeChangeRule {sscsl}{sw} {sscsw} {sscit} +\DeclareFontShapeChangeRule {sscsl}{sc} {scsl} {} +\DeclareFontShapeChangeRule {sscsl}{ulc} {sl} {} +\DeclareFontShapeChangeRule {sscsl}{up} {ssc} {} % \end{macrocode} % -% Supporting rollback \ldots % \begin{macrocode} +%\DeclareFontShapeChangeRule {sscsw}{n} {n} {} +\DeclareFontShapeChangeRule {sscsw}{it} {sscit} {sscsl} +\DeclareFontShapeChangeRule {sscsw}{sl} {sscsl} {sscit} +\DeclareFontShapeChangeRule {sscsw}{sw} {sscsw} {} +\DeclareFontShapeChangeRule {sscsw}{ssc} {sscsw} {} +\DeclareFontShapeChangeRule {sscsw}{sc} {scsw} {scit} +\DeclareFontShapeChangeRule {sscsw}{ulc} {sw} {it} +\DeclareFontShapeChangeRule {sscsw}{up} {ssc} {} % %\EndIncludeInRelease -%\IncludeInRelease{0000/00/00}% -% {\DeclareFontShapeChangeRule}{Font shape change rules}% +% \end{macrocode} +% +% \begin{macrocode} +%\IncludeInRelease{2020/02/02}% +% {\DeclareFontShapeChangeRule}{Rules for ssc and sw}% % -%\let\DeclareFontShapeChangeRule\@undefined -%\let\ulcshape\@undefined -%\let\ulcdefault\@undefined -%\let\swshape\@undefined -%\let\swdefault\@undefined -%\let\sscshape\@undefined -%\let\sscdefault\@undefined +%\DeclareFontShapeChangeRule {n}{it} {it} {sl} +%\DeclareFontShapeChangeRule {n}{sl} {sl} {it} +%\DeclareFontShapeChangeRule {n}{ulc} {n} {} +%\DeclareFontShapeChangeRule {n}{up} {n} {} +%\DeclareFontShapeChangeRule {it}{sl} {sl} {it} +%\DeclareFontShapeChangeRule {it}{sc} {scit} {scsl} +%\DeclareFontShapeChangeRule {it}{ulc} {it} {} +%\DeclareFontShapeChangeRule {it}{up} {n} {} +%\DeclareFontShapeChangeRule {sl}{it} {it} {sl} +%\DeclareFontShapeChangeRule {sl}{sc} {scsl} {scit} +%\DeclareFontShapeChangeRule {sl}{ulc} {sl} {} +%\DeclareFontShapeChangeRule {sl}{up} {n} {} +%\DeclareFontShapeChangeRule {sc}{it} {scit} {scsl} +%\DeclareFontShapeChangeRule {sc}{sl} {scsl} {scit} +%\DeclareFontShapeChangeRule {sc}{sw} {scsw} {sw} +%\DeclareFontShapeChangeRule {sc}{ulc} {n} {} +%\DeclareFontShapeChangeRule {sc}{up} {n} {} +%\DeclareFontShapeChangeRule {scit}{it} {scit} {} +%\DeclareFontShapeChangeRule {scit}{sl} {scsl} {scit} +%\DeclareFontShapeChangeRule {scit}{sw} {scsw} {sc} % or scit? +%\DeclareFontShapeChangeRule {scit}{sc} {scit} {} +%\DeclareFontShapeChangeRule {scit}{ulc} {it} {} +%\DeclareFontShapeChangeRule {scit}{up} {sc} {} +%\DeclareFontShapeChangeRule {scsl}{it} {scit} {scsl} +%\DeclareFontShapeChangeRule {scsl}{sl} {scsl} {} +%\DeclareFontShapeChangeRule {scsl}{sw} {scsw} {sc} % or scsl? +%\DeclareFontShapeChangeRule {scsl}{sc} {scsl} {} +%\DeclareFontShapeChangeRule {scsl}{ulc} {sl} {} +%\DeclareFontShapeChangeRule {scsl}{up} {sc} {} +%\DeclareFontShapeChangeRule {scsw}{it} {scit} {scsw} +%\DeclareFontShapeChangeRule {scsw}{sl} {scsl} {} +%\DeclareFontShapeChangeRule {scsw}{sw} {scsw} {} +%\DeclareFontShapeChangeRule {scsw}{sc} {scsw} {} +%\DeclareFontShapeChangeRule {scsw}{ulc} {sw} {} +%\DeclareFontShapeChangeRule {scsw}{up} {sc} {} +%\DeclareFontShapeChangeRule {sw}{sc} {scsw} {} +%\DeclareFontShapeChangeRule {sw}{ulc} {sw} {} +%\DeclareFontShapeChangeRule {sw}{up} {n} {} +% +% \end{macrocode} +% In 2022-02-02 the \texttt{ssc} shape had no rules, so +% that any use of it would have resulted in just switching to +% that shape or switching away from it; so we mimic that by +% providing the corresponding trivial rules to overrule those +% from above when we roll back. +% \begin{macrocode} +%\DeclareFontShapeChangeRule {n}{ssc} {ssc} {} +%\DeclareFontShapeChangeRule {it}{ssc} {ssc} {} +%\DeclareFontShapeChangeRule {sl}{ssc} {ssc} {} +%\DeclareFontShapeChangeRule {sw}{ssc} {ssc} {} +% +%\DeclareFontShapeChangeRule {scit}{ssc}{ssc} {} +%\DeclareFontShapeChangeRule {scsl}{ssc}{ssc} {} +%\DeclareFontShapeChangeRule {scsw}{ssc}{ssc} {} +% +%\DeclareFontShapeChangeRule {ssc}{it} {it} {} +%\DeclareFontShapeChangeRule {ssc}{sl} {sl} {} +%\DeclareFontShapeChangeRule {ssc}{sw} {sw} {} +%\DeclareFontShapeChangeRule {ssc}{sc} {sc} {} +%\DeclareFontShapeChangeRule {ssc}{ulc} {n} {} +%\DeclareFontShapeChangeRule {ssc}{up} {n} {} +% +%\DeclareFontShapeChangeRule {sscit}{it} {it} {} +%\DeclareFontShapeChangeRule {sscit}{sl} {sl} {} +%\DeclareFontShapeChangeRule {sscit}{sw} {sw} {} +%\DeclareFontShapeChangeRule {sscit}{ssc} {ssc}{} +%\DeclareFontShapeChangeRule {sscit}{sc} {sc} {} +%\DeclareFontShapeChangeRule {sscit}{ulc} {n} {} +%\DeclareFontShapeChangeRule {sscit}{up} {ssc}{} % +%\DeclareFontShapeChangeRule {sscsl}{it} {it} {} +%\DeclareFontShapeChangeRule {sscsl}{sl} {sl} {} +%\DeclareFontShapeChangeRule {sscsl}{sw} {sw} {} +%\DeclareFontShapeChangeRule {sscsl}{sc} {sc} {} +%\DeclareFontShapeChangeRule {sscsl}{ulc} {n} {} +%\DeclareFontShapeChangeRule {sscsl}{up} {ssc}{} +% +%\DeclareFontShapeChangeRule {sscsw}{it} {it} {} +%\DeclareFontShapeChangeRule {sscsw}{sl} {sl} {} +%\DeclareFontShapeChangeRule {sscsw}{sw} {sw} {} +%\DeclareFontShapeChangeRule {sscsw}{ssc} {ssc}{} +%\DeclareFontShapeChangeRule {sscsw}{sc} {sc} {} +%\DeclareFontShapeChangeRule {sscsw}{ulc} {n} {} +%\DeclareFontShapeChangeRule {sscsw}{up} {ssc}{} +%\EndIncludeInRelease +% \end{macrocode} +% Before 2020-02-02 we don't really care about any existing shape +% change rules since the mechanism isn't used. +% \begin{macrocode} +%\IncludeInRelease{0000/00/00}% +% {\DeclareFontShapeChangeRule}{Rules for ssc and sw}% %\EndIncludeInRelease % \end{macrocode} % % + + + + % \subsection{Changing to a new shape} % % diff --git a/base/testfiles-lthooks/lthooks-rollback-args.tlg b/base/testfiles-lthooks/lthooks-rollback-args.tlg index 99d92320c..a3cec03d3 100644 --- a/base/testfiles-lthooks/lthooks-rollback-args.tlg +++ b/base/testfiles-lthooks/lthooks-rollback-args.tlg @@ -410,6 +410,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg index 1b67c2771..11c707bd8 100644 --- a/base/testfiles/github-0479-often.luatex.tlg +++ b/base/testfiles/github-0479-often.luatex.tlg @@ -420,6 +420,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg index 82191b7a4..6156e89a6 100644 --- a/base/testfiles/github-0479-often.tlg +++ b/base/testfiles/github-0479-often.tlg @@ -410,6 +410,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg index 0a81f89f3..e397971b8 100644 --- a/base/testfiles/github-0479-often.xetex.tlg +++ b/base/testfiles/github-0479-often.xetex.tlg @@ -410,6 +410,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape 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 8c63b8e50..fb510ae4a 100644 --- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg @@ -387,6 +387,9 @@ Skipping: [....-..-..] Merge series values on input line .... Applying: [....-..-..] Merge series values on input line .... Skipping: [....-..-..] Font shape change rules on input line .... Applying: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... @@ -1252,6 +1255,9 @@ Skipping: [....-..-..] Merge series values on input line .... Applying: [....-..-..] Merge series values on input line .... Skipping: [....-..-..] Font shape change rules on input line .... Applying: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg index 13af3d3ab..4454184a2 100644 --- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg @@ -381,6 +381,9 @@ Skipping: [....-..-..] Merge series values on input line .... Applying: [....-..-..] Merge series values on input line .... Skipping: [....-..-..] Font shape change rules on input line .... Applying: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... @@ -1236,6 +1239,9 @@ Skipping: [....-..-..] Merge series values on input line .... Applying: [....-..-..] Merge series values on input line .... Skipping: [....-..-..] Font shape change rules on input line .... Applying: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change 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 1b4143d23..4f3bd9614 100644 --- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg @@ -381,6 +381,9 @@ Skipping: [....-..-..] Merge series values on input line .... Applying: [....-..-..] Merge series values on input line .... Skipping: [....-..-..] Font shape change rules on input line .... Applying: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... @@ -1245,6 +1248,9 @@ Skipping: [....-..-..] Merge series values on input line .... Applying: [....-..-..] Merge series values on input line .... Skipping: [....-..-..] Font shape change rules on input line .... Applying: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.luatex.tlg index 4335745ea..ab9388709 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.luatex.tlg @@ -420,6 +420,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.tlg index e46003562..23feb24d3 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.tlg @@ -410,6 +410,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg index 0247a86df..a1f331a2e 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg @@ -410,6 +410,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.luatex.tlg index def4433b2..d9b7c17fb 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.luatex.tlg @@ -421,6 +421,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.tlg index 0d9f86234..7c0e1aa77 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.tlg @@ -410,6 +410,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg index be4d664e5..8b95e1844 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg @@ -410,6 +410,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.luatex.tlg index fe90d8ed4..428f8b1cb 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.luatex.tlg @@ -421,6 +421,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.tlg index 68c4b0ec9..fca83e127 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.tlg @@ -410,6 +410,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg index dc018f085..a2f86f38e 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg @@ -410,6 +410,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg index 63ef2338e..8564bb399 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg @@ -422,6 +422,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg index bfa70ffab..d6c54a53a 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg @@ -411,6 +411,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg index 64172fb29..41e451cf5 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg @@ -411,6 +411,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg index 4030fe470..c38c86acd 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg @@ -422,6 +422,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg index 3f9c3d716..055a98cb7 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg @@ -411,6 +411,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg index 463a49b5b..4b5a4b44c 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg @@ -411,6 +411,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.luatex.tlg index 59efff3b9..ba5198671 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.luatex.tlg @@ -422,6 +422,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.tlg index 9b7401575..6130224f4 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.tlg @@ -411,6 +411,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.xetex.tlg index 27f608bb4..b49bd9a29 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.xetex.tlg @@ -411,6 +411,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.luatex.tlg index 276deb05f..dd168c7ac 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.luatex.tlg @@ -422,6 +422,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.tlg index 0f664fd4b..6c884e02f 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.tlg @@ -411,6 +411,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.xetex.tlg index 5b4946334..e72be5e0c 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.xetex.tlg @@ -411,6 +411,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2024-06-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2024-06-01.luatex.tlg index e8702b808..9d5204cd9 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2024-06-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2024-06-01.luatex.tlg @@ -422,6 +422,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2024-06-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2024-06-01.tlg index ee70197b1..199e6f905 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2024-06-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2024-06-01.tlg @@ -411,6 +411,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2024-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2024-06-01.xetex.tlg index a9b59593a..06f691eeb 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2024-06-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2024-06-01.xetex.tlg @@ -411,6 +411,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2024-11-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2024-11-01.luatex.tlg index 65f9782a9..a2e4c426f 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2024-11-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2024-11-01.luatex.tlg @@ -422,6 +422,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2024-11-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2024-11-01.tlg index e4cd4a4d8..dc453a9dd 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2024-11-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2024-11-01.tlg @@ -411,6 +411,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2024-11-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2024-11-01.xetex.tlg index 367e829ec..b13186349 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2024-11-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2024-11-01.xetex.tlg @@ -411,6 +411,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... LaTeX Info: Redefining \fontshapeforce on input line .... diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg index 2fa3bfa9b..620948540 100644 --- a/base/testfiles/tlb-rollback-004-often.luatex.tlg +++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg @@ -421,6 +421,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg index 9e6730902..024ef5a69 100644 --- a/base/testfiles/tlb-rollback-004-often.tlg +++ b/base/testfiles/tlb-rollback-004-often.tlg @@ -410,6 +410,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg index c6584b2dc..86717373f 100644 --- a/base/testfiles/tlb-rollback-004-often.xetex.tlg +++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg @@ -410,6 +410,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg index ff0125ab8..b44e21ea1 100644 --- a/base/testfiles/tlb-rollback-005.luatex.tlg +++ b/base/testfiles/tlb-rollback-005.luatex.tlg @@ -424,6 +424,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg index f2cc0696c..ee473b608 100644 --- a/base/testfiles/tlb-rollback-005.tlg +++ b/base/testfiles/tlb-rollback-005.tlg @@ -414,6 +414,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg index 5ee465f1d..4205db47c 100644 --- a/base/testfiles/tlb-rollback-005.xetex.tlg +++ b/base/testfiles/tlb-rollback-005.xetex.tlg @@ -414,6 +414,9 @@ LaTeX Info: Redefining \ulcshape on input line .... LaTeX Info: Redefining \swshape on input line .... LaTeX Info: Redefining \sscshape on input line .... Already applied: [....-..-..] Font shape change rules on input line .... +Skipping: [....-..-..] Rules for ssc and sw on input line .... +Applying: [....-..-..] Rules for ssc and sw on input line .... +Already applied: [....-..-..] Rules for ssc and sw on input line .... Skipping: [....-..-..] Font shape change on input line .... Applying: [....-..-..] Font shape change on input line .... LaTeX Info: Redefining \fontshape on input line .... diff --git a/base/update-rollback-tests.sh b/base/update-rollback-tests.sh index 6094d5507..308afe78a 100755 --- a/base/update-rollback-tests.sh +++ b/base/update-rollback-tests.sh @@ -7,14 +7,14 @@ l3build save -epdftex,xetex,luatex \ tlb-latexrelease-rollback-2023-06-01 \ tlb-latexrelease-rollback-2023-11-01 \ tlb-latexrelease-rollback-2024-06-01 \ + tlb-latexrelease-rollback-2024-11-01 \ tlb-latexrelease-rollback-003-often \ tlb-rollback-004-often \ tlb-rollback-005 \ github-0479-often l3build save \ - tlb-latexrelease-rollback-2023-06-01 \ - tlb-latexrelease-rollback-2024-11-01 + tlb-latexrelease-rollback-2023-06-01 l3build save -c config-lthooks \ lthooks-rollback-args