From 984f1bad8feb2cc586047e3304f76aae83618498 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 21 May 2021 21:06:51 +0000 Subject: fontsize (21may21) git-svn-id: svn://tug.org/texlive/trunk@59295 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fontsize/fontsize.bib | 14 +++++- Master/texmf-dist/doc/latex/fontsize/fontsize.pdf | Bin 405591 -> 378517 bytes .../texmf-dist/source/latex/fontsize/fontsize.dtx | 56 ++++++++++++++++----- Master/texmf-dist/tex/latex/fontsize/fontsize.sty | 13 +++-- Master/tlpkg/libexec/ctan2tds | 3 +- 5 files changed, 65 insertions(+), 21 deletions(-) diff --git a/Master/texmf-dist/doc/latex/fontsize/fontsize.bib b/Master/texmf-dist/doc/latex/fontsize/fontsize.bib index 8a68ab48a3e..2d711815f86 100644 --- a/Master/texmf-dist/doc/latex/fontsize/fontsize.bib +++ b/Master/texmf-dist/doc/latex/fontsize/fontsize.bib @@ -1,5 +1,5 @@ @manual{xkeyval, - title = {The \textsf{xkeyval} package}, + title = {The \sty{xkeyval} package}, subtitle = {Extension of the keyval package}, author = {Adriaens, Hendri}, url = {http://www.ctan.org/pkg/xkeyval}, @@ -46,9 +46,19 @@ } @manual{xfp, - title = {The \textit{xfp} package Floating Point Unit}, + title = {The \sty{xfp} package Floating Point Unit}, author = {{The \LaTeX\ Project}}, url = {https://www.ctan.org/pkg/xfp}, urldate = {2021-03-14}, date = {2021-03-12}, } + +@manual{tufte, + title = {\sty{tufte-latex} – Document classes inspired by the work of Edward Tufte}, + author = {Kevin Godby}, + url = {https://www.ctan.org/pkg/tufte-latex}, + urldate = {2021-05-18}, + date = {2015}, + version = {3.5.2} +} + diff --git a/Master/texmf-dist/doc/latex/fontsize/fontsize.pdf b/Master/texmf-dist/doc/latex/fontsize/fontsize.pdf index 7dd7a0d45bf..adfe6797603 100644 Binary files a/Master/texmf-dist/doc/latex/fontsize/fontsize.pdf and b/Master/texmf-dist/doc/latex/fontsize/fontsize.pdf differ diff --git a/Master/texmf-dist/source/latex/fontsize/fontsize.dtx b/Master/texmf-dist/source/latex/fontsize/fontsize.dtx index 9c9c7fdeb54..53dab90cc04 100644 --- a/Master/texmf-dist/source/latex/fontsize/fontsize.dtx +++ b/Master/texmf-dist/source/latex/fontsize/fontsize.dtx @@ -56,7 +56,7 @@ This work has the LPPL maintenance status "author-maintained". %\NeedsTeXFormat{LaTeX2e}[2005/12/01] %\ProvidesPackage{fontsize} %<*package> - [2021/04/18 v0.8.3 'fontsize' package. Set main font sizes (Ivan Valbusa)] + [2021/05/21 v0.8.4 'fontsize' package. Set main font sizes (Ivan Valbusa)] % %<*driver> \documentclass[12pt]{ltxdoc} @@ -287,6 +287,7 @@ This work has the LPPL maintenance status "author-maintained". % Right brace \} Tilde \~} % % +% \changes{v0.8.4}{2021/05/21}{Maintenance release.} % \changes{v0.8.3}{2021/04/18}{Corrected a bug in the \cmd{parindent} option. % Updated documentation.} % \changes{v0.8.2}{2021/04/17}{New \cmd{parindent} option. Updated documentation.} @@ -741,16 +742,30 @@ This work has the LPPL maintenance status "author-maintained". % %^^A--------------------------------------------------------------------- % -% \section{Some text samples}\label{sec:example} +% \subsection{Some text samples}\label{sec:example} % %^^A-------------------------------------------------------------------- % The following samples are obtained with the \cmd{printsamples} % command (see section \ref{sec:commands}): %\begin{verbatim} -%\printsamples{12.6pt}{10.6pt}[normalsizerr,normalsizerrr,large,larger,largerr] +% \printsamples{12.6pt}{10.6pt}[normalsize,normalsizer,normalsizerr, +% normalsizerrr,large,larger,largerr,largerr] %\end{verbatim} +% \printsamples{12.6pt}{10.6pt}[% +% normalsize,normalsizer,normalsizerr, +% normalsizerrr,large,larger,largerr,largerr] % -% \printsamples{12.6pt}{10.6pt}[normalsizerr,normalsizerrr,large,larger,largerr] +%^^A--------------------------------------------------------------------- +% +% \section{Known issues} +% +%^^A-------------------------------------------------------------------- +% +% The \opt{parindent} option does not work with classes and packages which sets \cmd{parindent} +% inside the \cmd{AtBeginDocument} hook (and other hooks). Among these is the \sty{tufte} +% class \parencite{tufte}. In such cases you can set the default +% indentation, for example, with \cmd{setlength}|{parindent}|\arm{dimen} +% declared \textit{after} |\begin{document}|. % % \StopEventually{% % \printbibliography[heading=bibintoc] @@ -877,7 +892,8 @@ This work has the LPPL maintenance status "author-maintained". % the maximum dimension that may be stored in plain % \TeX\ and \LaTeX. % The problem, which is probably more theoretical than practical, -% can be solved (thanks to Claudio Beccari) simply by changing it to this: +% can be solved simply by replacing +% the above code with this (thanks to Claudio Beccari): % \baddition % \begin{macrocode} \setlength{\@tempdimc}{\fpeval{100*\@tempdimb/\@tempdima}pt}% @@ -1295,13 +1311,16 @@ This work has the LPPL maintenance status "author-maintained". % \eaddition % For 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 -% in lengths affected by \sty{fontsize} inside the \file{bk*.clo} files only concern +% in the lengths affected by \sty{fontsize} inside the \file{bk*.clo} files only concern % \cmd{headheight}, \cmd{headsep}, \cmd{topskip} and \cmd{footskip}. % \baddition % \begin{macrocode} -\setlength\smallskipamount{\fpeval{1.090909091\@tempdimb/4}pt \@plus 1\p@ \@minus 1\p@}% -\setlength\medskipamount{\fpeval{1.090909091\@tempdimb/2}pt \@plus 2\p@ \@minus 2\p@}% -\setlength\bigskipamount{\fpeval{1.090909091\@tempdimb}pt \@plus 4\p@ \@minus 4\p@}% +\setlength\smallskipamount{ + \fpeval{1.090909091\@tempdimb/4}pt \@plus 1\p@ \@minus 1\p@}% +\setlength\medskipamount{ + \fpeval{1.090909091\@tempdimb/2}pt \@plus 2\p@ \@minus 2\p@}% +\setlength\bigskipamount{ + \fpeval{1.090909091\@tempdimb}pt \@plus 4\p@ \@minus 4\p@}% % \end{macrocode} % \eaddition % \def\tabfontsize{\fontsize{10.5}{12.5}\selectfont} @@ -1456,7 +1475,7 @@ This work has the LPPL maintenance status "author-maintained". % % 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 +% There are no reserved names for the \file{.clo} files. The name of the command is % a new name for the KOMA \cmd{generatefontfile}. In fact what the command % generates is a \file{.clo} file. % \begin{macrocode} @@ -2058,7 +2077,7 @@ This work has the LPPL maintenance status "author-maintained". LARGE,LARGEr,LARGErr,LARGErrr, huge,huger,hugerr,hugerrr, Huge,Huger,Hugerr,Hugerrr, - HGE,HUGEr,HUGErr,HUGErrr, + HUGE,HUGEr,HUGErr,HUGErrr, } } { @@ -2103,7 +2122,7 @@ This work has the LPPL maintenance status "author-maintained". % \iffalse %<*bib> @manual{xkeyval, - title = {The \textsf{xkeyval} package}, + title = {The \sty{xkeyval} package}, subtitle = {Extension of the keyval package}, author = {Adriaens, Hendri}, url = {http://www.ctan.org/pkg/xkeyval}, @@ -2150,12 +2169,23 @@ This work has the LPPL maintenance status "author-maintained". } @manual{xfp, - title = {The \textit{xfp} package Floating Point Unit}, + title = {The \sty{xfp} package Floating Point Unit}, author = {{The \LaTeX\ Project}}, url = {https://www.ctan.org/pkg/xfp}, urldate = {2021-03-14}, date = {2021-03-12}, } + +@manual{tufte, + title = {\sty{tufte-latex} – Document classes inspired by the work of Edward Tufte}, + author = {Kevin Godby}, + url = {https://www.ctan.org/pkg/tufte-latex}, + urldate = {2021-05-18}, + date = {2015}, + version = {3.5.2} +} + + % % \fi % \Finale diff --git a/Master/texmf-dist/tex/latex/fontsize/fontsize.sty b/Master/texmf-dist/tex/latex/fontsize/fontsize.sty index 5128c2b0170..d5c0aa21bad 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/04/18 v0.8.3 'fontsize' package. Set main font sizes (Ivan Valbusa)] + [2021/05/21 v0.8.4 'fontsize' package. Set main font sizes (Ivan Valbusa)] \@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}} \@ifpackageloaded{xfp}{}{\RequirePackage{xfp}} \DeclareOptionX{cloname}[fontsize]{\def\@fontsizefilebase{#1}} @@ -439,9 +439,12 @@ }% \normalsize% \setlength\parindent{\@fontsizeparindent}% -\setlength\smallskipamount{\fpeval{1.090909091\@tempdimb/4}pt \@plus 1\p@ \@minus 1\p@}% -\setlength\medskipamount{\fpeval{1.090909091\@tempdimb/2}pt \@plus 2\p@ \@minus 2\p@}% -\setlength\bigskipamount{\fpeval{1.090909091\@tempdimb}pt \@plus 4\p@ \@minus 4\p@}% +\setlength\smallskipamount{ + \fpeval{1.090909091\@tempdimb/4}pt \@plus 1\p@ \@minus 1\p@}% +\setlength\medskipamount{ + \fpeval{1.090909091\@tempdimb/2}pt \@plus 2\p@ \@minus 2\p@}% +\setlength\bigskipamount{ + \fpeval{1.090909091\@tempdimb}pt \@plus 4\p@ \@minus 4\p@}% \setlength{\@tempdimb}{\f@baselineskip}% \ctm@setlength{\parsep}% {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}% @@ -1131,7 +1134,7 @@ LARGE,LARGEr,LARGErr,LARGErrr, huge,huger,hugerr,hugerrr, Huge,Huger,Hugerr,Hugerrr, - HGE,HUGEr,HUGErr,HUGErrr, + HUGE,HUGEr,HUGErr,HUGErrr, } } { diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 42ddbb32523..b146397ff6d 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2928,6 +2928,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; 'fcolumn' => 'tex', 'fei' => 'tex', 'fge' => 'latex', # requires interaction + 'fontsize' => 'latex', 'g-brief' => 'latex', # requires interaction 'gbt7714' => 'tex -8bit', 'geometry' => 'tex', @@ -3021,7 +3022,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; 'xmuthesis' => 'etex', 'yathesis' => 'pdftex', ); -$standardinsrunner = "etex -8bit"; +$standardinsrunner = "latex -8bit"; %specialmakeindex= ( -- cgit v1.2.3