texlive[74589] Master/texmf-dist: fontscale (12mar25)

commits+karl at tug.org commits+karl at tug.org
Wed Mar 12 20:33:41 CET 2025


Revision: 74589
          https://tug.org/svn/texlive?view=revision&revision=74589
Author:   karl
Date:     2025-03-12 20:33:40 +0100 (Wed, 12 Mar 2025)
Log Message:
-----------
fontscale (12mar25)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md
    trunk/Master/texmf-dist/doc/latex/fontscale/beery.cls
    trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-code.pdf
    trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-code.tex
    trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex
    trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex
    trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex
    trunk/Master/texmf-dist/doc/latex/fontscale/fontscale.pdf
    trunk/Master/texmf-dist/doc/latex/fontscale/fontscale.tex
    trunk/Master/texmf-dist/tex/latex/fontscale/fontscale.sty

Modified: trunk/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md	2025-03-12 19:33:31 UTC (rev 74588)
+++ trunk/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md	2025-03-12 19:33:40 UTC (rev 74589)
@@ -7,6 +7,17 @@
 
 ## [Unreleased]
 
+## [v4.0.1] - 2025-03-11
+
+### Changed
+- The package now issues a package error if the font size would be 2048pt or
+  greater.
+
+### Fixed
+- Fixed a rare issue where `\fontscalesetup` would not issue a package error if
+  the font size of a font size command was `0pt` and the value of the key
+  `typographic-scale` was `musical`.
+
 ## [v4.0.0] - 2025-03-02
 
 ### Added

Modified: trunk/Master/texmf-dist/doc/latex/fontscale/beery.cls
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontscale/beery.cls	2025-03-12 19:33:31 UTC (rev 74588)
+++ trunk/Master/texmf-dist/doc/latex/fontscale/beery.cls	2025-03-12 19:33:40 UTC (rev 74589)
@@ -3,7 +3,7 @@
 % LOADING THE CLASS
 
 \NeedsTeXFormat{LaTeX2e}[2023-11-01]
-\ProvidesExplClass{beery}{2025-03-02}{0.0.0}{}
+\ProvidesExplClass{beery}{2025-03-11}{0.0.0}{}
 
 \prop_gput:Nnn \g_msg_module_type_prop { beery } { Class }
 
@@ -283,9 +283,9 @@
   }
 \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
+\setlength \bigskipamount   { \skip_use:N \c_beery_big_skip    }
+\setlength \medskipamount   { \skip_use:N \c_beery_medium_skip }
+\setlength \smallskipamount { \skip_use:N \c_beery_small_skip  }
 \skip_log:N \c_beery_big_skip
 \skip_log:N \c_beery_medium_skip
 \skip_log:N \c_beery_small_skip
@@ -292,10 +292,10 @@
 
 % \flushbottom
 \raggedbottom
-\int_set:Nn \vbadness { 100 }
+\vbadness = 100
 
-\skip_set:Nn \topskip { \l_fontscale_normalsize_size_dim }
-\skip_set_eq:NN \splittopskip \topskip
+\setlength \topskip { \dim_use:N \l_fontscale_normalsize_size_dim }
+\setlength \splittopskip { \topskip }
 
 \RequirePackage { geometry }
 \dim_const:Nn \c_beery_textwidth_dim
@@ -310,13 +310,13 @@
 \geometry
   {
       a4paper
-    , textwidth = \c_beery_textwidth_dim
-    , textheight = \c_beery_textheight_dim
+    , textwidth = \dim_use:N \c_beery_textwidth_dim
+    , textheight = \dim_use:N \c_beery_textheight_dim
     , heightrounded
     , centering
-    , headheight = \l_fontscale_footnotesize_baselineskip_skip
-    , headsep = \c_beery_big_dim
-    , footskip = \c_beery_footskip_dim
+    , headheight = \skip_use:N \l_fontscale_footnotesize_baselineskip_skip
+    , headsep = \dim_use:N \c_beery_big_dim
+    , footskip = \dim_use:N \c_beery_footskip_dim
   }
 
 \RequirePackage { fancyhdr }
