summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-02-16 03:01:49 +0000
committerNorbert Preining <norbert@preining.info>2024-02-16 03:01:49 +0000
commita6e02d45ad0d10cfc3256fc91abe80d6228325a4 (patch)
tree6d63cc33763dc264246cd1f7bcd9b8482acf956d /macros/latex/contrib
parent5b6839a58ea5468b40ebd52b579e680b8e62ff13 (diff)
CTAN sync 202402160301
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/expex-glossonly/README.md2
-rw-r--r--macros/latex/contrib/expex-glossonly/expex-glossonly.pdfbin53009 -> 52893 bytes
-rw-r--r--macros/latex/contrib/expex-glossonly/expex-glossonly.sty4
-rw-r--r--macros/latex/contrib/expex-glossonly/expex-glossonly.tex4
-rw-r--r--macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.pdfbin5519 -> 5519 bytes
-rw-r--r--macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.pdfbin9201 -> 9201 bytes
-rw-r--r--macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.tex1
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md16
-rw-r--r--macros/latex/contrib/siunitx/README.md2
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin647453 -> 647146 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-number.dtx31
-rw-r--r--macros/latex/contrib/siunitx/siunitx-print.dtx24
-rw-r--r--macros/latex/contrib/siunitx/siunitx-unit.dtx15
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin705436 -> 705175 bytes
15 files changed, 70 insertions, 31 deletions
diff --git a/macros/latex/contrib/expex-glossonly/README.md b/macros/latex/contrib/expex-glossonly/README.md
index 2b05c5d588..e52d03d019 100644
--- a/macros/latex/contrib/expex-glossonly/README.md
+++ b/macros/latex/contrib/expex-glossonly/README.md
@@ -1,6 +1,6 @@
# The `expex-glossonly` package
-## Version 0.9 2024/02/05
+## Version 0.9b 2024/02/14
`expex-glossonly` is a package which allows users of other popular example numbering package (`gb4e`, `linguex`, and `covington`) to use the glossing macros
of the ExPex package, while still using the standard example and subexample numbering macros of those respective packages.
diff --git a/macros/latex/contrib/expex-glossonly/expex-glossonly.pdf b/macros/latex/contrib/expex-glossonly/expex-glossonly.pdf
index b696ad8916..680c2d4d6e 100644
--- a/macros/latex/contrib/expex-glossonly/expex-glossonly.pdf
+++ b/macros/latex/contrib/expex-glossonly/expex-glossonly.pdf
Binary files differ
diff --git a/macros/latex/contrib/expex-glossonly/expex-glossonly.sty b/macros/latex/contrib/expex-glossonly/expex-glossonly.sty
index 95547ec2e0..eb263cfa2b 100644
--- a/macros/latex/contrib/expex-glossonly/expex-glossonly.sty
+++ b/macros/latex/contrib/expex-glossonly/expex-glossonly.sty
@@ -1,5 +1,5 @@
-\def\EPGL@version{0.9}
-\def\EPGL@date{2024/2/5}
+\def\EPGL@version{0.9b}
+\def\EPGL@date{2024-02-14}
% expex-glossonly is a package which allows gb4e and linguex and covington users to use
% the glossing macros of the ExPex package, while still using the standard example and
% subexample numbering macros of those respective packages.
diff --git a/macros/latex/contrib/expex-glossonly/expex-glossonly.tex b/macros/latex/contrib/expex-glossonly/expex-glossonly.tex
index 1301a2ad1e..215e81252c 100644
--- a/macros/latex/contrib/expex-glossonly/expex-glossonly.tex
+++ b/macros/latex/contrib/expex-glossonly/expex-glossonly.tex
@@ -1,6 +1,6 @@
% !TEX TS-program = lualatexmk
-\def\EPGLversion{0.9}
-\def\EPGLdate{February 5, 2024}
+\def\EPGLversion{0.9b}
+\def\EPGLdate{February 14, 2024}
\documentclass[11pt]{article}
\title{\textbf{The \textsf{expex-glossonly} package}}
\author{\textbf{Alan Munn}\\Department of Linguistics, Languages, and Cultures\\Michigan State University\\\texttt{\href{mailto:amunn@msu.edu}{amunn@msu.edu}}}
diff --git a/macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.pdf b/macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.pdf
index 3011a8b577..1525b3eb00 100644
--- a/macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.pdf
+++ b/macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.pdf
Binary files differ
diff --git a/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.pdf b/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.pdf
index 679b7e39c7..b8846c8303 100644
--- a/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.pdf
+++ b/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.pdf
Binary files differ
diff --git a/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.tex b/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.tex
index dac96724ef..7a9c9ab122 100644
--- a/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.tex
+++ b/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.tex
@@ -2,7 +2,6 @@
\documentclass[12pt,letterpaper]{article}
\usepackage[linguex]{expex-glossonly}
-
\begin{document}
% Examples here show with and without grammaticality judgements.
% Also a mixture of ExPex and linguex glossing in the same example set.
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index fcdd23876f..2c9d384bf9 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,19 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.3.12] - 2024-02-15
+
+### Fixed
+- Normalize active `<`/`>`in numerical input (see issue
+ [\#355](https://github.com/josephwright/siunitx/issues/355))
+- Allow for `\protect` inside symbolic units (see issue
+ [\#443](https://github.com/josephwright/siunitx/issues/443))
+- Do not error for entirely empty numerical input (see issue
+ [\#539](https://github.com/josephwright/siunitx/issues/539))
+- Print all numerical material in math mode when
+ `parse-numbers = false` is set (see issue
+ [\#721](https://github.com/josephwright/siunitx/issues/721))
+
## [v3.3.11] - 2024-02-07
### Fixed
@@ -2067,7 +2080,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.3.11...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.12...HEAD
+[v3.3.12]: https://github.com/josephwright/siunitx/compare/v3.3.11...v3.3.12
[v3.3.11]: https://github.com/josephwright/siunitx/compare/v3.3.10...v3.3.11
[v3.3.10]: https://github.com/josephwright/siunitx/compare/v3.3.9...v3.3.10
[v3.3.9]: https://github.com/josephwright/siunitx/compare/v3.3.8...v3.3.9
diff --git a/macros/latex/contrib/siunitx/README.md b/macros/latex/contrib/siunitx/README.md
index 1288929a5d..9b5881aead 100644
--- a/macros/latex/contrib/siunitx/README.md
+++ b/macros/latex/contrib/siunitx/README.md
@@ -21,4 +21,4 @@ This package is maintained by Joseph Wright: joseph.wright@morningstar2.co.uk
## License
-Released under the LaTeX Project Public License v1.3c or later. See http://www.latex-project.org/lppl.txt \ No newline at end of file
+Released under the LaTeX Project Public License v1.3c or later. See https://www.latex-project.org/lppl.txt \ No newline at end of file
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 06b482440b..71adbfb38c 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-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx
index 19e2c32e9b..8c94cefee4 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -764,9 +764,12 @@
\bool_if:NTF \l_siunitx_number_parse_bool
{
\siunitx_number_parse:nN {#1} \l_@@_parsed_tl
- \siunitx_number_process:NN \l_@@_parsed_tl \l_@@_parsed_tl
- \tl_set:Nx \l_@@_outputted_tl
- { \siunitx_number_output:N \l_@@_parsed_tl }
+ \tl_if_empty:NF \l_@@_parsed_tl
+ {
+ \siunitx_number_process:NN \l_@@_parsed_tl \l_@@_parsed_tl
+ \tl_set:Nx \l_@@_outputted_tl
+ { \siunitx_number_output:N \l_@@_parsed_tl }
+ }
}
{ \tl_set:Nn \l_@@_outputted_tl { \ensuremath {#1} } }
\exp_args:NNNV \group_end:
@@ -978,16 +981,16 @@
%
% \begin{macro}{\siunitx_number_normalize_symbols:N}
% \begin{macro}{\@@_normalize_aux:nN}
-% \begin{macro}{\@@_normalize_sign:N}
+% \begin{macro}{\@@_normalize_actives:N}
% \begin{variable}{\c_@@_normalize_tl}
-% There are two parts to the replacement code. First, any active
-% hyphens signs are normalised: these can come up with some packages and
+% There are two parts to the replacement code. First, any actives
+% are normalised: these can come up with some packages and
% cause issues. Multi-token signs then are converted to the single token
% equivalents so that everything else can work on a one token basis.
% \begin{macrocode}
\cs_new_protected:Npn \siunitx_number_normalize_symbols:N #1
{
- \@@_normalize_minus:N #1
+ \@@_normalize_actives:N #1
\exp_after:wN \@@_normalize_aux:NnN \exp_after:wN #1
\c_@@_normalize_tl
{ ? } \q_recursion_tail
@@ -1010,10 +1013,16 @@
}
\group_begin:
\char_set_catcode_active:N \-
- \cs_new_protected:Npx \@@_normalize_minus:N #1
+ \char_set_catcode_active:N \<
+ \char_set_catcode_active:N \>
+ \cs_new_protected:Npx \@@_normalize_actives:N #1
{
\tl_replace_all:Nnn #1
{ \exp_not:N - } { \token_to_str:N - }
+ \tl_replace_all:Nnn #1
+ { \exp_not:N < } { \token_to_str:N < }
+ \tl_replace_all:Nnn #1
+ { \exp_not:N > } { \token_to_str:N > }
}
\group_end:
% \end{macrocode}
@@ -1059,8 +1068,10 @@
\tl_map_inline:Nn \l_@@_input_ignore_tl
{ \tl_remove_all:Nn \l_@@_arg_tl {##1} }
\tl_if_empty:NF \l_@@_arg_tl
- { \@@_parse_comparator: }
- \@@_parse_check:
+ {
+ \@@_parse_comparator:
+ \@@_parse_check:
+ }
\exp_args:NNNV \group_end:
\tl_set:Nn #2 \l_@@_parsed_tl
}
diff --git a/macros/latex/contrib/siunitx/siunitx-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx
index 8d969925dd..9cc2e6aca2 100644
--- a/macros/latex/contrib/siunitx/siunitx-print.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-print.dtx
@@ -344,8 +344,8 @@
% Color support is always required; to avoid a potential clash we delay to
% the start of the document.
% \begin{macrocode}
-\cs_if_exist:NTF \hook_gput_code:nnn
- { \hook_gput_code:nnn { begindocument / before } { siunitx } }
+\cs_if_exist:NTF \AddToHook
+ { \AddToHook { begindocument / before } }
{ \AtBeginDocument }
{ \RequirePackage { color } }
% \end{macrocode}
@@ -466,6 +466,7 @@
% \siunitx_print_unit:o
% }
% \begin{macro}{\@@_aux:nn}
+% \begin{macro}{\@@_number:n, \@@_unit:n}
% The main printing function doesn't actually need to do very much: just set
% the color and select the correct sub-function. The \cs{tl_if_empty:oF} is
% needed to allow a leading \texttt{1} to be omitted in the case of a unit
@@ -485,19 +486,22 @@
\tl_if_empty:cTF { l_@@_ #1 _color_tl }
{ \use:n }
{ \ExpandArgs { v } \textcolor { l_@@_ #1 _color_tl } }
- {
- \use:c
- {
- siunitx_print_
- \tl_use:c { l_@@_ #1 _mode_tl } :n
- }
- {#2}
- }
+ { \use:c { @@ _ #1 :n } {#2} }
}
}
+\cs_new_protected:Npn \@@_number:n #1
+ {
+ \bool_if:NTF \l_siunitx_number_parse_bool
+ { \use:c { siunitx_print_ \l_@@_number_mode_tl :n } }
+ { \siunitx_print_math:n }
+ {#1}
+ }
+\cs_new_protected:Npn \@@_unit:n #1
+ { \use:c { siunitx_print_ \l_@@_unit_mode_tl :n } {#1} }
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\siunitx_print_match:n}
% When the \emph{output} mode should match the input, a simple selection of
diff --git a/macros/latex/contrib/siunitx/siunitx-unit.dtx b/macros/latex/contrib/siunitx/siunitx-unit.dtx
index 8c94acad0e..6c0210cec1 100644
--- a/macros/latex/contrib/siunitx/siunitx-unit.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-unit.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-unit.dtx Copyright (C) 2014-2023 Joseph Wright
+% File: siunitx-unit.dtx Copyright (C) 2014-2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -770,13 +770,24 @@
% the approach used is to set all of the symbolic unit commands expandable
% and to do nothing, with the few special cases handled manually. We expand
% the input here twice: this handles the case where there is a mapping or
-% similar in |#1| which returns its result in \cs{exp_not:n}.
+% similar in |#1| which returns its result in \cs{exp_not:n}. In the second
+% \tn{protected@edef}, changing the meaning of \tn{@unexpandable@protect}
+% allows removal of a literal \cs{protect} at the top level before
+% known symbolic entries: this deals with the case where the user has
+% put in a \cs{protect} for some edge cases.
% \begin{macrocode}
\prg_new_protected_conditional:Npnn \@@_if_symbolic:n #1 { TF }
{
\group_begin:
\bool_set_true:N \l_@@_test_bool
\protected@edef \l_@@_tmp_tl {#1}
+ \cs_set_eq:NN \@@_saved_@unexpandable@protect: \@unexpandable@protect
+ \cs_set_nopar:Npn \@unexpandable@protect ##1
+ {
+ \cs_if_exist:cF { @@_ \token_to_str:N ##1 :w }
+ { \@@_saved_@unexpandable@protect: }
+ ##1
+ }
\protected@edef \l_@@_tmp_tl { \l_@@_tmp_tl }
\exp_args:NNV \group_end:
\tl_if_blank:nTF \l_@@_tmp_tl
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index 4d6874c512..bd231a50f7 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/siunitx/siunitx.dtx
@@ -121,7 +121,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2024-02-07} {3.3.11}
+\ProvidesExplPackage {siunitx} {2024-02-15} {3.3.12}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 825cef3f2d..3d70a9723b 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