summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-09-23 03:01:31 +0000
committerNorbert Preining <norbert@preining.info>2021-09-23 03:01:31 +0000
commita26e6aee249adb0efff5d0eecaa2dfb8794585a5 (patch)
tree61f34ace7d0bd13f43cb638820af270f34868234 /macros/latex/contrib
parent094234b56c200ad35a041aa579c18cbcac8933ed (diff)
CTAN sync 202109230301
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/datax/datax.dtx33
-rw-r--r--macros/latex/contrib/datax/datax.pdfbin188210 -> 189196 bytes
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md9
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin1513922 -> 1513710 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-print.dtx1
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin637245 -> 637213 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx.tex2
-rw-r--r--macros/latex/contrib/to-be-determined/to-be-determined.pdfbin183126 -> 102667 bytes
-rw-r--r--macros/latex/contrib/to-be-determined/to-be-determined.sty20
-rw-r--r--macros/latex/contrib/to-be-determined/to-be-determined.tex5
-rw-r--r--macros/latex/contrib/willowtreebook/README5
-rw-r--r--macros/latex/contrib/willowtreebook/notation.gst12
-rw-r--r--macros/latex/contrib/willowtreebook/willowtreebook.cls8
-rw-r--r--macros/latex/contrib/willowtreebook/willowtreebook.pdfbin13983793 -> 13991774 bytes
-rw-r--r--macros/latex/contrib/willowtreebook/willowtreebook.tex20
16 files changed, 82 insertions, 35 deletions
diff --git a/macros/latex/contrib/datax/datax.dtx b/macros/latex/contrib/datax/datax.dtx
index 198745020b..d1f9e5c996 100644
--- a/macros/latex/contrib/datax/datax.dtx
+++ b/macros/latex/contrib/datax/datax.dtx
@@ -17,7 +17,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[2020/02/02]
%<package>\ProvidesPackage{datax}
-%<package> [2020/11/29 v1.1.1 data import into LaTeX]
+%<package> [2021-09-22 v1.1.2 data import into LaTeX]
%<package>\RequirePackage{pgfkeys}
%<package>\RequirePackage{pgfopts}
%
@@ -60,7 +60,7 @@
%</driver>
% \fi
%
-%\CheckSum{19}
+%\CheckSum{29}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -81,6 +81,7 @@
% \changes{v1.0}{2020/11/15}{Initial version}
% \changes{v1.1}{2020/11/17}{Polishing for release}
% \changes{v1.1.1}{2020/11/29}{Renaming the plugins, adding Python support}
+% \changes{v1.1.2}{2021-09-22}{Removing excessive spaces}
%
% \GetFileInfo{datax.sty}
% \DoNotIndex{}
@@ -180,16 +181,17 @@
% Default data file name: \texttt{data.tex}
% \begin{macrocode}
\pgfkeys{ /packageoptions/dataxfile/.initial=data.tex, }
+\pgfkeys{ /packageoptions/siunitxoptions/.initial={}, }
% \end{macrocode}
% Read any given options into family \texttt{/packageoptions/}. Then introduce
% family \texttt{/datax/} where all the variables will be stored.
% \begin{macrocode}
\ProcessPgfPackageOptions{/packageoptions}
-\pgfkeys{ /datax/.is family, datax, %
- .unknown/.code={ \pgfkeyssetvalue{ %
- \pgfkeyscurrentpath/\pgfkeyscurrentname %
- }{ #1 } },
+\pgfkeys{ /datax/.is family, datax,%
+ .unknown/.code={ \pgfkeyssetvalue{%
+ \pgfkeyscurrentpath/\pgfkeyscurrentname%
+ }{ #1 } },%
}
% \end{macrocode}
@@ -202,17 +204,24 @@
}{}{
\PackageWarning{datax}{Cannot read file `\dataxfile'}
}
+\newif\ifhassiunitx
+\@ifpackageloaded{siunitx}{\hassiunitxtrue}{\hassiunitxfalse}
% \end{macrocode}
% \begin{macro}{\datax}
% Include datum. If the supplied tag is unused, print bold question marks (like
% |\ref|), and throw a warning.
% \begin{macrocode}
-\newcommand{\datax}[1]{
- \pgfkeysifdefined{/datax/#1}{ %
- \pgfkeysvalueof{/datax/#1} %
- }{ %
- \PackageWarning{datax}{Data value `#1' undefined}\textbf{??} %
- } %
+\newcommand{\datax}[2][]{%
+ \pgfkeysifdefined{/datax/#2}{%
+ {%
+ \ifhassiunitx%
+ \sisetup{\pgfkeysvalueof{/packageoptions/siunitxoptions},#1}%
+ \fi%
+ \pgfkeysvalueof{/datax/#2}%
+ }%
+ }{%
+ \PackageWarning{datax}{Data value `#2' undefined}\textbf{??}%
+ }%
}
% \end{macrocode}
% \end{macro}
diff --git a/macros/latex/contrib/datax/datax.pdf b/macros/latex/contrib/datax/datax.pdf
index d0db4830ed..0c266b995d 100644
--- a/macros/latex/contrib/datax/datax.pdf
+++ b/macros/latex/contrib/datax/datax.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index f12b69375b..0ffdc514f5 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.0.31]
+
+### Changed
+- Avoid infinite loop with `tex4ht` (issue
+ [#549](https://github.com/josephwright/siunitx/issues/549))
+
## [v3.0.30]
### Changed
@@ -1579,7 +1585,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.0.30...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.31...HEAD
+[v3.0.31]: https://github.com/josephwright/siunitx/compare/v3.0.30...v3.0.31
[v3.0.30]: https://github.com/josephwright/siunitx/compare/v3.0.29...v3.0.30
[v3.0.29]: https://github.com/josephwright/siunitx/compare/v3.0.28...v3.0.29
[v3.0.28]: https://github.com/josephwright/siunitx/compare/v3.0.27...v3.0.28
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 9a8ebfd7c0..5070f406eb 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-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx
index 05ba3d64ea..fc3ba7c0fc 100644
--- a/macros/latex/contrib/siunitx/siunitx-print.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-print.dtx
@@ -637,6 +637,7 @@
{
\quark_if_recursion_tail_stop:N #1
\tl_replace_all:Nnn \l_@@_tmp_tl {#1} {#2}
+ \@@_math_replace:Nn
}
\cs_new_protected:Npn \@@_math_auxiii:n #1
{
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index 45534b9996..736c737e92 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} {2021-09-14} {3.0.30}
+\ProvidesExplPackage {siunitx} {2021-09-22} {3.0.31}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 171b0a74b5..71b3565536 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx.tex b/macros/latex/contrib/siunitx/siunitx.tex
index b05cd68fc9..d6d300c399 100644
--- a/macros/latex/contrib/siunitx/siunitx.tex
+++ b/macros/latex/contrib/siunitx/siunitx.tex
@@ -1660,7 +1660,7 @@ stored will be used in place of the normal product and base combination.
\num[output-exponent-marker = \mathrm{E}]{1e2}
\end{LaTeXdemo}
-\DescribeOption{uncertainty-separator}
+\DescribeOption{uncertainty-mode}
\DescribeOption{output-open-uncertainty}
\DescribeOption{output-close-uncertainty}
\DescribeOption{uncertainty-separator}
diff --git a/macros/latex/contrib/to-be-determined/to-be-determined.pdf b/macros/latex/contrib/to-be-determined/to-be-determined.pdf
index 7046da7c95..b62c65762d 100644
--- a/macros/latex/contrib/to-be-determined/to-be-determined.pdf
+++ b/macros/latex/contrib/to-be-determined/to-be-determined.pdf
Binary files differ
diff --git a/macros/latex/contrib/to-be-determined/to-be-determined.sty b/macros/latex/contrib/to-be-determined/to-be-determined.sty
index ffc106eb97..b5e343b1cd 100644
--- a/macros/latex/contrib/to-be-determined/to-be-determined.sty
+++ b/macros/latex/contrib/to-be-determined/to-be-determined.sty
@@ -21,27 +21,29 @@
% SOFTWARE.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{to-be-determined}[2021/07/21 0.1.1 Highlighting places requiring future work]
+\ProvidesPackage{to-be-determined}[2021/09/22 0.1.2 Highlighting places requiring future work]
\RequirePackage{xkeyval}
-\newif\iftbdhide
-\DeclareOptionX{hide}{\tbdhidetrue}
-\newif\iftbdoff
-\DeclareOptionX{off}{\tbdofftrue}
+\makeatletter
+\newif\iftbd@hide
+\DeclareOptionX{hide}{\tbd@hidetrue}
+\newif\iftbd@off
+\DeclareOptionX{off}{\tbd@offtrue}
+\makeatother
\ProcessOptionsX\relax
\RequirePackage{xcolor}
\RequirePackage{soul}
-\newcommand\tbd[1]{{%
- \iftbdoff\else%
+\makeatletter\newcommand\tbd[1]{{%
+ \iftbd@off\else%
\sethlcolor{yellow}%
- \iftbdhide%
+ \iftbd@hide%
\hl{TBD}%
\else%
\hl{#1}%
\fi%
\fi%
-}}
+}}\makeatother
\endinput
diff --git a/macros/latex/contrib/to-be-determined/to-be-determined.tex b/macros/latex/contrib/to-be-determined/to-be-determined.tex
index ccaf9c744a..9f787004e9 100644
--- a/macros/latex/contrib/to-be-determined/to-be-determined.tex
+++ b/macros/latex/contrib/to-be-determined/to-be-determined.tex
@@ -27,7 +27,7 @@
\usepackage{ffcode}
\title{\ff{to-be-determined}: \LaTeX{} Package \\ for highlighting places that require more work}
\author{Yegor Bugayenko}
-\date{0.1.1 2021/07/21}
+\date{0.1.2 2021/09/22}
\begin{document}
\pagenumbering{gobble}
\raggedbottom
@@ -58,9 +58,6 @@ The budget is \tbd{99.00 USD}.
\end{multicols}
-With this package it's also possible to highlight
-\tbd{larger pieces of text that take \textbf{a few lines}} on the page.
-
If you want to hide the content of what's inside \ff{\char`\\tbd},
use \ff{hide} option of the package. They will all be replaced with
\tbd{TBD} placeholders.
diff --git a/macros/latex/contrib/willowtreebook/README b/macros/latex/contrib/willowtreebook/README
index b1991b8328..df5fb11cab 100644
--- a/macros/latex/contrib/willowtreebook/README
+++ b/macros/latex/contrib/willowtreebook/README
@@ -1,6 +1,6 @@
Willow Tree Book Class
-v1.01
-24 April 2020
+v1.02
+22 September 2021
Authors:
Ben McKay
@@ -18,3 +18,4 @@ See http://www.latex-project.org/lppl.txt
The willowtreebook class is a simple book class, which I use for lecture notes.
It actually just selects options for the more sophisticated memoir class.
+Changes: added hint and bibliography preambles, to load before the hints or bibliography.
diff --git a/macros/latex/contrib/willowtreebook/notation.gst b/macros/latex/contrib/willowtreebook/notation.gst
new file mode 100644
index 0000000000..2ee81b75a6
--- /dev/null
+++ b/macros/latex/contrib/willowtreebook/notation.gst
@@ -0,0 +1,12 @@
+%%% analysis.gst basic makindex glossary style file
+%%% Output style parameters
+preamble "\\begin{theglossary}"
+postamble "\n\\end{theglossary}\n"
+item_0 "\n\\glossitem"
+delim_0 "{\\memglonum{"
+encap_suffix "}}}"
+headings_flag 1
+heading_prefix "\\doglobookmark{"
+heading_suffix "}"
+%%% Input style parameters
+keyword "\\glossaryentry"
diff --git a/macros/latex/contrib/willowtreebook/willowtreebook.cls b/macros/latex/contrib/willowtreebook/willowtreebook.cls
index 28ea7bbc99..1a2eb4d49c 100644
--- a/macros/latex/contrib/willowtreebook/willowtreebook.cls
+++ b/macros/latex/contrib/willowtreebook/willowtreebook.cls
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{willowtreebook}[2020/04/24 Willow Tree Book LaTeX class v1.01]
+\ProvidesClass{willowtreebook}[2021/09/22 Willow Tree Book LaTeX class v1.02]
\DeclareOption{ContainsChinese}{\def\ChineseTextInThisDocument{}}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{memoir}}
\ProcessOptions\relax
@@ -9,7 +9,7 @@
\def\mckaybook@subtitle{}
\def\mckaybook@author{}
\def\mckaybook@bibliography{}
-\def\mckaybook@colophon{This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.}
+\def\mckaybook@colophon{This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 Unported License.}
\NewDocumentCommand\Title{m}{\global\def\mckaybook@title{#1}}
\NewDocumentCommand\Subtitle{m}{\global\def\mckaybook@subtitle{#1}}
\NewDocumentCommand\Author{m}{\global\def\mckaybook@author{#1}}
@@ -511,6 +511,7 @@ ref=\theenumi.\emph{\alph*}}
\pagenumbering{arabic}
}%
\NewDocumentCommand\hintsPreamble{}{}
+\NewDocumentCommand\bibliographyPreamble{}{}
\AtEndDocument%
{%%
\backmatter
@@ -525,7 +526,8 @@ ref=\theenumi.\emph{\alph*}}
\ifx\mckaybook@bibliography\@empty
\else
% Bibliography
-\bibliographystyle{amsplain}
+\bibliographystyle{amsplain}%
+\renewcommand{\prebibhook}{\bibliographyPreamble{}}
\bibliography{\mckaybook@bibliography}
\flushbottom
\fi
diff --git a/macros/latex/contrib/willowtreebook/willowtreebook.pdf b/macros/latex/contrib/willowtreebook/willowtreebook.pdf
index e799a3dc18..0c3d8b6578 100644
--- a/macros/latex/contrib/willowtreebook/willowtreebook.pdf
+++ b/macros/latex/contrib/willowtreebook/willowtreebook.pdf
Binary files differ
diff --git a/macros/latex/contrib/willowtreebook/willowtreebook.tex b/macros/latex/contrib/willowtreebook/willowtreebook.tex
index 96cb7d3190..2418ae455e 100644
--- a/macros/latex/contrib/willowtreebook/willowtreebook.tex
+++ b/macros/latex/contrib/willowtreebook/willowtreebook.tex
@@ -1,5 +1,5 @@
\documentclass{willowtreebook}
-\Title{The Willow Tree Book Class 1.01}
+\Title{The Willow Tree Book Class 1.02}
\Author{Benjamin \scotsMc{}Kay}
\Colophon{Released under the \LaTeX{} Public Project License 1.3c}
\BibliographyFile{willowtreebook}
@@ -25,7 +25,8 @@ Here is a typical book using the Willow Tree Book class:
This is the preface to my book.
\afterpreface
\chapter{We meet Odysseus}
-Tell me, O muse, of that ingenious hero \dots
+Tell me, O muse, of that ingenious hero
+ % The rest of the text goes here.
Thus spoke Minerva, and Ulysses obeyed her gladly. Then Minerva assumed
the form and voice of Mentor, and presently made a covenant of peace
between the two contending parties.
@@ -100,6 +101,8 @@ In any triangle with sides of lengths \(a,b,c\),
side of length \(c\) is a right angle.
\end{theorem}
\end{Verbatim}
+\newpage
+\section{Examples}
I often want to present an example, and make clear where it starts and stops.
\begin{example}
The integral
@@ -112,6 +115,7 @@ is evaluated by substituting \(u=x^2\), so
\]
\end{example}
\begin{Verbatim}[frame=leftline]
+\begin{example}
The integral
\[
\int e^{x^2}x\,dx
@@ -120,5 +124,17 @@ is evaluated by substituting \(u=x^2\), so
\[
\int e^{x^2}x\,dx=\int e^u \frac{du}{2}.
\]
+\end{example}
+\end{Verbatim}
+\section{Preambles}
+We can put some \LaTeX{} code before the hints:
+\begin{Verbatim}[frame=leftline]
+\RenewDocumentCommand\hintsPreamble{}{\par\noindent{}\textit{When you are describing, \\ A shape, or sound, or tint; \\ Don't state the matter plainly, \\ But put it in a hint; \\\ And learn to look at all things, \\ With a sort of mental squint.}\par\noindent{}---\ {Lewis Carroll}}
+\end{Verbatim}
+\RenewDocumentCommand\hintsPreamble{}{\par\noindent{}\textit{When you are describing, \\ A shape, or sound, or tint; \\ Don't state the matter plainly, \\ But put it in a hint; \\\ And learn to look at all things, \\ With a sort of mental squint.}\par\noindent{}---\ {Lewis Carroll}}
+or before the bibliography:
+\begin{Verbatim}[frame=leftline]
+\RenewDocumentCommand\bibliographyPreamble{}{\par\noindent\textit{If those books are in agreement with the Quran, we have no need of them; and if these are opposed to the Quran, destroy them.}\par\noindent{}---\ {Omar}}
\end{Verbatim}
+\RenewDocumentCommand\bibliographyPreamble{}{\par\noindent\textit{If those books are in agreement with the Quran, we have no need of them; and if these are opposed to the Quran, destroy them.}\par\noindent{}---\ {Omar}}
\end{document}