@@ -331,24 +331,24 @@
 % \frenchspacing
 \nonfrenchspacing
 \linespread { 1 }
-\RequirePackage [ skip = \c_beery_medium_skip ] { parskip }
+\RequirePackage [ skip = \skip_use:N \c_beery_medium_skip ] { parskip }
 \RequirePackage [ raggedrightboxes ] { ragged2e }
-\skip_set:Nn \RaggedRightRightskip { \c_zero_dim plus \c_beery_alphabet_dim }
-\dim_zero:N \RaggedRightParindent
-\dim_set_eq:NN \JustifyingParindent \RaggedRightParindent
+\setlength \RaggedRightRightskip { 0pt plus \dim_use:N \c_beery_alphabet_dim }
+\setlength \RaggedRightParindent { 0pt }
+\setlength \JustifyingParindent { \RaggedRightParindent }
 \RaggedRight
 % \justifying
 \RequirePackage { microtype }
 \microtypesetup { protrusion = false , expansion = false }
-\int_set:Nn \pretolerance { -1 }
-\int_set:Nn \tolerance { 200 }
-\dim_zero:N \emergencystretch
-\int_set:Nn \widowpenalty { 10000 }
-\int_set_eq:NN \clubpenalty \widowpenalty
-\int_set_eq:NN \displaywidowpenalty \widowpenalty
+\pretolerance = -1
+\tolerance = 200
+\setlength \emergencystretch { 0pt }
+\widowpenalty = 10000
+\clubpenalty = \widowpenalty
+\displaywidowpenalty = \widowpenalty
 % hyphenation
-\int_set:Nn \hyphenpenalty { 99 }
-\int_set_eq:NN \exhyphenpenalty \hyphenpenalty
+\hyphenpenalty = 50
+\exhyphenpenalty = \hyphenpenalty
 
 % HEADINGS, TABLE OF CONTENTS
 
@@ -357,21 +357,27 @@
 \setcounter { tocdepth } { 2 }
 
 \titlespacing* \section % section
-  { \c_zero_dim } % indent
+  { 0pt } % indent
   {
-    \c_beery_big_dim
-    plus  \fp_to_dim:n { 1 / 2 * 4 * \dim_to_fp:n { \c_beery_big_dim } }
-    minus \fp_to_dim:n { 1 / 3 / 4 * \dim_to_fp:n { \c_beery_big_dim } }
+    \skip_eval:n
+      {
+        \c_beery_big_dim
+        plus  \dim_eval:n { \c_beery_big_dim / 2 * 4 }
+        minus \dim_eval:n { \c_beery_big_dim / 3 / 4 }
+      }
   } % before
-  { \c_beery_medium_skip } % after
+  { \skip_use:N \c_beery_medium_skip } % after
 \titlespacing* \subsection
-  { \c_zero_dim }
+  { 0pt }
   {
-    \fp_to_dim:n { 4 / 3 * \dim_to_fp:n { \c_beery_medium_dim } }
-    plus  \fp_to_dim:n { 1 / 2 * 4 * \dim_to_fp:n { \c_beery_medium_dim } }
-    minus \fp_to_dim:n { 1 / 3 / 4 * \dim_to_fp:n { \c_beery_medium_dim } }
+    \skip_eval:n
+      {
+        \dim_eval:n { \c_beery_medium_dim * 4 / 3 }
+        plus  \dim_eval:n { \c_beery_medium_dim / 2 * 4 }
+        minus \dim_eval:n { \c_beery_medium_dim / 3 / 4 }
+      }
   }
-  { \c_beery_medium_skip }
+  { \skip_use:N \c_beery_medium_skip }
 
 \titleformat \section % section
   [ block ] % shape
@@ -397,10 +403,10 @@
       leftmargin = *
     , labelsep  = 0.5em
       % vertical spacing
