texlive[73990] branches/branch2024.final/Master/texmf-dist: fontscale
commits+karl at tug.org
commits+karl at tug.org
Fri Feb 14 23:35:42 CET 2025
Revision: 73990
https://tug.org/svn/texlive?view=revision&revision=73990
Author: karl
Date: 2025-02-14 23:35:42 +0100 (Fri, 14 Feb 2025)
Log Message:
-----------
fontscale (branch) (14feb25)
Modified Paths:
--------------
branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md
branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/beery.cls
branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-code.pdf
branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-code.tex
branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex
branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex
branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex
branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale.pdf
branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale.tex
branches/branch2024.final/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md 2025-02-14 22:35:32 UTC (rev 73989)
+++ branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md 2025-02-14 22:35:42 UTC (rev 73990)
@@ -7,6 +7,11 @@
## [Unreleased]
+## [v3.1.2] - 2025-02-13
+
+### Fixed
+- The package now correctly requires `l3kernel` version 2023-11-09.
+
## [v3.1.1] - 2025-02-06
### Changed
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/beery.cls
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/beery.cls 2025-02-14 22:35:32 UTC (rev 73989)
+++ branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/beery.cls 2025-02-14 22:35:42 UTC (rev 73990)
@@ -1,25 +1,23 @@
-% Note: This class is designed ONLY for 'fontscale.tex'. Compiled with LuaTeX.
+% Note: This class is designed ONLY for 'fontscale.tex'.
% LOADING THE CLASS
-% LaTeX2e version 2023-11-01 added \IfExplAtLeastTF.
\NeedsTeXFormat{LaTeX2e}[2023-11-01]
\ProvidesExplClass
{beery}
- {2025-02-06}
+ {2025-02-13}
{0.0.0}
{}
\prop_gput:Nnn \g_msg_module_type_prop { beery } { Class }
-% l3kernel version 2023-10-10 added many 'e'-variants.
-\IfExplAtLeastTF { 2023-10-10 } { }
+\IfExplAtLeastTF { 2023-11-09 } { }
{
\msg_new:nnn { beery } { l3kernel-out-of-date }
{
- The~ beery~ class~ could~ not~ load.~
+ The~ beery~ class~ could~ not~ load. \\
This~ class~ requires~
- L3~ programming~ layer~ version~ 2023-10-10~ or~ newer.
+ L3~ programming~ layer~ version~ 2023-11-09~ or~ newer.
}
\msg_critical:nn { beery } { l3kernel-out-of-date }
}
@@ -27,7 +25,10 @@
\sys_if_engine_luatex:F
{
\msg_new:nnn { beery } { luatex-required }
- { The~ beery~ class~ could~ not~ load.~ This~ class~ requires~ LuaTeX. }
+ {
+ The~ beery~ class~ could~ not~ load. \\
+ This~ class~ requires~ LuaTeX.
+ }
\msg_critical:nn { beery } { luatex-required }
}
@@ -65,9 +66,9 @@
\fp_const:Nn \c_beery_golden_ratio_fp { 1.6180 3398 8749 8948 }
\tl_const:Nn \c_beery_alphabet_tl { abcdefghijklmnopqrstuvwxyz }
\tl_const:Nn \c_beery_digits_tl { 0123456789 }
+\tl_const:Nn \c_beery_pangram_tl
+ { The~ quick~ brown~ fox~ jumps~ over~ the~ lazy~ dog. }
-\regex_const:Nn \c__beery_ends_in_letter_regex { ^.*[A-Za-z]$ }
-
% Scratch variables
\box_new:N \l__beery_tmp_box
@@ -74,9 +75,8 @@
% CUSTOM MACROS
\NewExpandableDocumentCommand \alphabet { } { \c_beery_alphabet_tl }
-\NewExpandableDocumentCommand \digits { } { \c_beery_digits_tl }
-\NewExpandableDocumentCommand \pangram { }
- { The~ quick~ brown~ fox~ jumps~ over~ the~ lazy~ dog. }
+\NewExpandableDocumentCommand \digits { } { \c_beery_digits_tl }
+\NewExpandableDocumentCommand \pangram { } { \c_beery_pangram_tl }
\NewDocumentCommand \Key
{ >{ \TrimSpaces } m >{ \TrimSpaces } o >{ \TrimSpaces } o }
@@ -189,10 +189,7 @@
{ \__beery_text_all_caps:nn {#1} {#2} }
}
\cs_new_protected:Npn \__beery_text_all_caps:nn #1#2
- {
- \textls [ \int_eval:n {#1} ] { \text_uppercase:n {#2} }
- \regex_match:NnT \c__beery_ends_in_letter_regex {#2} { \@ }
- }
+ { \textls [ \int_eval:n {#1} ] { \text_uppercase:n {#2} } }
\NewDocumentCommand \allsmallcaps
{ >{ \ReverseBoolean } s O { 50 } >{ \TrimSpaces } m }
{
@@ -354,9 +351,9 @@
, itemsep = \c_zero_skip
}
\setlist [ itemize , 1 ] { label = \textbullet }
-\setlist [ itemize , 2 ] { label = \ScaleTextBullets { 2 } }
-\setlist [ itemize , 3 ] { label = \ScaleTextBullets { 3 } }
-\setlist [ itemize , 4 ] { label = \ScaleTextBullets { 4 } }
+\setlist [ itemize , 2 ] { label = \scaletextbullets { 2 } }
+\setlist [ itemize , 3 ] { label = \scaletextbullets { 3 } }
+\setlist [ itemize , 4 ] { label = \scaletextbullets { 4 } }
\setlist [ enumerate , 1 ] { label = \arabic* . }
\setlist [ enumerate , 2 ] { label = \theenumi \arabic* . }
\setlist [ enumerate , 3 ] { label = \theenumii \arabic* . }
@@ -364,7 +361,7 @@
% list headings
% https://tex.stackexchange.com/questions/2644/how-to-prevent-a-page-break-before-an-itemize-list
-\NewDocumentCommand \keepnextpar { > { \ReverseBoolean } s }
+\NewDocumentCommand \keepnextpar { >{ \ReverseBoolean } s }
{
\mode_if_math:TF
{
@@ -390,9 +387,9 @@
\msg_error:nne { beery } { math-mode-error }
{ \token_to_str:N \listheading }
}
- { \__beery_typeset_list_heading:n {#1} }
+ { \__beery_list_heading:n {#1} }
}
-\cs_new_protected:Npn \__beery_typeset_list_heading:n #1
+\cs_new_protected:Npn \__beery_list_heading:n #1
{
\par
#1
@@ -451,7 +448,10 @@
% REFERENCES
-\AddToHook { shipout / lastpage } { \label { LastPage } }
+\cs_new_protected:Npn \__beery_hook_code_shipout_last_page:
+ { \label { LastPage } }
+\hook_gput_code:nnn { shipout / last page } { beery }
+ { \__beery_hook_code_shipout_last_page: }
\RequirePackage { xurl }
\RequirePackage { hyperref }
\hypersetup { bookmarksnumbered , hidelinks , linktoc = page }
\ No newline at end of file
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-code.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-code.tex
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-code.tex 2025-02-14 22:35:32 UTC (rev 73989)
+++ branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-code.tex 2025-02-14 22:35:42 UTC (rev 73990)
@@ -20,7 +20,7 @@
Oliver Beery
-Version 3.1.1\quad{}6 February 2025
+Version 3.1.2\quad{}13 February 2025
\dochighinput[language=latex/latex3]{fontscale.sty}
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex 2025-02-14 22:35:32 UTC (rev 73989)
+++ branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex 2025-02-14 22:35:42 UTC (rev 73990)
@@ -1,4 +1,4 @@
-\ProvidesFile{fontscale-table-classic.tex}[2025-02-06]
+\ProvidesFile{fontscale-table-classic.tex}[2025-02-13]
\begin{table}
\centering
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex 2025-02-14 22:35:32 UTC (rev 73989)
+++ branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex 2025-02-14 22:35:42 UTC (rev 73990)
@@ -1,4 +1,4 @@
-\ProvidesFile{fontscale-table-font-steps.tex}[2025-02-06]
+\ProvidesFile{fontscale-table-font-steps.tex}[2025-02-13]
\begin{table}
\centering
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex 2025-02-14 22:35:32 UTC (rev 73989)
+++ branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex 2025-02-14 22:35:42 UTC (rev 73990)
@@ -1,4 +1,4 @@
-\ProvidesFile{fontscale-table-musical.tex}[2025-02-06]
+\ProvidesFile{fontscale-table-musical.tex}[2025-02-13]
\begin{table}
\centering
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale.tex
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale.tex 2025-02-14 22:35:32 UTC (rev 73989)
+++ branches/branch2024.final/Master/texmf-dist/doc/latex/fontscale/fontscale.tex 2025-02-14 22:35:42 UTC (rev 73990)
@@ -14,7 +14,7 @@
Oliver Beery
-Version 3.1.1\quad{}6 February 2025
+Version 3.1.2\quad{}13 February 2025
\section{Introduction}
@@ -45,7 +45,7 @@
\listheading{Requirements:}
\begin{itemize}
\item \LaTeXe{} version 2023-11-01 or newer
- \item \pkg{l3kernel} version 2023-10-10 or newer
+ \item \pkg{l3kernel} version 2023-11-09 or newer
\end{itemize}
You may need to ensure that your \LaTeX{} installation is up\-/to\-/date before using this package.
@@ -146,7 +146,7 @@
\numlist{6;7;8;9;10;11;12;14;16;18;21;24;36;48;60;72}.%
\footnote{See \S3.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.
-Setting the value of the key \Key{typographic-scale} to \Key{classic-10pt}, \Key{classic-11pt}, or \Key{classic-12pt} sets the font size of each font size command from \cs{tiny} to \cs{Huge} to values based on their position in the classic typographic scale.
+Setting the value of the key \Key{typographic-scale} to \texttt{classic-10pt}, \texttt{classic-11pt}, or \texttt{classic-12pt} sets the font size of each font size command from \cs{tiny} to \cs{Huge} to values based on their position in the classic typographic scale.
The named point size\---\qtylist[list-final-separator={, or }]{10;11;12}{pt}\---is the font size of \cs{normalsize}.
The font sizes of the other font size commands are the adjacent font sizes in the classic typographic scale.
Table \ref{table:classic} displays the font size of each font size command when using a classic typographic scale.
Modified: branches/branch2024.final/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
===================================================================
--- branches/branch2024.final/Master/texmf-dist/tex/latex/fontscale/fontscale.sty 2025-02-14 22:35:32 UTC (rev 73989)
+++ branches/branch2024.final/Master/texmf-dist/tex/latex/fontscale/fontscale.sty 2025-02-14 22:35:42 UTC (rev 73990)
@@ -10,18 +10,18 @@
\NeedsTeXFormat{LaTeX2e}[2023-11-01]
\ProvidesExplPackage
{fontscale}
- {2025-02-06}
- {3.1.1}
+ {2025-02-13}
+ {3.1.2}
{A flexible interface for setting font sizes}
-% l3kernel version 2023-10-10 added many 'e'-variants.
-\IfExplAtLeastTF { 2023-10-10 } { }
+% l3kernel version 2023-11-09 added documentation for \c_nan_fp.
+\IfExplAtLeastTF { 2023-11-09 } { }
{
\msg_new:nnn { fontscale } { l3kernel-out-of-date }
{
- The~ fontscale~ package~ could~ not~ load.~
+ The~ fontscale~ package~ could~ not~ load. \\
This~ package~ requires~
- L3~ programming~ layer~ version~ 2023-10-10~ or~ newer.
+ L3~ programming~ layer~ version~ 2023-11-09~ or~ newer.
}
\msg_critical:nn { fontscale } { l3kernel-out-of-date }
}
@@ -31,32 +31,28 @@
\msg_new:nnn { fontscale } { key-musical-base-out-of-bounds }
{
Invalid~ value~ '#1'~ \msg_line_context:. \\
- The~ value~ of~ the~ key~ 'musical / base'~
- must~ be~ a~ positive~ length.
+ The~ value~ of~ the~ key~ 'musical / base'~ must~ be~ a~ positive~ length.
}
\msg_new:nnn { fontscale } { key-musical-ratio-out-of-bounds }
{
Invalid~ value~ '#1'~ \msg_line_context:. \\
- The~ value~ of~ the~ key~ 'musical / ratio'~
- must~ be~ greater~ than~ 1.
+ The~ value~ of~ the~ key~ 'musical / ratio'~ must~ be~ greater~ than~ 1.
}
\msg_new:nnn { fontscale } { key-musical-notes-out-of-bounds }
{
Invalid~ value~ '#1'~ \msg_line_context:. \\
- The~ value~ of~ the~ key~ 'musical / notes'~
- must~ be~ a~ positive~ integer.
+ The~ value~ of~ the~ key~ 'musical / notes'~ must~ be~ a~ positive~
+ integer.
}
\msg_new:nnn { fontscale } { key-font-scale-out-of-bounds }
{
- Invalid~ value~ '#1'~ \msg_line_context:. \\
- The~ value~ of~ the~ key~ '#2 / scale'~
- must~ be~ positive.
+ Invalid~ value~ '#2'~ \msg_line_context:. \\
+ The~ value~ of~ the~ key~ '#1 / scale'~ must~ be~ positive.
}
\msg_new:nnn { fontscale } { key-font-size-out-of-bounds }
{
- Invalid~ value~ '#1'~ \msg_line_context:. \\
- The~ value~ of~ the~ key~ '#2 / size'~
- must~ be~ a~ positive~ length.
+ Invalid~ value~ '#2'~ \msg_line_context:. \\
+ The~ value~ of~ the~ key~ '#1 / size'~ must~ be~ a~ positive~ length.
}
\msg_new:nnn { fontscale } { key-font-scale-overwritten }
{
@@ -192,8 +188,6 @@
% the font size equals that of \normalsize is optimized further because it is
% by far the most common case. \f at size and \f at baselineskip are not used
% elsewhere in the code.
-\hook_gput_code:nnn { selectfont } { fontscale }
- { \__fontscale_hook_code_selectfont: }
\cs_new_protected:Npn \__fontscale_hook_code_selectfont:
{
\dim_set:Nn \l_fontscale_size_dim { \f at size pt }
@@ -284,6 +278,8 @@
}
{ \fp_set_eq:NN \l_fontscale_step_fp \c_nan_fp }
}
+\hook_gput_code:nnn { selectfont } { fontscale }
+ { \__fontscale_hook_code_selectfont: }
% Used only to speed up floating point calculations.
\fp_new:N \l__fontscale_normalsize_size_fp
@@ -302,7 +298,7 @@
%%> \section{Some functions}
% Variants of l3kernel functions
-\cs_generate_variant:Nn \msg_error:nnnn { nnv , nne }
+\cs_generate_variant:Nn \msg_error:nnnn { nnnv }
% Sets a dimen/skip variable from a dimen/skip expression, appending a default
% unit 'pt', and removes extra trailing tokens, if any.
\cs_new_protected:Npn \__fontscale_dim_set_default_pt:Nn #1#2
@@ -704,8 +700,8 @@
{ \l__fontscale_normalsize_size_tl }
\dim_compare:nNnF \l_fontscale_normalsize_size_dim > \c_zero_dim
{
- \msg_error:nnVn { fontscale } { key-font-size-out-of-bounds }
- \l_fontscale_normalsize_size_dim { normalsize }
+ \msg_error:nnnV { fontscale } { key-font-size-out-of-bounds }
+ { normalsize } \l_fontscale_normalsize_size_dim
\prg_break:
}
}
@@ -842,8 +838,8 @@
{
\tl_map_break:n
{
- \msg_error:nnen { fontscale } { key-font-scale-out-of-bounds }
- { \fp_eval:n { \use:c { l__fontscale_#1_scale_tl } } } {#1}
+ \msg_error:nnne { fontscale } { key-font-scale-out-of-bounds }
+ {#1} { \fp_eval:n { \use:c { l__fontscale_#1_scale_tl } } }
\prg_break:
}
}
@@ -857,8 +853,8 @@
{
\tl_map_break:n
{
- \msg_error:nnvn { fontscale } { key-font-size-out-of-bounds }
- { l_fontscale_#1_size_dim } {#1}
+ \msg_error:nnnv { fontscale } { key-font-size-out-of-bounds }
+ {#1} { l_fontscale_#1_size_dim }
\prg_break:
}
}
More information about the tex-live-commits
mailing list.