texlive[57523] Master/texmf-dist: fontsize (25jan21)
commits+karl at tug.org
commits+karl at tug.org
Mon Jan 25 23:08:35 CET 2021
Revision: 57523
http://tug.org/svn/texlive?view=revision&revision=57523
Author: karl
Date: 2021-01-25 23:08:34 +0100 (Mon, 25 Jan 2021)
Log Message:
-----------
fontsize (25jan21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/fontsize/README
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/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontsize/README 2021-01-25 22:08:06 UTC (rev 57522)
+++ trunk/Master/texmf-dist/doc/latex/fontsize/README 2021-01-25 22:08:34 UTC (rev 57523)
@@ -51,5 +51,4 @@
where `$' stands for the shell's prompt.
-2020/02/20
Ivan Valbusa
Modified: trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.bib 2021-01-25 22:08:06 UTC (rev 57522)
+++ trunk/Master/texmf-dist/doc/latex/fontsize/fontsize.bib 2021-01-25 22:08:34 UTC (rev 57523)
@@ -1,28 +1,28 @@
@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}
+ 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}
}
@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}
+ 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}
}
@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}
+ 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}
}
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 2021-01-25 22:08:06 UTC (rev 57522)
+++ trunk/Master/texmf-dist/source/latex/fontsize/fontsize.dtx 2021-01-25 22:08:34 UTC (rev 57523)
@@ -5,7 +5,7 @@
\preamble
The 'fontsize' package
-Copyright (C) 2020 Ivan Valbusa
+Copyright (C) 2020-2021 Ivan Valbusa
<ivan dot valbusa at gmail dot com>
All rights reserved.
@@ -28,9 +28,9 @@
\Msg{*** Generating the package file ***}
\generate{
- \file{fontsize.sty}{\from{fontsize.dtx}{package}}
- \nopreamble\nopostamble
- \file{fontsize.bib}{\from{fontsize.dtx}{bib}}}
+ \file{fontsize.sty}{\from{fontsize.dtx}{package}}
+ \nopreamble\nopostamble
+ \file{fontsize.bib}{\from{fontsize.dtx}{bib}}}
\Msg{***********************************************************}
\Msg{*}
@@ -56,13 +56,13 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{fontsize}
%<*package>
- [2020/12/19 v0.3 'fontsize' package. Set main font sizes (Ivan Valbusa)]
+ [2021/01/25 v0.4 'fontsize' package. Set main font sizes (Ivan Valbusa)]
%</package>
%<*driver>
\documentclass[12pt]{ltxdoc}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
-\usepackage[fontsize=11.7pt]{fontsize}
+\usepackage[fontsize=12pt]{fontsize}
\usepackage{array,booktabs,siunitx}
%--------------------------------------------------------
% GRAPHICS
@@ -94,6 +94,7 @@
\usepackage{amsthm}
\usepackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
\usepackage[cal=boondoxo]{mathalfa}
+\usepackage{manfnt}
%--------------------------------------------------------
% LAYOUT
%--------------------------------------------------------
@@ -125,7 +126,7 @@
\DeclareRobustCommand*{\ar}[1]{\texttt{\char`\{}\textrm{\argstyle#1}\texttt{\char`\}}}
\DeclareRobustCommand*{\oar}[1]{\texttt{[}\textrm{\argstyle#1}\texttt{]}}
\DeclareRobustCommand*{\meta}[1]{%
- $\langle${\argstyle\rmfamily#1\kern0.12em}$\rangle$}
+ $\langle${\argstyle\rmfamily#1\kern0.12em}$\rangle$}
\DeclareRobustCommand*{\arm}[1]{\ar{\meta{\argstyle#1}}}
\DeclareRobustCommand*{\oarm}[1]{\oar{\meta{\argstyle#1}}}
\newcommand*{\OR}{${}\mid{}$}
@@ -133,7 +134,7 @@
% New environments
%
\newenvironment{ttquote}{%
- \begin{mdframed}\ttfamily\microtypesetup{activate=false}}{\end{mdframed}}
+ \begin{mdframed}\ttfamily\microtypesetup{activate=false}}{\end{mdframed}}
\newenvironment{latexcode}{\begin{mdframed}}{\end{mdframed}}
\makeatletter
% Customizing option and value list:
@@ -144,42 +145,39 @@
\patchcmd{\ltd at option@i}{=}{\ = }{}{}
% New color for items
\renewcommand*{\optionlistfont}{%
- \color{philA}\sffamily\displayverbfont}
+ \color{philA}\sffamily\displayverbfont}
\renewcommand*{\ltxsyntaxlabelfont}{%
- \color{philA}\sffamily\displayverbfont}
+ \color{philA}\sffamily\displayverbfont}
\renewcommand*{\marglistfont}{%
- \color{philA}\sffamily\displayverbfont}
+ \color{philA}\sffamily\displayverbfont}
%
% Table of contents
%
\renewcommand\tableofcontents{%
- \setlength{\columnsep}{1cm}
- {\centering
- \section*{\contentsname}%
- \@mkboth{\contentsname}{\contentsname}}
- \thispagestyle{empty}
- \begin{multicols}{2}
- \@starttoc{toc}%
+ \setlength{\columnsep}{1cm}
+ {\centering
+ \section*{\contentsname}%
+ \@mkboth{\contentsname}{\contentsname}}
+ \thispagestyle{empty}
+ \begin{multicols}{2}
+ \@starttoc{toc}%
\end{multicols}}
\makeatother
%
% Commands for code
%
-\def\baddition#1{%
- \medskip{[\emph{addition begins\ldots}\par\medskip
- \sffamily\bfseries#1\par}}
-\def\eaddition{%
- \emph{\ldots addition ends}]\medskip}
+\def\baddition{\color{DarkBlue}}
+\def\eaddition{\color{black}}
% --------------------------------------------------------
% HYPERREF SETUP
% --------------------------------------------------------
\usepackage{hyperref}
\hypersetup{%
- hidelinks,
- pdftitle={User's guide to \textsf{fontsize}},
- pdfsubject={A small package to change the font size},
- pdfauthor={Ivan Valbusa},
- pdfkeywords={latex, fonts}}
+ hidelinks,
+ pdftitle={User's guide to \textsf{fontsize}},
+ pdfsubject={A small package to change the font size},
+ pdfauthor={Ivan Valbusa},
+ pdfkeywords={latex, fonts}}
% --------------------------------------------------------
% FINAL SETTINGS
% --------------------------------------------------------
@@ -193,7 +191,7 @@
%</driver>
% \fi
%
-% \CheckSum{1774}
+% \CheckSum{1731}
%
% \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
@@ -212,7 +210,8 @@
% 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.4}{2021/01/25}{Maintenance release. Updated documentation.}
+% \changes{v0.3}{2020/12/19}{Added definitions of some lengths omitted from KOMA-script 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}
@@ -313,7 +312,7 @@
%
% The code is an excerpt of the \sty{scrextend} and
% \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.
+% 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.
%
%^^A---------------------------------------------------------------------
% \section*{Caveat}
@@ -320,13 +319,14 @@
%^^A---------------------------------------------------------------------
%
% 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.
+% 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{clo} files.
+% 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---------------------------------------------------------------------
-%
+% \enlargethispage{\baselineskip}
+%
% The package can be loaded, as usual, with:
% \begin{ttquote}
% \noindent\cmd{usepackage}\oarg{options}|{fontsize}|
@@ -341,22 +341,21 @@
%
% \begin{optionlist}
%
-% \optitem[10pt\OR10]{fontsize}{\meta{fontsize}}
+% \optitem[10pt]{fontsize}{\meta{fontsize}}
%
-% The \meta{fontsize} can be given in any unit recognized
-% by TeX (for example: \opt{6mm}, \opt{1ex}, \opt{11.5pt}).
-% If the unit is not declared it defaults to \texttt{pt}.
-% If a file named \file{custom\meta{fontsize}.clo} exists it is used to setup
-% the font sizes. To generate this file see the \cmd{generateclofile}
-% command below.
+% Sets the normal size to \meta{fontsize} and the normal line spacing
+% to 1.2\meta{fontsize}. The other sizes (\cmd{tiny}, \cmd{scriptsize},
+% \cmd{small}, ecc.) and line spacings are set proportionally.
+% You can use any unit recognized by \TeX\ and you can
+% omit the unit as well (in which case it defaults to \texttt{pt}).
+% If a file named \file{\meta{name}\meta{fontsize}.clo} exists it is used to setup
+% the font sizes. This file can be generated through the \cmd{generateclofile}
+% command (see below).
%
% \optitem[custom]{cloname}{\meta{name}}
%
-% Sets to \meta{name} the name prefix of the \file{.clo} file to be used to
-% setup the font sizes. In this way, if a file named
-% \file{\meta{name}\meta{fontsize}.clo} exists it is used to setup the
-% font sizes. To generate this file see the \cmd{generateclofile}
-% command below.
+% Sets to \meta{name} the name prefix of the \file{.clo} file generated
+% by the \cmd{generateclofile} command (see below).
%
% \end{optionlist}
%
@@ -368,75 +367,58 @@
%
% \cmditem{changefontsize}[baselineskip]{fontsize} \hfill iff \meta{baselineskip} $\geq$\meta{fontsize}
%
-% Changes the font size and the line spacing of the normal size and of the other sizes consistently. If the first optional argument is omitted the command has the same effect of the \opt{fontsize} option. You can use any unit recognized by TeX and you can omit the unit as well. For example:
-% \begin{verbatim}
-% \changefontsize[13.5pt]{11.5pt}
-% \changefontsize[13]{11}
-% \end{verbatim}
+% Sets the normal size to \meta{fontsize} and the normal line spacing to
+% \meta{baselineskip}. The other sizes (\cmd{tiny}, \cmd{scriptsize},
+% \cmd{small}, ecc.) and line spacings are set proportionally.
+% If the first optional argument is omitted the command has the same effect
+% of the \opt{fontsize} option. You can use any unit recognized by \TeX\ and
+% you can omit the unit as well (in which case it defaults to \texttt{pt}).
+% For example: \verb|\changefontsize[13.5pt]{11.5pt}|.
%
-% \cmditem{printfontsize}[baselineskip]{fontsize} \hfill iff \meta{baselineskip} $\geq$\meta{fontsize}
-%
-% A command thought to test the \sty{fontsize} settings. It prints a section with the
-% value of the font size and line spacing for all the font size changing commands. The section \ref{sec:example} below is generated by this command.
-%
% \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 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.
+% Generates a file named \file{\meta{name}\meta{fontsize}.clo} in which the
+% normal size is \meta{fontsize} and the normal line spacing is \meta{baselineskip}.
+% The other sizes (\cmd{tiny}, \cmd{scriptsize},
+% \cmd{small}, ecc.) and line spacings are set proportionally.
+% You can use any unit recognized
+% by \TeX\ and you can omit the unit as well (in which case it defaults
+% to \texttt{pt}).
+% If \opt{cloname=\meta{name}} \textit{and} \opt{fontsize=\meta{fontsize}}
+% the generated file will be automatically used to setup the main font sizes.
%
-% \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
+% \begin{tabular}{@{}m{0.05\textwidth}@{}m{0.95\textwidth}@{}}
+% \raisebox{1.475\height}{\dbend} &
+% \emph{In fact the \file{.clo} 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}
+% \end{tabular}
%
-% \iffalse
-%<*example>
-% \fi
+% \begin{ttquote}\small
+% \cmd{usepackage}|[fontsize=11.5pt]{fontsize}| |% loads custom11.5pt.clo|\\
+% \cmd{generateclofile}|{custom}[13.5pt]{11.5pt}| |% generates custom11.5pt.clo|
+%
+% \cmd{usepackage}|[fontsize=11.5pt,cloname=fs]{fontsize}| |% loads fs11.5pt.clo| \\
+% \cmd{generateclofile}|{fs}[13.5pt]{11.5pt}| |% generates fs11.5pt.clo|
+% \end{ttquote}
%
-% \noindent (a) Using the the default \file{custom} name:\smallskip
+% \cmditem{printfontsize}[baselineskip]{fontsize} \hfill iff \meta{baselineskip} $\geq$\meta{fontsize}
%
-% \lstset{xleftmargin=.5cm,numbers=left,
-% numberblanklines=false,escapeinside=||,numberstyle=\scriptsize}
-\begin{ttquote}
- \begin{lstlisting}
- \usepackage[fontsize=11.5]{fontsize} % |\textrm{loads}| custom11.5.clo
- \generateclofile{custom}[13.5]{11.5} % |\textrm{generates}| custom11.5.clo
-\end{lstlisting}
-\begin{lstlisting}
- \usepackage[fontsize=11.5pt]{fontsize} % |\textrm{loads}| custom11.5pt.clo
- \generateclofile{custom}[13.5pt]{11.5pt} % |\textrm{generates}| custom11.5pt.clo
- \end{lstlisting}
-\end{ttquote}
+% A command thought to test the \sty{fontsize} settings.
+% It prints a text sample for every sizing commands, showing the
+% value of the normal size and line spacing.
+% The section \ref{sec:example} below is generated by this command.
%
-% \iffalse
-%</example>
-% \fi
-%
-% \iffalse
-%<*example>
-% \fi
-%
-% \noindent (b) Using the \opt{cloname} option:\smallskip
-%
-\begin{ttquote}
-\begin{lstlisting}
-\usepackage[fontsize=11.5,cloname=fs]{fontsize} % |\textrm{loads}| fs11.5.clo
- \generateclofile{fs}[13.5]{11.5} % |\textrm{generates}| fs11.5.clo
-\end{lstlisting}
-\begin{lstlisting}
-\usepackage[fontsize=11.5pt,cloname=fs]{fontsize}% |\textrm{loads}| fs11.5pt.clo
- \generateclofile{fs}[13.5pt]{11.5pt} % |\textrm{generates}| fs11.5pt.clo
-\end{lstlisting}
-\end{ttquote}
-% \iffalse
-%</example>
-% \fi
-%
% \end{ltxsyntax}
%
%^^A---------------------------------------------------------------------
% \section{An example of font settings}\label{sec:example}
%^^A--------------------------------------------------------------------
-% The following framed example is generated by \cmd{printfontsize}\texttt{[13]\{11\}}.
-% \begin{mdframed}[linecolor=black,backgroundcolor=none]
+%
+% This section shows the values of the standard font sizing commands corresponding to \cmd{changefontsize}\texttt{[13]\{11\}}, which sets the normal size and line spacing, respectively, to 11\,pt and 13\,pt. The other sizes are scaled proportionally.
+%
% \printfontsize[13]{11}
-% \end{mdframed}
+%
% \nocite{xkeyval,etoolbox}
%
% \StopEventually{%
@@ -449,20 +431,24 @@
%^^A---------------------------------------------------------------------
% \section{The Code}
%^^A---------------------------------------------------------------------
+%\textcolor{DarkBlue}{The parts added to the basic structure of \file{scrextend} and \file{scrfontsizes} are highlighted in blue.}
+% All 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.
%
-% 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.
+% \baddition
% \begin{macrocode}
\@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
\@ifpackageloaded{etoolbox}{}{\RequirePackage{etoolbox}}
% \end{macrocode}
-% \baddition{New options}
+% \eaddition
+% Here we define the only new package option \opt{cloname}:
+% \baddition
% \begin{macrocode}
\DeclareOptionX{cloname}[custom]{\def\@fontsizefilebase{#1}}
% \end{macrocode}
% \eaddition
%
-% \subsection*{Excerpt from \file{scrextend.sty}}
+% \paragraph{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}.
@@ -493,15 +479,14 @@
\expandafter\AtEndOfPackage\expandafter{\@tempa}%
}
% \end{macrocode}
-% \baddition{Execute and process options}
-% Now we can execute and process the options. As \opt{cloname} is responsible for defining \cmd{|@|fontsizefilebase} it must precede \opt{fontsize} which uses this command.
+% Now we can execute and process the new options defined above. As \opt{cloname} is responsible for defining \cmd{|@|fontsizefilebase} it must precede \opt{fontsize} which uses this command.
+% The \cmd{ctm at setlength} and \cmd{changefontsize} commands are simply new names, respectively, for \cmd{scr at setlength} and \cmd{changefontsizes} used in \file{scrextend.sty}.
+% \baddition
% \begin{macrocode}
\ExecuteOptionsX{cloname,fontsize}
\ProcessOptionsX*\relax
% \end{macrocode}
% \eaddition
-%
-% 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]{%
\ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
@@ -534,9 +519,6 @@
\fi
\fi
}
-% \end{macrocode}
-% The comamnd \cmd{changefontsize} is simply a new name for \cmd{changefontsizes} of \file{scrextend}.
-% \begin{macrocode}
\providecommand*{\changefontsize}[2][1.2\@tempdima]{%
\@defaultunits\@tempdima#2pt\relax\@nnil
\setlength{\@tempdimc}{\@tempdima}%
@@ -641,39 +623,41 @@
}%
\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.
+% The KOMA files do 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. So we definte the following new
+% lengths:
+% \baddition
% \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.
+% \eaddition
+% For these other 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.
+% \baddition
% \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}
+% \eaddition
% 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@{}}
+% \newcolumntype{Y}{@{}S[table-column-width=1.04cm]}
+% \noindent\begin{tabular}{@{}m{3.7cm}@{\hskip2mm}YYYYYYYYYYY@{\hskip-2mm}}
% \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
+% Normal 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.12 &12.24 &12.36 &12.48 &12.6 &12.72 &12.84 &12.96 &13.08 &13.2\\\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\\
+% \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}%
@@ -803,9 +787,9 @@
}
% \end{macrocode}
%
-% \subsection*{Excerpt from \file{scrfontsizes.sty}}
+% \paragraph{Excerpt from \file{scrfontsizes.sty}}
%
-% 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.
+% 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]{%
\kernel at ifnextchar [{\@generatefontfile{#1}}{\@@generatefontfile{#1}}%
@@ -814,7 +798,11 @@
\def\@generatefontfile#1[#2]#3{%
\begingroup
% \end{macrocode}
-% 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.
+% 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 |[#2]|
+% in place of |[{#2}]| for the optional argument of \cmd{changefontsize}
+% used immediately below.
% \begin{macrocode}
\setlength{\parskip}{0pt}%
\changefontsize[#2]{#3}%
@@ -946,16 +934,17 @@
\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.
+% The new lengths previously defined are recalled here and written in the .clo file
+% if the \cmd{generateclofile} command is used.
+% \baddition
% \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%
+ \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}
@@ -1099,35 +1088,30 @@
}
\@onlypreamble\generateclofile
% \end{macrocode}
-%
-% \baddition{New commands}
% We will now define some internal commands to test the package functions.
+% \baddition
% \begin{macrocode}
-\def\fs at extext{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.}
+\def\fontsize at lipsum{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 be shown, reason would
+ thereby be made to contradict.}
\chardef\fsbslash=`\\
-\newcommand{\mysize}[1]{%
- \bgroup\noindent\csname#1\endcsname
- The \texttt{\fsbslash #1} size is: \textbf{\csname#1\endcsname\f at size\,pt}.\\
- The \texttt{\fsbslash baselineskip} is \the\baselineskip\par\vskip2mm\egroup}
-\newcommand{\mysizeex}[1]{%
- \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}
+% Thanks to @Werner (https://tex.stackexchange.com/a/87423/231952)
+\newcommand{\sizesamples}[1]{%
+ \def\nextitem{\par}% Separator
+ \renewcommand*{\do}[1]{\nextitem\bgroup\csname##1\endcsname
+ \noindent\textbf{\csname ##1\endcsname \texttt{\fsbslash ##1}:
+ \f at size pt on \the\baselineskip} \fontsize at lipsum\par\egroup
+ }% How to process each item
+ \docsvlist{#1}% Process list
+}
\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}
- \mysizeex{tiny}\mysizeex{scriptsize}\mysizeex{footnotesize}
- \mysizeex{small}\mysizeex{normalsize}\mysizeex{large}\mysizeex{Large}
- \mysizeex{LARGE}\mysizeex{huge}\mysizeex{Huge}
-}
+ \changefontsize[#1]{#2}
+ \sizesamples{tiny,scriptsize,footnotesize,small,
+ normalsize,large,Large,LARGE,huge,Huge}}
% \end{macrocode}
% \eaddition
% \iffalse
@@ -1137,32 +1121,32 @@
% \iffalse
%<*bib>
@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}
+ 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}
}
@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}
+ 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}
}
@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}
+ 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
Modified: trunk/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fontsize/fontsize.sty 2021-01-25 22:08:06 UTC (rev 57522)
+++ trunk/Master/texmf-dist/tex/latex/fontsize/fontsize.sty 2021-01-25 22:08:34 UTC (rev 57523)
@@ -7,7 +7,7 @@
%% fontsize.dtx (with options: `package')
%%
%% The 'fontsize' package
-%% Copyright (C) 2020 Ivan Valbusa
+%% Copyright (C) 2020-2021 Ivan Valbusa
%% <ivan dot valbusa at gmail dot com>
%%
%% All rights reserved.
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{fontsize}
- [2020/12/19 v0.3 'fontsize' package. Set main font sizes (Ivan Valbusa)]
+ [2021/01/25 v0.4 'fontsize' package. Set main font sizes (Ivan Valbusa)]
\@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
\@ifpackageloaded{etoolbox}{}{\RequirePackage{etoolbox}}
\DeclareOptionX{cloname}[custom]{\def\@fontsizefilebase{#1}}
@@ -454,11 +454,11 @@
\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%
+ \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{%
@@ -598,31 +598,26 @@
\immediate\closeout\@fontfile
}
\@onlypreamble\generateclofile
-\def\fs at extext{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.}
+\def\fontsize at lipsum{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 be shown, reason would
+ thereby be made to contradict.}
\chardef\fsbslash=`\\
-\newcommand{\mysize}[1]{%
- \bgroup\noindent\csname#1\endcsname
- The \texttt{\fsbslash #1} size is: \textbf{\csname#1\endcsname\f at size\,pt}.\\
- The \texttt{\fsbslash baselineskip} is \the\baselineskip\par\vskip2mm\egroup}
-\newcommand{\mysizeex}[1]{%
- \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}
+\newcommand{\sizesamples}[1]{%
+ \def\nextitem{\par}% Separator
+ \renewcommand*{\do}[1]{\nextitem\bgroup\csname##1\endcsname
+ \noindent\textbf{\csname ##1\endcsname \texttt{\fsbslash ##1}:
+ \f at size pt on \the\baselineskip} \fontsize at lipsum\par\egroup
+ }% How to process each item
+ \docsvlist{#1}% Process list
+}
\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}
- \mysizeex{tiny}\mysizeex{scriptsize}\mysizeex{footnotesize}
- \mysizeex{small}\mysizeex{normalsize}\mysizeex{large}\mysizeex{Large}
- \mysizeex{LARGE}\mysizeex{huge}\mysizeex{Huge}
-}
+ \changefontsize[#1]{#2}
+ \sizesamples{tiny,scriptsize,footnotesize,small,
+ normalsize,large,Large,LARGE,huge,Huge}}
\endinput
%%
%% End of file `fontsize.sty'.
More information about the tex-live-commits
mailing list.