summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-02-10 22:04:56 +0000
committerKarl Berry <karl@freefriends.org>2021-02-10 22:04:56 +0000
commit58665a2016e1cccf45a403fef776d82cdce08a3a (patch)
treec4c813d9af3969a46a1a5feb4e78cdeeff0e1023 /Master/texmf-dist/tex/latex/fontsize/fontsize.sty
parent24d32bcde145f8a1a3fd07b2d66909f5d04536fc (diff)
fontsize (10feb21)
git-svn-id: svn://tug.org/texlive/trunk@57703 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fontsize/fontsize.sty')
-rw-r--r--Master/texmf-dist/tex/latex/fontsize/fontsize.sty371
1 files changed, 217 insertions, 154 deletions
diff --git a/Master/texmf-dist/tex/latex/fontsize/fontsize.sty b/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
index e161d7f6049..e23cfbb41eb 100644
--- a/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
+++ b/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
@@ -26,9 +26,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{fontsize}
- [2021/02/06 v0.6 'fontsize' package. Set main font sizes (Ivan Valbusa)]
+ [2021/02/10 v0.7 'fontsize' package. Set main font sizes (Ivan Valbusa)]
\@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
-\@ifpackageloaded{etoolbox}{}{\RequirePackage{etoolbox}}
\DeclareOptionX{cloname}[fontsize]{\def\@fontsizefilebase{#1}}
\DeclareOptionX{fontsize}[10]{%
\expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil
@@ -200,101 +199,101 @@
\setlength{\belowdisplayskip}{\abovedisplayskip}%
}
\def\fontsize@app{%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
+ \abovedisplayskip \the\abovedisplayskip%
+ \abovedisplayshortskip \the\abovedisplayshortskip%
+ \belowdisplayskip \the\belowdisplayskip%
+ \belowdisplayshortskip \the\belowdisplayshortskip%
}
- \setlength{\@tempdima}{0.934375\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \fontsize@pre
- \edef\smallr{%
- \noexpand\@setfontsize\noexpand\smallr
- {\the\@tempdima}{\the\@tempdimb}%
- \fontsize@app
- \let\noexpand\@listi\noexpand\@listi@small
- }%
- \setlength{\@tempdima}{0.95625\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \fontsize@pre
- \edef\smallrr{%
- \noexpand\@setfontsize\noexpand\smallrr
- {\the\@tempdima}{\the\@tempdimb}%
- \fontsize@app
- \let\noexpand\@listi\noexpand\@listi@small
- }%
- \setlength{\@tempdima}{0.978125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \fontsize@pre
- \edef\smallrrr{%
- \noexpand\@setfontsize\noexpand\smallrrr
- {\the\@tempdima}{\the\@tempdimb}%
- \fontsize@app
- \let\noexpand\@listi\noexpand\@listi@small
- }%
- \setlength{\@tempdima}{0.85313\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \fontsize@pre
- \edef\footnotesizer{%
- \noexpand\@setfontsize\noexpand\footnotesizer
- {\the\@tempdima}{\the\@tempdimb}%
- \fontsize@app
- \let\noexpand\@listi\noexpand\@listi@footnotesize
- }%
- \setlength{\@tempdima}{0.87292\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \fontsize@pre
- \edef\footnotesizerr{%
- \noexpand\@setfontsize\noexpand\footnotesizerr
- {\the\@tempdima}{\the\@tempdimb}%
- \fontsize@app
- \let\noexpand\@listi\noexpand\@listi@footnotesize
- }%
- \setlength{\@tempdima}{0.89271\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \fontsize@pre
- \edef\footnotesizerrr{%
- \noexpand\@setfontsize\noexpand\footnotesizerrr
- {\the\@tempdima}{\the\@tempdimb}%
- \fontsize@app
- \let\noexpand\@listi\noexpand\@listi@footnotesize
- }%
- \setlength{\@tempdima}{0.7083375\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsizer{%
- \noexpand\@setfontsize\noexpand\scriptsizer
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{0.750005\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsizerr{%
- \noexpand\@setfontsize\noexpand\scriptsizerr
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{0.7916725\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsizerrr{%
- \noexpand\@setfontsize\noexpand\scriptsizerrr
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{0.5416675\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tinyr{%
- \noexpand\@setfontsize\noexpand\tinyr
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{0.583335\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tinyrr{%
- \noexpand\@setfontsize\noexpand\tinyrr
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{0.6250025\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tinyrrr{%
- \noexpand\@setfontsize\noexpand\tinyrrr
- {\the\@tempdima}{\the\@tempdimb}%
- }%
+ \setlength{\@tempdima}{0.934375\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \fontsize@pre
+ \edef\smallr{%
+ \noexpand\@setfontsize\noexpand\smallr
+ {\the\@tempdima}{\the\@tempdimb}%
+ \fontsize@app
+ \let\noexpand\@listi\noexpand\@listi@small
+ }%
+ \setlength{\@tempdima}{0.95625\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \fontsize@pre
+ \edef\smallrr{%
+ \noexpand\@setfontsize\noexpand\smallrr
+ {\the\@tempdima}{\the\@tempdimb}%
+ \fontsize@app
+ \let\noexpand\@listi\noexpand\@listi@small
+ }%
+ \setlength{\@tempdima}{0.978125\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \fontsize@pre
+ \edef\smallrrr{%
+ \noexpand\@setfontsize\noexpand\smallrrr
+ {\the\@tempdima}{\the\@tempdimb}%
+ \fontsize@app
+ \let\noexpand\@listi\noexpand\@listi@small
+ }%
+ \setlength{\@tempdima}{0.85313\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \fontsize@pre
+ \edef\footnotesizer{%
+ \noexpand\@setfontsize\noexpand\footnotesizer
+ {\the\@tempdima}{\the\@tempdimb}%
+ \fontsize@app
+ \let\noexpand\@listi\noexpand\@listi@footnotesize
+ }%
+ \setlength{\@tempdima}{0.87292\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \fontsize@pre
+ \edef\footnotesizerr{%
+ \noexpand\@setfontsize\noexpand\footnotesizerr
+ {\the\@tempdima}{\the\@tempdimb}%
+ \fontsize@app
+ \let\noexpand\@listi\noexpand\@listi@footnotesize
+ }%
+ \setlength{\@tempdima}{0.89271\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \fontsize@pre
+ \edef\footnotesizerrr{%
+ \noexpand\@setfontsize\noexpand\footnotesizerrr
+ {\the\@tempdima}{\the\@tempdimb}%
+ \fontsize@app
+ \let\noexpand\@listi\noexpand\@listi@footnotesize
+ }%
+ \setlength{\@tempdima}{0.7083375\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\scriptsizer{%
+ \noexpand\@setfontsize\noexpand\scriptsizer
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{0.750005\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\scriptsizerr{%
+ \noexpand\@setfontsize\noexpand\scriptsizerr
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{0.7916725\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\scriptsizerrr{%
+ \noexpand\@setfontsize\noexpand\scriptsizerrr
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{0.5416675\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\tinyr{%
+ \noexpand\@setfontsize\noexpand\tinyr
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{0.583335\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\tinyrr{%
+ \noexpand\@setfontsize\noexpand\tinyrr
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{0.6250025\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\tinyrrr{%
+ \noexpand\@setfontsize\noexpand\tinyrrr
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
\setlength{\@tempdima}{1.05\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
\fontsize@pre
@@ -315,8 +314,8 @@
}%
\setlength{\@tempdima}{1.15\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\normalsizerrr{%
\fontsize@pre
+ \edef\normalsizerrr{%
\noexpand\@setfontsize\noexpand\normalsizerrr
{\the\@tempdima}{\the\@tempdimb}%
\fontsize@app
@@ -412,12 +411,36 @@
\noexpand\@setfontsize\noexpand\Hugerrr
{\the\@tempdima}{\the\@tempdimb}%
}%
+ \setlength{\@tempdima}{3.006\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\HUGE{%
+ \noexpand\@setfontsize\noexpand\HUGE
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{3,155\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\HUGEr{%
+ \noexpand\@setfontsize\noexpand\HUGEr
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{3,304\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\HUGErr{%
+ \noexpand\@setfontsize\noexpand\HUGErr
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{3,453\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\HUGErrr{%
+ \noexpand\@setfontsize\noexpand\HUGErrr
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
\normalsize%
\setlength\parindent{\@tempdimb}%
\setlength\headheight{\dimexpr(\@tempdimb+2pt)}%
-\setlength\smallskipamount{\dimexpr((\@tempdimb+1pt)/4) \@plus 1\p@ \@minus 1\p@}%
-\setlength\medskipamount{\dimexpr((\@tempdimb+1pt)/2) \@plus 2\p@ \@minus 2\p@}%
-\setlength\bigskipamount{\dimexpr(\@tempdimb+1pt) \@plus 4\p@ \@minus 4\p@}%
+\setlength\smallskipamount{\dimexpr(1.1\@tempdimb/4) \@plus 1\p@ \@minus 1\p@}%
+\setlength\medskipamount{\dimexpr(1.1\@tempdimb/2) \@plus 2\p@ \@minus 2\p@}%
+\setlength\bigskipamount{\dimexpr(1.1\@tempdimb) \@plus 4\p@ \@minus 4\p@}%
\setlength{\@tempdimb}{\f@baselineskip}%
\ctm@setlength{\parsep}%
{.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
@@ -737,53 +760,53 @@
\@ind}\@percentchar^^J%
}
\begingroup\smallr\@listi
-\immediate\write\@fontfile{%
- \string\def\string\smallr{\@percentchar^^J%
- \@ind\string\@setfontsize\string\smallr{\f@size}{\f@baselineskip}%
- \fs@appsmall%
- }\@percentchar%
-}%
-\endgroup
-\begingroup\smallrr\@listi
-\immediate\write\@fontfile{%
- \string\def\string\smallrr{\@percentchar^^J%
- \@ind\string\@setfontsize\string\smallrr{\f@size}{\f@baselineskip}%
- \fs@appsmall%
- }\@percentchar%
-}%
-\endgroup
-\begingroup\smallrrr\@listi
-\immediate\write\@fontfile{%
- \string\def\string\smallrrr{\@percentchar^^J%
- \@ind\string\@setfontsize\string\smallrrr{\f@size}{\f@baselineskip}%
- \fs@appsmall%
- }\@percentchar%
-}%
-\endgroup
-\begingroup\footnotesizer\@listi
-\immediate\write\@fontfile{%
- \string\def\string\footnotesizer{\@percentchar^^J%
- \@ind\string\@setfontsize\string\footnotesizer{\f@size}{\f@baselineskip}%
- \fs@appsmall%
- }\@percentchar%
-}%
-\endgroup
-\begingroup\footnotesizerr\@listi
-\immediate\write\@fontfile{%
- \string\def\string\footnotesizerr{\@percentchar^^J%
- \@ind\string\@setfontsize\string\footnotesizerr{\f@size}{\f@baselineskip}%
- \fs@appsmall%
- }\@percentchar%
-}%
-\endgroup
-\begingroup\footnotesizerrr\@listi
-\immediate\write\@fontfile{%
- \string\def\string\footnotesizerrr{\@percentchar^^J%
- \@ind\string\@setfontsize\string\footnotesizerrr{\f@size}{\f@baselineskip}%
- \fs@appsmall%
- }\@percentchar%
-}%
-\endgroup
+ \immediate\write\@fontfile{%
+ \string\def\string\smallr{\@percentchar^^J%
+ \@ind\string\@setfontsize\string\smallr{\f@size}{\f@baselineskip}%
+ \fs@appsmall%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\smallrr\@listi
+ \immediate\write\@fontfile{%
+ \string\def\string\smallrr{\@percentchar^^J%
+ \@ind\string\@setfontsize\string\smallrr{\f@size}{\f@baselineskip}%
+ \fs@appsmall%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\smallrrr\@listi
+ \immediate\write\@fontfile{%
+ \string\def\string\smallrrr{\@percentchar^^J%
+ \@ind\string\@setfontsize\string\smallrrr{\f@size}{\f@baselineskip}%
+ \fs@appsmall%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\footnotesizer\@listi
+ \immediate\write\@fontfile{%
+ \string\def\string\footnotesizer{\@percentchar^^J%
+ \@ind\string\@setfontsize\string\footnotesizer{\f@size}{\f@baselineskip}%
+ \fs@appsmall%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\footnotesizerr\@listi
+ \immediate\write\@fontfile{%
+ \string\def\string\footnotesizerr{\@percentchar^^J%
+ \@ind\string\@setfontsize\string\footnotesizerr{\f@size}{\f@baselineskip}%
+ \fs@appsmall%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\footnotesizerrr\@listi
+ \immediate\write\@fontfile{%
+ \string\def\string\footnotesizerrr{\@percentchar^^J%
+ \@ind\string\@setfontsize\string\footnotesizerrr{\f@size}{\f@baselineskip}%
+ \fs@appsmall%
+ }\@percentchar%
+ }%
+ \endgroup
\begingroup\normalsizer
\immediate\write\@fontfile{%
\string\def\string\normalsizer{\@percentchar^^J%
@@ -920,6 +943,34 @@
}\@percentchar%
}%
\endgroup
+ \begingroup\HUGE
+ \immediate\write\@fontfile{%
+ \string\def\string\HUGE{%
+ \string\@setfontsize\string\HUGE{\f@size}{\f@baselineskip}%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\HUGEr
+ \immediate\write\@fontfile{%
+ \string\def\string\HUGEr{%
+ \string\@setfontsize\string\HUGEr{\f@size}{\f@baselineskip}%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\HUGErr
+ \immediate\write\@fontfile{%
+ \string\def\string\HUGErr{%
+ \string\@setfontsize\string\HUGErr{\f@size}{\f@baselineskip}%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\HUGErrr
+ \immediate\write\@fontfile{%
+ \string\def\string\HUGErrr{%
+ \string\@setfontsize\string\HUGErrr{\f@size}{\f@baselineskip}%
+ }\@percentchar%
+ }%
+\endgroup
\immediate\write\@fontfile{\string\normalsize}%
\begingroup
\immediate\write\@fontfile{%
@@ -1067,6 +1118,16 @@
\immediate\closeout\@fontfile
}
\@onlypreamble\generateclofile
+\def\fontsizelipsum{%
+ As any dedicated reader can clearly see, the Ideal of practical reason is a
+ representation of, as far as I know, the things in themselves; as I have shown
+ elsewhere, the phenomena should only be used as a canon for our understanding.
+ The paralogisms of practical reason are what first give rise to the
+ architectonic of practical reason. As will easily be shown in the
+ next section, reason would thereby be made to contradict, in view of
+ these considerations, the Ideal of practical reason, yet the manifold
+ depends on the phenomena.}
+
\ExplSyntaxOn
\NewDocumentCommand{\printsamples}
@@ -1082,7 +1143,9 @@
Large,Larger,Largerr,Largerrr,
LARGE,LARGEr,LARGErr,LARGErrr,
huge,huger,hugerr,hugerrr,
- Huge,Huger,Hugerr,Hugerrr}
+ Huge,Huger,Hugerr,Hugerrr,
+ HGE,HUGEr,HUGErr,HUGErrr,
+ }
}
{
\fontsize_printsamples:nnn { #1 } { #2 } { #3 }
@@ -1100,16 +1163,16 @@
% set the size
\changefontsize[#1]{#2}\selectfont
% header
- \subsubsection*{Text~samples~for~#2~on~#1}
+ \subsubsection*{Text~samples~for~\symbol{92}normalsize~#2~on~#1}
% map through the desired sizes
\clist_map_inline:nn { #3 }
{
- \use:c{##1} % set the font size
- \noindent\texttt{\symbol{92}##1}:~ % print the font size command
- \__fontsize_round_f:n {size}~ % print the size in points
+ \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
- \kant[1][1-3] % sample text
- \par\addvspace{\medskipamount} % finish up
+ \fontsizelipsum % sample text
+ \par\addvspace{\medskipamount} % finish up
}
% close the group
\group_end: