fontsize (4mar21)

git-svn-id: svn://tug.org/texlive/trunk@58122 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 106 insertions, 31 deletions

diff --git a/Master/texmf-dist/doc/latex/fontsize/fontsize.bib b/Master/texmf-dist/doc/latex/fontsize/fontsize.bib
index 276e38af2f0..1200785e5fb 100644
--- a/Master/texmf-dist/doc/latex/fontsize/fontsize.bib
+++ b/Master/texmf-dist/doc/latex/fontsize/fontsize.bib
@@ -26,3 +26,21 @@
   date = {2020-04-19},
   version = {3.30}
 }
+
+@manual{lm,
+ title = {The Latin Modern (LM) Family of Fonts},
+ author = {B. Jackowski and J.M. Nowacki},
+ url = {http://www.ctan.org/pkg/lm},
+ urldate = {2021-03-04},
+ date = {2009-10-30},
+ version = {2.004}
+}
+
+@manual{cochineal,
+ title = {The Cochineal Font Package},
+ author = {Michael Sharpe},
+ url = {http://www.ctan.org/pkg/cochineal},
+ urldate = {2021-03-04},
+ date = {2020-12-19},
+ version = {1.065 }
+}
diff --git a/Master/texmf-dist/doc/latex/fontsize/fontsize.pdf b/Master/texmf-dist/doc/latex/fontsize/fontsize.pdf
index e869a963f4a..5642de57f85 100644
--- a/Master/texmf-dist/doc/latex/fontsize/fontsize.pdf
+++ b/Master/texmf-dist/doc/latex/fontsize/fontsize.pdf
diff --git a/Master/texmf-dist/source/latex/fontsize/fontsize.dtx b/Master/texmf-dist/source/latex/fontsize/fontsize.dtx
index b13a571f555..a7a75d6db68 100644
--- a/Master/texmf-dist/source/latex/fontsize/fontsize.dtx
+++ b/Master/texmf-dist/source/latex/fontsize/fontsize.dtx
@@ -56,14 +56,15 @@ This work has the LPPL maintenance status "author-maintained".
 %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<package>\ProvidesPackage{fontsize}
 %<*package>
-  [2021/02/10 v0.7 'fontsize' package. Set main font sizes (Ivan Valbusa)]
+  [2021/03/04 v0.8 'fontsize' package. Set main font sizes (Ivan Valbusa)]
 %</package>
 %<*driver>
 \documentclass[12pt]{ltxdoc}
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage[fontsize=12pt]{fontsize}
-\usepackage{array,booktabs,siunitx,tabu}
+\usepackage{array,booktabs,tabu}
+\usepackage{siunitx}
 \usepackage{multicol}
 %--------------------------------------------------------
 % GRAPHICS
@@ -214,6 +215,7 @@ This work has the LPPL maintenance status "author-maintained".
 %   Right brace   \}     Tilde         \~}
 %
 %
+% \changes{v0.8}{2021/03/04}{Corrected a bug occuring when the line spacing is grater than \SI{163.84}{pt}.}
 % \changes{v0.7}{2021/02/10}{New font sizing commands \cmd{HUGE}, \cmd{HUGEr}, \cmd{HUGErr}, \cmd{HUGErrr}. Changed default name for the \file{.clo} file to \opt{fontsize}. Updated documentation.}
 % \changes{v0.6}{2021/02/06}{New font sizing commands from \cmd{small} down. Updated documentation.}
 % \changes{v0.5}{2021/01/31}{New font sizing commands from \cmd{normalsize} up. New command \cmd{printsamples}. Updated documentation.}
@@ -260,8 +262,18 @@ This work has the LPPL maintenance status "author-maintained".
 %};
 % \end{tikzpicture}
 % \clearpage\thispagestyle{empty}
+% \null\vspace{1cm}
 %
