texlive[57194] Master/texmf-dist: fontsize (21dec20)
commits+karl at tug.org
commits+karl at tug.org
Mon Dec 21 23:13:35 CET 2020
Revision: 57194
http://tug.org/svn/texlive?view=revision&revision=57194
Author: karl
Date: 2020-12-21 23:13:34 +0100 (Mon, 21 Dec 2020)
Log Message:
-----------
fontsize (21dec20)
Modified Paths:
--------------
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
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.bib
Added: trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.bib (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.bib 2020-12-21 22:13:34 UTC (rev 57194)
@@ -0,0 +1,28 @@
+ at manual{xkeyval,
+title = {The \textsf{xkeyval} package},
+subtitle = {Extension of the keyval package},
+author = {Adriaens, Hendri},
+url = {http://www.ctan.org/pkg/xkeyval},
+urldate = {2020-07-05},
+date = {2014-03-12},
+version = {2.7a}
+}
+
+ at manual{etoolbox,
+title = {The \sty{etoolbox} Package. An e-\TeX{} Toolbox
+for Class and Package Authors},
+author = {Philipp Lehman and Joseph Wright},
+url = {http://www.ctan.org/pkg/etoolbox},
+urldate = {2020-07-05},
+date = {2019-09-21},
+version = {2.5h}
+}
+
+ at manual{koma,
+title = {KOMA -- Script. A versatile \LaTeXe{} bundle},
+author = {Frank Neukam and Markus Kohm and Axel Kielhorn},
+url = {http://www.ctan.org/pkg/koma-script},
+urldate = {2020-07-05},
+date = {2020-04-19},
+version = {3.30}
+}
Property changes on: trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
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 2020-12-21 22:13:08 UTC (rev 57193)
+++ trunk/Master/texmf-dist/source/latex/fontsize/fontsize.dtx 2020-12-21 22:13:34 UTC (rev 57194)
@@ -5,7 +5,7 @@
\preamble
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,9 +26,11 @@
\keepsilent
\askforoverwritefalse
-\Msg{*** Generating the package files ***}
+\Msg{*** Generating the package file ***}
\generate{
- \file{fontsize.sty}{\from{fontsize.dtx}{package}}}
+ \file{fontsize.sty}{\from{fontsize.dtx}{package}}
+ \nopreamble\nopostamble
+ \file{fontsize.bib}{\from{fontsize.dtx}{bib}}}
\Msg{***********************************************************}
\Msg{*}
@@ -54,13 +56,14 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{fontsize}
%<*package>
- [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)]
%</package>
%<*driver>
\documentclass[12pt]{ltxdoc}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
-\usepackage[fontsize=12pt]{fontsize}
+\usepackage[fontsize=11.7pt]{fontsize}
+\usepackage{array,booktabs,siunitx}
%--------------------------------------------------------
% GRAPHICS
%--------------------------------------------------------
@@ -108,6 +111,12 @@
heightrounded}
\usepackage{sectsty}
\allsectionsfont{\sffamily}
+% --------------------------------------------------------
+% OTHER PACKAGES
+% --------------------------------------------------------
+\usepackage[autostyle]{csquotes}
+\usepackage[style=philosophy-classic]{biblatex}
+\addbibresource{fontsize.bib}
%--------------------------------------------------------
% COMMANDS AND ENVIRONMENTS
%--------------------------------------------------------
@@ -126,25 +135,14 @@
\newenvironment{ttquote}{%
\begin{mdframed}\ttfamily\microtypesetup{activate=false}}{\end{mdframed}}
\newenvironment{latexcode}{\begin{mdframed}}{\end{mdframed}}
-% Correct (?) \optitem to use \meta inside #2
\makeatletter
-\renewcommand*{\ltd at ol@optitem}[3][]{%
- \ifblank{#1}
- {\ltd at option{}{#2}{#3}{}}
- {\ltd at option{}{#2}{#3}{\ltd at textverb{#1}}}}%
-\renewenvironment*{valuelist}[1][]
-{\list{}{%
- \ifblank{#1}
- {\setlength{\labelwidth}{5em}}
- {\setlength{\labelwidth}{#1}}%
- \setlength{\labelsep}{1em}%
- \setlength{\leftmargin}{\labelwidth}%
- \addtolength{\leftmargin}{\labelsep}%
- \setlength{\itemsep}{0pt}%
- \renewcommand*{\makelabel}[1]{\valuelistfont##1\hss}}}
-{\endlist}
-\newcommand*{\valuelistfont}{%
- \color{olive}\sffamily\displayverbfont}
+% Customizing option and value list:
+\patchcmd{\optionlist}{\marglistwidth}{0pt}{}{}
+\patchcmd{\optionlist}{\hss}{\phantom{\rule{1pt}{20pt}}\hss}{}{}
+\patchcmd{\ltd at option@i}{\linewidth}{\linewidth-\marglistwidth}{}{}
+\patchcmd{\ltxsyntax}{\marglistwidth}{0pt}{}{}
+\patchcmd{\ltd at option@i}{=}{\ = }{}{}
+% New color for items
\renewcommand*{\optionlistfont}{%
\color{philA}\sffamily\displayverbfont}
\renewcommand*{\ltxsyntaxlabelfont}{%
@@ -172,12 +170,6 @@
\sffamily\bfseries#1\par}}
\def\eaddition{%
\emph{\ldots addition ends}]\medskip}
-
-\def\bexcerpt#1{%
- \medskip{[\emph{excerpt from \file{#1} begins}\par\medskip}}
-\def\eexcerpt#1{%
- \emph{\ldots excerpt from \file{#1} ends}]\medskip}
-
% --------------------------------------------------------
% HYPERREF SETUP
% --------------------------------------------------------
@@ -184,7 +176,7 @@
\usepackage{hyperref}
\hypersetup{%
hidelinks,
- pdftitle={User's Guide to \textsf{fontsize}},
+ pdftitle={User's guide to \textsf{fontsize}},
pdfsubject={A small package to change the font size},
pdfauthor={Ivan Valbusa},
pdfkeywords={latex, fonts}}
@@ -201,7 +193,7 @@
%</driver>
% \fi
%
-% \CheckSum{1727}
+% \CheckSum{1774}
%
% \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
@@ -219,6 +211,8 @@
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
+%
+% \changes{v0.3}{2020/12/19}{Added definitions of some lengths omitted from Koma files: \cmd{smallskiamount}, \cmd{medskiamount}, \cmd{bigskiamount}. Redefined \cmd{parindent} and \cmd{headheight}.}
% \changes{v0.2}{2020/05/24}{Updated documentation and code comments.}
% \changes{v0.1}{2020/02/20}{First public release}
% \GetFileInfo{fontsize.dtx}
@@ -294,7 +288,7 @@
%
% \begin{center}
% {\color{philA}\bfseries\sffamily
-% \Huge User's Guide to \texttt{fontsize}\\[3mm]}
+% \huge User's guide to \texttt{fontsize}\\[3mm]}
% {\large\bfseries\sffamily A small package to change the font size}
% \vspace{.8cm}
%
@@ -318,8 +312,8 @@
%^^A---------------------------------------------------------------------
%
% The code is an excerpt of the \sty{scrextend} and
-% \sty{scrfontsizes} packages (see \cite{koma}), with few minor
-% changes to make it completely independent of the Koma bundle and with a couple of new features.
+% \sty{scrfontsizes} packages \parencite{koma}, with few minor
+% changes to make it completely independent of the Koma 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.
%
%^^A---------------------------------------------------------------------
% \section*{Caveat}
@@ -328,8 +322,7 @@
% Although effective with any value for the \meta{fontsize} (as long as the font
% is scalable!), the package is meant for small font size changes.
% For truly optimal results you should (re)define your own \file{.clo} file.
-% Indeed note that the file generated with \cmd{generateclofile}, as well as the macros redefined via \cmd{changefontsize}, are a subset of the standard \file{bk11.clo} file and some lengths such as \cmd{smallskipamount}, \cmd{medskipamount}, \cmd{bigskipamount}, \cmd{headsep} are not defined by the package. Up to now!
-% \enlargethispage{1\baselineskip}
+% Indeed note that the file generated with \cmd{generateclofile}, as well as the macros redefined via \cmd{changefontsize}, are a subset of the standard \file{clo} files.
%^^A---------------------------------------------------------------------
% \section{Usage}
%^^A---------------------------------------------------------------------
@@ -338,6 +331,9 @@
% \begin{ttquote}
% \noindent\cmd{usepackage}\oarg{options}|{fontsize}|
% \end{ttquote}
+%
+%^^A The \sty{geometry} package and the settings to change the page layout
+%^^A must follow \sty{fontsize} to avoid errors in the layout
%
%^^A---------------------------------------------------------------------
% \subsection{Options}
@@ -385,7 +381,7 @@
%
% \cmditem{generateclofile}{name}[baselineskip]{fontsize} \hfill iff \meta{baselineskip} $\geq$\meta{fontsize}
%
-% Generates a file named \file{\meta{name}\meta{fontsize}.clo} in which the normal line spacing is \meta{baselineskip} and the other sizes and line spacings are adjusted consistently. If \opt{cloname=\meta{name}} \textit{and} \opt{fontsize=\meta{fontsize}} the generated file will be automatically use to setup the main font sizes. You can use any unit recognized by TeX and you can omit the unit as well.
+% Generates a file named \file{\meta{name}\meta{fontsize}.clo} in which the normal line spacing is \meta{baselineskip} and the other sizes and line spacings are adjusted consistently. If \opt{cloname=\meta{name}} \textit{and} \opt{fontsize=\meta{fontsize}} the generated file will be automatically used to setup the main font sizes (it requires two runs). You can use any unit recognized by TeX and you can omit the unit as well.
%
% \emph{In fact this file is only needed if you intend to modify it. In this case remember to comment the command, otherwise the edited file will be overwrittern}.\bigskip
%
@@ -441,34 +437,19 @@
% \begin{mdframed}[linecolor=black,backgroundcolor=none]
% \printfontsize[13]{11}
% \end{mdframed}
+% \nocite{xkeyval,etoolbox}
%
-% \begin{thebibliography}{label}
-% \bibitem{koma} Frank Neukam, Markus Kohm, Axel Kielhorn,
-% \textit{KOMA -- Script. A versatile \LaTeXe{} bundle}.
-% \url{https://www.ctan.org/pkg/koma-script}
-% \bibitem{xkeyval} Hendri Adriaens, \textit{The \sty{xkeyval} package},
-% \url{https://www.ctan.org/pkg/xkeyval}.
-% \bibitem{etoolbox} Philipp Lehman, Joseph Wright,
-% \textit{The \sty{etoolbox} Package. An e-\TeX{} Toolbox for Class
-% and Package Authors}, \url{https://www.ctan.org/pkg/etoolbox}.
-% \end{thebibliography}
+% \StopEventually{%
+% \printbibliography[heading=bibintoc]
+% \PrintChanges\PrintIndex}
%
-% \StopEventually{\PrintChanges\PrintIndex}
-%
-%\newgeometry{
-% a4paper,
-% margin=3cm,
-% left=4cm,
-% headheight=15pt,
-% ignoreall,
-% heightrounded}
+% \iffalse
+%<*package>
+% \fi
%^^A---------------------------------------------------------------------
% \section{The Code}
%^^A---------------------------------------------------------------------
%
-% \iffalse
-%<*package>
-% \fi
% The options of the package are defined via \sty{xkeyval}, while \sty{etoolbox}
% is required to execute \cmd{AtEndOfPackage}. It is probably not necessary but for the moment I prefer to take advantage of it.
% \begin{macrocode}
@@ -481,7 +462,7 @@
% \end{macrocode}
% \eaddition
%
-% \bexcerpt{scrextend.sty}
+% \subsection*{Excerpt from \file{scrextend.sty}}
%
% Here the \sty{scrextend} code begins. Only a few names have been changed.
% The value of \cmd{|@|fontsizefilebase} is set to \texttt{custom} instead of \texttt{scrsize}.
@@ -519,7 +500,7 @@
\ProcessOptionsX*\relax
% \end{macrocode}
% \eaddition
-% \begin{macro}{\ctm at setlength}
+%
% The comamnd \cmd{ctm at setlength} is simply a new name for \cmd{scr at setlength} of \file{scrextend}.
% \begin{macrocode}
\newcommand*\ctm at setlength[4]{%
@@ -554,8 +535,6 @@
\fi
}
% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\changefontsize}
% The comamnd \cmd{changefontsize} is simply a new name for \cmd{changefontsizes} of \file{scrextend}.
% \begin{macrocode}
\providecommand*{\changefontsize}[2][1.2\@tempdima]{%
@@ -568,15 +547,6 @@
\edef\@tempb{\the\@tempdimc}%
\setlength{\@tempdimc}{\@tempdima}%
\def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
-% \end{macrocode}
-% \baddition{New lengths}
-% The Koma code does not define \cmd{parindent} and other lengths related to the page dimensions (\cmd{textheight}, \cmd{headheight}, \cmd{headsep}, etc.) Anyway I think that some of these lengths are strictly linked to the font rather than to the page and text dimensions. Particularly \cmd{parindent} and \cmd{headheight} (the value of the last one could cause a well known warning if \sty{fancyhdr} is loaded). The default value of \cmd{parindent} is \cmd{baselineskip} and the value of \cmd{headheight} is set normal size plus 2.5\,pt.
-% \begin{macrocode}
-\setlength\parindent{\the\@tempdimb}
-\setlength\headheight{\dimexpr(\@tempdima+2.5pt)}
-% \end{macrocode}
-% \eaddition
-% \begin{macrocode}
\expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
\ctm at setlength{\abovedisplayskip}%
{.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
@@ -669,7 +639,42 @@
\noexpand\@setfontsize\noexpand\Huge
{\the\@tempdima}{\the\@tempdimb}%
}%
- \normalsize
+ \normalsize%
+% \end{macrocode}
+% \baddition{New lengths}
+% The Koma code does not define \cmd{parindent} and other lengths related to the page dimensions (\cmd{textheight}, \cmd{headheight}, \cmd{headsep}, etc.) Anyway I think that some of these lengths are strictly linked to the font rather than to the page and text dimensions. Particularly \cmd{headheight}, whose value may cause a well known warning if \sty{fancyhdr} is loaded.
+% \begin{macrocode}
+\setlength\parindent{\f at size pt}%
+\setlength\headheight{\dimexpr(\f at size pt+2pt)}%
+% \end{macrocode}
+% In the following lengths, all values are calculated proportionally to the main font. I took the \file{bk11.clo} file as a reference point. Note that the differences of these lengths in the files \file{bk10.clo} \file{bk11.clo} and \file{bk12.clo} only affect \cmd{headsep}, \cmd{topskip} and \cmd{footskip}, which are not redefined here.
+% \begin{macrocode}
+\setlength\smallskipamount{\dimexpr((\f at size pt+1pt)/4) \@plus 1\p@ \@minus 1\p@}%
+\setlength\medskipamount{\dimexpr((\f at size pt+1pt)/2) \@plus 2\p@ \@minus 2\p@}%
+\setlength\bigskipamount{\dimexpr(\f at size pt+1pt) \@plus 4\p@ \@minus 4\p@}%
+% \end{macrocode}
+% The following table shows the values of some specific lengths
+% defined by the pacakge, relative to some significant settings
+% of the main font and line spacing. The values are exressed in pt
+% and rounded to the second decimal place.
+%
+% \begin{small}
+% \newcolumntype{Y}{@{}S[table-column-width=1.04cm]} \begin{tabular}{@{}m{4cm}YYYYYYYYYYY@{}}
+% \toprule
+% Main font size & 10 & 10.1 & 10.2 & 10.3 & 10.4 & 10.5 & 10.6 & 10.7 & 10.8 & 10.9 & 11\\
+% Line spacing & 12 & 12.1 & 12.2 & 12.3 & 12.4 & 12.5 & 12.6 & 12.7 & 12.8 & 12.9 & 11\\
+% \midrule
+% \cmd{headheight} &12 &12.1 &12.2 &12.3 &12.4 &12.5 &12.6 &12.7 &12.8 &12.9 &13\\
+% \cmd{parindent} &10 &10.1 &10.2 &10.3 &10.4 &10.5 &10.6 &10.7 &10.8 &10.9 &11\\
+% \cmd{bigskipamount}\ \hfill$\pm$\SI{4}{pt} &11 &11.1 &11.2 &11.3 &11.4 &11.5 &11.6 &11.7 &11.8 &11.9 &12\\
+% \cmd{medskipamount}\ \hfill$\pm$\SI{2}{pt} &5.5 &5.55 &5.6 &5.65 &5.7 &5.75 &5.8 &5.85 &5.9 &5.95 &6\\
+% \cmd{smallskipamount}\ \hfill$\pm$\SI{1}{pt} &2.75 &2.78 &2.8 &2.82 &2.85 &2.88 &2.9 &2.93 &2.95 &2.98 &3\\
+% \bottomrule
+% \end{tabular}
+% \end{small}
+%
+% \eaddition
+% \begin{macrocode}
\setlength{\@tempdimb}{\f at baselineskip}%
\ctm at setlength{\parsep}%
{.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
@@ -797,13 +802,9 @@
\ctm at setlength{\partopsep}{.2\@tempdimb}{.1\@tempdimb}{.1\@tempdimb}%
}
% \end{macrocode}
-% \end{macro}
%
-% \eexcerpt{scrextend.sty}
+% \subsection*{Excerpt from \file{scrfontsizes.sty}}
%
-% \bexcerpt{scrfontsizes.sty}
-%
-% \begin{macro}{\generateclofile}
% Here is a portion of the \sty{scrfontsizes} package. It simply provides the \cmd{generateclofile} command, without the Koma-related definitions. There are no reserved names for the \file{.clo} files. The command name is a new name for the Koma \cmd{generatefontfile}. In fact, what the command generates, is a \file{.clo} file.
% \begin{macrocode}
\newcommand*{\generateclofile}[1]{%
@@ -813,9 +814,9 @@
\def\@generatefontfile#1[#2]#3{%
\begingroup
% \end{macrocode}
-% Here we use |[#2]| in place of |[{#2}]| of the
-% \sty{scrfontsizes} code.
+% At least starting with version 3.31 of the \sty{scrfontsizes} package the code of the \cmd{@generatefontfile} and \cmd{@@generatefontfile} commands sets the \cmd{parskip} value to |0pt|. We also use \cmd{changefontsize}|[#2]{#3}| in place of \cmd{changefontsize}|[{#2}]{#3}| of the \sty{scrfontsizes} code.
% \begin{macrocode}
+ \setlength{\parskip}{0pt}%
\changefontsize[#2]{#3}%
\generate at fontfile{#1}{#3}%
\endgroup
@@ -822,6 +823,7 @@
}
\newcommand\@@generatefontfile[2]{%
\begingroup
+ \setlength{\parskip}{0pt}%
\changefontsize{#2}%
\generate at fontfile{#1}{#2}%
\endgroup
@@ -834,6 +836,11 @@
\immediate\openout\@fontfile #1#2.clo
\immediate\write\@fontfile{\@percentchar^^J%
\@percentchar\space This is file `#1#2.clo', generated with^^J%
+% \end{macrocode}
+% In the next three lines we only replace `scrfontsizes' with `fontsize'
+% and `Markus Kohm' with `Ivan Valbusa', in order to get the correc informations
+% in the .log file.
+% \begin{macrocode}
\@percentchar\space fontsize
\csname ver at fontsize.\@pkgextension\endcsname,^^J%
\@percentchar\space Copyright (c) Ivan Valbusa.^^J%
@@ -841,17 +848,7 @@
\string\ProvidesFile{#1#2.clo}[%
\the\year/\ifnum\month<10 0\fi\the\month/\ifnum\day<10 0\fi\the\day%
\space generated font size class option (#2)]}%
-% \end{macrocode}
-% \baddition{New lengths in the \file{.clo} file.}
-% \begin{macrocode}
\immediate\write\@fontfile{%
- \string\setlength{\string\parindent}{\f at baselineskip}^^J%
- \string\setlength{\string\headheight}{\dimexpr(\f at size+2.5pt)}^^J%
- }%
-% \end{macrocode}
-% \eaddition
-% \begin{macrocode}
- \immediate\write\@fontfile{%
\string\def\string\normalsize{\@percentchar^^J%
\@ind\string\@setfontsize\string\normalsize{\f at size}{\f at baselineskip}%
\@percentchar^^J%
@@ -948,6 +945,22 @@
}%
\endgroup
\immediate\write\@fontfile{\string\normalsize}%
+% \end{macrocode}
+% \baddition{New lengths in the \file{.clo} file.}
+% The new lengths previously defined are recalled here and written in the .clo file.
+% \begin{macrocode}
+\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
+% \end{macrocode}
+% \eaddition
+% \begin{macrocode}
\immediate\write\@fontfile{%
\string\setlength{\string\footnotesep}{\the\footnotesep}\@percentchar
}%
@@ -1086,10 +1099,7 @@
}
\@onlypreamble\generateclofile
% \end{macrocode}
-% \end{macro}
%
-% \eexcerpt{scrfontsizes.sty}
-%
% \baddition{New commands}
% We will now define some internal commands to test the package functions.
% \begin{macrocode}
@@ -1108,25 +1118,52 @@
\paragraph*{\csname #1\endcsname \texttt{\fsbslash #1}
\textmd{\f at size pt on \the\baselineskip}\\}
\noindent\bgroup\raggedright\csname #1\endcsname\fs at extext\par\egroup}
-% \end{macrocode}
-% \begin{macro}{\printfontsize}
-% \begin{macrocode}
\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}
+}
% \end{macrocode}
% \eaddition
-% \end{macro}
-% \begin{macrocode}
-\endinput
-% \end{macrocode}
% \iffalse
%</package>
% \fi
+%
+% \iffalse
+%<*bib>
+ at manual{xkeyval,
+ title = {The \textsf{xkeyval} package},
+ subtitle = {Extension of the keyval package},
+ author = {Adriaens, Hendri},
+ url = {http://www.ctan.org/pkg/xkeyval},
+ urldate = {2020-07-05},
+ date = {2014-03-12},
+ version = {2.7a}
+}
+
+ at manual{etoolbox,
+ title = {The \sty{etoolbox} Package. An e-\TeX{} Toolbox
+ for Class and Package Authors},
+ author = {Philipp Lehman and Joseph Wright},
+ url = {http://www.ctan.org/pkg/etoolbox},
+ urldate = {2020-07-05},
+ date = {2019-09-21},
+ version = {2.5h}
+}
+
+ at manual{koma,
+ title = {KOMA -- Script. A versatile \LaTeXe{} bundle},
+ author = {Frank Neukam and Markus Kohm and Axel Kielhorn},
+ url = {http://www.ctan.org/pkg/koma-script},
+ urldate = {2020-07-05},
+ date = {2020-04-19},
+ version = {3.30}
+}
+%</bib>
+% \fi
% \Finale
Modified: trunk/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fontsize/fontsize.sty 2020-12-21 22:13:08 UTC (rev 57193)
+++ trunk/Master/texmf-dist/tex/latex/fontsize/fontsize.sty 2020-12-21 22:13:34 UTC (rev 57194)
@@ -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 at 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 at size pt}%
+\setlength\headheight{\dimexpr(\f at size pt+2pt)}%
+\setlength\smallskipamount{\dimexpr((\f at size pt+1pt)/4) \@plus 1\p@ \@minus 1\p@}%
+\setlength\medskipamount{\dimexpr((\f at size pt+1pt)/2) \@plus 2\p@ \@minus 2\p@}%
+\setlength\bigskipamount{\dimexpr(\f at size pt+1pt) \@plus 4\p@ \@minus 4\p@}%
\setlength{\@tempdimb}{\f at baselineskip}%
\ctm at setlength{\parsep}%
{.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
@@ -325,6 +328,7 @@
\newcommand*{\@generatefontfile}{}
\def\@generatefontfile#1[#2]#3{%
\begingroup
+ \setlength{\parskip}{0pt}%
\changefontsize[#2]{#3}%
\generate at fontfile{#1}{#3}%
\endgroup
@@ -331,6 +335,7 @@
}
\newcommand\@@generatefontfile[2]{%
\begingroup
+ \setlength{\parskip}{0pt}%
\changefontsize{#2}%
\generate at 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 at baselineskip}^^J%
- \string\setlength{\string\headheight}{\dimexpr(\f at size+2.5pt)}^^J%
- }%
- \immediate\write\@fontfile{%
\string\def\string\normalsize{\@percentchar^^J%
\@ind\string\@setfontsize\string\normalsize{\f at size}{\f at 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 @@
\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'.
More information about the tex-live-commits
mailing list.