summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-03-08 23:21:49 +0000
committerKarl Berry <karl@freefriends.org>2024-03-08 23:21:49 +0000
commit904bcd83fba7b8d1b4c51fefddbe99b6f60ae85c (patch)
treee3935eec798accdc0a8749db34a4e9badbb81e40
parentd5ca92f60d047586026230b42a7a5432088beb5b (diff)
fontscale (branch) (9mar24)
git-svn-id: svn://tug.org/texlive/branches/branch2023.final@70514 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/README.txt3
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/beery.cls244
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-classic.tex37
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-font-steps.tex36
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-modular-musical.tex36
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-manual.tex376
-rw-r--r--Master/texmf-dist/tex/latex/fontscale/fontscale.sty5
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
8 files changed, 735 insertions, 3 deletions
diff --git a/Master/texmf-dist/doc/latex/fontscale/README.txt b/Master/texmf-dist/doc/latex/fontscale/README.txt
index 1662524eebb..292cfada9ba 100644
--- a/Master/texmf-dist/doc/latex/fontscale/README.txt
+++ b/Master/texmf-dist/doc/latex/fontscale/README.txt
@@ -1,4 +1,5 @@
Package: fontscale -- A user interface for setting document font sizes
Copyright: 2024 (c) Oliver Beery <beeryoliver@gmail.com>
+CTAN: https://ctan.org/pkg/fontscale
Repository: https://github.com/beeryoliver/fontscale
-License: The LaTeX Project Public License 1.3c \ No newline at end of file
+License: The LaTeX Project Public License 1.3c
diff --git a/Master/texmf-dist/doc/latex/fontscale/beery.cls b/Master/texmf-dist/doc/latex/fontscale/beery.cls
new file mode 100644
index 00000000000..d1d480ba138
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontscale/beery.cls
@@ -0,0 +1,244 @@
+% Note: This documentclass is designed ONLY for the document 'fontscale-manual'. Compiled using LuaLaTeX.
+
+% The 2023-06-01 LaTeX kernel update added the 'shipout' hook.
+\NeedsTeXFormat{LaTeX2e}[2023-06-01]
+\ProvidesExplClass
+ {beery}
+ {2024-03-08}
+ {}
+ {}
+
+\RequirePackage { fix-cm }
+\LoadClass { article }
+\RequirePackage { fontscale }
+\RequirePackage [ list-final-separator = { ,~ and~ } ] { siunitx }
+\RequirePackage { mathtools }
+\RequirePackage [ shortcuts , allowbreakbefore ] { extdash }
+\RequirePackage { csquotes }
+
+% CUSTOM MACROS
+
+\NewDocumentCommand \Key { m o o }
+ {
+ \group_begin:
+ \ttfamily
+ \bool_case:nF
+ {
+ {
+ \bool_lazy_and_p:nn
+ { \tl_if_novalue_p:n {#2} }
+ { \tl_if_novalue_p:n {#3} }
+ }
+ {#1}
+ {
+ \bool_lazy_and_p:nn
+ { ! \tl_if_novalue_p:n {#2} }
+ { \tl_if_novalue_p:n {#3} }
+ }
+ { #1~ =~ #2 }
+ {
+ \bool_lazy_and_p:nn
+ { ! \tl_if_novalue_p:n {#2} }
+ { ! \tl_if_novalue_p:n {#3} }
+ }
+ { #1~ =~ #2 \hspace* { \fill } \makebox { initial~ =~ #3 } }
+ }
+ { \errmessage { invalid } }
+ \group_end:
+ }
+\NewDocumentCommand \cmd { m } { \texttt { \token_to_str:N #1 } \@ }
+\NewDocumentCommand \cs { m } { \texttt { \token_to_str:c {#1} } \@ }
+\NewDocumentCommand \marg { m }
+ { \texttt { \c_left_brace_str #1 \c_right_brace_str } }
+\NewDocumentCommand \oarg { m } { \texttt { [ #1 ] } }
+\NewDocumentCommand \meta { m } { \texttt { \textlangle #1 \textrangle } }
+\NewDocumentCommand \cls { m } { \textsf {#1} }
+\NewDocumentCommand \env { m } { \texttt {#1} }
+\NewDocumentCommand \pkg { m } { \textsf {#1} }
+\NewDocumentCommand \filex { m } { \texttt {#1} \@ }
+\NewDocumentCommand \latin { m } { \textit {#1} }
+
+% PAGE STYLE
+
+\hbox_set:Nn \l_tmpa_box { abcdefghijklmnopqrstuvwxyz }
+\dim_const:Nn \c_beery_alphabet_dim { \box_wd:N \l_tmpa_box }
+
+\dim_const:Nn \c_beery_big_dim
+ { \fp_to_dim:n { \l_fontscale_normalsize_size_dim * 10 / 7 } }
+\dim_const:Nn \c_beery_medium_dim { \c_beery_big_dim / 2 }
+\dim_const:Nn \c_beery_small_dim { \c_beery_big_dim / 4 }
+\skip_const:Nn \c_beery_big_skip
+ {
+ \c_beery_big_dim
+ plus \dim_eval:n { \c_beery_big_dim / 2 }
+ minus \dim_eval:n { \c_beery_big_dim / 3 }
+ }
+\skip_const:Nn \c_beery_medium_skip { \c_beery_big_skip / 2 }
+\skip_const:Nn \c_beery_small_skip { \c_beery_big_skip / 4 }
+\skip_set_eq:NN \bigskipamount \c_beery_big_skip
+\skip_set_eq:NN \medskipamount \c_beery_medium_skip
+\skip_set_eq:NN \smallskipamount \c_beery_small_skip
+
+\flushbottom
+\int_set:Nn \vbadness { 100 }
+
+\skip_set:Nn \topskip { \l_fontscale_normalsize_size_dim }
+\skip_set_eq:NN \splittopskip \topskip
+\RequirePackage
+ [
+ letterpaper
+ , textwidth = \dim_eval:n { \fp_use:N \c_e_fp \c_beery_alphabet_dim }
+ , textheight =
+ \dim_eval:n { \fp_eval:n { \c_e_fp * 1.6180 } \c_beery_alphabet_dim }
+ , heightrounded
+ , centering
+ , headheight = \l_fontscale_footnotesize_baselineskip_skip
+ , headsep = \c_beery_big_dim
+ , footskip =
+ \dim_eval:n
+ { \c_beery_big_dim + \l_fontscale_footnotesize_baselineskip_skip }
+ ]
+ { geometry }
+
+\RequirePackage { fancyhdr }
+\pagestyle { fancy }
+\fancyhf { }
+\cs_set:Npn \headrulewidth { 0pt }
+\fancyfoot [ C ]
+ { \footnotesize \thepage \c_space_tl of~ \pageref { LastPage } }
+
+% PARAGRAPH STYLE
+
+\nonfrenchspacing
+\linespread { \fp_eval:n { 25 / 21 } }
+\RequirePackage [ skip = \c_beery_medium_skip ] { parskip }
+\RequirePackage [ raggedrightboxes ] { ragged2e }
+\skip_set:Nn \RaggedRightRightskip { 0pt plus 0.5 \linewidth }
+\RaggedRight
+\int_set:Nn \widowpenalty { 10000 }
+\int_set_eq:NN \clubpenalty \widowpenalty
+\int_set_eq:NN \displaywidowpenalty \widowpenalty
+
+% HEADINGS, TABLE OF CONTENTS
+
+\RequirePackage { titlesec , titletoc }
+\setcounter { secnumdepth } { 2 }
+\setcounter { tocdepth } { 2 }
+
+\titlespacing* \section % section
+ { 0pt } % indent
+ {
+ \fp_eval:n { 4 / 3 } \c_beery_medium_dim
+ plus \fp_eval:n { 1 / 2 * 4 } \c_beery_medium_dim
+ minus \fp_eval:n { 1 / 3 / 4 } \c_beery_medium_dim
+ } % before
+ { \c_beery_medium_skip } % after
+\titlespacing* \subsection
+ { 0pt }
+ {
+ \fp_eval:n { 4 / 3 } \c_beery_medium_dim
+ plus \fp_eval:n { 1 / 2 * 4 } \c_beery_medium_dim
+ minus \fp_eval:n { 1 / 3 / 4 } \c_beery_medium_dim
+ }
+ { \c_beery_medium_skip }
+
+\titleformat \section % section
+ [ block ] % shape
+ { \raggedright \large \bfseries } % format
+ { \thesection . } % label
+ { 0.5em } % the horizontal separation between label and title body
+ { } % before code
+ { } % after code
+\titleformat \subsection
+ [ block ]
+ { \raggedright \normalsize \bfseries }
+ { \thesubsection . }
+ { 0.5em }
+ { }
+ { }
+
+% LISTS, LIST HEADINGS
+
+\RequirePackage { enumitem }
+\setlist
+ {
+ % horizontal spacing
+ leftmargin = *
+ , labelsep = 0.5em
+ % vertical spacing
+ , topsep = 0pt
+ , partopsep = 0pt
+ , parsep = \c_beery_small_skip
+ , itemsep = 0pt
+ }
+\setlist [ itemize , 1 ] { label = \textbullet }
+\setlist [ enumerate , 1 ] { label = \arabic* . }
+
+% list headings
+% https://tex.stackexchange.com/questions/2644/how-to-prevent-a-page-break-before-an-itemize-list
+\NewDocumentCommand \KeepNextPar { s }
+ {
+ \par
+ \bool_if:NTF #1
+ { \int_compare:nNnT { \prevgraf } = { 1 } { \nobreak \@afterheading } }
+ { \nobreak \@afterheading }
+ }
+\NewDocumentCommand \listheading { m }
+ {
+ \par
+ #1
+ \par
+ \int_compare:nNnT { \prevgraf } = { 1 } { \nobreak \@afterheading }
+ \vspace { \skip_eval:n { \c_beery_small_skip - \parskip } }
+ }
+
+% TABLES
+
+\renewcommand \bottomfraction { 1 }
+\renewcommand \topfraction { 1 }
+\skip_set:Nn \textfloatsep
+ {
+ \c_beery_big_dim plus \c_beery_big_dim minus
+ \dim_eval:n { \c_beery_big_dim / 3 }
+ }
+
+\RequirePackage { tabularray }
+\UseTblrLibrary { booktabs , siunitx }
+
+% FOOTNOTES
+
+\RequirePackage [ bottom ] { footmisc }
+\renewcommand \footnoterule { }
+\setlength { \skip \footins } { \c_beery_big_skip }
+
+\coffin_new:N \l__beery_footnote_coffin
+% 1.2 = baselineskip-size-ratio
+\dim_const:Nn \c_beery_footnote_baselineheight_dim
+ { \fp_eval:n { 1.2 * \f@linespread - 1 } \l_fontscale_footnotesize_size_dim }
+\RenewDocumentCommand \@makefntext { +m }
+ {
+ \vcoffin_set:Nnn \l__beery_footnote_coffin { \textwidth }
+ {
+ \list { \@thefnmark . }
+ {
+ \dim_set:Nn \leftmargin
+ {
+ \fp_eval:n { ( 1 - \l_fontscale_footnotesize_scale_fp ) / 2 }
+ \textwidth
+ }
+ \dim_set_eq:NN \rightmargin \leftmargin
+ \dim_set:Nn \labelsep { 0.5em }
+ \skip_zero:N \topsep
+ \skip_zero:N \partopsep
+ }
+ \item #1 \endlist
+ }
+ \coffin_typeset:Nnnnn \l__beery_footnote_coffin { l } { b }
+ { 0pt } { - \c_beery_footnote_baselineheight_dim }
+ }
+
+% REFERENCES
+
+\AddToHook { shipout / lastpage } { \label { LastPage } }
+\RequirePackage { xurl }
+\RequirePackage [ bookmarksnumbered , hidelinks , linktoc = page ] { hyperref } \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-classic.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-classic.tex
new file mode 100644
index 00000000000..56015bba68f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-classic.tex
@@ -0,0 +1,37 @@
+\ProvidesFile{fontscale-manual-table-classic.tex}[2024-03-08]
+
+\begin{table}
+ \centering
+ \caption
+ {%
+ The size of each font size command in \unit{pt} when using a classic typographic scale.%
+ \label{table:classicscales}%
+ }
+ \bigskip
+ \begin{tblr}
+ {
+ colspec=
+ {
+ l
+ Q[si={table-format=3.2},c]
+ Q[si={table-format=3.2},c]
+ Q[si={table-format=3.2},c]
+ }
+ ,cell{1}{2-Z}={guard}
+ }
+ \toprule
+ Command & \Key{classic-10pt} & \Key{classic-11pt} & \Key{classic-12pt} \\
+ \midrule
+ \cs{tiny} & 6 & 7 & 8 \\
+ \cs{scriptsize} & 7 & 8 & 9 \\
+ \cs{footnotesize} & 8 & 9 & 10 \\
+ \cs{small} & 9 & 10 & 11 \\
+ \cs{normalsize} & 10 & 11 & 12 \\
+ \cs{large} & 11 & 12 & 14 \\
+ \cs{Large} & 12 & 14 & 16 \\
+ \cs{LARGE} & 14 & 16 & 18 \\
+ \cs{huge} & 16 & 18 & 21 \\
+ \cs{Huge} & 18 & 21 & 24 \\
+ \bottomrule
+ \end{tblr}
+\end{table} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-font-steps.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-font-steps.tex
new file mode 100644
index 00000000000..8392f99dbbf
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-font-steps.tex
@@ -0,0 +1,36 @@
+\ProvidesFile{fontscale-manual-table-font-steps.tex}[2024-03-08]
+
+\begin{table}
+ \centering
+ \caption
+ {%
+ The step of each font size command.
+ These are constants and cannot be changed.%
+ \label{table:fontsteps}%
+ }
+ \bigskip
+ \begin{tblr}
+ {
+ colspec=
+ {
+ l
+ Q[si={table-format=3.2},c]
+ }
+ , cell{1}{2}={guard}
+ }
+ \toprule
+ Command & Step \\
+ \midrule
+ \cs{tiny} & -4 \\
+ \cs{scriptsize} & -3 \\
+ \cs{footnotesize} & -2 \\
+ \cs{small} & -1 \\
+ \cs{normalsize} & 0 \\
+ \cs{large} & 1 \\
+ \cs{Large} & 2 \\
+ \cs{LARGE} & 3 \\
+ \cs{huge} & 4 \\
+ \cs{Huge} & 5 \\
+ \bottomrule
+ \end{tblr}
+\end{table} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-modular-musical.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-modular-musical.tex
new file mode 100644
index 00000000000..6fd10d99916
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-modular-musical.tex
@@ -0,0 +1,36 @@
+\ProvidesFile{fontscale-manual-table-modular-musical.tex}[2024-03-08]
+
+\begin{table}
+ \centering
+ \caption
+ {%
+ The size of each font size command when using a modular or musical typographic scale with the initial settings.
+ The font sizes are in \unit{pt} and rounded to two decimal places.%
+ }
+ \bigskip
+ \begin{tblr}
+ {
+ colspec=
+ {
+ l
+ Q[si={table-format=3.2},c]
+ Q[si={table-format=3.2},c]
+ }
+ ,cell{1}{2-3}={guard}
+ }
+ \toprule
+ Command & \Key{modular} & \Key{musical} \\
+ \midrule
+ \cs{tiny} & 6.24 & 5.74 \\
+ \cs{scriptsize} & 7.02 & 6.60 \\
+ \cs{footnotesize} & 7.90 & 7.58 \\
+ \cs{small} & 8.89 & 8.71 \\
+ \cs{normalsize} & 10 & 10 \\
+ \cs{large} & 11.25 & 11.49 \\
+ \cs{Large} & 12.66 & 13.20 \\
+ \cs{LARGE} & 14.24 & 15.16 \\
+ \cs{huge} & 16.02 & 17.41 \\
+ \cs{Huge} & 18.02 & 20 \\
+ \bottomrule
+ \end{tblr}
+\end{table} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual.tex
new file mode 100644
index 00000000000..3a24f6bca54
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual.tex
@@ -0,0 +1,376 @@
+\documentclass{beery}
+
+\begin{document}
+
+
+\section*
+ {%
+ \SetFontStep*{1}%
+ The \pkg{fontscale} package%
+ }
+
+A user interface for setting document font sizes
+
+Oliver Beery
+
+Version 1.0.1\quad{}8~March 2024
+
+
+\section{Introduction}
+\label{sec:intro}
+
+\subsection{About}
+\label{subsec:about}
+
+\listheading{The \pkg{fontscale} package provides the following functionalities:}
+\begin{itemize}
+ \item
+ Set document font sizes via a classic, modular, or musical typographic scale.
+ \item
+ Set arbitrary scales, sizes, and baselineskips for the standard font size commands \cs{tiny}, \cs{scriptsize}, \cs{footnotesize}, \cs{small}, \cs{normalsize}, \cs{large}, \cs{Large}, \cs{LARGE}, \cs{huge}, and \cs{Huge}.
+ \item
+ Set the font size settings mid\-/document or within a local group.
+ \item
+ Set the font size by setting the font step, scale, or size.
+ \item
+ Set the font size relative to the current font size.
+ \item
+ Use the current font step, scale, size, and baselineskip directly, for example, for printing or within calculations.
+ \item
+ Print sample text to test different font sizes.
+ \item
+ For advanced users, store the step, scale, size, and baselineskip of each font size command in \pkg{expl3} variables.
+\end{itemize}
+
+
+\subsection{Loading the package}
+\label{subsec:loading}
+
+This package requires the 10~October 2023 \pkg{l3kernel} update.
+Since this update is fairly recent, you may need to ensure that your \LaTeX{} installation is up\-/to\-/date before using this package.
+
+This package lets the user set arbitrary font sizes.
+This works with most fonts produced today, but, for historical reasons, the default Computer Modern font is available only in a number of fixed sizes.
+If you get a warning that Computer Modern is not available in the requested size, you may need to add the code \cs{RequirePackage{fix-cm}} before \cs{documentclass} to make Computer Modern available at arbitrary font sizes.
+
+\cs{usepackage}\marg{fontscale}
+\nopagebreak\newline
+\cs{fontscalesetup}\marg{\meta{keys}}
+
+Load the \pkg{fontscale} package via the usual command in the document preamble.
+This package has no package options.
+Instead, the package keys are set up via the command \cs{fontscalesetup}\marg{\meta{keys}}.
+\meta{keys} must receive a comma\-/separated list of keys and their associated values.
+The package keys are documented in \S\ref{sec:choosing} and \S\ref{sec:overwriting}.
+
+Many \LaTeX{} document classes have a font size option (\Key{10pt}, \Key{11pt}, \Key{12pt}, etc.\@) which not only changes the set of document font sizes, but also modifies additional settings such as the page layout and vertical spacing which were specifically designed to work with those font sizes.
+For this reason, you may want to set the document class font size option close to the value of \cs{normalsize} set by this package.
+
+Internally, this package sets up each font size command from \cs{tiny} to \cs{Huge} using the kernel command \cs{@setfontsize}\---they have no additional functionality beyond that of \cs{@setfontsize}.
+Unlike the standard document classes, the font size commands set up by this package do not change the vertical spacing for displayed math and list structures.
+If the user would like to add this functionality or perhaps other features to the font size commands, they can do so via hooks, which are documented in the \LaTeX{} kernel.
+
+
+\subsection{Terminology}
+\label{subsec:terminology}
+
+When using the \pkg{fontscale} package, each font size, including the standard font size commands from \cs{tiny} to \cs{Huge}, has a step, scale, size, and baselineskip.
+The latter two parameters are the familiar first and second arguments to the low\-/level font command \cs{fontsize}\marg{\meta{size}}\marg{\meta{baselineskip}}.
+The font scale is the relative font size; the ratio of the font size to \cs{normalsize}.
+The font step is the number of font size gradations from \cs{normalsize}, which has a step of \num{0}.
+Table~\ref{table:fontsteps} lists the font step of each font size command.
+
+\input{./fontscale-manual-table-font-steps.tex}
+
+
+\section{Choosing the typographic scale}
+\label{sec:choosing}
+
+\Key{typographic-scale}
+ [classic-10pt, classic-11pt, classic-12pt, modular, musical]
+ [classic-10pt]
+\newline
+\Key{modular/ratio}[\meta{number}][1.125]
+\newline
+\Key{musical/ratio}[\meta{number}][2]%
+\nopagebreak\newline
+\Key{musical/notes}[\meta{integer}][5]
+
+The key \Key{typographic\-/scale} sets the font sizes using a classic, modular, or musical typographic scale.
+These are common methods of choosing a set of document font sizes.
+The choice of typographic scale initializes to \Key{classic\-/10pt}.
+
+The key \Key{typographic\-/scale} can also be set in a condensed format via the keys \Key{classic\-/10pt}, \Key{classic\-/11pt}, \Key{classic\-/12pt}, \Key{modular}, or \Key{musical}, which set the key \Key{typographic\-/scale} to the corresponding value.
+
+The classic typographic scale consists of the traditional font sizes
+\numlist{6;7;8;9;10;11;12;14;16;18;21;24;36;48;60;72}.%
+\footnote{See \S{}3.1 of \textit{The Elements of Typographic Style} by Robert Bringhurst.}
+They have been used since the sixteenth century and are the default font sizes on most computer software.
+The keys \Key{classic-10pt, classic-11pt, classic-12pt} set the size of each font size command to values based on their position in the classic typographic scale.
+The size of \cs{normalsize} is the named point size.
+The sizes of the other font size commands are the adjacent font sizes in the scale.
+Table~\ref{table:classicscales} lists the size of each font size command when using a classic typographic scale.
+
+\input{./fontscale-manual-table-classic.tex}
+
+The key \Key{modular} sets the font sizes from \cs{tiny} to \cs{Huge} using a modular typographic scale.
+In a modular scale, each font size is a fixed ratio from the adjacent font sizes.%
+\footnote{\url{https://alistapart.com/article/more-meaningful-typography/}}
+Here, the base font size is the size of \cs{normalsize}, which can be set via the key \Key{normalsize/size}[\meta{size}], more documented in \S\ref{sec:overwriting}.
+If not set, \cs{normalsize} initializes to \qty{10}{pt}.
+The modular ratio can be set via the key \Key{modular\slash{}ratio}.
+The initial modular ratio is \num{1.125}.
+
+\input{./fontscale-manual-table-modular-musical.tex}
+
+The key \Key{musical} sets the font sizes according to their position in a musical typographic scale.
+The font size is calculated using the formula:%
+\footnote
+ {%
+ I have referenced this article by Spencer Mortensen:
+ \newline
+ \url{https://spencermortensen.com/articles/typographic-scale/}%
+ }
+\[ f_i = f_0 \times r ^ { i / n } \]
+$f_0$ is the base font size, the size of \cs{normalsize}.
+$f_i$ is the font size with font step~$i$.
+$n$ is the number of notes in the musical scale\---the number of font size gradations or steps above \cs{normalsize}.
+$r$ is the ratio of the musical scale, the ratio of the highest to the lowest note $ f_n / f_0 $.
+(The modular typographic scale is actually a special case of the musical typographic scale where $n=1$.)
+
+The musical ratio~$r$ and the number of notes~$n$ can be set via the keys \Key{musical\slash{}ratio} and \Key{musical\slash{}notes}.
+The initial musical ratio\---\num{2}\---and the initial number of notes\---\num{5}\---are the same as that of the classic typographic scale.%
+\footnote{Ibid.}
+Conveniently, \cs{Huge} is \num{5} steps above \cs{normalsize}.
+The font size of \cs{normalsize}~$f_0$ can be set using the key \Key{normalsize/size}[\meta{size}], more documented in \S\ref{sec:overwriting}.
+When using a musical typographic scale, \cs{normalsize} initializes to \qty{10}{pt}.%
+\footnote {I have set the initial value to \qty{10}{pt} instead of the \qty{12}{pt} recommended by the Spencer Mortensen article because this matches the default settings of the standard \LaTeXe{} document classes.}
+
+\Key{baselineskip-size-ratio}[\meta{number}][1.2]
+\KeepNextPar*
+
+The key \Key{baselineskip\-/size\-/ratio} sets the ratio of the font baselineskip to the font size.
+By default, the font baselineskip of each font size command equals its font size times \Key{baselineskip\-/size\-/ratio}.
+Users should not adjust this value unless they really know what they are doing.
+When using increased line spacing, users should prefer the low\-/level font command \cs{linespread} or the \pkg{setspace} package.
+
+
+\section{Overwriting the typographic scale}
+\label{sec:overwriting}
+
+In some situations, users may need to explicitly set the scale, size, or baselineskip of a font size command, overwriting the value set by the keys in \S\ref{sec:choosing}.
+Note that the font steps and the scale of \cs{normalsize} are constants and cannot be changed.
+
+\Key{\meta{font size command}/scale}[\meta{number}]
+\KeepNextPar*
+
+The keys \Key{\meta{font size command}\slash{}scale} set the scale of \meta{font size command} to \meta{number}, ignoring the value set by the key \Key{typographic-scale}.
+The key \Key{normalsize\slash{}scale} is not defined.
+
+\Key{\meta{font size command}/size}[\meta{size}]
+\KeepNextPar*
+
+The keys \Key{\meta{font size command}\slash{}size} set the size of \meta{font size command} to \meta{size}, ignoring the values set by the keys \Key{typographic-scale} and \Key{\meta{font size command}\slash{}scale}.
+\meta{size} supplies a default unit of \unit{pt}.
+
+The package will issue a warning if the user sets the keys \Key{\meta{font size command}\slash{}size} and \Key{\meta{font size command}\slash{}scale} for the same \meta{font size command} since the latter key will be ignored.
+
+\Key{\meta{font size command}/baselineskip}[\meta{skip}]
+\KeepNextPar*
+
+The keys \Key{\meta{font size command}\slash{}baselineskip} set the font baselineskip of \meta{font size command} to \meta{skip} instead of calculating it from the size of \meta{font size command} and \Key{baselineskip\-/size\-/ratio}.
+\meta{skip} supplies a default unit of \unit{pt}.
+
+\Key{\meta{font size command}}[\meta{size}]
+\nopagebreak\newline
+\Key{\meta{font size command}}[\meta{size}/\meta{baselineskip}]
+
+The keys \Key{\meta{font size command}} set the keys \Key{\meta{font size command}\slash{}size} or \Key{\meta{font size command}\slash{}baselineskip} in a condensed format.
+The latter format resembles traditional typographic notation where the size and leading of a text can be expressed as, for example, $10/12$ or $11/13$.
+The number before/after the slash is the size/leading in \unit{pts}.
+
+\Key{ignore-order}[true, false][false]
+\KeepNextPar*
+
+The user should take care to ensure that the font sizes and font baselineskips remain in the correct order when directly setting the scales, sizes, or baselineskips of the different font size commands.
+The magnitudes of the sizes and baselineskips should be ordered from \cs{tiny} to \cs{normalsize} to \cs{Huge}.
+This is important for typographic and syntactic consistency.
+This package will issue a warning if they are not in the correct order.
+The user can disable this warning via the key \Key{ignore\-/order}[true] or just \Key{ignore\-/order}.
+
+
+\section{User commands}
+\label{sec:usercommands}
+
+\subsection{Expandable font parameters}
+\label{subsec:fontparameters}
+
+\cs{CurrentFontStep}
+\nopagebreak\newline
+\cs{CurrentFontScale}
+\newline
+\cs{CurrentFontSize}
+\nopagebreak\newline
+\cs{CurrentFontBaselineskip}
+
+These are fully expandable commands that expand to the current font step, scale, size, or baselineskip.
+They can be used for printing or within calculations.
+Caution: \cs{CurrentFontStep} will expand to nothing if the current step is undefined.
+
+Internally, \cs{CurrentFontStep}, \cs{CurrentFontScale}, and \cs{CurrentFontSize} use the kernel command \cs{f@size}.
+\cs{CurrentFontSize} expands to \texttt{f@size pt}.
+\cs{CurrentFontBaselineskip} expands to the kernel command \cs{f@baselineskip}.
+Note that the low\-/level font command \cs{fontsize}\marg{\meta{size}}\allowbreak\marg{\meta{baselineskip}} sets \cs{f@size} before expanding its second argument.
+This means that \cs{CurrentFontStep}, \cs{CurrentFontScale}, and \cs{CurrentFontSize} may need to be first expanded if used in \meta{baselineskip}.
+This package provides the command \cs{SetFontSizeBaselineskip} as an alternative to \cs{fontsize} + \cs{selectfont} that avoids this issue (\S\ref{subsec:fontsize}).
+
+\subsection{More font sizing commands}
+\label{subsec:fontsize}
+
+The \pkg{fontscale} package provides the commands \cs{SetFontStep}, \cs{SetFontScale}, \cs{SetFontSize}, \cs{ScaleFont}, and \cs{SetFontSizeBaselineskip} which set the font size in different ways.
+The first three commands have a starred version which sets the font size relative to the current font size.
+Internally, these commands all use the low\-/level font commands \cs{fontsize}\marg{\meta{size}}\allowbreak\marg{\meta{baselineskip}} and \cs{selectfont}.
+These commands should be used only in special cases.
+Generally, users should prefer the font size commands from \cs{tiny} to \cs{Huge} for typographic and syntactic consistency, although \cs{SetFontStep*}\marg{\meta{integer}} can use a font size command directly.
+
+\cs{SetFontStep}\marg{\meta{number}}
+\nopagebreak\newline
+\cs{SetFontStep*}\marg{\meta{number}}
+
+\cs{SetFontStep} sets the font size by setting the font step to \meta{number}.
+The starred version \cs{SetFontStep*} adds \meta{number} to the current font step.
+If the choice of typographic scale is not modular or musical, then the only valid values for \meta{number} are the integers from \num{-4} to \num{5}, corresponding to the font size commands from \cs{tiny} to \cs{Huge}.
+\cs{SetFontStep} will issue an error if the step is invalid.
+\cs{SetFontStep} sets the font baselineskip to the calculated font size \texttimes{} \Key{baselineskip\-/size\-/ratio}.
+If the step matches the step of any font size command, then that font size command will be used directly.
+
+\listheading{Examples:}
+\begin{itemize}
+ \item
+ For example, \cs{SetFontStep}\marg{-2} and \cs{SetFontStep}\marg{2} use \cs{footnotesize} and \cs{Large}.
+ Note that it is typically better to use the equivalent font size command in place of \cs{SetFontStep}\marg{\meta{integer}}.
+ \item
+ If the current font size is \cs{normalsize}, \cs{SetFontStep*}\marg{1} and \cs{SetFontStep*}\marg{-1} use \cs{large} and \cs{small}.
+ This is useful for moving up or down a note on the typographic scale.
+ \item
+ If the choice of typographic scale is modular or musical, \cs{SetFontStep*}\marg{-0.5} sets the font size and font baselineskip to values between that of \cs{normalsize} and \cs{small}.
+ Otherwise, it produces an error.
+\end{itemize}
+
+\cs{SetFontScale}\marg{\meta{number}}
+\nopagebreak\newline
+\cs{SetFontScale*}\marg{\meta{number}}
+
+\cs{SetFontScale} sets the font size by setting the font scale to \meta{number}.
+The font baselineskip is set to the calculated font size \texttimes{} \Key{baselineskip\-/size\-/ratio}.
+The starred version \cs{SetFontScale*} adds \meta{number} to the current font scale.
+For example, \cs{SetFontScale}\marg{1.25} makes the font size 25\% larger than \cs{normalsize}.
+If the current font size is \cs{normalsize}, \cs{SetFontScale*}\marg{0.25} is equivalent to \cs{SetFontScale}\marg{1.25}.
+
+\cs{SetFontSize}\marg{\meta{size}}
+\nopagebreak\newline
+\cs{SetFontSize*}\marg{\meta{size}}
+
+\cs{SetFontSize} sets the font size to \meta{size}.
+\meta{size} supplies a default unit of \unit{pt}.
+The font baselineskip is set to the font size \texttimes{} \Key{baselineskip\-/size\-/ratio}.
+The starred version \cs{SetFontSize*} adds \meta{size} to the current size.
+For example, \cs{SetFontSize*}\marg{1} and \cs{SetFontSize*}\marg{-1pt} increase and decrease the current font size by a \unit{pt}.
+
+\cs{ScaleFont}\marg{\meta{number}}
+\KeepNextPar*
+
+Scales the current font size and the current font baselineskip by \meta{number}.
+\cs{ScaleFont} resembles the \cs{scalefont} command provided by the \pkg{scalefnt} package, except that it uses floating point calculations and clears the stretch and shrink components of the font baselineskip.
+For example, if the current font size and font baselineskip are \qty{10}{pt} and \qty{12}{pt}, using \cs{ScaleFont}\marg{0.8} will reduce them proportionally to \qty{8}{pt} and \qty{9.6}{pt}.
+
+\cs{SetFontSizeBaselineskip}\marg{\meta{size}}\marg{\meta{baselineskip}}
+\KeepNextPar*
+
+Sets the font size and font baselineskip to \meta{size} and \meta{baselineskip}.
+Both \meta{size} and \meta{baselineskip} supply a default unit of \unit{pt}.
+\cs{SetFontSizeBaselineskip} can be used as an alternative to \cs{fontsize} + \cs{selectfont} as it avoids the issue with \cs{f@size} discussed in \S\ref{subsec:fontparameters}
+\vfill\pagebreak%manual
+
+\subsection{Testing and debugging}
+\label{subsec:debug}
+
+The commands documented here are intended primarily for testing and debugging.
+I have used them often when developing this package so I think users will find them helpful.
+
+\cs{PrintFontParameters}
+\nopagebreak\newline
+\cs{PrintAllFontParameters}
+
+\cs{PrintFontParameters} prints the current step, scale, size, and baselineskip in this order in a comma\-/separated list of key = value pairs.
+If the current step is undefined (as explained for \cs{SetFontStep} in \S\ref{subsec:fontsize}), it will be left blank.
+\cs{PrintAllFontParameters} prints the step, scale, size, and baselineskip of each font size command.
+
+\cs{PrintSampleText}\oarg{\meta{text}}
+\nopagebreak\newline
+\cs{PrintSampleText*}\oarg{\meta{text}}
+
+\cs{PrintSampleText} prints \meta{text} in each font size ordered from \cs{tiny} to \cs{Huge} each followed by a paragraph break.
+The starred version \cs{PrintSampleText*} reverses the sizing order.
+The \meta{text} can be changed via the optional argument, but cannot contain \cs{par} tokens.
+The default \meta{text} is \enquote{The \texttt{fontscale} package: A user interface for setting document font sizes}.
+
+\cs{PrintFontSizeCommand}
+\KeepNextPar*
+
+\cs{PrintFontSizeCommand} tests whether the current font size and font baselineskip match that of any font size command.
+If so, it prints the name of that font size command.
+If not, it instead prints \enquote{UNDEFINED\@}.
+One useful way of printing example text is by using
+\cs{PrintSampleText}\allowbreak\oarg{\cs{PrintFontSizeCommand}:\textvisiblespace{}\cs{PrintFontParameters}}.
+
+\subsection
+ {%
+ \texorpdfstring
+ {More on \cs{fontscalesetup}}
+ {More on \textbackslash{}fontscalesetup}%
+ }
+\label{subsec:fontscalesetup}
+
+\cs{fontscalesetup}\marg{\meta{keys}}
+\KeepNextPar*
+
+Sets and processes the \pkg{fontscale} package keys and uses \cs{normalsize}.
+\cs{fontscalesetup} can be applied mid\-/document or locally within the current \TeX{} group.
+The key \Key{reset} is also available.
+Its value must be either \texttt{initial} or \texttt{preamble}.
+The key \Key{reset}[initial] or just \Key{reset} sets all the keys to their initial values.
+The key \Key{reset}[preamble] sets all the keys to their values at the end of the preamble (or does nothing if used before the end of the preamble).
+
+
+\section{Programming}
+\label{sec:programming}
+
+For \LaTeX3 programmers, the \pkg{fontscale} package provides some public \pkg{expl3} variables.
+No public \pkg{expl3} functions are provided.
+The package stores in public variables the step, scale, size, and baselineskip of each font size command.
+These variables should not be modified directly.
+Instead, they should be modified only indirectly via the command \cs{fontscalesetup}.
+
+Each takes the form:
+
+\begingroup
+ \ttfamily
+ \textbackslash{}c\_fontscale\_\meta{font size command}\_step\_fp
+ \nopagebreak\newline
+ \textbackslash{}l\_fontscale\_\meta{font size command}\_scale\_fp
+ \newline
+ \textbackslash{}l\_fontscale\_\meta{font size command}\_size\_dim
+ \nopagebreak\newline
+ \textbackslash{}l\_fontscale\_\meta{font size command}\_baselineskip\_skip
+\endgroup
+
+Exception:
+\cs{l_fontscale_normalsize_scale_fp} is not defined.
+The scale of \cs{normalsize} is instead stored as the constant \cs{c_fontscale_normalsize_scale_fp}, which always equals \num{1}.
+
+The step, scale, size, and baselineskip of each font size command are also stored in property lists, one for each font size command:
+
+\texttt{\textbackslash{}l\_fontscale\_\meta{font size command}\_prop}
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/fontscale/fontscale.sty b/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
index ac56b07015d..c4ad86c21d3 100644
--- a/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
+++ b/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
@@ -1,5 +1,6 @@
% Package : fontscale -- A user interface for setting document font sizes
% Copyright : 2024 (c) Oliver Beery <beeryoliver@gmail.com>
+% CTAN : https://ctan.org/pkg/fontscale
% Repository: https://github.com/beeryoliver/fontscale
% License : The LaTeX Project Public License 1.3c
@@ -7,8 +8,8 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{fontscale}
- {2024-03-04}
- {1.0.0}
+ {2024-03-08}
+ {1.0.1}
{A user interface for setting document font sizes}
% The 2023-10-10 l3kernel update added many 'e'-variants.
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 97d25089a5d..7ba811bfdc2 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2197,6 +2197,7 @@ $standardtex
'fontawesome5','\.lua|' . $standardtex,
'fontch', '\.tex',
'fontloader-luaotfload', '\.lua$',
+ 'fontscale', '\.sty', # not beery.cls
'footnpag', 'footnpag\.sty',
'fragments', '\.tex|' . $standardtex,
'frame', 'frame\.tex|' . $standardtex,