summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-12-21 22:13:34 +0000
committerKarl Berry <karl@freefriends.org>2020-12-21 22:13:34 +0000
commit2feb3ea7213bfb38a1b508a11c899cf8b01cb053 (patch)
treefe21c59be2416e4d840f63fe3973228fbaafd87a /Master/texmf-dist/tex/latex/fontsize/fontsize.sty
parente736371fc31f8453f31c26d884a13d783dc66077 (diff)
fontsize (21dec20)
git-svn-id: svn://tug.org/texlive/trunk@57194 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.sty39
1 files changed, 25 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/fontsize/fontsize.sty b/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
index 50fdc64eb39..50067a6de44 100644
--- a/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
+++ b/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
@@ -7,7 +7,7 @@
%% fontsize.dtx (with options: `package')
%%
%% The 'fontsize' package
-%% Copyright (C) 2009-2020 Ivan Valbusa
+%% Copyright (C) 2020 Ivan Valbusa
%% <ivan dot valbusa at gmail dot com>
%%
%% All rights reserved.
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{fontsize}
- [2020/05/24 v0.2 'fontsize' package. Set main font sizes (Ivan Valbusa)]
+ [2020/12/19 v0.3 'fontsize' package. Set main font sizes (Ivan Valbusa)]
\@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
\@ifpackageloaded{etoolbox}{}{\RequirePackage{etoolbox}}
\DeclareOptionX{cloname}[custom]{\def\@fontsizefilebase{#1}}
@@ -98,8 +98,6 @@
\edef\@tempb{\the\@tempdimc}%
\setlength{\@tempdimc}{\@tempdima}%
\def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
-\setlength\parindent{\the\@tempdimb}
-\setlength\headheight{\dimexpr(\@tempdima+2.5pt)}
\expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
\ctm@setlength{\abovedisplayskip}%
{.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
@@ -192,7 +190,12 @@
\noexpand\@setfontsize\noexpand\Huge
{\the\@tempdima}{\the\@tempdimb}%
}%
- \normalsize
+ \normalsize%
+\setlength\parindent{\f@size pt}%
+\setlength\headheight{\dimexpr(\f@size pt+2pt)}%
+\setlength\smallskipamount{\dimexpr((\f@size pt+1pt)/4) \@plus 1\p@ \@minus 1\p@}%
+\setlength\medskipamount{\dimexpr((\f@size pt+1pt)/2) \@plus 2\p@ \@minus 2\p@}%
+\setlength\bigskipamount{\dimexpr(\f@size pt+1pt) \@plus 4\p@ \@minus 4\p@}%
\setlength{\@tempdimb}{\f@baselineskip}%
\ctm@setlength{\parsep}%
{.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
@@ -325,12 +328,14 @@
\newcommand*{\@generatefontfile}{}
\def\@generatefontfile#1[#2]#3{%
\begingroup
+ \setlength{\parskip}{0pt}%
\changefontsize[#2]{#3}%
\generate@fontfile{#1}{#3}%
\endgroup
}
\newcommand\@@generatefontfile[2]{%
\begingroup
+ \setlength{\parskip}{0pt}%
\changefontsize{#2}%
\generate@fontfile{#1}{#2}%
\endgroup
@@ -351,10 +356,6 @@
\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\setlength{\string\parindent}{\f@baselineskip}^^J%
- \string\setlength{\string\headheight}{\dimexpr(\f@size+2.5pt)}^^J%
- }%
- \immediate\write\@fontfile{%
\string\def\string\normalsize{\@percentchar^^J%
\@ind\string\@setfontsize\string\normalsize{\f@size}{\f@baselineskip}%
\@percentchar^^J%
@@ -451,6 +452,15 @@
}%
\endgroup
\immediate\write\@fontfile{\string\normalsize}%
+\begingroup
+\immediate\write\@fontfile{%
+\string\setlength{\string\parindent}{\the\parindent}^^J%
+\string\setlength{\string\headheight}{\the\headheight}^^J%
+\string\setlength{\string\smallskipamount}{\the\smallskipamount}^^J%
+\string\setlength{\string\medskipamount}{\the\medskipamount}^^J%
+\string\setlength{\string\bigskipamount}{\the\bigskipamount}^^J%
+}%
+\endgroup
\immediate\write\@fontfile{%
\string\setlength{\string\footnotesep}{\the\footnotesep}\@percentchar
}%
@@ -606,12 +616,13 @@ practical reason.}
\newcommand{\printfontsize}[2][]{%
\section*{Settings with \texttt{\fsbslash changefontsize[#1]\{#2\}}}%
\changefontsize[#1]{#2}
- \mysize{tiny}\mysize{scriptsize}\mysize{footnotesize}
- \mysize{small}\mysize{normalsize}\mysize{large}\mysize{Large}
- \mysize{LARGE}\mysize{huge}\mysize{Huge}
+ \mysize{tiny}\mysize{scriptsize}\mysize{footnotesize}\mysize{small}
+ \mysize{normalsize}\mysize{large}\mysize{Large}\mysize{LARGE}
+ \mysize{huge}\mysize{Huge}
\mysizeex{tiny}\mysizeex{scriptsize}\mysizeex{footnotesize}
- \mysizeex{small}\mysizeex{normalsize}\mysizeex{large}
- \mysizeex{Large}\mysizeex{LARGE}\mysizeex{huge}\mysizeex{Huge}}
+ \mysizeex{small}\mysizeex{normalsize}\mysizeex{large}\mysizeex{Large}
+ \mysizeex{LARGE}\mysizeex{huge}\mysizeex{Huge}
+}
\endinput
%%
%% End of file `fontsize.sty'.