summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/siunitx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-03-21 16:55:59 +0000
committerKarl Berry <karl@freefriends.org>2023-03-21 16:55:59 +0000
commit954cb6d8f93ad7b3192c7fc1d5e948632356d5e9 (patch)
tree74ba47e19ea438de3ae05384c1319764ec5df906 /Master/texmf-dist/source/latex/siunitx
parent9f3fe3f6c00094cda68cbcabae31d6f1e0e76ef6 (diff)
siunitx (14mar23)
git-svn-id: svn://tug.org/texlive/trunk@66627 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx')
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-angle.dtx57
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx2
2 files changed, 48 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-angle.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-angle.dtx
index 866fae193fe..a2335a2c9bc 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-angle.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-angle.dtx
@@ -236,7 +236,7 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\siunitx_angle:n}
+% \begin{macro}{\siunitx_angle:n, \@@_angle:n}
% \begin{macro}{\siunitx_angle:nnn}
% \begin{macro}{\@@_arc_convert:n}
% The first step here is to force format conversion if required. Going to
@@ -245,6 +245,21 @@
% \begin{macrocode}
\cs_new_protected:Npn \siunitx_angle:n #1
{
+ \bool_if:NTF \l_siunitx_number_parse_bool
+ { \@@_angle:n {#1} }
+ {
+ \tl_if_blank:nF {#1}
+ {
+ \tl_set:Nn \l_@@_degrees_tl { \ensuremath {#1} }
+ \@@_arc_print:VVV
+ \l_@@_degrees_tl
+ \c_empty_tl
+ \c_empty_tl
+ }
+ }
+ }
+\cs_new_protected:Npn \@@_angle:n #1
+ {
\bool_if:NTF \l_@@_force_arc_bool
{ \exp_args:Ne \@@_arc_convert:n { \fp_eval:n {#1} } }
{
@@ -260,12 +275,27 @@
}
\cs_new_protected:Npn \siunitx_angle:nnn #1#2#3
{
- \bool_if:NTF \l_@@_force_decimal_bool
+ \bool_if:NTF \l_siunitx_number_parse_bool
+ {
+ \bool_if:NTF \l_@@_force_decimal_bool
+ {
+ \exp_args:Ne \siunitx_angle:n
+ { \fp_eval:n { #1 + (#2) / 60 + (#3) / 3600 } }
+ }
+ { \@@_arc_sign:nnn {#1} {#2} {#3} }
+ }
{
- \exp_args:Ne \siunitx_angle:n
- { \fp_eval:n { #1 + (#2) / 60 + (#3) / 3600 } }
+ \tl_set:Nx \l_@@_degrees_tl
+ { \tl_if_blank:nF {#1} { \exp_not:n { \ensuremath {#1} } } }
+ \tl_set:Nx \l_@@_minutes_tl
+ { \tl_if_blank:nF {#2} { \exp_not:n { \ensuremath {#2} } } }
+ \tl_set:Nx \l_@@_seconds_tl
+ { \tl_if_blank:nF {#3} { \exp_not:n { \ensuremath {#3} } } }
+ \@@_arc_print:VVV
+ \l_@@_degrees_tl
+ \l_@@_minutes_tl
+ \l_@@_seconds_tl
}
- { \@@_arc_sign:nnn {#1} {#2} {#3} }
}
\cs_new_protected:Npn \@@_arc_convert:n #1
{
@@ -439,18 +469,25 @@
{
\tl_if_blank:nF {#1}
{
- \bool_if:NTF \l_@@_astronomy_bool
- { \@@_arc_print_auxii:nw {#2} #1 \q_stop }
+ \bool_if:NTF \l_siunitx_number_parse_bool
{
- \@@_arc_print_auxv:w #1 \q_stop
+ \bool_if:NTF \l_@@_astronomy_bool
+ { \@@_arc_print_auxii:nw {#2} #1 \q_stop }
+ {
+ \@@_arc_print_auxv:w #1 \q_stop
+ \@@_arc_print_auxvi:n {#2}
+ }
+ }
+ {
+ \siunitx_print_number:n {#1}
\@@_arc_print_auxvi:n {#2}
}
- \tl_if_blank:nF {#3}
+ \tl_if_blank:nF {#3}
{
\nobreak
\l_@@_separator_tl
}
- }
+ }
}
\cs_generate_variant:Nn \@@_arc_print_auxi:nnn { nV }
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 047da57d554..3242c280077 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -122,7 +122,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2023-03-04} {3.2.2}
+\ProvidesExplPackage {siunitx} {2023-03-14} {3.2.3}
{A comprehensive (SI) units package}
% \end{macrocode}
%