texlive[73038] Master/texmf-dist: fontsize (4dec24)
commits+karl at tug.org
commits+karl at tug.org
Wed Dec 4 22:31:53 CET 2024
Revision: 73038
https://tug.org/svn/texlive?view=revision&revision=73038
Author: karl
Date: 2024-12-04 22:31:52 +0100 (Wed, 04 Dec 2024)
Log Message:
-----------
fontsize (4dec24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.bib
trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.pdf
trunk/Master/texmf-dist/source/latex/fontsize/fontsize.dtx
trunk/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
Modified: trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.bib 2024-12-04 21:14:16 UTC (rev 73037)
+++ trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.bib 2024-12-04 21:31:52 UTC (rev 73038)
@@ -62,3 +62,12 @@
version = {3.5.2}
}
+ at manual{relsize,
+ title = {\sty{relsize} – Set the font size relative to the current font size},
+ author = {Donald Arseneau and Matt Swift},
+ url = {https://www.ctan.org/pkg/relsize},
+ urldate = {2021-11-23},
+ date = {2013-03-29},
+ version = {4.1}
+}
+
Modified: trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/fontsize/fontsize.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fontsize/fontsize.dtx 2024-12-04 21:14:16 UTC (rev 73037)
+++ trunk/Master/texmf-dist/source/latex/fontsize/fontsize.dtx 2024-12-04 21:31:52 UTC (rev 73038)
@@ -5,7 +5,7 @@
\preamble
The 'fontsize' package
-Copyright (C) 2020-2021 Ivan Valbusa
+Copyright (C) 2020-2024 Ivan Valbusa
<ivan dot valbusa at gmail dot com>
All rights reserved.
@@ -56,13 +56,13 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{fontsize}
%<*package>
- [2021/08/04 v0.8.5 'fontsize' package. Set main font sizes (Ivan Valbusa)]
+ [2024/12/04 v0.9 'fontsize' package. Set main font sizes (Ivan Valbusa)]
%</package>
%<*driver>
\documentclass[12pt]{ltxdoc}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
-\usepackage[fontsize=12]{fontsize}
+\usepackage[fontsize=11]{fontsize}
%--------------------------------------------------------
% GRAPHICS
%--------------------------------------------------------
@@ -267,7 +267,7 @@
%</driver>
% \fi
%
-% \CheckSum{3068}
+% \CheckSum{3878}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -286,6 +286,8 @@
% Right brace \} Tilde \~}
%
%
+% \changes{v0.9}{2024/12/04}{Changed default calculations using the \cmd{fpeval} command. New option \opt{fsround}.}
+% \changes{v0.8.6}{2024/01/11}{Added note on incompatibility with \sty{relsize}. Updated to updated to version |4034 2023-04-20 08:03:46Z| of the \file{scrkernel-fonts.dtx} file. }
% \changes{v0.8.5}{2021/08/04}{Updated documentation.}
% \changes{v0.8.4}{2021/05/21}{Maintenance release.}
% \changes{v0.8.3}{2021/04/18}{Corrected a bug in the \cmd{parindent} option.
@@ -415,7 +417,7 @@
% \sty{scrfontsizes} packages \parencite{koma}, with few minor
% changes to make it completely independent of the KOMA-script bundle and with
% a couple of new features. The package is updated to version
-%|3390 2019-11-18 17:09:35Z| of the \file{scrkernel-fonts.dtx} file.
+%|4034 2023-04-20 08:03:46Z| of the \file{scrkernel-fonts.dtx} file.
%
%^^A---------------------------------------------------------------------
% \section*{Caveat}
@@ -490,6 +492,12 @@
% This file can be generated through the \cmd{generateclofile}
% command (see below).
%
+% \optitem[5]{fsround}{\meta{n}}
+%
+% Rounds values to the \meta{n}th decimal place.
+% If you are not interested in generating a \file{.clo} file,
+% and then editing it, you should not need this option.
+%
%^^A If \opt{cloname=fontsize-std} and \opt{fontsize=10\OR 11\OR 12}
%^^A a file which emulate the standard bk*.clo files will be used.
%^^A \file{fontsize-std10pt.clo},
@@ -767,6 +775,9 @@
% indentation, for example, with \cmd{setlength}|{parindent}|\arm{dimen}
% declared \textit{after} |\begin{document}|.
%
+%
+% \alert The \sty{fontsize} package is incompatible with \sty{relsize} by \textcite{relsize}.
+%
% \StopEventually{%
% \printbibliography[heading=bibintoc]
% \PrintChanges\PrintIndex}
@@ -784,15 +795,16 @@
% \sty{xkeyval} \parencite{xkeyval},
% while the \sty{xfp} package \parencite{xfp} provides the \cmd{fpeval} command
% to use instead of \cmd{dimexpr} for some size calculations.
-% Only two new package options, called \opt{cloname} and \opt{parindent}
-% are defined.
+% Only three new package options, called \opt{cloname}, \opt{parindent} and
+% \opt{fsround} are defined.
%
% \baddition
% \begin{macrocode}
\@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
-\@ifpackageloaded{xfp}{}{\RequirePackage{xfp}}
+\unless\ifdefined\fpeval\RequirePackage{xfp}\fi
\DeclareOptionX{cloname}[fontsize]{\def\@fontsizefilebase{#1}}
-\DeclareOptionX{parindent}[1.5\@tempdimb]{\def\@fontsizeparindent{#1}}
+\DeclareOptionX{parindent}[\fscalc{1.5\@tempdimb}]{\def\@fontsizeparindent{#1}}
+\DeclareOptionX{fsround}[5]{\def\@fsround{#1}}
% \end{macrocode}
% \eaddition
%
@@ -827,8 +839,12 @@
}%
\noexpand\catcode`\noexpand\@=\the\catcode`\@
}%
- \expandafter\AtEndOfPackage\expandafter{\@tempa}%
+ \@ifundefined{changefontsize}{%
+ \expandafter\AtEndOfPackage\expandafter{\@tempa}%
+ }{%
+ \@tempa
}
+}
% \end{macrocode}
% Now we can execute and process the new options defined above.
% As \opt{cloname} is responsible for defining \cmd{|@|fontsizefilebase}
@@ -838,43 +854,59 @@
% and \cmd{changefontsizes} used in \file{scrextend.sty}.
% \baddition
% \begin{macrocode}
-\ExecuteOptionsX{cloname,fontsize,parindent}
+\ExecuteOptionsX{cloname,fontsize,parindent,fsround}
\ProcessOptionsX*\relax
% \end{macrocode}
% \eaddition
+% We introduce a new command to perform calculations via \fpeval.
+% The \cmd{\@fsround} command is defined by the \opt{fsround} option.
+% \baddition
% \begin{macrocode}
+\NewDocumentCommand{\fscalc}{m}{\fpeval{round(#1,\@fsround)}pt}
+% \end{macrocode}
+% \eaddition
+% In the following code, |#1|, |#2|, |#3|, |#4|
+% have been wrapped in the \cmd{fscalc} command
+% just defined.
+% \begin{macrocode}
\newcommand*\ctm at setlength[4]{%
- \ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
- \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
- \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
- \setlength{#1}{\p@ \@plus\p@ \@minus\p@}%
- \else
- \setlength{#1}{\p@ \@plus\p@ \@minus#4}%
- \fi
- \else
- \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
- \setlength{#1}{\p@ \@plus#3 \@minus\p@}%
- \else
- \setlength{#1}{\p@ \@plus#3 \@minus#4}%
- \fi
- \fi
- \else
- \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
- \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
- \setlength{#1}{#2 \@plus\p@ \@minus\p@}%
- \else
- \setlength{#1}{#2 \@plus\p@ \@minus#4}%
- \fi
- \else
- \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
- \setlength{#1}{#2 \@plus#3 \@minus\p@}%
- \else
- \setlength{#1}{#2 \@plus#3 \@minus#4}%
- \fi
- \fi
- \fi
+ \ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus\p@ \@minus\fscalc{#4}}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus\fscalc{#3} \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus\fscalc{#3} \@minus\fscalc{#4}}%
+ \fi
+ \fi
+ \else
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\fscalc{#2} \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{\fscalc{#2} \@plus\p@ \@minus\fscalc{#4}}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\fscalc{#2} \@plus\fscalc{#3} \@minus\p@}%
+ \else
+ \setlength{#1}{\fscalc{#2} \@plus\fscalc{#3} \@minus\fscalc{#4}}%
+ \fi
+ \fi
+ \fi
}
-\providecommand*{\changefontsize}[2][1.2\@tempdima]{%
+% \end{macrocode}
+% In the following code the default line spacing was set in \sty{scrextend.sty}
+% to $1.2*$\meta{normal size} using the basic calculation: |1.2\@tempdima|.
+% Coherently with the other cases, here we prefer
+% to use \cmd{fscalc}:
+% \begin{macrocode}
+\providecommand*{\changefontsize}[2][\fscalc{1.2*\@tempdima}]{%
\@defaultunits\@tempdima#2pt\relax\@nnil
\setlength{\@tempdimc}{\@tempdima}%
\addtolength{\@tempdimc}{-10\p@}%
@@ -885,7 +917,7 @@
% \begin{center}\footnotesize
% |\setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}|
% \end{center}
-% returns an error when the the line spacing is greater than \SI{163.84}{pt}
+% returns an error when the line spacing is greater than \SI{163.84}{pt}
% or the value passed to the \opt{fontsize} option is grater than \SI{136.53}{pt}.
% This is due to the intermediate calculation:
% $100 \verb!\@tempdimb! = \SI{16384}{pt}$, which is
@@ -910,7 +942,7 @@
\ctm at setlength{\belowdisplayshortskip}%
{.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \edef\normalsize{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
\abovedisplayskip \the\abovedisplayskip
@@ -919,8 +951,15 @@
\belowdisplayshortskip \the\belowdisplayshortskip
\let\noexpand\@listi\noexpand\@listI
}%
- \setlength{\@tempdima}{0.9125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\normalsize\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\normalsize\expandafter{\reserved at a}%
+% \end{macrocode}
+% Also in the following cases (up to page \pageref{endfscalc}),
+% the values of \cmd{@tempdima} and \cmd{@tempdimb}
+% were calculated through \cmd{fscalc}:
+% \begin{macrocode}
+ \setlength{\@tempdima}{\fscalc{0.9125\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\ctm at setlength{\abovedisplayskip}%
{.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
\ctm at setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
@@ -927,7 +966,7 @@
\ctm at setlength{\belowdisplayshortskip}%
{.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \edef\small{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
\abovedisplayskip \the\abovedisplayskip
@@ -936,8 +975,10 @@
\belowdisplayshortskip \the\belowdisplayshortskip
\let\noexpand\@listi\noexpand\@listi at small
}%
- \setlength{\@tempdima}{.83334\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\small\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\small\expandafter{\reserved at a} %
+ \setlength{\@tempdima}{\fscalc{.83334\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\ctm at setlength{\abovedisplayskip}%
{.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
\ctm at setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
@@ -944,7 +985,7 @@
\ctm at setlength{\belowdisplayshortskip}%
{.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \edef\footnotesize{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
\abovedisplayskip \the\abovedisplayskip
@@ -953,52 +994,68 @@
\belowdisplayshortskip \the\belowdisplayshortskip
\let\noexpand\@listi\noexpand\@listi at footnotesize
}%
- \setlength{\@tempdima}{.66667\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsize{%
+ \let\footnotesize\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\footnotesize\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{.66667\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\scriptsize
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{.5\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tiny{%
+ \let\scriptsize\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\scriptsize\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{.5\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\tiny
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.2\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\large{%
+ \let\tiny\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\tiny\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.2\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\large
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.44\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Large{%
+ \let\large\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\large\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.44\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Large
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.728\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGE{%
+ \let\Large\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Large\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.728\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\LARGE
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.074\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
+ \let\LARGE\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\LARGE\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.074\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\huge
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.488\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
+ \let\huge\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\huge\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.488\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Huge
{\the\@tempdima}{\the\@tempdimb}%
}%
+ \let\Huge\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Huge\expandafter{\reserved at a}%
% \end{macrocode}
% We will now define some new font sizing commands. There are three variants
% for each standard command:
-% \cmd{\meta{cmd}r} > \cmd{\meta{cmd}rr} > \cmd{\meta{cmd}rrr}.
+% \cmd{\meta{cmd}r} < \cmd{\meta{cmd}rr} < \cmd{\meta{cmd}rrr}.
% Every level is scaled proportionally in order to preserve the default
% value of the corresponding standard command.
% \baddition
@@ -1021,282 +1078,351 @@
% {\color{black}Definition of \cmd{smallr}, \cmd{smallrr}, \cmd{smallrrr}.\\
% Scale factor: 0,021875.}
% \begin{macrocode}
- \setlength{\@tempdima}{0.934375\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\fscalc{0.934375\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\smallr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\smallr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listi at small
}%
- \setlength{\@tempdima}{0.95625\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\smallr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\smallr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.95625\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\smallrr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\smallrr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listi at small
}%
- \setlength{\@tempdima}{0.978125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\smallrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\smallrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.978125\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\smallrrr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\smallrrr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listi at small
}%
+ \let\smallrrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\smallrrr\expandafter{\reserved at a}%
% \end{macrocode}
% {\color{black}Definition of \cmd{footnotesizer}, \cmd{footnotesizerr},
% \cmd{footnotesizerrr}.\\
% Scale factor: 0.01979.}
% \begin{macrocode}
- \setlength{\@tempdima}{0.85313\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\fscalc{0.85313\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\footnotesizer{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\footnotesizer
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listi at footnotesize
}%
- \setlength{\@tempdima}{0.87292\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\footnotesizer\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\footnotesizer\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.87292\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\footnotesizerr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\footnotesizerr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listi at footnotesize
}%
- \setlength{\@tempdima}{0.89271\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\footnotesizerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\footnotesizerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.89271\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\footnotesizerrr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\footnotesizerrr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listi at footnotesize
}%
+ \let\footnotesizerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\footnotesizerrr\expandafter{\reserved at a}%
% \end{macrocode}
% {\color{black}Definition of \cmd{scriptsizer}, \cmd{scriptsizerr},
% \cmd{scriptsizerrr}.\\
% Scale factor: 0,0416675.}
% \begin{macrocode}
- \setlength{\@tempdima}{0.7083375\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsizer{%
+ \setlength{\@tempdima}{\fscalc{0.7083375\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\scriptsizer
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{0.750005\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsizerr{%
+ \let\scriptsizer\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\scriptsizer\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.750005\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\scriptsizerr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{0.7916725\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsizerrr{%
+ \let\scriptsizerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\scriptsizerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.7916725\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\scriptsizerrr
{\the\@tempdima}{\the\@tempdimb}%
}%
+ \let\scriptsizerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\scriptsizerrr\expandafter{\reserved at a}%
% \end{macrocode}
% {\color{black}Definition of \cmd{tinyr}, \cmd{tinyrr}, \cmd{tinyrrr}.\\
% Scale factor: 0.0416675.}
% \begin{macrocode}
- \setlength{\@tempdima}{0.5416675\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tinyr{%
+ \setlength{\@tempdima}{\fscalc{0.5416675\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\tinyr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{0.583335\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tinyrr{%
+\let\tinyr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\tinyr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.583335\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\tinyrr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{0.6250025\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tinyrrr{%
+\let\tinyrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\tinyrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.6250025\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\tinyrrr
{\the\@tempdima}{\the\@tempdimb}%
}%
+\let\tinyrrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\tinyrrr\expandafter{\reserved at a}%
% \end{macrocode}
% {\color{black}Definition of \cmd{normalsizer}, \cmd{normalsizerr},
% \cmd{normalsizerrr}.\\
% Scale factor: 0.05.}
% \begin{macrocode}
- \setlength{\@tempdima}{1.05\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\fscalc{1.05\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\normalsizer{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\normalsizer
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listI
}%
- \setlength{\@tempdima}{1.1\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+\let\normalsizer\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\normalsizer\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.1\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\normalsizerr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\normalsizerr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listI
}%
- \setlength{\@tempdima}{1.15\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+\let\normalsizerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\normalsizerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.15\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\normalsizerrr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\normalsizerrr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listI
}%
+\let\normalsizerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\normalsizerrr\expandafter{\reserved at a}%
% \end{macrocode}
% {\color{black}Definition of \cmd{larger}, \cmd{largerr}, \cmd{largerrr}.\\
% Scale factor: 0,06.}
% \begin{macrocode}
- \setlength{\@tempdima}{1.26\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\larger{%
+ \setlength{\@tempdima}{\fscalc{1.26\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\larger
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.32\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\largerr{%
+\let\larger\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\larger\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.32\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\largerr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.38\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\largerrr{%
+\let\largerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\largerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.38\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\largerrr
{\the\@tempdima}{\the\@tempdimb}%
}%
+\let\largerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\largerrr\expandafter{\reserved at a}%
% \end{macrocode}
% {\color{black}Definition of \cmd{Larger}, \cmd{Largerr}, \cmd{Largerrr}.\\
% Scale factor: 0,072.}
% \begin{macrocode}
- \setlength{\@tempdima}{1.512\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Larger{%
+ \setlength{\@tempdima}{\fscalc{1.512\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Larger
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.584\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Largerr{%
+\let\Larger\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Larger\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.584\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Largerr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.656\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Largerrr{%
+\let\Largerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Largerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.656\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Largerrr
{\the\@tempdima}{\the\@tempdimb}%
}%
+\let\Largerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Largerrr\expandafter{\reserved at a}%
% \end{macrocode}
% {\color{black}Definition of \cmd{LARGEr}, \cmd{LARGErr}, \cmd{LARGErrr}.\\
% Scale factor: 0,0865.}
% \begin{macrocode}
- \setlength{\@tempdima}{1.8145\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGEr{%
+ \setlength{\@tempdima}{\fscalc{1.8145\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\LARGEr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.901\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGErr{%
+\let\LARGEr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\LARGEr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.901\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\LARGErr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.9875\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGErrr{%
+\let\LARGErr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\LARGErr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.9875\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\LARGErrr
{\the\@tempdima}{\the\@tempdimb}%
}%
+\let\LARGErrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\LARGErrr\expandafter{\reserved at a}%
% \end{macrocode}
% {\color{black}Definition of \cmd{huger}, \cmd{hugerr}, \cmd{hugerrr}.\\
% Scale factor: 0,1035.}
% \begin{macrocode}
- \setlength{\@tempdima}{2.1775\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huger{%
+ \setlength{\@tempdima}{\fscalc{2.1775\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\huger
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.281\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\hugerr{%
+\let\huger\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\huger\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.281\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\hugerr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.3845\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\hugerrr{%
+\let\hugerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\hugerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.3845\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\hugerrr
{\the\@tempdima}{\the\@tempdimb}%
}%
+\let\hugerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\hugerrr\expandafter{\reserved at a}%
% \end{macrocode}
% {\color{black}Definition of \cmd{Huger}, \cmd{Hugerr}, \cmd{Hugerrr}.\\
% Scale factor: 0.123.}
% \begin{macrocode}
- \setlength{\@tempdima}{2.611\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huger{%
+ \setlength{\@tempdima}{\fscalc{2.611\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Huger
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.734\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Hugerr{%
+\let\Huger\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Huger\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.734\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Hugerr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.857\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Hugerrr{%
+\let\Hugerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Hugerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.857\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Hugerrr
{\the\@tempdima}{\the\@tempdimb}%
}%
+\let\Hugerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Hugerrr\expandafter{\reserved at a}%
% \end{macrocode}
% {\color{black}Definition of \cmd{HUGE}, \cmd{HUGER}, \cmd{HUGERR},
% \cmd{HUGERRR}.\\
% Scale factor: 0,149.}
% \begin{macrocode}
- \setlength{\@tempdima}{3.006\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\HUGE{%
+ \setlength{\@tempdima}{\fscalc{3.006\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\HUGE
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{3.155\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\HUGEr{%
+\let\HUGE\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\HUGE\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{3.155\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\HUGEr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{3.304\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\HUGErr{%
+\let\HUGEr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\HUGEr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{3.304\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\HUGErr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{3.453\@tempdimc}%
+\let\HUGErr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\HUGErr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{3.453\@tempdimc}}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\HUGErrr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\HUGErrr
{\the\@tempdima}{\the\@tempdimb}%
}%
+\let\HUGErrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\HUGErrr\expandafter{\reserved at a}%
% \end{macrocode}
+% \label{endfscalc}
% \eaddition
% \begin{macrocode}
\normalsize%
@@ -1525,7 +1651,8 @@
\the\year/\ifnum\month<10 0\fi\the\month/\ifnum\day<10 0\fi\the\day%
\space generated font size class option (#2)]}%
\immediate\write\@fontfile{%
- \string\def\string\normalsize{\@percentchar^^J%
+ \string\let\string\normalsize\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\normalsize{\@percentchar^^J%
\@ind\string\@setfontsize\string\normalsize{\f at size}{\f at baselineskip}%
\@percentchar^^J%
\@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
@@ -1537,7 +1664,8 @@
}%
\begingroup\small\@listi
\immediate\write\@fontfile{%
- \string\def\string\small{\@percentchar^^J%
+ \string\let\string\small\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\small{\@percentchar^^J%
\@ind\string\@setfontsize\string\small{\f at size}{\f at baselineskip}%
\@percentchar^^J%
\@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
@@ -1555,7 +1683,8 @@
\endgroup
\begingroup\footnotesize\@listi
\immediate\write\@fontfile{%
- \string\def\string\footnotesize{\@percentchar^^J%
+ \string\let\string\footnotesize\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\footnotesize{\@percentchar^^J%
\@ind\string\@setfontsize\string\footnotesize{\f at size}{\f at baselineskip}%
\@percentchar^^J%
\@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
@@ -1573,7 +1702,8 @@
\endgroup
\begingroup\scriptsize
\immediate\write\@fontfile{%
- \string\def\string\scriptsize{%
+ \string\let\string\scriptsize\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\scriptsize{\@percentchar^^J%
\string\@setfontsize\string\scriptsize{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1580,7 +1710,8 @@
\endgroup
\begingroup\tiny
\immediate\write\@fontfile{%
- \string\def\string\tiny{%
+ \string\let\string\tiny\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\tiny{\@percentchar^^J%
\string\@setfontsize\string\tiny{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1587,7 +1718,8 @@
\endgroup
\begingroup\large
\immediate\write\@fontfile{%
- \string\def\string\large{%
+ \string\let\string\large\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\large{\@percentchar^^J%
\string\@setfontsize\string\large{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1594,7 +1726,8 @@
\endgroup
\begingroup\Large
\immediate\write\@fontfile{%
- \string\def\string\Large{%
+ \string\let\string\Large\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Large{\@percentchar^^J%
\string\@setfontsize\string\Large{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1601,7 +1734,8 @@
\endgroup
\begingroup\LARGE
\immediate\write\@fontfile{%
- \string\def\string\LARGE{%
+ \string\let\string\LARGE\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\LARGE{\@percentchar^^J%
\string\@setfontsize\string\LARGE{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1608,7 +1742,8 @@
\endgroup
\begingroup\huge
\immediate\write\@fontfile{%
- \string\def\string\huge{%
+ \string\let\string\huge\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\huge{\@percentchar^^J%
\string\@setfontsize\string\huge{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1615,7 +1750,8 @@
\endgroup
\begingroup\Huge
\immediate\write\@fontfile{%
- \string\def\string\Huge{%
+ \string\let\string\Huge\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Huge{\@percentchar^^J%
\string\@setfontsize\string\Huge{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1627,7 +1763,8 @@
% \begin{macrocode}
\begingroup\tinyr
\immediate\write\@fontfile{%
- \string\def\string\tinyr{%
+ \string\let\string\tinyr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\tinyr{\@percentchar^^J%
\string\@setfontsize\string\tinyr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1634,7 +1771,8 @@
\endgroup
\begingroup\tinyrr
\immediate\write\@fontfile{%
- \string\def\string\tinyrr{%
+ \string\let\string\tinyrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\tinyrr{\@percentchar^^J%
\string\@setfontsize\string\tinyrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1641,7 +1779,8 @@
\endgroup
\begingroup\tinyrrr
\immediate\write\@fontfile{%
- \string\def\string\tinyrrr{%
+ \string\let\string\tinyrrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\tinyrrr{\@percentchar^^J%
\string\@setfontsize\string\tinyrrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1648,7 +1787,8 @@
\endgroup
\begingroup\scriptsizer
\immediate\write\@fontfile{%
- \string\def\string\scriptsizer{%
+ \string\let\string\scriptsizer\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\scriptsizer{\@percentchar^^J%
\string\@setfontsize\string\scriptsizer{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1655,7 +1795,8 @@
\endgroup
\begingroup\scriptsizerr
\immediate\write\@fontfile{%
- \string\def\string\scriptsizerr{%
+ \string\let\string\scriptsizerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\scriptsizerr{\@percentchar^^J%
\string\@setfontsize\string\scriptsizerr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1662,7 +1803,8 @@
\endgroup
\begingroup\scriptsizerrr
\immediate\write\@fontfile{%
- \string\def\string\scriptsizerrr{%
+ \string\let\string\scriptsizerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\scriptsizerrr{\@percentchar^^J%
\string\@setfontsize\string\scriptsizerrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1690,7 +1832,8 @@
}
\begingroup\smallr\@listi
\immediate\write\@fontfile{%
- \string\def\string\smallr{\@percentchar^^J%
+ \string\let\string\smallr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\smallr{\@percentchar^^J%
\@ind\string\@setfontsize\string\smallr{\f at size}{\f at baselineskip}%
\fs at appsmall%
}\@percentchar%
@@ -1698,7 +1841,8 @@
\endgroup
\begingroup\smallrr\@listi
\immediate\write\@fontfile{%
- \string\def\string\smallrr{\@percentchar^^J%
+ \string\let\string\smallrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\smallrr{\@percentchar^^J%
\@ind\string\@setfontsize\string\smallrr{\f at size}{\f at baselineskip}%
\fs at appsmall%
}\@percentchar%
@@ -1706,7 +1850,8 @@
\endgroup
\begingroup\smallrrr\@listi
\immediate\write\@fontfile{%
- \string\def\string\smallrrr{\@percentchar^^J%
+ \string\let\string\smallrrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\smallrrr{\@percentchar^^J%
\@ind\string\@setfontsize\string\smallrrr{\f at size}{\f at baselineskip}%
\fs at appsmall%
}\@percentchar%
@@ -1714,7 +1859,8 @@
\endgroup
\begingroup\footnotesizer\@listi
\immediate\write\@fontfile{%
- \string\def\string\footnotesizer{\@percentchar^^J%
+ \string\let\string\footnotesizer\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\footnotesizer{\@percentchar^^J%
\@ind\string\@setfontsize\string\footnotesizer{\f at size}{\f at baselineskip}%
\fs at appsmall%
}\@percentchar%
@@ -1722,7 +1868,8 @@
\endgroup
\begingroup\footnotesizerr\@listi
\immediate\write\@fontfile{%
- \string\def\string\footnotesizerr{\@percentchar^^J%
+ \string\let\string\footnotesizerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\footnotesizerr{\@percentchar^^J%
\@ind\string\@setfontsize\string\footnotesizerr{\f at size}{\f at baselineskip}%
\fs at appsmall%
}\@percentchar%
@@ -1730,7 +1877,8 @@
\endgroup
\begingroup\footnotesizerrr\@listi
\immediate\write\@fontfile{%
- \string\def\string\footnotesizerrr{\@percentchar^^J%
+ \string\let\string\footnotesizerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\footnotesizerrr{\@percentchar^^J%
\@ind\string\@setfontsize\string\footnotesizerrr{\f at size}{\f at baselineskip}%
\fs at appsmall%
}\@percentchar%
@@ -1738,7 +1886,8 @@
\endgroup
\begingroup\normalsizer
\immediate\write\@fontfile{%
- \string\def\string\normalsizer{\@percentchar^^J%
+ \string\let\string\normalsizer\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\normalsizer{\@percentchar^^J%
\@ind\string\@setfontsize\string\normalsizer{\f at size}{\f at baselineskip}%
\fs at appnormal%
}\@percentchar%
@@ -1746,7 +1895,8 @@
\endgroup
\begingroup\normalsizerr
\immediate\write\@fontfile{%
- \string\def\string\normalsizerr{\@percentchar^^J%
+ \string\let\string\normalsizerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\normalsizerr{\@percentchar^^J%
\@ind\string\@setfontsize\string\normalsizerr{\f at size}{\f at baselineskip}%
\fs at appnormal%
}\@percentchar%
@@ -1754,7 +1904,8 @@
\endgroup
\begingroup\normalsizerrr
\immediate\write\@fontfile{%
- \string\def\string\normalsizerrr{\@percentchar^^J%
+ \string\let\string\normalsizerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\normalsizerrr{\@percentchar^^J%
\@ind\string\@setfontsize\string\normalsizerrr{\f at size}{\f at baselineskip}%
\fs at appnormal%
}\@percentchar%
@@ -1762,7 +1913,8 @@
\endgroup
\begingroup\larger
\immediate\write\@fontfile{%
- \string\def\string\larger{%
+ \string\let\string\larger\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\larger{\@percentchar^^J%
\string\@setfontsize\string\larger{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1769,7 +1921,8 @@
\endgroup
\begingroup\largerr
\immediate\write\@fontfile{%
- \string\def\string\largerr{%
+ \string\let\string\largerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\largerr{\@percentchar^^J%
\string\@setfontsize\string\largerr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1776,21 +1929,24 @@
\endgroup
\begingroup\largerrr
\immediate\write\@fontfile{%
- \string\def\string\largerrr{%
+ \string\let\string\largerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\largerrr{\@percentchar^^J%
\string\@setfontsize\string\largerrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
\endgroup
- \begingroup\Large
- \immediate\write\@fontfile{%
- \string\def\string\Large{%
- \string\@setfontsize\string\Large{\f at size}{\f at baselineskip}%
- }\@percentchar%
- }%
- \endgroup
+%\begingroup\Large
+%\immediate\write\@fontfile{%
+% \string\let\string\Large\string\@undefined^^J%
+% \string\DeclareRobustCommand\string\Large{\@percentchar^^J%
+% \string\@setfontsize\string\Large{\f at size}{\f at baselineskip}%
+% }\@percentchar%
+%}%
+%\endgroup
\begingroup\Larger
\immediate\write\@fontfile{%
- \string\def\string\Larger{%
+ \string\let\string\Larger\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Larger{\@percentchar^^J%
\string\@setfontsize\string\Larger{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1797,7 +1953,8 @@
\endgroup
\begingroup\Largerr
\immediate\write\@fontfile{%
- \string\def\string\Largerr{%
+ \string\let\string\Largerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Largerr{\@percentchar^^J%
\string\@setfontsize\string\Largerr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1804,7 +1961,8 @@
\endgroup
\begingroup\Largerrr
\immediate\write\@fontfile{%
- \string\def\string\Largerrr{%
+ \string\let\string\Largerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Largerrr{\@percentchar^^J%
\string\@setfontsize\string\Largerrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1811,7 +1969,8 @@
\endgroup
\begingroup\LARGEr
\immediate\write\@fontfile{%
- \string\def\string\LARGEr{%
+ \string\let\string\LARGEr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\LARGEr{\@percentchar^^J%
\string\@setfontsize\string\LARGEr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1818,7 +1977,8 @@
\endgroup
\begingroup\LARGErr
\immediate\write\@fontfile{%
- \string\def\string\LARGErr{%
+ \string\let\string\LARGErr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\LARGErr{\@percentchar^^J%
\string\@setfontsize\string\LARGErr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1825,7 +1985,8 @@
\endgroup
\begingroup\LARGErrr
\immediate\write\@fontfile{%
- \string\def\string\LARGErrr{%
+ \string\let\string\LARGErrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\LARGErrr{\@percentchar^^J%
\string\@setfontsize\string\LARGErrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1832,7 +1993,8 @@
\endgroup
\begingroup\huger
\immediate\write\@fontfile{%
- \string\def\string\huger{%
+ \string\let\string\huger\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\huger{\@percentchar^^J%
\string\@setfontsize\string\huger{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1839,7 +2001,8 @@
\endgroup
\begingroup\hugerr
\immediate\write\@fontfile{%
- \string\def\string\hugerr{%
+ \string\let\string\hugerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\hugerr{\@percentchar^^J%
\string\@setfontsize\string\hugerr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1846,7 +2009,8 @@
\endgroup
\begingroup\hugerrr
\immediate\write\@fontfile{%
- \string\def\string\hugerrr{%
+ \string\let\string\hugerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\hugerrr{\@percentchar^^J%
\string\@setfontsize\string\hugerrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1853,7 +2017,8 @@
\endgroup
\begingroup\Huger
\immediate\write\@fontfile{%
- \string\def\string\Huger{%
+ \string\let\string\Huger\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Huger{\@percentchar^^J%
\string\@setfontsize\string\Huger{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1860,7 +2025,8 @@
\endgroup
\begingroup\Hugerr
\immediate\write\@fontfile{%
- \string\def\string\Hugerr{%
+ \string\let\string\Hugerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Hugerr{\@percentchar^^J%
\string\@setfontsize\string\Hugerr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1867,7 +2033,8 @@
\endgroup
\begingroup\Hugerrr
\immediate\write\@fontfile{%
- \string\def\string\Hugerrr{%
+ \string\let\string\Hugerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Hugerrr{\@percentchar^^J%
\string\@setfontsize\string\Hugerrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1874,7 +2041,8 @@
\endgroup
\begingroup\HUGE
\immediate\write\@fontfile{%
- \string\def\string\HUGE{%
+ \string\let\string\HUGE\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\HUGE{\@percentchar^^J%
\string\@setfontsize\string\HUGE{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1881,7 +2049,8 @@
\endgroup
\begingroup\HUGEr
\immediate\write\@fontfile{%
- \string\def\string\HUGEr{%
+ \string\let\string\HUGEr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\HUGEr{\@percentchar^^J%
\string\@setfontsize\string\HUGEr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1888,7 +2057,8 @@
\endgroup
\begingroup\HUGErr
\immediate\write\@fontfile{%
- \string\def\string\HUGErr{%
+ \string\let\string\HUGErr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\HUGErr{\@percentchar^^J%
\string\@setfontsize\string\HUGErr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1895,7 +2065,8 @@
\endgroup
\begingroup\HUGErrr
\immediate\write\@fontfile{%
- \string\def\string\HUGErrr{%
+ \string\let\string\HUGErrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\HUGErrr{\@percentchar^^J%
\string\@setfontsize\string\HUGErrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -2105,7 +2276,7 @@
\use:c{##1} % set the font size
\noindent\texttt{\symbol{92}##1}:~ % print the font size command
\__fontsize_round_f:n {size}~on~ % print the size in points
- \__fontsize_round_f:n {baselineskip}.~ % print the baseline skip in points
+ \__fontsize_round_f:n {baselineskip}.~ % print the baseline skip in points
\fs at sampletext % sample text
\par\addvspace{\medskipamount} % finish up
}
@@ -2185,6 +2356,14 @@
version = {3.5.2}
}
+ at manual{relsize,
+ title = {\sty{relsize} – Set the font size relative to the current font size},
+ author = {Donald Arseneau and Matt Swift},
+ url = {https://www.ctan.org/pkg/relsize},
+ urldate = {2021-11-23},
+ date = {2013-03-29},
+ version = {4.1}
+}
%</bib>
% \fi
Modified: trunk/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fontsize/fontsize.sty 2024-12-04 21:14:16 UTC (rev 73037)
+++ trunk/Master/texmf-dist/tex/latex/fontsize/fontsize.sty 2024-12-04 21:31:52 UTC (rev 73038)
@@ -7,7 +7,7 @@
%% fontsize.dtx (with options: `package')
%%
%% The 'fontsize' package
-%% Copyright (C) 2020-2021 Ivan Valbusa
+%% Copyright (C) 2020-2024 Ivan Valbusa
%% <ivan dot valbusa at gmail dot com>
%%
%% All rights reserved.
@@ -26,11 +26,12 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{fontsize}
- [2021/08/04 v0.8.5 'fontsize' package. Set main font sizes (Ivan Valbusa)]
+ [2024/12/04 v0.9 'fontsize' package. Set main font sizes (Ivan Valbusa)]
\@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
-\@ifpackageloaded{xfp}{}{\RequirePackage{xfp}}
+\unless\ifdefined\fpeval\RequirePackage{xfp}\fi
\DeclareOptionX{cloname}[fontsize]{\def\@fontsizefilebase{#1}}
-\DeclareOptionX{parindent}[1.5\@tempdimb]{\def\@fontsizeparindent{#1}}
+\DeclareOptionX{parindent}[\fscalc{1.5\@tempdimb}]{\def\@fontsizeparindent{#1}}
+\DeclareOptionX{fsround}[5]{\def\@fsround{#1}}
\DeclareOptionX{fontsize}[10]{%
\expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil
\edef\@tempa{#1}%
@@ -55,42 +56,47 @@
}%
\noexpand\catcode`\noexpand\@=\the\catcode`\@
}%
- \expandafter\AtEndOfPackage\expandafter{\@tempa}%
+ \@ifundefined{changefontsize}{%
+ \expandafter\AtEndOfPackage\expandafter{\@tempa}%
+ }{%
+ \@tempa
}
-\ExecuteOptionsX{cloname,fontsize,parindent}
+}
+\ExecuteOptionsX{cloname,fontsize,parindent,fsround}
\ProcessOptionsX*\relax
+\NewDocumentCommand{\fscalc}{m}{\fpeval{round(#1,\@fsround)}pt}
\newcommand*\ctm at setlength[4]{%
- \ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
- \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
- \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
- \setlength{#1}{\p@ \@plus\p@ \@minus\p@}%
- \else
- \setlength{#1}{\p@ \@plus\p@ \@minus#4}%
- \fi
- \else
- \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
- \setlength{#1}{\p@ \@plus#3 \@minus\p@}%
- \else
- \setlength{#1}{\p@ \@plus#3 \@minus#4}%
- \fi
- \fi
- \else
- \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
- \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
- \setlength{#1}{#2 \@plus\p@ \@minus\p@}%
- \else
- \setlength{#1}{#2 \@plus\p@ \@minus#4}%
- \fi
- \else
- \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
- \setlength{#1}{#2 \@plus#3 \@minus\p@}%
- \else
- \setlength{#1}{#2 \@plus#3 \@minus#4}%
- \fi
- \fi
- \fi
+ \ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus\p@ \@minus\fscalc{#4}}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus\fscalc{#3} \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus\fscalc{#3} \@minus\fscalc{#4}}%
+ \fi
+ \fi
+ \else
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\fscalc{#2} \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{\fscalc{#2} \@plus\p@ \@minus\fscalc{#4}}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\fscalc{#2} \@plus\fscalc{#3} \@minus\p@}%
+ \else
+ \setlength{#1}{\fscalc{#2} \@plus\fscalc{#3} \@minus\fscalc{#4}}%
+ \fi
+ \fi
+ \fi
}
-\providecommand*{\changefontsize}[2][1.2\@tempdima]{%
+\providecommand*{\changefontsize}[2][\fscalc{1.2*\@tempdima}]{%
\@defaultunits\@tempdima#2pt\relax\@nnil
\setlength{\@tempdimc}{\@tempdima}%
\addtolength{\@tempdimc}{-10\p@}%
@@ -107,7 +113,7 @@
\ctm at setlength{\belowdisplayshortskip}%
{.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \edef\normalsize{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
\abovedisplayskip \the\abovedisplayskip
@@ -116,8 +122,10 @@
\belowdisplayshortskip \the\belowdisplayshortskip
\let\noexpand\@listi\noexpand\@listI
}%
- \setlength{\@tempdima}{0.9125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\normalsize\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\normalsize\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.9125\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\ctm at setlength{\abovedisplayskip}%
{.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
\ctm at setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
@@ -124,7 +132,7 @@
\ctm at setlength{\belowdisplayshortskip}%
{.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \edef\small{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
\abovedisplayskip \the\abovedisplayskip
@@ -133,8 +141,10 @@
\belowdisplayshortskip \the\belowdisplayshortskip
\let\noexpand\@listi\noexpand\@listi at small
}%
- \setlength{\@tempdima}{.83334\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\small\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\small\expandafter{\reserved at a} %
+ \setlength{\@tempdima}{\fscalc{.83334\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\ctm at setlength{\abovedisplayskip}%
{.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
\ctm at setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
@@ -141,7 +151,7 @@
\ctm at setlength{\belowdisplayshortskip}%
{.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \edef\footnotesize{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
\abovedisplayskip \the\abovedisplayskip
@@ -150,48 +160,64 @@
\belowdisplayshortskip \the\belowdisplayshortskip
\let\noexpand\@listi\noexpand\@listi at footnotesize
}%
- \setlength{\@tempdima}{.66667\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsize{%
+ \let\footnotesize\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\footnotesize\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{.66667\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\scriptsize
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{.5\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tiny{%
+ \let\scriptsize\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\scriptsize\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{.5\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\tiny
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.2\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\large{%
+ \let\tiny\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\tiny\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.2\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\large
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.44\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Large{%
+ \let\large\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\large\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.44\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Large
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.728\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGE{%
+ \let\Large\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Large\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.728\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\LARGE
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.074\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
+ \let\LARGE\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\LARGE\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.074\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\huge
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.488\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
+ \let\huge\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\huge\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.488\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Huge
{\the\@tempdima}{\the\@tempdimb}%
}%
+ \let\Huge\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Huge\expandafter{\reserved at a}%
\def\fontsize at pre{%
\ctm at setlength{\abovedisplayskip}%
{.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
@@ -206,237 +232,305 @@
\belowdisplayskip \the\belowdisplayskip%
\belowdisplayshortskip \the\belowdisplayshortskip%
}
- \setlength{\@tempdima}{0.934375\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\fscalc{0.934375\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\smallr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\smallr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listi at small
}%
- \setlength{\@tempdima}{0.95625\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\smallr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\smallr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.95625\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\smallrr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\smallrr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listi at small
}%
- \setlength{\@tempdima}{0.978125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\smallrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\smallrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.978125\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\smallrrr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\smallrrr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listi at small
}%
- \setlength{\@tempdima}{0.85313\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\smallrrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\smallrrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.85313\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\footnotesizer{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\footnotesizer
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listi at footnotesize
}%
- \setlength{\@tempdima}{0.87292\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\footnotesizer\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\footnotesizer\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.87292\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\footnotesizerr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\footnotesizerr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listi at footnotesize
}%
- \setlength{\@tempdima}{0.89271\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \let\footnotesizerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\footnotesizerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.89271\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\footnotesizerrr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\footnotesizerrr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listi at footnotesize
}%
- \setlength{\@tempdima}{0.7083375\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsizer{%
+ \let\footnotesizerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\footnotesizerrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.7083375\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\scriptsizer
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{0.750005\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsizerr{%
+ \let\scriptsizer\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\scriptsizer\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.750005\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\scriptsizerr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{0.7916725\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsizerrr{%
+ \let\scriptsizerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\scriptsizerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.7916725\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\scriptsizerrr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{0.5416675\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tinyr{%
+ \let\scriptsizerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\scriptsizerrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.5416675\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\tinyr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{0.583335\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tinyrr{%
+\let\tinyr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\tinyr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.583335\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\tinyrr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{0.6250025\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tinyrrr{%
+\let\tinyrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\tinyrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{0.6250025\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\tinyrrr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.05\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+\let\tinyrrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\tinyrrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.05\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\normalsizer{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\normalsizer
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listI
}%
- \setlength{\@tempdima}{1.1\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+\let\normalsizer\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\normalsizer\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.1\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\normalsizerr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\normalsizerr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listI
}%
- \setlength{\@tempdima}{1.15\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
+\let\normalsizerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\normalsizerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.15\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
\fontsize at pre
- \edef\normalsizerrr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\normalsizerrr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize at app
\let\noexpand\@listi\noexpand\@listI
}%
- \setlength{\@tempdima}{1.26\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\larger{%
+\let\normalsizerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\normalsizerrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.26\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\larger
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.32\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\largerr{%
+\let\larger\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\larger\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.32\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\largerr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.38\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\largerrr{%
+\let\largerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\largerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.38\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\largerrr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.512\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Larger{%
+\let\largerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\largerrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.512\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Larger
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.584\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Largerr{%
+\let\Larger\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Larger\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.584\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Largerr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.656\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Largerrr{%
+\let\Largerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Largerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.656\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Largerrr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.8145\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGEr{%
+\let\Largerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Largerrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.8145\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\LARGEr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.901\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGErr{%
+\let\LARGEr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\LARGEr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.901\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\LARGErr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{1.9875\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGErrr{%
+\let\LARGErr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\LARGErr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{1.9875\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\LARGErrr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.1775\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huger{%
+\let\LARGErrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\LARGErrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.1775\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\huger
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.281\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\hugerr{%
+\let\huger\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\huger\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.281\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\hugerr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.3845\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\hugerrr{%
+\let\hugerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\hugerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.3845\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\hugerrr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.611\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huger{%
+\let\hugerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\hugerrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.611\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Huger
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.734\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Hugerr{%
+\let\Huger\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Huger\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.734\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Hugerr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{2.857\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Hugerrr{%
+\let\Hugerr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Hugerr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{2.857\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\Hugerrr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{3.006\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\HUGE{%
+\let\Hugerrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Hugerrr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{3.006\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\HUGE
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{3.155\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\HUGEr{%
+\let\HUGE\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\HUGE\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{3.155\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\HUGEr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{3.304\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\HUGErr{%
+\let\HUGEr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\HUGEr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{3.304\@tempdimc}}%
+ \setlength{\@tempdimb}{\fscalc{\@tempb\@tempdima}}%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\HUGErr
{\the\@tempdima}{\the\@tempdimb}%
}%
- \setlength{\@tempdima}{3.453\@tempdimc}%
+\let\HUGErr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\HUGErr\expandafter{\reserved at a}%
+ \setlength{\@tempdima}{\fscalc{3.453\@tempdimc}}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\HUGErrr{%
+ \edef\reserved at a{%
\noexpand\@setfontsize\noexpand\HUGErrr
{\the\@tempdima}{\the\@tempdimb}%
}%
+\let\HUGErrr\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\HUGErrr\expandafter{\reserved at a}%
\normalsize%
\setlength\parindent{\@fontsizeparindent}%
\setlength\smallskipamount{
@@ -605,7 +699,8 @@
\the\year/\ifnum\month<10 0\fi\the\month/\ifnum\day<10 0\fi\the\day%
\space generated font size class option (#2)]}%
\immediate\write\@fontfile{%
- \string\def\string\normalsize{\@percentchar^^J%
+ \string\let\string\normalsize\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\normalsize{\@percentchar^^J%
\@ind\string\@setfontsize\string\normalsize{\f at size}{\f at baselineskip}%
\@percentchar^^J%
\@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
@@ -617,7 +712,8 @@
}%
\begingroup\small\@listi
\immediate\write\@fontfile{%
- \string\def\string\small{\@percentchar^^J%
+ \string\let\string\small\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\small{\@percentchar^^J%
\@ind\string\@setfontsize\string\small{\f at size}{\f at baselineskip}%
\@percentchar^^J%
\@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
@@ -635,7 +731,8 @@
\endgroup
\begingroup\footnotesize\@listi
\immediate\write\@fontfile{%
- \string\def\string\footnotesize{\@percentchar^^J%
+ \string\let\string\footnotesize\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\footnotesize{\@percentchar^^J%
\@ind\string\@setfontsize\string\footnotesize{\f at size}{\f at baselineskip}%
\@percentchar^^J%
\@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
@@ -653,7 +750,8 @@
\endgroup
\begingroup\scriptsize
\immediate\write\@fontfile{%
- \string\def\string\scriptsize{%
+ \string\let\string\scriptsize\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\scriptsize{\@percentchar^^J%
\string\@setfontsize\string\scriptsize{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -660,7 +758,8 @@
\endgroup
\begingroup\tiny
\immediate\write\@fontfile{%
- \string\def\string\tiny{%
+ \string\let\string\tiny\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\tiny{\@percentchar^^J%
\string\@setfontsize\string\tiny{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -667,7 +766,8 @@
\endgroup
\begingroup\large
\immediate\write\@fontfile{%
- \string\def\string\large{%
+ \string\let\string\large\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\large{\@percentchar^^J%
\string\@setfontsize\string\large{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -674,7 +774,8 @@
\endgroup
\begingroup\Large
\immediate\write\@fontfile{%
- \string\def\string\Large{%
+ \string\let\string\Large\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Large{\@percentchar^^J%
\string\@setfontsize\string\Large{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -681,7 +782,8 @@
\endgroup
\begingroup\LARGE
\immediate\write\@fontfile{%
- \string\def\string\LARGE{%
+ \string\let\string\LARGE\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\LARGE{\@percentchar^^J%
\string\@setfontsize\string\LARGE{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -688,7 +790,8 @@
\endgroup
\begingroup\huge
\immediate\write\@fontfile{%
- \string\def\string\huge{%
+ \string\let\string\huge\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\huge{\@percentchar^^J%
\string\@setfontsize\string\huge{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -695,7 +798,8 @@
\endgroup
\begingroup\Huge
\immediate\write\@fontfile{%
- \string\def\string\Huge{%
+ \string\let\string\Huge\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Huge{\@percentchar^^J%
\string\@setfontsize\string\Huge{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -702,7 +806,8 @@
\endgroup
\begingroup\tinyr
\immediate\write\@fontfile{%
- \string\def\string\tinyr{%
+ \string\let\string\tinyr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\tinyr{\@percentchar^^J%
\string\@setfontsize\string\tinyr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -709,7 +814,8 @@
\endgroup
\begingroup\tinyrr
\immediate\write\@fontfile{%
- \string\def\string\tinyrr{%
+ \string\let\string\tinyrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\tinyrr{\@percentchar^^J%
\string\@setfontsize\string\tinyrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -716,7 +822,8 @@
\endgroup
\begingroup\tinyrrr
\immediate\write\@fontfile{%
- \string\def\string\tinyrrr{%
+ \string\let\string\tinyrrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\tinyrrr{\@percentchar^^J%
\string\@setfontsize\string\tinyrrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -723,7 +830,8 @@
\endgroup
\begingroup\scriptsizer
\immediate\write\@fontfile{%
- \string\def\string\scriptsizer{%
+ \string\let\string\scriptsizer\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\scriptsizer{\@percentchar^^J%
\string\@setfontsize\string\scriptsizer{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -730,7 +838,8 @@
\endgroup
\begingroup\scriptsizerr
\immediate\write\@fontfile{%
- \string\def\string\scriptsizerr{%
+ \string\let\string\scriptsizerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\scriptsizerr{\@percentchar^^J%
\string\@setfontsize\string\scriptsizerr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -737,7 +846,8 @@
\endgroup
\begingroup\scriptsizerrr
\immediate\write\@fontfile{%
- \string\def\string\scriptsizerrr{%
+ \string\let\string\scriptsizerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\scriptsizerrr{\@percentchar^^J%
\string\@setfontsize\string\scriptsizerrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -765,7 +875,8 @@
}
\begingroup\smallr\@listi
\immediate\write\@fontfile{%
- \string\def\string\smallr{\@percentchar^^J%
+ \string\let\string\smallr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\smallr{\@percentchar^^J%
\@ind\string\@setfontsize\string\smallr{\f at size}{\f at baselineskip}%
\fs at appsmall%
}\@percentchar%
@@ -773,7 +884,8 @@
\endgroup
\begingroup\smallrr\@listi
\immediate\write\@fontfile{%
- \string\def\string\smallrr{\@percentchar^^J%
+ \string\let\string\smallrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\smallrr{\@percentchar^^J%
\@ind\string\@setfontsize\string\smallrr{\f at size}{\f at baselineskip}%
\fs at appsmall%
}\@percentchar%
@@ -781,7 +893,8 @@
\endgroup
\begingroup\smallrrr\@listi
\immediate\write\@fontfile{%
- \string\def\string\smallrrr{\@percentchar^^J%
+ \string\let\string\smallrrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\smallrrr{\@percentchar^^J%
\@ind\string\@setfontsize\string\smallrrr{\f at size}{\f at baselineskip}%
\fs at appsmall%
}\@percentchar%
@@ -789,7 +902,8 @@
\endgroup
\begingroup\footnotesizer\@listi
\immediate\write\@fontfile{%
- \string\def\string\footnotesizer{\@percentchar^^J%
+ \string\let\string\footnotesizer\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\footnotesizer{\@percentchar^^J%
\@ind\string\@setfontsize\string\footnotesizer{\f at size}{\f at baselineskip}%
\fs at appsmall%
}\@percentchar%
@@ -797,7 +911,8 @@
\endgroup
\begingroup\footnotesizerr\@listi
\immediate\write\@fontfile{%
- \string\def\string\footnotesizerr{\@percentchar^^J%
+ \string\let\string\footnotesizerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\footnotesizerr{\@percentchar^^J%
\@ind\string\@setfontsize\string\footnotesizerr{\f at size}{\f at baselineskip}%
\fs at appsmall%
}\@percentchar%
@@ -805,7 +920,8 @@
\endgroup
\begingroup\footnotesizerrr\@listi
\immediate\write\@fontfile{%
- \string\def\string\footnotesizerrr{\@percentchar^^J%
+ \string\let\string\footnotesizerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\footnotesizerrr{\@percentchar^^J%
\@ind\string\@setfontsize\string\footnotesizerrr{\f at size}{\f at baselineskip}%
\fs at appsmall%
}\@percentchar%
@@ -813,7 +929,8 @@
\endgroup
\begingroup\normalsizer
\immediate\write\@fontfile{%
- \string\def\string\normalsizer{\@percentchar^^J%
+ \string\let\string\normalsizer\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\normalsizer{\@percentchar^^J%
\@ind\string\@setfontsize\string\normalsizer{\f at size}{\f at baselineskip}%
\fs at appnormal%
}\@percentchar%
@@ -821,7 +938,8 @@
\endgroup
\begingroup\normalsizerr
\immediate\write\@fontfile{%
- \string\def\string\normalsizerr{\@percentchar^^J%
+ \string\let\string\normalsizerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\normalsizerr{\@percentchar^^J%
\@ind\string\@setfontsize\string\normalsizerr{\f at size}{\f at baselineskip}%
\fs at appnormal%
}\@percentchar%
@@ -829,7 +947,8 @@
\endgroup
\begingroup\normalsizerrr
\immediate\write\@fontfile{%
- \string\def\string\normalsizerrr{\@percentchar^^J%
+ \string\let\string\normalsizerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\normalsizerrr{\@percentchar^^J%
\@ind\string\@setfontsize\string\normalsizerrr{\f at size}{\f at baselineskip}%
\fs at appnormal%
}\@percentchar%
@@ -837,7 +956,8 @@
\endgroup
\begingroup\larger
\immediate\write\@fontfile{%
- \string\def\string\larger{%
+ \string\let\string\larger\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\larger{\@percentchar^^J%
\string\@setfontsize\string\larger{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -844,7 +964,8 @@
\endgroup
\begingroup\largerr
\immediate\write\@fontfile{%
- \string\def\string\largerr{%
+ \string\let\string\largerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\largerr{\@percentchar^^J%
\string\@setfontsize\string\largerr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -851,21 +972,16 @@
\endgroup
\begingroup\largerrr
\immediate\write\@fontfile{%
- \string\def\string\largerrr{%
+ \string\let\string\largerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\largerrr{\@percentchar^^J%
\string\@setfontsize\string\largerrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
\endgroup
- \begingroup\Large
- \immediate\write\@fontfile{%
- \string\def\string\Large{%
- \string\@setfontsize\string\Large{\f at size}{\f at baselineskip}%
- }\@percentchar%
- }%
- \endgroup
\begingroup\Larger
\immediate\write\@fontfile{%
- \string\def\string\Larger{%
+ \string\let\string\Larger\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Larger{\@percentchar^^J%
\string\@setfontsize\string\Larger{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -872,7 +988,8 @@
\endgroup
\begingroup\Largerr
\immediate\write\@fontfile{%
- \string\def\string\Largerr{%
+ \string\let\string\Largerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Largerr{\@percentchar^^J%
\string\@setfontsize\string\Largerr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -879,7 +996,8 @@
\endgroup
\begingroup\Largerrr
\immediate\write\@fontfile{%
- \string\def\string\Largerrr{%
+ \string\let\string\Largerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Largerrr{\@percentchar^^J%
\string\@setfontsize\string\Largerrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -886,7 +1004,8 @@
\endgroup
\begingroup\LARGEr
\immediate\write\@fontfile{%
- \string\def\string\LARGEr{%
+ \string\let\string\LARGEr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\LARGEr{\@percentchar^^J%
\string\@setfontsize\string\LARGEr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -893,7 +1012,8 @@
\endgroup
\begingroup\LARGErr
\immediate\write\@fontfile{%
- \string\def\string\LARGErr{%
+ \string\let\string\LARGErr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\LARGErr{\@percentchar^^J%
\string\@setfontsize\string\LARGErr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -900,7 +1020,8 @@
\endgroup
\begingroup\LARGErrr
\immediate\write\@fontfile{%
- \string\def\string\LARGErrr{%
+ \string\let\string\LARGErrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\LARGErrr{\@percentchar^^J%
\string\@setfontsize\string\LARGErrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -907,7 +1028,8 @@
\endgroup
\begingroup\huger
\immediate\write\@fontfile{%
- \string\def\string\huger{%
+ \string\let\string\huger\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\huger{\@percentchar^^J%
\string\@setfontsize\string\huger{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -914,7 +1036,8 @@
\endgroup
\begingroup\hugerr
\immediate\write\@fontfile{%
- \string\def\string\hugerr{%
+ \string\let\string\hugerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\hugerr{\@percentchar^^J%
\string\@setfontsize\string\hugerr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -921,7 +1044,8 @@
\endgroup
\begingroup\hugerrr
\immediate\write\@fontfile{%
- \string\def\string\hugerrr{%
+ \string\let\string\hugerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\hugerrr{\@percentchar^^J%
\string\@setfontsize\string\hugerrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -928,7 +1052,8 @@
\endgroup
\begingroup\Huger
\immediate\write\@fontfile{%
- \string\def\string\Huger{%
+ \string\let\string\Huger\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Huger{\@percentchar^^J%
\string\@setfontsize\string\Huger{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -935,7 +1060,8 @@
\endgroup
\begingroup\Hugerr
\immediate\write\@fontfile{%
- \string\def\string\Hugerr{%
+ \string\let\string\Hugerr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Hugerr{\@percentchar^^J%
\string\@setfontsize\string\Hugerr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -942,7 +1068,8 @@
\endgroup
\begingroup\Hugerrr
\immediate\write\@fontfile{%
- \string\def\string\Hugerrr{%
+ \string\let\string\Hugerrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\Hugerrr{\@percentchar^^J%
\string\@setfontsize\string\Hugerrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -949,7 +1076,8 @@
\endgroup
\begingroup\HUGE
\immediate\write\@fontfile{%
- \string\def\string\HUGE{%
+ \string\let\string\HUGE\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\HUGE{\@percentchar^^J%
\string\@setfontsize\string\HUGE{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -956,7 +1084,8 @@
\endgroup
\begingroup\HUGEr
\immediate\write\@fontfile{%
- \string\def\string\HUGEr{%
+ \string\let\string\HUGEr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\HUGEr{\@percentchar^^J%
\string\@setfontsize\string\HUGEr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -963,7 +1092,8 @@
\endgroup
\begingroup\HUGErr
\immediate\write\@fontfile{%
- \string\def\string\HUGErr{%
+ \string\let\string\HUGErr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\HUGErr{\@percentchar^^J%
\string\@setfontsize\string\HUGErr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -970,7 +1100,8 @@
\endgroup
\begingroup\HUGErrr
\immediate\write\@fontfile{%
- \string\def\string\HUGErrr{%
+ \string\let\string\HUGErrr\string\@undefined^^J%
+ \string\DeclareRobustCommand\string\HUGErrr{\@percentchar^^J%
\string\@setfontsize\string\HUGErrr{\f at size}{\f at baselineskip}%
}\@percentchar%
}%
@@ -1160,7 +1291,7 @@
\use:c{##1} % set the font size
\noindent\texttt{\symbol{92}##1}:~ % print the font size command
\__fontsize_round_f:n {size}~on~ % print the size in points
- \__fontsize_round_f:n {baselineskip}.~ % print the baseline skip in points
+ \__fontsize_round_f:n {baselineskip}.~ % print the baseline skip in points
\fs at sampletext % sample text
\par\addvspace{\medskipamount} % finish up
}
More information about the tex-live-commits
mailing list.