-    , topsep    = \c_zero_skip
-    , partopsep = \c_zero_skip
-    , parsep    = \c_beery_small_skip
-    , itemsep   = \c_zero_skip
+    , topsep    = 0pt
+    , partopsep = 0pt
+    , parsep    = \skip_use:N \c_beery_small_skip
+    , itemsep   = 0pt
   }
 \setlist [ itemize   , 1 ] { label = \textbullet }
 \setlist [ itemize   , 2 ] { label = \scaletextbullets { 2 } }
@@ -461,7 +467,7 @@
 \RequirePackage [ bottom ] { footmisc }
 \cs_set_protected:Npn \footnoterule { }
 % \setlength { \skip \footins } { \c_beery_big_skip }
-\dim_set:Nn \footnotesep { \f at linespread \footnotesep }
+\setlength \footnotesep { \f at linespread \footnotesep }
 \coffin_new:N \l__beery_footnote_coffin
 % 1.2 = baselineskip-size-ratio
 % \f at linespread must not be empty here
@@ -479,7 +485,7 @@
       {
         \list { \@thefnmark . }
           {
-            \dim_set:Nn \leftmargin
+            \setlength \leftmargin
               {
                 \fp_to_dim:n
                   {
@@ -487,10 +493,10 @@
                     \dim_to_fp:n { \textwidth }
                   }
               }
-            \dim_set_eq:NN \rightmargin \leftmargin
-            \dim_set:Nn \labelsep { 0.5em }
-            \skip_zero:N \topsep
-            \skip_zero:N \partopsep
+            \setlength \rightmargin { \leftmargin }
+            \setlength \labelsep { 0.5em }
+            \setlength \topsep { 0pt }
+            \setlength \partopsep { 0pt }
           }
         \item \tl_trim_spaces:n {#1} \endlist
       }

Modified: trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-code.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-code.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-code.tex	2025-03-12 19:33:31 UTC (rev 74588)
+++ trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-code.tex	2025-03-12 19:33:40 UTC (rev 74589)
@@ -20,7 +20,7 @@
 
 Oliver Beery
 
-Version 4.0.0\quad{}2 March 2025
+Version 4.0.1\quad{}11 March 2025
 
 \dochighinput[language=latex/latex3]{fontscale.sty}
 

Modified: trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex	2025-03-12 19:33:31 UTC (rev 74588)
+++ trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex	2025-03-12 19:33:40 UTC (rev 74589)
@@ -1,4 +1,4 @@
-\ProvidesFile{fontscale-table-classic.tex}[2025-03-02]
+\ProvidesFile{fontscale-table-classic.tex}[2025-03-11]
 
 \begin{table}
   \centering

Modified: trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex	2025-03-12 19:33:31 UTC (rev 74588)
+++ trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex	2025-03-12 19:33:40 UTC (rev 74589)
@@ -1,4 +1,4 @@
-\ProvidesFile{fontscale-table-font-steps.tex}[2025-03-02]
+\ProvidesFile{fontscale-table-font-steps.tex}[2025-03-11]
 
 \begin{table}
   \centering

Modified: trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex	2025-03-12 19:33:31 UTC (rev 74588)
+++ trunk/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex	2025-03-12 19:33:40 UTC (rev 74589)
@@ -1,4 +1,4 @@
-\ProvidesFile{fontscale-table-musical.tex}[2025-03-02]
+\ProvidesFile{fontscale-table-musical.tex}[2025-03-11]
 
 \begin{table}
   \centering

Modified: trunk/Master/texmf-dist/doc/latex/fontscale/fontscale.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/fontscale/fontscale.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontscale/fontscale.tex	2025-03-12 19:33:31 UTC (rev 74588)
+++ trunk/Master/texmf-dist/doc/latex/fontscale/fontscale.tex	2025-03-12 19:33:40 UTC (rev 74589)
@@ -14,7 +14,7 @@
 
 Oliver Beery
 
-Version 4.0.0\quad{}2 March 2025
+Version 4.0.1\quad{}11 March 2025
 
 
 \section{Introduction}

Modified: trunk/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fontscale/fontscale.sty	2025-03-12 19:33:31 UTC (rev 74588)
+++ trunk/Master/texmf-dist/tex/latex/fontscale/fontscale.sty	2025-03-12 19:33:40 UTC (rev 74589)
@@ -9,8 +9,8 @@
 % LaTeX2e version 2023-11-01 added \IfExplAtLeastTF.
 \NeedsTeXFormat{LaTeX2e}[2023-11-01]
 \DeclareRelease{v3}{2025-02-13}{fontscale-v3.sty}
-\DeclareCurrentRelease{}{2025-03-02}
-\ProvidesExplPackage{fontscale}{2025-03-02}{4.0.0}
+\DeclareCurrentRelease{}{2025-03-11}
+\ProvidesExplPackage{fontscale}{2025-03-11}{4.0.1}
   {A flexible interface for setting font sizes}
 
 % l3kernel version 2023-11-09 added documentation for \c_nan_fp.
@@ -28,12 +28,12 @@
 % fontscale defines \scalefont.
 \cs_new_protected:Npn \__fontscale_hook_scalefnt:
   {
-    \msg_new:nnn { fontscale } { package-scalefnt-incompatible }
+    \msg_new:nnn { fontscale } { package-scalefnt }
       {
         The~ fontscale~ package~ is~ incompatible~ with~ the~ 'scalefnt'~
         package.
       }
-    \msg_error:nn { fontscale } { package-scalefnt-incompatible }
+    \msg_error:nn { fontscale } { package-scalefnt }
   }
 \hook_gput_code:nnn { package / scalefnt / before } { fontscale }
   { \__fontscale_hook_scalefnt: }
@@ -43,7 +43,8 @@
 \msg_new:nnn { fontscale } { key-musical-base-invalid }
   {
     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~
+    and~ less~ than~ 2048pt.
   }
 \msg_new:nnn { fontscale } { key-musical-ratio-invalid }
   {
@@ -56,18 +57,13 @@
     The~ value~ of~ the~ key~ 'musical / notes'~ must~ be~ a~ positive~
     integer.
   }
-\msg_new:nnn { fontscale } { key-font-scale-invalid }
+\msg_new:nnn { fontscale } { name-font-size-invalid }
   {
-    Invalid~ value~ '#2'~ \msg_line_context:. \\
-    The~ value~ of~ the~ key~ '#1 / scale'~ must~ be~ positive.
+    Invalid~ font~ size~ of~ \iow_char:N \\#1~ '#2'~ \msg_line_context:. \\
+    The~ font~ size~ must~ be~ a~ positive~ length~ and~ less~ than~ 2048pt.
   }
-\msg_new:nnn { fontscale } { key-font-size-invalid }
+\msg_new:nnn { fontscale } { key-name-scale-overwritten }
   {
-    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 }
-  {
     The~ font~ size~ set~ by~ the~ key~ '#1 / scale'~
     has~ been~ overwritten~ by~ the~ key~ '#1 / size'~ \msg_line_context:.
   }
@@ -90,7 +86,7 @@
 \msg_new:nnn { fontscale } { font-size-invalid }
   {
     Invalid~ font~ size~ '#1'~ \msg_line_context:. \\
-    The~ font~ size~ must~ be~ a~ positive~ length.
+    The~ font~ size~ must~ be~ a~ positive~ length~ and~ less~ than~ 2048pt.
   }
 \msg_new:nnn { fontscale } { font-step-invalid }
   {
@@ -325,7 +321,7 @@
   }
 \cs_new_protected:Npn \__fontscale_set_font_size_aux:nn #1#2
   {
-    \dim_compare:nNnTF {#1} > \c_zero_dim
+    \dim_compare:nTF { \c_zero_dim < #1 < 2048pt }
       { \fontsize {#1} {#2} \selectfont }
       { \msg_error:nnn { fontscale } { font-size-invalid } {#1} }
   }
@@ -335,7 +331,7 @@
   { \exp_args:Ne \__fontscale_set_font_size_aux:n { \dim_eval:n {#1} } }
 \cs_new_protected:Npn \__fontscale_set_font_size_aux:n #1
   {
-    \dim_compare:nNnTF {#1} > \c_zero_dim
+    \dim_compare:nTF { \c_zero_dim < #1 < 2048pt }
       {
         \fontsize {#1}
           {
@@ -532,7 +528,7 @@
   }
 \cs_new_protected:Npn \__fontscale_keys_process_start:
   {
-    \dim_compare:nNnF \l__fontscale_musical_base_dim > \c_zero_dim
+    \dim_compare:nF { \c_zero_dim < \l__fontscale_musical_base_dim < 2048pt }
       {
         \msg_error:nnV { fontscale } { key-musical-base-invalid }
           \l__fontscale_musical_base_dim
@@ -571,9 +567,10 @@
       {
         \dim_set:Nn \l_fontscale_normalsize_size_dim
           { \l__fontscale_normalsize_size_tl }
-        \dim_compare:nNnF \l_fontscale_normalsize_size_dim > \c_zero_dim
+        \dim_compare:nF
+          { \c_zero_dim < \l_fontscale_normalsize_size_dim < 2048pt }
           {
-            \msg_error:nnnV { fontscale } { key-font-size-invalid }
+            \msg_error:nnnV { fontscale } { name-font-size-invalid }
               { normalsize } \l_fontscale_normalsize_size_dim
             \prg_break:
           }
@@ -593,60 +590,83 @@
           { \l__fontscale_normalsize_baselineskip_tl }
       }
   }
-% Auxiliary functions that expand to the font size depending on the name of the
-% font size command.
-\cs_new:Npn \__fontscale_keys_process_other_classic_xpt:n #1
+% Auxiliary functions that set the font size depending on the name of the font
+% size command.
+\cs_new_protected:Npn \__fontscale_keys_process_other_classic_xpt:n #1
   {
-    \str_case:nn {#1}
+    \dim_set:cn { l_fontscale_#1_size_dim }
       {
-        { tiny         } {  6pt }
-        { scriptsize   } {  7pt }
-        { footnotesize } {  8pt }
-        { small        } {  9pt }
-        { large        } { 11pt }
-        { Large        } { 12pt }
-        { LARGE        } { 14pt }
-        { huge         } { 16pt }
-        { Huge         } { 18pt }
+        \str_case:nn {#1}
+          {
+            { tiny         } {  6pt }
+            { scriptsize   } {  7pt }
+            { footnotesize } {  8pt }
+            { small        } {  9pt }
+            { large        } { 11pt }
+            { Large        } { 12pt }
+            { LARGE        } { 14pt }
+            { huge         } { 16pt }
+            { Huge         } { 18pt }
+          }
       }
   }
-\cs_new:Npn \__fontscale_keys_process_other_classic_xipt:n #1
+\cs_new_protected:Npn \__fontscale_keys_process_other_classic_xipt:n #1
   {
-    \str_case:nn {#1}
+    \dim_set:cn { l_fontscale_#1_size_dim }
       {
-        { tiny         } {  7pt }
-        { scriptsize   } {  8pt }
-        { footnotesize } {  9pt }
-        { small        } { 10pt }
-        { large        } { 12pt }
-        { Large        } { 14pt }
-        { LARGE        } { 16pt }
-        { huge         } { 18pt }
-        { Huge         } { 21pt }
+        \str_case:nn {#1}
+          {
+            { tiny         } {  7pt }
+            { scriptsize   } {  8pt }
+            { footnotesize } {  9pt }
+            { small        } { 10pt }
+            { large        } { 12pt }
+            { Large        } { 14pt }
+            { LARGE        } { 16pt }
+            { huge         } { 18pt }
+            { Huge         } { 21pt }
+          }
       }
   }
-\cs_new:Npn \__fontscale_keys_process_other_classic_xiipt:n #1
+\cs_new_protected:Npn \__fontscale_keys_process_other_classic_xiipt:n #1
   {
-    \str_case:nn {#1}
+    \dim_set:cn { l_fontscale_#1_size_dim }
       {
-        { tiny         } {  8pt }
-        { scriptsize   } {  9pt }
-        { footnotesize } { 10pt }
-        { small        } { 11pt }
-        { large        } { 14pt }
-        { Large        } { 16pt }
-        { LARGE        } { 18pt }
-        { huge         } { 21pt }
-        { Huge         } { 24pt }
+        \str_case:nn {#1}
+          {
+            { tiny         } {  8pt }
+            { scriptsize   } {  9pt }
+            { footnotesize } { 10pt }
+            { small        } { 11pt }
+            { large        } { 14pt }
+            { Large        } { 16pt }
+            { LARGE        } { 18pt }
+            { huge         } { 21pt }
+            { Huge         } { 24pt }
+          }
       }
   }
-\cs_new:Npn \__fontscale_keys_process_other_musical:n #1
+\cs_new_protected:Npn \__fontscale_keys_process_other_musical:n #1
   {
-    \fp_to_dim:n
+    \dim_set:cn { l_fontscale_#1_size_dim }
       {
-        \l__fontscale_musical_base_fp * \l__fontscale_musical_ratio_fp ^
-        ( \use:c { c_fontscale_#1_step_fp } / \l__fontscale_musical_notes_fp )
+        \fp_to_dim:n
+          {
+            \l__fontscale_musical_base_fp * \l__fontscale_musical_ratio_fp ^
+            ( \use:c { c_fontscale_#1_step_fp } /
+            \l__fontscale_musical_notes_fp )
+          }
       }
+    \dim_compare:nF
+      { \c_zero_dim < \use:c { l_fontscale_#1_size_dim } < 2048pt }
+      {
+        \tl_map_break:n
+          {
+            \msg_error:nnnv { fontscale } { name-font-size-invalid } {#1}
+              { l_fontscale_#1_size_dim }
+            \prg_break:
+          }
+      }
   }
 % Sets the font size, font scale, and font baselineskip of the other font size
 % commands.
@@ -703,12 +723,13 @@
                 ( \use:c { l__fontscale_#1_scale_tl } )
               }
           }
-        \dim_compare:nNnF { \use:c { l_fontscale_#1_size_dim } } > \c_zero_dim
+        \dim_compare:nF
+          { \c_zero_dim < \use:c { l_fontscale_#1_size_dim } < 2048pt }
           {
             \tl_map_break:n
               {
-                \msg_error:nnne { fontscale } { key-font-scale-invalid } {#1}
-                  { \fp_eval:n { \use:c { l__fontscale_#1_scale_tl } } }
+                \msg_error:nnnv { fontscale } { name-font-size-invalid } {#1}
+                  { l_fontscale_#1_size_dim }
                 \prg_break:
               }
           }
@@ -718,11 +739,12 @@
       {
         \dim_set:cn { l_fontscale_#1_size_dim }
           { \use:c { l__fontscale_#1_size_tl } }
-        \dim_compare:nNnF { \use:c { l_fontscale_#1_size_dim } } > \c_zero_dim
+        \dim_compare:nF
+          { \c_zero_dim < \use:c { l_fontscale_#1_size_dim } < 2048pt }
           {
             \tl_map_break:n
               {
-                \msg_error:nnnv { fontscale } { key-font-size-invalid } {#1}
+                \msg_error:nnnv { fontscale } { name-font-size-invalid } {#1}
                   { l_fontscale_#1_size_dim }
                 \prg_break:
               }
@@ -729,12 +751,11 @@
           }
         \quark_if_no_value:cF { l__fontscale_#1_scale_tl }
           {
-            \msg_warning:nnn { fontscale } { key-font-scale-overwritten } {#1}
+            \msg_warning:nnn { fontscale } { key-name-scale-overwritten } {#1}
           }
         \prg_break:
       }
-    \dim_set:cn { l_fontscale_#1_size_dim }
-      { \__fontscale_keys_process_other_aux:n {#1} }
+    \__fontscale_keys_process_other_aux:n {#1}
     \prg_break:
     \prg_break_point:
     \fp_set:cn { l_fontscale_#1_scale_fp }



More information about the tex-live-commits mailing list.