summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-03-15 03:01:23 +0000
committerNorbert Preining <norbert@preining.info>2023-03-15 03:01:23 +0000
commitbb077b85d20ee236d733a6d34ce144bd825fcc26 (patch)
tree8e8a749fc8eedb96838f1475bf99935d45e68c2f /macros
parent2ba976b06ff8c59f0eec2151c5afb7671a35671e (diff)
CTAN sync 202303150301
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md9
-rw-r--r--macros/latex/contrib/siunitx/siunitx-angle.dtx57
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin641978 -> 642235 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin691123 -> 691121 bytes
-rw-r--r--macros/luatex/latex/novel/README.md2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-DropCap.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-FileData.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-Fonts.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-Footnotes.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-Images.sty4
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-PostLayout.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-Sandbox.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-TextMacros.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-pdfx.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel.cls4
20 files changed, 74 insertions, 28 deletions
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 3fef1b87f7..9d37819ad8 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,12 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.2.3] - 2023-03-14
+
+### Fixed
+- Allow for `parse-nmumbers = false` in handling `\ang` (see issues
+ [\#649](https://github.com/josephwright/siunitx/issues/649))
+
## [v3.2.2] - 2023-03-04
### Fixed
@@ -1876,7 +1882,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.2.2...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.2.3...HEAD
+[v3.2.3]: https://github.com/josephwright/siunitx/compare/v3.2.2...v3.2.3
[v3.2.2]: https://github.com/josephwright/siunitx/compare/v3.2.1...v3.2.2
[v3.2.1]: https://github.com/josephwright/siunitx/compare/v3.2.0...v3.2.1
[v3.2.0]: https://github.com/josephwright/siunitx/compare/v3.1.11...v3.2.0
diff --git a/macros/latex/contrib/siunitx/siunitx-angle.dtx b/macros/latex/contrib/siunitx/siunitx-angle.dtx
index 866fae193f..a2335a2c9b 100644
--- a/macros/latex/contrib/siunitx/siunitx-angle.dtx
+++ b/macros/latex/contrib/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/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index b6daad35bc..447e005499 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.pdf
+++ b/macros/latex/contrib/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index 047da57d55..3242c28007 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/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}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index aba22033ac..b896144622 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ
diff --git a/macros/luatex/latex/novel/README.md b/macros/luatex/latex/novel/README.md
index 219947aa63..cdd8b2111d 100644
--- a/macros/luatex/latex/novel/README.md
+++ b/macros/luatex/latex/novel/README.md
@@ -10,6 +10,8 @@ Extensive documentation is in HTML format. The "novel.pdf" file is merely a plac
## News:
+Version 1.81, March 13, 2023: Bug fix for FloatImage.
+
Version 1.80, February 8, 2023: Small tweaks.
Version 1.52, April 26, 2018: Enhanced detection and Warnings, using Lua code.
diff --git a/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty b/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty
index 40308f6590..2f14d0671d 100644
--- a/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty
@@ -12,7 +12,7 @@
%%
%%
\ProvidesFile{novel-CalculateLayout.sty}%
-[2023/02/08 v1.80 LaTeX file (layout calculations)]
+[2023/03/13 v1.81 LaTeX file (layout calculations)]
%%
%%
diff --git a/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty b/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty
index 89d77c718f..b36a3d9eb7 100644
--- a/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-ChapterScene.sty}%
-[2023/02/08 v1.80 LaTeX file (chapter and scene macros)]
+[2023/03/13 v1.81 LaTeX file (chapter and scene macros)]
%%
diff --git a/macros/luatex/latex/novel/lualatex/novel-DropCap.sty b/macros/luatex/latex/novel/lualatex/novel-DropCap.sty
index 7d418b45f5..70e9a60285 100644
--- a/macros/luatex/latex/novel/lualatex/novel-DropCap.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-DropCap.sty
@@ -17,7 +17,7 @@
%
%%
\ProvidesFile{novel-DropCap.sty}%
- [2023/02/08 v1.80 (Drop Caps)]
+[2023/03/13 v1.81 (Drop Caps)]
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%
%
diff --git a/macros/luatex/latex/novel/lualatex/novel-FileData.sty b/macros/luatex/latex/novel/lualatex/novel-FileData.sty
index 4d4535ead0..a941ceed2f 100644
--- a/macros/luatex/latex/novel/lualatex/novel-FileData.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-FileData.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-FileData.sty}%
-[2023/02/08 v1.80 LaTeX file (File Data settings)]
+[2023/03/13 v1.81 LaTeX file (File Data settings)]
%%
diff --git a/macros/luatex/latex/novel/lualatex/novel-Fonts.sty b/macros/luatex/latex/novel/lualatex/novel-Fonts.sty
index f35708f606..d05fd92fb8 100644
--- a/macros/luatex/latex/novel/lualatex/novel-Fonts.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-Fonts.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-Fonts.sty}%
-[2023/02/08 v1.80 LaTeX file (font settings and defaults)]
+[2023/03/13 v1.81 LaTeX file (font settings and defaults)]
%%
diff --git a/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty b/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty
index 5465b0b70b..479031b531 100644
--- a/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-Footnotes.sty}%
-[2023/02/08 v1.80 LaTeX file (commands for footnotes and endnotes)]
+[2023/03/13 v1.81 LaTeX file (commands for footnotes and endnotes)]
%%
diff --git a/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty b/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty
index 4e003edd15..96e0843371 100644
--- a/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-HeadFootStyles.sty}%
-[2023/02/08 v1.80 LaTeX file (header and footer layouts and styles)]
+[2023/03/13 v1.81 LaTeX file (header and footer layouts and styles)]
%%
diff --git a/macros/luatex/latex/novel/lualatex/novel-Images.sty b/macros/luatex/latex/novel/lualatex/novel-Images.sty
index 206f130565..63a666a581 100644
--- a/macros/luatex/latex/novel/lualatex/novel-Images.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-Images.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-Images.sty}%
-[2023/02/08 v1.80 LaTeX file (image placement)]
+[2023/03/13 v1.81 LaTeX file (image placement)]
%%
@@ -372,7 +372,7 @@ end
%%
\DeclareDocumentCommand \@FloatImage { m m m }{% DO NOT CALL DIRECTLY
\global\@UsingNovelCommandtrue%
- \gdef\@mygraphic{\novel@sub@inclgr[scale=\@TMratio]{#3}}%
+ \gdef\@mygraphic{\novel@sub@inclgr{#3}}%
\gdef\@mygraphicname{#3}%
\gsetlength\@imagewidth{\widthof{\@mygraphic}}%
\gsetlength\@imageheight{\heightof{\@mygraphic}}%
diff --git a/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty b/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty
index a9b2bb09e1..ef47d1e6e5 100644
--- a/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-LayoutSettings.sty}%
-[2023/02/08 v1.80 LaTeX file (layout settings)]
+[2023/03/13 v1.81 LaTeX file (layout settings)]
%%
diff --git a/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty b/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty
index 5096645cac..1d0a741165 100644
--- a/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty
@@ -12,7 +12,7 @@
%%
%%
\ProvidesFile{novel-PostLayout.sty}%
-[2023/02/08 v1.80 LaTeX file (post-layout modifications)]
+[2023/03/13 v1.81 LaTeX file (post-layout modifications)]
%%
%%
diff --git a/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty b/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty
index 71b890738e..e5ac09a2a0 100644
--- a/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty
@@ -17,7 +17,7 @@
%%
%%
\ProvidesFile{novel-Sandbox.sty}%
-[2023/02/08 v1.80 LaTeX file (used only with sandbox class option)]
+[2023/03/13 v1.81 LaTeX file (used only with sandbox class option)]
%%
%%
diff --git a/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty b/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty
index 23a6a8af9d..dd05ed1e6b 100644
--- a/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-TextMacros.sty}%
-[2023/02/08 v1.80 LaTeX file (text macros usable within document body)]
+[2023/03/13 v1.81 LaTeX file (text macros usable within document body)]
%%
diff --git a/macros/luatex/latex/novel/lualatex/novel-pdfx.sty b/macros/luatex/latex/novel/lualatex/novel-pdfx.sty
index 537ccf65c7..210132dc92 100644
--- a/macros/luatex/latex/novel/lualatex/novel-pdfx.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-pdfx.sty
@@ -21,7 +21,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{novel-pdfx.sty}%
-[2023/02/08 v1.80 LaTeX file (PDF/X support for novel class)]
+[2023/03/13 v1.81 LaTeX file (PDF/X support for novel class)]
% This package supports, and is part of, class `novel'.
% No support for anything but LuaLaTeX.
diff --git a/macros/luatex/latex/novel/lualatex/novel.cls b/macros/luatex/latex/novel/lualatex/novel.cls
index 0d894e1fdf..28115256cf 100644
--- a/macros/luatex/latex/novel/lualatex/novel.cls
+++ b/macros/luatex/latex/novel/lualatex/novel.cls
@@ -14,9 +14,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
% Actually needs LuaLaTeX, at least version 0.95 from TeXLive 2016.
-\ProvidesClass{novel}[2023/02/08 v1.80 LaTeX document class]
+\ProvidesClass{novel}[2023/03/13 v1.81 LaTeX document class]
%%
-%% Version 1.80: Minor changes. Class option `revert' for 1.5.2 behavior.
+%% Version 1.81: Minor changes. Class option `revert' for 1.5.2 behavior.
%% DESCRIPTION: