texlive[68493] Master/texmf-dist: setspaceenhanced (9oct23)
commits+karl at tug.org
commits+karl at tug.org
Mon Oct 9 22:22:38 CEST 2023
Revision: 68493
https://tug.org/svn/texlive?view=revision&revision=68493
Author: karl
Date: 2023-10-09 22:22:38 +0200 (Mon, 09 Oct 2023)
Log Message:
-----------
setspaceenhanced (9oct23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/setspaceenhanced/README.md
trunk/Master/texmf-dist/doc/latex/setspaceenhanced/setspaceenhanced.pdf
trunk/Master/texmf-dist/source/latex/setspaceenhanced/setspaceenhanced.dtx
trunk/Master/texmf-dist/tex/latex/setspaceenhanced/setspaceenhanced.sty
Modified: trunk/Master/texmf-dist/doc/latex/setspaceenhanced/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/setspaceenhanced/README.md 2023-10-09 20:22:12 UTC (rev 68492)
+++ trunk/Master/texmf-dist/doc/latex/setspaceenhanced/README.md 2023-10-09 20:22:38 UTC (rev 68493)
@@ -2,7 +2,7 @@
Copyright © 2008–2023 Markus Kohm
-Release: 2023-09-19 v1.01
+Release: 2023-10-09 v1.02
License: LPPL 1.3c
@@ -159,5 +159,5 @@
- option `fontsize` has been renamed to `keepfontsize` because of
incompatibility with KOMA-Script → [issue
- #1](https://github.com/komascript/third-party-enhancements/issues/1)
+ 1](https://github.com/komascript/third-party-enhancements/issues/1)
Modified: trunk/Master/texmf-dist/doc/latex/setspaceenhanced/setspaceenhanced.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/setspaceenhanced/setspaceenhanced.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/setspaceenhanced/setspaceenhanced.dtx 2023-10-09 20:22:12 UTC (rev 68492)
+++ trunk/Master/texmf-dist/source/latex/setspaceenhanced/setspaceenhanced.dtx 2023-10-09 20:22:38 UTC (rev 68493)
@@ -32,7 +32,7 @@
%</dtx>
%<*dtx|package>
%<package>\ProvidesExplPackage{setspaceenhanced}
- {2023-09-19}{1.01}
+ {2023-10-09}{1.02}
{%
%<*dtx>
sources and unpack driver of
@@ -549,31 +549,40 @@
% \end{macrocode}
% \end{Constant}
%
-% \begin{Variable}{\@@_single_factor_fp,
-% \@@_onehalf_factor_fp,
-% \@@_double_factor_fp}
+% \begin{Variable}{\g_@@_single_factor_fp,
+% \g_@@_onehalf_factor_fp,
+% \g_@@_double_factor_fp}
% \ExplSyntaxOff
+% \changes{v1.02}{2023-10-09}{missing prefix \texttt{g} added to variable
+% name}
% The internal variables used to store the configured stretch factors for
% singlespacing, onehalfspacing and doublespacing. If \texttt{nan}
% \cs{@@\_linespread} is calculated.
% \begin{macrocode}
-\fp_new:N \@@_single_factor_fp \fp_set:Nn \@@_single_factor_fp { 1.0 }
-\fp_new:N \@@_onehalf_factor_fp \fp_set_eq:NN \@@_onehalf_factor_fp \c_nan_fp
-\fp_new:N \@@_double_factor_fp \fp_set_eq:NN \@@_double_factor_fp \c_nan_fp
+\fp_new:N \g_@@_single_factor_fp
+\fp_set:Nn \g_@@_single_factor_fp { 1.0 }
+\fp_new:N \g_@@_onehalf_factor_fp
+\fp_set_eq:NN \g_@@_onehalf_factor_fp \c_nan_fp
+\fp_new:N \g_@@_double_factor_fp
+\fp_set_eq:NN \g_@@_double_factor_fp \c_nan_fp
% \end{macrocode}
% \end{Variable}
%
-% \begin{Variable}{\@@_linespread_fp,\@@_fp}
+% \begin{Variable}{\g_@@_linespread_fp,\g_@@_fp}
% \ExplSyntaxOff
+% \changes{v1.02}{2023-10-09}{missing prefix \texttt{g} added to variable
+% name}
% Storage of the current calculated stretch factor and the used constant.
% \begin{macrocode}
-\fp_new:N \@@_linespread_fp \fp_set:Nn \@@_linespread_fp { 1.0 }
+\fp_new:N \g_@@_linespread_fp
+\fp_set:Nn \g_@@_linespread_fp { 1.0 }
+\fp_new:N \g_@@_fp
% \end{macrocode}
% \end{Variable}
%
% \begin{macro}{\@@_set_spacing:nn}
% \ExplSyntaxOff
-% These commands are used to set the stretch factor for one of the
+% This function is used to set the stretch factor for one of the
% spacings.
% \begin{macrocode}
\cs_new:Nn \@@_set_spacing:nn
@@ -580,18 +589,18 @@
{
\tl_if_blank:nF { #1 }
{
- \fp_set:cn { @@_#2_factor_fp } { #1 }
+ \fp_set:cn { g_@@_#2_factor_fp } { #1 }
}
- \fp_if_nan:nTF { \tl_use:c { @@_#2_factor_fp } }
+ \fp_if_nan:nTF { \tl_use:c { g_@@_#2_factor_fp } }
{
- \fp_set_eq:Nc \@@_fp { c_@@_#2_fp }
+ \fp_set_eq:Nc \g_@@_fp { c_@@_#2_fp }
\@@_calc_stretch:
}
{
- \fp_set_eq:Nc \@@_linespread_fp { @@_#2_factor_fp }
- \fp_set_eq:NN \@@_fp \c_nan_fp
+ \fp_set_eq:Nc \g_@@_linespread_fp { g_@@_#2_factor_fp }
+ \fp_set_eq:NN \g_@@_fp \c_nan_fp
}
- \setstretch{ \fp_to_decimal:N \@@_linespread_fp }
+ \setstretch{ \fp_to_decimal:N \g_@@_linespread_fp }
}
% \end{macrocode}
% \end{macro}
@@ -599,16 +608,16 @@
% \begin{macro}{\@@_calc_stretch:}
% \ExplSyntaxOff
% This macro is used to (re-)calculate the stretch factor
-% \cs{@@\_calcstretch} if the the current used constant is not
+% \cs{@@\_calcstretch} if the currently used constant is not
% \texttt{nan}.
% \begin{macrocode}
\cs_new:Nn \@@_calc_stretch:
{
- \fp_if_nan:nF { \@@_fp }
+ \fp_if_nan:nF { \g_@@_fp }
{
- \fp_set:Nn \@@_linespread_fp
+ \fp_set:Nn \g_@@_linespread_fp
{
- \f at size / \dim_to_fp:n { \f at baselineskip } * \@@_fp
+ \f at size / \dim_to_fp:n { \f at baselineskip } * \g_@@_fp
}
}
}
@@ -623,17 +632,17 @@
% \begin{macrocode}
\hook_gput_code:nnn { selectfont } { setspaceenhanced }
{%
- \bool_if:NT \__setspaceenhanced_byselectfont_bool
+ \bool_if:NT \g_@@_byselectfont_bool
{
\cs_if_exist:NT \size at update
{
\fp_set:Nn \l_tmpa_fp { \f at linespread }
- \fp_compare:nNnT \__setspaceenhanced_linespread_fp = \l_tmpa_fp
+ \fp_compare:nNnT \g_@@_linespread_fp = \l_tmpa_fp
{
- \__setspaceenhanced_calc_stretch:
+ \@@_calc_stretch:
\set at fontsize
{
- \fp_to_decimal:N \__setspaceenhanced_linespread_fp
+ \fp_to_decimal:N \g_@@_linespread_fp
}
\f at size \f at baselineskip
}
@@ -648,7 +657,7 @@
% \pkg{setspace}. But with \opt{keepfontsize=true} we use \cs{linespread}:
% \begin{macrocode}
\renewcommand*{\setstretch}[1]{
- \bool_if:NTF \@@_fontsize_bool
+ \bool_if:NTF \g_@@_fontsize_bool
{
\linespread{#1}\selectfont
}
@@ -673,10 +682,10 @@
onehalfspacing .usage = general,
doublespacing .code = \@@_set_spacing:nn {#1} {double},
doublespacing .usage = general,
- byselectfont .bool_set:N = \@@_byselectfont_bool,
+ byselectfont .bool_set:N = \g_@@_byselectfont_bool,
byselectfont .default:n = true,
byselectfont .initial:n = false,
- keepfontsize .bool_set:N = \@@_fontsize_bool,
+ keepfontsize .bool_set:N = \g_@@_fontsize_bool,
keepfontsize .default:n = true,
keepfontsize .initial:n = false,
}
@@ -691,16 +700,16 @@
% singlespacing, onehalfspacing and doublespacing.
% \begin{macrocode}
\renewcommand*{\singlespacing}{
- \__setspaceenhanced_set_spacing:nn {} {single}
+ \@@_set_spacing:nn {} {single}
}
\renewcommand*{\onehalfspacing}{
- \__setspaceenhanced_set_spacing:nn {} {onehalf}
+ \@@_set_spacing:nn {} {onehalf}
}
\renewcommand*{\doublespacing}{
- \__setspaceenhanced_set_spacing:nn {} {double}
+ \@@_set_spacing:nn {} {double}
}
\renewcommand*{\SetSinglespace}[1]{
- \fp_set:Nn \@@_single_factor_fp { #1 }
+ \fp_set:Nn \g_@@_single_factor_fp { #1 }
}
% \end{macrocode}
% \end{command}
Modified: trunk/Master/texmf-dist/tex/latex/setspaceenhanced/setspaceenhanced.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/setspaceenhanced/setspaceenhanced.sty 2023-10-09 20:22:12 UTC (rev 68492)
+++ trunk/Master/texmf-dist/tex/latex/setspaceenhanced/setspaceenhanced.sty 2023-10-09 20:22:38 UTC (rev 68493)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesExplPackage{setspaceenhanced}
- {2023-09-19}{1.01}
+ {2023-10-09}{1.02}
{%
improved setspace package%
}
@@ -40,50 +40,55 @@
\fp_const:Nn \c__setspaceenhanced_single_fp { 1.2 }
\fp_const:Nn \c__setspaceenhanced_onehalf_fp { 1.5 }
\fp_const:Nn \c__setspaceenhanced_double_fp { 2.0 }
-\fp_new:N \__setspaceenhanced_single_factor_fp \fp_set:Nn \__setspaceenhanced_single_factor_fp { 1.0 }
-\fp_new:N \__setspaceenhanced_onehalf_factor_fp \fp_set_eq:NN \__setspaceenhanced_onehalf_factor_fp \c_nan_fp
-\fp_new:N \__setspaceenhanced_double_factor_fp \fp_set_eq:NN \__setspaceenhanced_double_factor_fp \c_nan_fp
-\fp_new:N \__setspaceenhanced_linespread_fp \fp_set:Nn \__setspaceenhanced_linespread_fp { 1.0 }
+\fp_new:N \g__setspaceenhanced_single_factor_fp
+\fp_set:Nn \g__setspaceenhanced_single_factor_fp { 1.0 }
+\fp_new:N \g__setspaceenhanced_onehalf_factor_fp
+\fp_set_eq:NN \g__setspaceenhanced_onehalf_factor_fp \c_nan_fp
+\fp_new:N \g__setspaceenhanced_double_factor_fp
+\fp_set_eq:NN \g__setspaceenhanced_double_factor_fp \c_nan_fp
+\fp_new:N \g__setspaceenhanced_linespread_fp
+\fp_set:Nn \g__setspaceenhanced_linespread_fp { 1.0 }
+\fp_new:N \g__setspaceenhanced_fp
\cs_new:Nn \__setspaceenhanced_set_spacing:nn
{
\tl_if_blank:nF { #1 }
{
- \fp_set:cn { __setspaceenhanced_#2_factor_fp } { #1 }
+ \fp_set:cn { g__setspaceenhanced_#2_factor_fp } { #1 }
}
- \fp_if_nan:nTF { \tl_use:c { __setspaceenhanced_#2_factor_fp } }
+ \fp_if_nan:nTF { \tl_use:c { g__setspaceenhanced_#2_factor_fp } }
{
- \fp_set_eq:Nc \__setspaceenhanced_fp { c__setspaceenhanced_#2_fp }
+ \fp_set_eq:Nc \g__setspaceenhanced_fp { c__setspaceenhanced_#2_fp }
\__setspaceenhanced_calc_stretch:
}
{
- \fp_set_eq:Nc \__setspaceenhanced_linespread_fp { __setspaceenhanced_#2_factor_fp }
- \fp_set_eq:NN \__setspaceenhanced_fp \c_nan_fp
+ \fp_set_eq:Nc \g__setspaceenhanced_linespread_fp { g__setspaceenhanced_#2_factor_fp }
+ \fp_set_eq:NN \g__setspaceenhanced_fp \c_nan_fp
}
- \setstretch{ \fp_to_decimal:N \__setspaceenhanced_linespread_fp }
+ \setstretch{ \fp_to_decimal:N \g__setspaceenhanced_linespread_fp }
}
\cs_new:Nn \__setspaceenhanced_calc_stretch:
{
- \fp_if_nan:nF { \__setspaceenhanced_fp }
+ \fp_if_nan:nF { \g__setspaceenhanced_fp }
{
- \fp_set:Nn \__setspaceenhanced_linespread_fp
+ \fp_set:Nn \g__setspaceenhanced_linespread_fp
{
- \f at size / \dim_to_fp:n { \f at baselineskip } * \__setspaceenhanced_fp
+ \f at size / \dim_to_fp:n { \f at baselineskip } * \g__setspaceenhanced_fp
}
}
}
\hook_gput_code:nnn { selectfont } { setspaceenhanced }
{%
- \bool_if:NT \__setspaceenhanced_byselectfont_bool
+ \bool_if:NT \g__setspaceenhanced_byselectfont_bool
{
\cs_if_exist:NT \size at update
{
\fp_set:Nn \l_tmpa_fp { \f at linespread }
- \fp_compare:nNnT \__setspaceenhanced_linespread_fp = \l_tmpa_fp
+ \fp_compare:nNnT \g__setspaceenhanced_linespread_fp = \l_tmpa_fp
{
\__setspaceenhanced_calc_stretch:
\set at fontsize
{
- \fp_to_decimal:N \__setspaceenhanced_linespread_fp
+ \fp_to_decimal:N \g__setspaceenhanced_linespread_fp
}
\f at size \f at baselineskip
}
@@ -91,7 +96,7 @@
}
}
\renewcommand*{\setstretch}[1]{
- \bool_if:NTF \__setspaceenhanced_fontsize_bool
+ \bool_if:NTF \g__setspaceenhanced_fontsize_bool
{
\linespread{#1}\selectfont
}
@@ -107,10 +112,10 @@
onehalfspacing .usage = general,
doublespacing .code = \__setspaceenhanced_set_spacing:nn {#1} {double},
doublespacing .usage = general,
- byselectfont .bool_set:N = \__setspaceenhanced_byselectfont_bool,
+ byselectfont .bool_set:N = \g__setspaceenhanced_byselectfont_bool,
byselectfont .default:n = true,
byselectfont .initial:n = false,
- keepfontsize .bool_set:N = \__setspaceenhanced_fontsize_bool,
+ keepfontsize .bool_set:N = \g__setspaceenhanced_fontsize_bool,
keepfontsize .default:n = true,
keepfontsize .initial:n = false,
}
@@ -125,7 +130,7 @@
\__setspaceenhanced_set_spacing:nn {} {double}
}
\renewcommand*{\SetSinglespace}[1]{
- \fp_set:Nn \__setspaceenhanced_single_factor_fp { #1 }
+ \fp_set:Nn \g__setspaceenhanced_single_factor_fp { #1 }
}
\newcommand*{\spacesetup}{\SetKeys[setspaceenhanced]}
\endinput
More information about the tex-live-commits
mailing list.