-% \null\vfill
+%\hfill\begin{minipage}{.5\textwidth}
+% \raggedleft\footnotesize
+% The serif typeface is Cochineal, created by Michael Sharpe 
+% on the basis of Sebastian Kosch's Crimson. 
+% The \texttt{typewriter} font is Inconsolata, 
+% designed by Raph Levien and the \textsf{sans serif} text 
+% is typeset in Linux Biolinum, created by Philipp H.~Pol. 
+%\end{minipage}
+%
+% \vfill
 %
 % ^^A ----------------------------------------------------------------
 % ^^A
@@ -274,7 +286,7 @@ This work has the LPPL maintenance status "author-maintained".
 %
 % \noindent This package is author-maintained. 
 % Permission is granted to copy, distribute and/or modify this software 
-% under the terms of the \LaTeX{} Project Public License, version 1.3 or 
+% under the terms of the \hologo{LaTeX} Project Public License, version 1.3 or 
 % later (\url{http://latex-project.org/lppl}). 
 % This software is provided ``as is'', without warranty of any kind, 
 % either expressed or implied, including, but not limited to, the implied 
@@ -429,10 +441,14 @@ This work has the LPPL maintenance status "author-maintained".
 %^^A Defines the \meta{text} to be used by \cmd{printsamples}.
 % 
 % \end{ltxsyntax}
+%
 %^^A---------------------------------------------------------------------
-% \section{New font sizing commands}\label{sec:sizingcmd}
+% \subsection{New font sizing commands}\label{sec:sizingcmd}
 %^^A--------------------------------------------------------------------
-% The package provides three additional font sizing commands for each standard size:
+%
+% The package provides three additional font sizing commands for each standard size.
+% The value of these new sizes (rounded to the second decimal place) are shown in 
+% table \ref{tab:sizes}.
 % \medskip
 %
 %\def\fshw{Lipsum}
@@ -489,11 +505,17 @@ This work has the LPPL maintenance status "author-maintained".
 % }
 %\medskip
 %
-% \begin{normalsize}
+% \begin{footnotesize}
 %\alert  If you want these commands to work as expected, the font must be 
-% smoothly scalable. This is the case of many Type 1 and Open Type fonts. 
-% Anyway, if the font has optical sizes, unusual things can happen: 
-% some larger sizes may appear smaller. For example, with the Latin Modern 12\,pt typeface a similar situation can be encountered:\medskip
+% smoothly scalable. 
+% This is the case of many Type 1 and Open Type fonts such as Cochineal 
+% used in this document \parencite{cochineal}, but 
+% if the font has optical sizes, unusual things can happen: 
+% some larger sizes may appear smaller. In any case, with the \LaTeX\ 
+% default font (i.e. Computer Modern)  I recommend loading 
+% \cmd{RequirePackage}|{fix-cm}| just before \cmd{documentclass}. 
+% For example, with the Latin Modern 12\,pt typeface \parencite{lm} 
+% a similar situation can be encountered:\medskip
 %
 % \begingroup
 % \centering
@@ -509,7 +531,6 @@ This work has the LPPL maintenance status "author-maintained".
 % \scalebox{3}{\large H} \scalebox{3}{\larger H} \scalebox{3}{\largerr H} 
 %
 % \endgroup
-% \end{normalsize}
 % \medskip
 %
 % In fact the font used for the \cmd{larger} `Hello world' is bigger than 
@@ -517,7 +538,9 @@ This work has the LPPL maintenance status "author-maintained".
 % thickness of the stems, which makes the words appear shorter and clearer, 
 % but not less high (as you can see in the figure on the
 % right which shows the letter H appropriately scaled to see the 
-% differences better).
+% differences better). 
+%
+% \end{footnotesize}
 % 
 % \clearpage\thispagestyle{empty}
 % \def\ivalbmidrule{\arrayrulecolor{black!40}\midrule\rowfont{\color{philA}}}
@@ -526,7 +549,7 @@ This work has the LPPL maintenance status "author-maintained".
 % \centering 
 % \centerline{%
 % \begin{tabu}{lSSSSSSSSS}
-%\toprule
+%\toprule\rowfont{\color{philA}}
 %	\tcmd{tiny}           & 4.00  & 4.25  & 4.50  & 4.75  & 5.00  & 5.25  & 5.50  & 5.75  & 6.00  \\
 %	\cmd{tinyr}           & 4.33  & 4.60  & 4.88  & 5.15  & 5.42  & 5.69  & 5.96  & 6.23  & 6.50  \\
 %	\cmd{tinyrr}          & 4.67  & 4.96  & 5.25  & 5.54  & 5.83  & 6.12  & 6.42  & 6.71  & 7.00  \\
@@ -589,18 +612,14 @@ This work has the LPPL maintenance status "author-maintained".
 %\clearpage\thispagestyle{plain}
 %
 %^^A---------------------------------------------------------------------
+%
 % \section{Some text samples}\label{sec:example}
 %
 %^^A--------------------------------------------------------------------
 % The following examples are obtained with the \cmd{printsamples} command (see section \ref{sec:commands}).
 %
-%^^A Below you can see some text samples scaled proportionally 
-%^^A to match the different values of the selected normal size and line spacing. 
-%
 % \printsamples{13.2pt}{11.2pt}[normalsizer,normalsizerr,normalsizerrr,large,larger]
 % \printsamples{13.4pt}{11.7pt}[normalsizer,normalsizerr,normalsizerrr,large,larger]
-% 
-% \nocite{xkeyval,etoolbox}
 %
 % \StopEventually{%
 % \printbibliography[heading=bibintoc]
@@ -614,7 +633,7 @@ This work has the LPPL maintenance status "author-maintained".
 %^^A---------------------------------------------------------------------
 %\textcolor{DarkBlue}{The parts added to the basic code of \file{scrextend} and \file{scrfontsizes} are highlighted in blue.}
 %
-%\noindent All the options of the package are defined via \sty{xkeyval}.
+%\noindent All the options of the package are defined via \sty{xkeyval} \parencite{xkeyval}. Only a new package option called \opt{cloname} is defined.
 % \baddition
 %    \begin{macrocode}
 \@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
@@ -624,7 +643,8 @@ This work has the LPPL maintenance status "author-maintained".
 %
 % \paragraph{Excerpt from \file{scrextend.sty}}
 %
-% Here the \sty{scrextend} code begins. Only a few names have been changed. 
+% Here the \sty{scrextend} code begins. All the KOMA related codes have 
+% been removed and only a few names have been changed.
 % The value of \cmd{|@|fontsizefilebase} is set to \texttt{fontsize} instead of \texttt{scrsize}.
 %    \begin{macrocode}
 \DeclareOptionX{fontsize}[10]{%
@@ -700,7 +720,25 @@ This work has the LPPL maintenance status "author-maintained".
   \addtolength{\@tempdimc}{-10\p@}%
   \edef\@ptsize{\strip@pt\@tempdimc}%
   \@defaultunits\@tempdimb#1pt\relax\@nnil
-  \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
+%    \end{macrocode}
+% The value of \cmd{@tempdimc} set in \sty{scrextend.sty}
+% \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} 
+% 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 
+% the maximum dimension that may be stored in plain 
+% \TeX\ and \LaTeX.
+% The problem, which is probably more theoretical than practical, 
+% can be solved simply by changing it to this (thanks to Claudio Beccari):
+% \baddition
+%    \begin{macrocode}
+  \setlength{\@tempdimc}{100\dimexpr (\@tempdimb * \p@ / \@tempdima)}
+%    \end{macrocode}
+% \eaddition
+%    \begin{macrocode}
   \edef\@tempb{\the\@tempdimc}%
   \setlength{\@tempdimc}{\@tempdima}%
   \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
@@ -1075,19 +1113,19 @@ This work has the LPPL maintenance status "author-maintained".
    \noexpand\@setfontsize\noexpand\HUGE
    {\the\@tempdima}{\the\@tempdimb}%
   }%
-  \setlength{\@tempdima}{3,155\@tempdimc}%
+  \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{\@tempdima}{3.304\@tempdimc}%
   \setlength{\@tempdimb}{\@tempb\@tempdima}%
   \edef\HUGErr{%
    \noexpand\@setfontsize\noexpand\HUGErr
    {\the\@tempdima}{\the\@tempdimb}%
   }%
-  \setlength{\@tempdima}{3,453\@tempdimc}%
+  \setlength{\@tempdima}{3.453\@tempdimc}%
   \setlength{\@tempdimb}{\@tempb\@tempdima}%
   \edef\HUGErrr{%
    \noexpand\@setfontsize\noexpand\HUGErrr
@@ -1266,7 +1304,7 @@ This work has the LPPL maintenance status "author-maintained".
 %
 % \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@ifnextchar [{\@generatefontfile{#1}}{\@@generatefontfile{#1}}%
@@ -1850,7 +1888,8 @@ This work has the LPPL maintenance status "author-maintained".
 %    \end{macrocode}
 % We will now define some internal commands to test the package functions.
 % Since version 0.6 I have been using the \LaTeX 3 solution provided by 
-% Enrico Gregorio in place of the previous macros based on \sty{etoolbox}.
+% Enrico Gregorio in place of the previous macros based on 
+% \sty{etoolbox} \parencite{etoolbox}.
 % \baddition
 %    \begin{macrocode}
 \def\fontsizelipsum{%
@@ -1951,6 +1990,24 @@ This work has the LPPL maintenance status "author-maintained".
   date = {2020-04-19},
   version = {3.30}
 }
+
+@manual{lm,
+ title = {The Latin Modern (LM) Family of Fonts},
+ author = {B. Jackowski and J.M. Nowacki},
+ url = {http://www.ctan.org/pkg/lm},
+ urldate = {2021-03-04}, 
+ date = {2009-10-30},
+ version = {2.004}
+}
+
+@manual{cochineal,
+ title = {The Cochineal Font Package},
+ author = {Michael Sharpe},
+ url = {http://www.ctan.org/pkg/cochineal},
+ urldate = {2021-03-04}, 
+ date = {2020-12-19},
+ version = {1.065 }
+}
 %</bib>
 % \fi
 % \Finale
diff --git a/Master/texmf-dist/tex/latex/fontsize/fontsize.sty b/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
index e23cfbb41eb..b2905b61644 100644
--- a/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
+++ b/Master/texmf-dist/tex/latex/fontsize/fontsize.sty
@@ -26,7 +26,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{fontsize}
-  [2021/02/10 v0.7 'fontsize' package. Set main font sizes (Ivan Valbusa)]
+  [2021/03/04 v0.8 'fontsize' package. Set main font sizes (Ivan Valbusa)]
 \@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
 \DeclareOptionX{cloname}[fontsize]{\def\@fontsizefilebase{#1}}
 \DeclareOptionX{fontsize}[10]{%
@@ -94,7 +94,7 @@
   \addtolength{\@tempdimc}{-10\p@}%
   \edef\@ptsize{\strip@pt\@tempdimc}%
   \@defaultunits\@tempdimb#1pt\relax\@nnil
-  \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
+  \setlength{\@tempdimc}{100\dimexpr (\@tempdimb * \p@ / \@tempdima)}
   \edef\@tempb{\the\@tempdimc}%
   \setlength{\@tempdimc}{\@tempdima}%
   \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
@@ -417,19 +417,19 @@
    \noexpand\@setfontsize\noexpand\HUGE
    {\the\@tempdima}{\the\@tempdimb}%
   }%
-  \setlength{\@tempdima}{3,155\@tempdimc}%
+  \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{\@tempdima}{3.304\@tempdimc}%
   \setlength{\@tempdimb}{\@tempb\@tempdima}%
   \edef\HUGErr{%
    \noexpand\@setfontsize\noexpand\HUGErr
    {\the\@tempdima}{\the\@tempdimb}%
   }%
-  \setlength{\@tempdima}{3,453\@tempdimc}%
+  \setlength{\@tempdima}{3.453\@tempdimc}%
   \setlength{\@tempdimb}{\@tempb\@tempdima}%
   \edef\HUGErrr{%
    \noexpand\@setfontsize\noexpand\HUGErrr