diff options
author | Norbert Preining <norbert@preining.info> | 2023-08-25 03:00:47 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-08-25 03:00:47 +0000 |
commit | ba73c7edc85ac1310d82920c5f432993f8a9af23 (patch) | |
tree | 46730fefd96488c7fb8ccd7a65e2af40e037dc95 /macros/latex | |
parent | fa4f3dd7e8be851df6afdaf4658fe87e1738a6c4 (diff) |
CTAN sync 202308250300
Diffstat (limited to 'macros/latex')
17 files changed, 205 insertions, 154 deletions
diff --git a/macros/latex/contrib/hvextern/Changes b/macros/latex/contrib/hvextern/Changes index 6e6ba9f53f..5c38357d6f 100644 --- a/macros/latex/contrib/hvextern/Changes +++ b/macros/latex/contrib/hvextern/Changes @@ -1,11 +1,12 @@ hvextern.sty ---------------- +v 0.36 2023-08-24 - added option "vshift" for inline objects v 0.35 2023-08-22 - fix shellesc option, don`t set it globally to true v 0.34 2023-07-05 - fix for missing --shell-escape option v 0.33 2023-01-29 - fixed bug with vertical space before and end of the example code v 0.32 2022-06-23 - fixed introduced bug - - added checkCode also for pdflatex and xelatex + - added checkCode also for pdflatex and xelatex v 0.31 2022-06-20 - added package option checkCode to run the external file only if the code changes. v 0.30 2022-06-09 - added \hfuzz=\maxdimen for filename to prevent diff --git a/macros/latex/contrib/hvextern/doc/hvextern.pdf b/macros/latex/contrib/hvextern/doc/hvextern.pdf Binary files differindex e6743fb28b..fddd186b01 100644 --- a/macros/latex/contrib/hvextern/doc/hvextern.pdf +++ b/macros/latex/contrib/hvextern/doc/hvextern.pdf diff --git a/macros/latex/contrib/hvextern/doc/hvextern.tex b/macros/latex/contrib/hvextern/doc/hvextern.tex index b05f01e14a..84b2df5183 100644 --- a/macros/latex/contrib/hvextern/doc/hvextern.tex +++ b/macros/latex/contrib/hvextern/doc/hvextern.tex @@ -1,7 +1,7 @@ -%% $Id: hvextern.tex 748 2023-08-22 18:03:42Z herbert $ +%% $Id: hvextern.tex 749 2023-08-24 19:10:17Z herbert $ \RequirePackage{pdfmanagement-testphase} \DeclareDocumentMetadata{} -\documentclass[ngerman,a4paper,twoside]{article} +\documentclass[english,a4paper,twoside]{article} \usepackage{babel} \usepackage{libertinus} \setmonofont[Scale=MatchLowercase,FakeStretch=0.88]{AnonymousPro} @@ -10,13 +10,12 @@ \usepackage{fancyhdr} \pagestyle{fancy} \usepackage{hvlogos} -\usepackage%[checkCode] -{hvextern} +\usepackage[checkCode]{hvextern} \usepackage{hvindex} \usepackage{hvdoctools} \usepackage{listings} \lstset{basicstyle=\ttfamily\small,language=[LaTeX]TeX,breaklines} -\usepackage{xcolor,xspace} +\usepackage{xcolor,xspace,varioref} \usepackage{hyperref} \def\Python{\textsf{Python}\xspace} @@ -28,14 +27,14 @@ \begin{document} \title{Writing, running and including the output of external documents from within a main\newline \LaTeX\ document~--v. \hvexternFileversion} -\author{Herbert Voß \url{herbert@dante.de}\thanks{Thanks to Karl Berry; +\author{Herbert Voß \url{hvoss@tug.org}\thanks{Thanks to Karl Berry; Werner Lemberg; Rolf Niepraschk}} \maketitle \tableofcontents %\newpage -\setkeys{hv}{%moveToExampleDir,ExampleDir=Exa, +\setkeys{hv}{moveToExampleDir,ExampleDir=Exa, showFilename,verbose} @@ -78,7 +77,12 @@ source code {<external filename without extension>} \end{verbatim} -The main document \emph{must} be run with the \Loption{-shell-escape} option, otherwise it won't work, e.g.: +The very first compilation run of the main document must be done + with the \Loption{-shell-escape} command-line option, otherwise it won't + work. Follow-up runs, for example, to resolve references, should + usually be done without \Loption{-shell-escape}. + +The currently used filename for the example is saved in the macro \Lcs{hvExternFilename}. \begin{verbatim} lualatex --shell-escape <file> @@ -107,10 +111,10 @@ This document was run with \LuaLaTeX. Suppose you want to insert the output of a which needs for several reasons a \XeLaTeX\ run. Instead of created and running a document outside of the main document and then to insert the output we can do this from within this \LuaLaTeX\ document itself. The external document is compiled -with \XeLaTeX\ and the output is insert as pdf image: +with \XeLaTeX\ and the output is insert as pdf image:\label{inline-exa} \begin{externalDocument}[% compiler=xelatex, inline, force=true, runs=2, grfOptions={height=8pt},% - crop, cropmargin=0, cleanup, docType=latex]{voss} + crop, cropmargin=0, cleanup, docType=latex,vshift=-1pt]{voss} \documentclass{ctexart} \pagestyle{empty} \begin{document} @@ -118,7 +122,9 @@ with \XeLaTeX\ and the output is insert as pdf image: \end{document} \end{externalDocument} -Another example which needs a \pdfLaTeX\ run. The \Index{source} code itself is also not +The current filename of the above example is \hvExternFilename. + +Let's show another example which needs a \pdfLaTeX\ run. The \Index{source} code itself is also not shown by the environment \Lenv{externalDocument}. @@ -1867,8 +1873,8 @@ to get the directory listed: \section{Other options} \begin{description} -%\item[\Lkeyword{showFilename}] Prints the filename in the outer margin (right for oneside) or in twocolumn mode for -% the first column in the left and the second column in the right margin. +\item[\Lkeyword{vshift}] A length for a vertical shift of the object, only valid for the inline mode. +See document source of example~\vpageref{inline-exa}. %\item[\Lkeyword{outerFN}] Only valid for the twocolumn mode with onecolumn floats (environment \texttt{figure*}), % to get the filename on the right or left of the whole page. %\item[\Lkeyword{shiftFN}] A length to move the printed filename up or down. @@ -1889,6 +1895,9 @@ if the package option \Loption{checkCode} exists. \end{description} + + + \printindex diff --git a/macros/latex/contrib/hvextern/latex/hvextern.sty b/macros/latex/contrib/hvextern/latex/hvextern.sty index b61d69a6fa..1304e197e7 100644 --- a/macros/latex/contrib/hvextern/latex/hvextern.sty +++ b/macros/latex/contrib/hvextern/latex/hvextern.sty @@ -1,4 +1,4 @@ -%% $Id: hvextern.sty 747 2023-08-22 17:53:38Z herbert $ +%% $Id: hvextern.sty 749 2023-08-24 19:10:17Z herbert $ %% This is file `hvextern.sty', %% %% Copyright (C) 2016-23 @@ -12,8 +12,8 @@ %% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\def\hvexternFileversion{0.35} -\ProvidesFile{hvextern}[2023/08/22 v\hvexternFileversion: package for running external documents (HV)] +\def\hvexternFileversion{0.36} +\ProvidesFile{hvextern}[2023/08/24 v\hvexternFileversion: package for running external documents (HV)] \newif\ifhv@extern@checkCode \hv@extern@checkCodefalse @@ -36,7 +36,6 @@ \def\hv@mkdir{mkdir }% \else \def\hv@move{mv }% - \def\hv@move{mv }% \def\hv@rm{rm }% \def\hv@mkdir{mkdir -p }% \def\hv@diff{diff } @@ -56,6 +55,7 @@ \newlength\hv@extern@belowbodyskip \newlength\hv@extern@belowskip \newlength\hv@extern@shiftFN +\newlength\hv@extern@vshift \newlength\hvExternLineWidth \AtBeginDocument{\hvExternLineWidth=\the\dimexpr\linewidth-2\fboxsep-2\fboxrule\relax} @@ -94,6 +94,7 @@ \define@boolkey{hv}[hv@extern@]{showFilename}[true]{} \define@boolkey{hv}[hv@extern@]{outerFN}[true]{} \define@key{hv}{shiftFN}[0pt]{\setlength\hv@extern@shiftFN{#1}} +\define@key{hv}{vshift}[0pt]{\setlength\hv@extern@vshift{#1}}% \define@boolkey{hv}[hv@extern@]{code}[true]{} \define@boolkey{hv}[hv@extern@]{force}[true]{} \define@boolkey{hv}[hv@extern@]{crop}[true]{} @@ -140,9 +141,10 @@ \def\ResetKeys{% \setkeys{hv}{% - showFilename=false,% Dateinamen im Rand angeben + showFilename=false,% Filenamen im Rand angeben outerFN=false,% use fullwidth in twocolumn mode (starred floats) shiftFN=\z@,% raise printed filename + vshift=\z@,% raise object (pdf) with \raisebox{}{} ext=tex,% file extension code=false,% show Code crop=false,% erzeugte PDF "croppen" @@ -219,7 +221,7 @@ \ExplSyntaxOn \NewDocumentCommand\run@hv@extern@cleanup{ m } { - \clist_map_inline:nn {#1}{\ShellEscape{\hv@rm \hv@extern@ExamplesDir\hvExternDateiname.##1}} + \clist_map_inline:nn {#1}{\ShellEscape{\hv@rm \hv@extern@ExamplesDir\hvExternFilename.##1}} \ifnum\hv@extern@compilerNo=0\relax % we have metapost \ShellEscape{\hv@rm\space epsf.*}% \fi @@ -228,7 +230,7 @@ { \clist_map_inline:nn {#1}{% \hv@ex@typeout{sequencerun: ##1}% - \ShellEscape{\hv@extern@progpath##1\space\hv@run@options\hvExternDateiname}% + \ShellEscape{\hv@extern@progpath##1\space\hv@run@options\hvExternFilename}% } } \ExplSyntaxOff @@ -428,42 +430,42 @@ %%%--------------------------------- end config part ------------------ %% -%% [#1]: Optionen #2: Dateiname +%% [#1]: Optionen #2: Filename %% \newenvironment{externalDocument}[2][] {% \ifhv@extern@shellesc\gdef\hv@run@options{ --shell-escape }\else\gdef\hv@run@options{}\fi% - \xdef\hvExternDateiname{#2-\arabic{hv@example@counter}}% + \xdef\hvExternFilename{#2-\arabic{hv@example@counter}}% \gdef\hv@extern@savePara{#1}% \setkeys{hv}{#1}% \begin - \hv@ex@typeout{External filename: \hvExternDateiname}% - \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternDateiname.pdf}{}{% - \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternDateiname.png}{}{% - \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternDateiname.txt}{}{% + \hv@ex@typeout{External filename: \hvExternFilename}% + \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternFilename.pdf}{}{% + \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternFilename.png}{}{% + \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternFilename.txt}{}{% \global\hv@extern@forcetrue}}}% set force, if no pdf or png exists \begingroup - \hv@ex@typeout{writing file \hvExternDateiname\hv@extern@ext ...}% - \filecontents[force,noheader]{\hvExternDateiname\hv@extern@ext}% + \hv@ex@typeout{writing file \hvExternFilename\hv@extern@ext ...}% + \filecontents[force,noheader]{\hvExternFilename\hv@extern@ext}% } {\endfilecontents% \end% \hv@ex@typeout{... done}% \global\stepcounter{hv@example@counter}% \endgroup \expandafter\hvExternSetKeys\expandafter{\hv@extern@savePara}% - \xdef\hv@extern@fullPath{\hv@extern@ExamplesDir\hvExternDateiname}% + \xdef\hv@extern@fullPath{\hv@extern@ExamplesDir\hvExternFilename}% \ifhv@extern@checkCode \ifluatex - \directlua{if GetFileContents("\hvExternDateiname\hv@extern@ext", - "\hv@extern@ExamplesDir\hvExternDateiname\hv@extern@ext") then + \directlua{if GetFileContents("\hvExternFilename\hv@extern@ext", + "\hv@extern@ExamplesDir\hvExternFilename\hv@extern@ext") then tex.print("\\csname hv@ex@typeout\\endcsname{current file is NOT newer: no run }\\global\\csname hv@extern@forcefalse\\endcsname") else tex.print("\\csname hv@ex@typeout\\endcsname{current file is newer: force run }\\global\\csname hv@extern@forcetrue\\endcsname") end}% \else \hv@ex@typeout{Check, if new file has a different code}% - \ShellEscape{hvextern-checkfile "\hvExternDateiname\hv@extern@ext" - "\hv@extern@ExamplesDir\hvExternDateiname\hv@extern@ext"}% - \InputIfFileExists{\hvExternDateiname\hv@extern@ext.diff}{}{}% + \ShellEscape{hvextern-checkfile "\hvExternFilename\hv@extern@ext" + "\hv@extern@ExamplesDir\hvExternFilename\hv@extern@ext"}% + \InputIfFileExists{\hvExternFilename\hv@extern@ext.diff}{}{}% \ifx\hvCheckNewFile\empty \hv@ex@typeout{current file is NOT newer: no run }% \global\hv@extern@forcefalse @@ -471,63 +473,63 @@ \hv@ex@typeout{current file is newer: force run }% \global\hv@extern@forcetrue \fi - \ifhv@extern@verbose\else\ShellEscape{\hv@rm \hvExternDateiname\hv@extern@ext.diff}\fi + \ifhv@extern@verbose\else\ShellEscape{\hv@rm \hvExternFilename\hv@extern@ext.diff}\fi \fi \fi \ifhv@extern@force \ifx\hv@extern@runsequence\@empty - \hv@ex@typeout{force=true: running \hv@extern@progpath\hv@extern@compiler\ \hv@run@options \hvExternDateiname\hv@extern@ext ...}% + \hv@ex@typeout{force=true: running \hv@extern@progpath\hv@extern@compiler\ \hv@run@options \hvExternFilename\hv@extern@ext ...}% \setcounter{@@@runs}{\value{hv@extern@runs}}% \loop\ifnum\the@@@runs > 0\relax \ifcase\hv@extern@compilerNo \relax % we have metapost - \hv@ex@typeout{running mpost \hvExternDateiname\hv@extern@ext}% - \hv@extern@runMP{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}% + \hv@ex@typeout{running mpost \hvExternFilename\hv@extern@ext}% + \hv@extern@runMP{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternFilename}{\hv@extern@ext}% \or %1 - \hv@ex@typeout{running tex \hvExternDateiname\hv@extern@ext}% - \hv@extern@runTEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}% + \hv@ex@typeout{running tex \hvExternFilename\hv@extern@ext}% + \hv@extern@runTEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternFilename}{\hv@extern@ext}% \or %2 - \hv@ex@typeout{running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext}% - \hv@extern@runLATEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}% + \hv@ex@typeout{running \hv@extern@compiler~ \hvExternFilename\hv@extern@ext}% + \hv@extern@runLATEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternFilename}{\hv@extern@ext}% \else \ifhv@extern@redirect - \hv@ex@typeout{running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext > \hvExternDateiname.txt}% - \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname\hv@extern@ext\space > \hvExternDateiname.txt}% + \hv@ex@typeout{running \hv@extern@compiler~ \hvExternFilename\hv@extern@ext > \hvExternFilename.txt}% + \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternFilename\hv@extern@ext\space > \hvExternFilename.txt}% \else - \hv@ex@typeout{running \hv@extern@compiler~\hv@run@options~\hvExternDateiname\hv@extern@ext}% - \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hv@run@options\space\hvExternDateiname\hv@extern@ext}% + \hv@ex@typeout{running \hv@extern@compiler~\hv@run@options~\hvExternFilename\hv@extern@ext}% + \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hv@run@options\space\hvExternFilename\hv@extern@ext}% \fi \fi \addtocounter{@@@runs}{-1}% \repeat \hv@ex@typeout{... done}% \ifhv@extern@biber - \ShellEscape{biber \hvExternDateiname}% NAch biber nochmal latex - \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname}% + \ShellEscape{biber \hvExternFilename}% NAch biber nochmal latex + \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternFilename}% \fi \ifhv@extern@xindex - \ShellEscape{xindex \hv@extern@xindexOptions\space \hvExternDateiname.idx}% NAch xindex nochmal latex - \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname}% + \ShellEscape{xindex \hv@extern@xindexOptions\space \hvExternFilename.idx}% NAch xindex nochmal latex + \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternFilename}% \fi \expandafter\ifnum\value{hv@extern@runsAfter} > 0 - \hv@ex@typeout{runsAfter>0: running \hv@extern@progpath\hv@extern@compiler~ \hvExternDateiname\hv@extern@ext ...}% + \hv@ex@typeout{runsAfter>0: running \hv@extern@progpath\hv@extern@compiler~ \hvExternFilename\hv@extern@ext ...}% \setcounter{@@@runs}{\value{hv@extern@runsAfter}}% \loop\ifnum\the@@@runs > 0\relax \ifcase\hv@extern@compilerNo \relax % we have metapost - \hv@ex@typeout{running mpost \hvExternDateiname\hv@extern@ext}% - \hv@extern@runMP{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}% + \hv@ex@typeout{running mpost \hvExternFilename\hv@extern@ext}% + \hv@extern@runMP{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternFilename}{\hv@extern@ext}% \or %1 - \hv@ex@typeout{running tex \hvExternDateiname\hv@extern@ext}% - \hv@extern@runTEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}% + \hv@ex@typeout{running tex \hvExternFilename\hv@extern@ext}% + \hv@extern@runTEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternFilename}{\hv@extern@ext}% \or %2 - \hv@ex@typeout{running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext}% - \hv@extern@runLATEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}% + \hv@ex@typeout{running \hv@extern@compiler~ \hvExternFilename\hv@extern@ext}% + \hv@extern@runLATEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternFilename}{\hv@extern@ext}% \else \ifhv@extern@redirect - \hv@ex@typeout{running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext > \hvExternDateiname.txt}% - \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname\hv@extern@ext\space > \hvExternDateiname.txt}% + \hv@ex@typeout{running \hv@extern@compiler~ \hvExternFilename\hv@extern@ext > \hvExternFilename.txt}% + \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternFilename\hv@extern@ext\space > \hvExternFilename.txt}% \else - \hv@ex@typeout{running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext}% - \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname\hv@extern@ext}% + \hv@ex@typeout{running \hv@extern@compiler~ \hvExternFilename\hv@extern@ext}% + \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternFilename\hv@extern@ext}% \fi \fi \addtocounter{@@@runs}{-1}% @@ -538,14 +540,14 @@ \expandafter\run@hv@extern@sequenceList\expandafter{\hv@extern@runsequence}% \fi \ifhv@extern@crop - \ShellEscape{pdfcrop --margins \hv@extern@cropmargin \hvExternDateiname}% - \ShellEscape{\hv@move \hvExternDateiname-crop.pdf \hvExternDateiname.pdf}% + \ShellEscape{pdfcrop --margins \hv@extern@cropmargin \hvExternFilename}% + \ShellEscape{\hv@move \hvExternFilename-crop.pdf \hvExternFilename.pdf}% \fi \ifhv@extern@eps - \ShellEscape{pdftops -eps -f 1 -l 1 \hvExternDateiname.pdf}% + \ShellEscape{pdftops -eps -f 1 -l 1 \hvExternFilename.pdf}% \fi \else - \hv@ex@typeout{force=false: NOT running \hvExternDateiname\hv@extern@ext ...}% + \hv@ex@typeout{force=false: NOT running \hvExternFilename\hv@extern@ext ...}% \fi% end force \hfuzz=\maxdimen \ifhv@extern@code%-------------- Code Part @@ -573,20 +575,20 @@ \@nameuse{\hv@extern@docType @initPreambleFancy}% \edef\@@@temp{\@nameuse{\hv@extern@docType @initPreamble}}% % we need lstinputlisting, because \VerbatimInput doesn't work in a box - \savebox\hv@extern@box{\expandafter\lstinputlisting\expandafter[\@@@temp]{\hvExternDateiname\hv@extern@ext}}% + \savebox\hv@extern@box{\expandafter\lstinputlisting\expandafter[\@@@temp]{\hvExternFilename\hv@extern@ext}}% \ifdim\wd\hv@extern@box > \z@\relax \expandafter\fvset\expandafter{\hv@extern@lstOptions}% \tcbset{colback=\hv@extern@BGpreamble,colframe=\hv@extern@BOpreamble}% - \PreambleVerbatim{\hvExternDateiname\hv@extern@ext}% + \PreambleVerbatim{\hvExternFilename\hv@extern@ext}% \vspace{\hv@extern@belowpreambleskip}% \fi \else \edef\@@@temp{\@nameuse{\hv@extern@docType @initPreamble}}% - \savebox\hv@extern@box{\expandafter\lstinputlisting\expandafter[\@@@temp]{\hvExternDateiname\hv@extern@ext}}% + \savebox\hv@extern@box{\expandafter\lstinputlisting\expandafter[\@@@temp]{\hvExternFilename\hv@extern@ext}}% \ifdim\wd\hv@extern@box>\z@\relax \expandafter\lstset\expandafter{\hv@extern@lstOptions}% \tcbset{colback=\hv@extern@BGpreamble,colframe=\hv@extern@BOpreamble}% - \PreambleListing[\@@@temp]{\hvExternDateiname\hv@extern@ext}% + \PreambleListing[\@@@temp]{\hvExternFilename\hv@extern@ext}% \vspace{\hv@extern@belowpreambleskip}% \fi \fi @@ -594,7 +596,7 @@ \hv@ex@typeout{Set filename in the margin!}% \noindent \hfuzz=\maxdimen - \hv@marginpar{\hvExternDateiname\hv@extern@ext}% + \hv@marginpar{\hvExternFilename\hv@extern@ext}% \fi % \hv@ex@typeout{Starting Code body ...}%} @@ -602,12 +604,12 @@ \@nameuse{\hv@extern@docType @initTextFancy}% \expandafter\fvset\expandafter{\hv@extern@lstOptions}% \tcbset{colback=\hv@extern@BGbody,colframe=\hv@extern@BObody}% - \expandafter\BodyVerbatim\expandafter[\hv@extern@lstOptions]{\hvExternDateiname\hv@extern@ext}% + \expandafter\BodyVerbatim\expandafter[\hv@extern@lstOptions]{\hvExternFilename\hv@extern@ext}% \else \expandafter\lstset\expandafter{\hv@extern@lstOptions}% \edef\@@@temp{\@nameuse{\hv@extern@docType @initText}}% \tcbset{colback=\hv@extern@BGbody,colframe=\hv@extern@BObody}% - \BodyListing[\@@@temp]{\hvExternDateiname\hv@extern@ext}% + \BodyListing[\@@@temp]{\hvExternFilename\hv@extern@ext}% \fi \ifdim\hv@extern@mpwidth > \z@\relax \endminipage\fi \endgroup @@ -616,19 +618,20 @@ \ifhv@extern@showFilename \hv@ex@typeout{Set filename in the margin!}% \noindent - \hv@marginpar{\hvExternDateiname\hv@extern@ext}% + \hv@marginpar{\hvExternFilename\hv@extern@ext}% \fi \fi \ifhv@extern@moveToExampleDir % \ShellEscape{mkdir\space\hv@extern@ExamplesDir/}% \hv@ex@typeout{Move file into example dir}% - \hv@ex@typeout{\hvExternDateiname ----> \hv@extern@ExamplesDir}% - \ShellEscape{\hv@move \hvExternDateiname.*\space \hv@extern@ExamplesDir}% + \hv@ex@typeout{\hvExternFilename ----> \hv@extern@ExamplesDir}% + \ShellEscape{\hv@move \hvExternFilename.*\space \hv@extern@ExamplesDir}% \fi \ifhv@extern@showoutput \ifhv@extern@includegraphic \ifhv@extern@inline - \expandafter\includegraphics\expandafter[\hv@extern@grfOptions]{\hv@extern@fullPath}% + \raisebox{\hv@extern@vshift}{% + \expandafter\includegraphics\expandafter[\hv@extern@grfOptions]{\hv@extern@fullPath}}% \else \ifhv@extern@float \hv@ex@typeout{Floating environment}% @@ -687,19 +690,22 @@ \fi \fi \fi - \fi% end of \ifshowoutput - \ifhv@extern@force\expandafter\run@hv@extern@cleanup\expandafter{\hv@extern@cleanup}\fi% cleanup + \fi% end of \ifshowoutput + \ifhv@extern@force\expandafter\run@hv@extern@cleanup\expandafter{\hv@extern@cleanup}\fi% cleanup + \hv@ex@typeout{Move source file into example dir, in case of missing --shell-escape}% +% \hv@ex@typeout{\hvExternFilename ----> \hv@extern@ExamplesDir}% + \ShellEscape{\hv@move \hvExternFilename\hv@extern@ext\space \hv@extern@ExamplesDir}% \vspace{\hv@extern@belowskip}% } \newcommand\runExtCmd[3][]{% #1:options; #2:comamnd; #3:filename \begingroup \setkeys{hv}{cleanup={},code=false,includegraphic=false,#1}% - \xdef\hvExternDateiname{#3-\arabic{hv@example@counter}}% - \xdef\hv@extern@fullPath{\hv@extern@ExamplesDir\hvExternDateiname}% + \xdef\hvExternFilename{#3-\arabic{hv@example@counter}}% + \xdef\hv@extern@fullPath{\hv@extern@ExamplesDir\hvExternFilename}% \hv@ex@typeout{running #2}% \ifhv@extern@redirect - \ShellEscape{\hv@extern@progpath#2 > \hv@extern@ExamplesDir\hvExternDateiname.txt}% + \ShellEscape{\hv@extern@progpath#2 > \hv@extern@ExamplesDir\hvExternFilename.txt}% \else \ShellEscape{\hv@extern@progpath#2}% \fi @@ -708,7 +714,7 @@ \ifhv@extern@showoutput \ifhv@extern@includegraphic \ifhv@extern@inline - \expandafter\includegraphics\expandafter[\hv@extern@grfOptions]{\hv@extern@ExamplesDir\hvExternDateiname}% + \expandafter\includegraphics\expandafter[\hv@extern@grfOptions]{\hv@extern@ExamplesDir\hvExternFilename}% \else \ifhv@extern@float \hv@ex@typeout{Floating environment}% @@ -718,7 +724,7 @@ \par\noindent\begingroup \fi \hv@extern@align - \hv@ex@typeout{Input image \hv@extern@ExamplesDir\hvExternDateiname}% + \hv@ex@typeout{Input image \hv@extern@ExamplesDir\hvExternFilename}% \ifhv@extern@frame \begingroup \fboxsep=\hv@extern@framesep @@ -864,37 +870,37 @@ \newenvironment{createPNGfromPSTricks}[3][]% #1:options #2: pstricks packages #3: filename {% - \xdef\hvExternDateiname{#2-\arabic{hv@example@counter}}% + \xdef\hvExternFilename{#2-\arabic{hv@example@counter}}% \gdef\hv@extern@savePara{#1}% \setkeys{hv}{#1}% \begin - \hv@ex@typeout{External filename: \hvExternDateiname}% - \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternDateiname.pdf}{}{% - \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternDateiname.png}{}{% - \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternDateiname.txt}{}{% + \hv@ex@typeout{External filename: \hvExternFilename}% + \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternFilename.pdf}{}{% + \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternFilename.png}{}{% + \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternFilename.txt}{}{% \global\hv@extern@forcetrue}}}% set force, if no pdf or png exists \begingroup - \hv@ex@typeout{writing file \hvExternDateiname\hv@extern@ext ...}% - \filecontents[force,noheader]{\hvExternDateiname\hv@extern@ext}% + \hv@ex@typeout{writing file \hvExternFilename\hv@extern@ext ...}% + \filecontents[force,noheader]{\hvExternFilename\hv@extern@ext}% } {\endfilecontents% \end% \hv@ex@typeout{... done}% \global\stepcounter{hv@example@counter}% \endgroup \expandafter\hvExternSetKeys\expandafter{\hv@extern@savePara}% - \xdef\hv@extern@fullPath{\hv@extern@ExamplesDir\hvExternDateiname}% + \xdef\hv@extern@fullPath{\hv@extern@ExamplesDir\hvExternFilename}% \ifhv@extern@checkCode \ifluatex - \directlua{if GetFileContents("\hvExternDateiname\hv@extern@ext", - "\hv@extern@ExamplesDir\hvExternDateiname\hv@extern@ext") then + \directlua{if GetFileContents("\hvExternFilename\hv@extern@ext", + "\hv@extern@ExamplesDir\hvExternFilename\hv@extern@ext") then tex.print("\\csname hv@ex@typeout\\endcsname{current file is NOT newer: no run }\\global\\csname hv@extern@forcefalse\\endcsname") else tex.print("\\csname hv@ex@typeout\\endcsname{current file is newer: force run }\\global\\csname hv@extern@forcetrue\\endcsname") end}% \else \hv@ex@typeout{Check, if new file has a different code}% - \ShellEscape{hvextern-checkfile "\hvExternDateiname\hv@extern@ext" - "\hv@extern@ExamplesDir\hvExternDateiname\hv@extern@ext"}% - \InputIfFileExists{\hvExternDateiname\hv@extern@ext.diff}{}{}% + \ShellEscape{hvextern-checkfile "\hvExternFilename\hv@extern@ext" + "\hv@extern@ExamplesDir\hvExternFilename\hv@extern@ext"}% + \InputIfFileExists{\hvExternFilename\hv@extern@ext.diff}{}{}% \ifx\hvCheckNewFile\empty \hv@ex@typeout{current file is NOT newer: no run }% \global\hv@extern@forcefalse @@ -902,55 +908,55 @@ \hv@ex@typeout{current file is newer: force run }% \global\hv@extern@forcetrue \fi - \ifhv@extern@verbose\else\hv@rm{\hvExternDateiname\hv@extern@ext.diff}\fi + \ifhv@extern@verbose\else\hv@rm{\hvExternFilename\hv@extern@ext.diff}\fi \fi \fi \ifhv@extern@force \ifx\hv@extern@runsequence\@empty - \hv@ex@typeout{force=true: running \hv@extern@progpath\hv@extern@compiler~ \hvExternDateiname\hv@extern@ext ...}% + \hv@ex@typeout{force=true: running \hv@extern@progpath\hv@extern@compiler~ \hvExternFilename\hv@extern@ext ...}% \setcounter{@@@runs}{\value{hv@extern@runs}}% \loop\ifnum\the@@@runs > 0\relax \ifcase\hv@extern@compilerNo \relax % we have metapost - \hv@ex@typeout{running mpost \hvExternDateiname\hv@extern@ext}% - \hv@extern@runMP{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}% + \hv@ex@typeout{running mpost \hvExternFilename\hv@extern@ext}% + \hv@extern@runMP{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternFilename}{\hv@extern@ext}% \or %1 - \hv@ex@typeout{running tex \hvExternDateiname\hv@extern@ext}% - \hv@extern@runTEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}% + \hv@ex@typeout{running tex \hvExternFilename\hv@extern@ext}% + \hv@extern@runTEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternFilename}{\hv@extern@ext}% \or %2 - \hv@ex@typeout{running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext}% - \hv@extern@runLATEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}% + \hv@ex@typeout{running \hv@extern@compiler~ \hvExternFilename\hv@extern@ext}% + \hv@extern@runLATEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternFilename}{\hv@extern@ext}% \else \ifhv@extern@redirect - \hv@ex@typeout{running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext > \hvExternDateiname.txt}% - \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname\hv@extern@ext\space > \hvExternDateiname.txt}% + \hv@ex@typeout{running \hv@extern@compiler~ \hvExternFilename\hv@extern@ext > \hvExternFilename.txt}% + \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternFilename\hv@extern@ext\space > \hvExternFilename.txt}% \else - \hv@ex@typeout{running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext}% - \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname\hv@extern@ext}% + \hv@ex@typeout{running \hv@extern@compiler~ \hvExternFilename\hv@extern@ext}% + \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternFilename\hv@extern@ext}% \fi \fi \addtocounter{@@@runs}{-1}% \repeat \hv@ex@typeout{... done}% \ifhv@extern@biber - \ShellEscape{biber \hvExternDateiname}% NAch biber nochmal latex - \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname}% + \ShellEscape{biber \hvExternFilename}% NAch biber nochmal latex + \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternFilename}% \fi \ifhv@extern@xindex - \ShellEscape{xindex \hv@extern@xindexOptions\space \hvExternDateiname.idx}% NAch xindex nochmal latex - \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname}% + \ShellEscape{xindex \hv@extern@xindexOptions\space \hvExternFilename.idx}% NAch xindex nochmal latex + \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternFilename}% \fi \else % runsequence \expandafter\run@hv@extern@sequenceList\expandafter{\hv@extern@runsequence}% \fi \ifhv@extern@crop - \ShellEscape{pdfcrop --margins \hv@extern@cropmargin \hvExternDateiname}% - \ShellEscape{\hv@move \hvExternDateiname-crop.pdf \hvExternDateiname.pdf}% + \ShellEscape{pdfcrop --margins \hv@extern@cropmargin \hvExternFilename}% + \ShellEscape{\hv@move \hvExternFilename-crop.pdf \hvExternFilename.pdf}% \fi \ifhv@extern@eps - \ShellEscape{pdftops -eps -f 1 -l 1 \hvExternDateiname.pdf}% + \ShellEscape{pdftops -eps -f 1 -l 1 \hvExternFilename.pdf}% \fi \else - \hv@ex@typeout{force=false: NOT running \hvExternDateiname\hv@extern@ext ...}% + \hv@ex@typeout{force=false: NOT running \hvExternFilename\hv@extern@ext ...}% \fi% end force \hfuzz=\maxdimen \ifhv@extern@code%-------------- Code Part @@ -977,20 +983,20 @@ \@nameuse{\hv@extern@docType @initPreambleFancy}% \edef\@@@temp{\@nameuse{\hv@extern@docType @initPreamble}}% % we need lstinputlisting, because \VerbatimInput doesn't work in a box - \savebox\hv@extern@box{\expandafter\lstinputlisting\expandafter[\@@@temp]{\hvExternDateiname\hv@extern@ext}}% + \savebox\hv@extern@box{\expandafter\lstinputlisting\expandafter[\@@@temp]{\hvExternFilename\hv@extern@ext}}% \ifdim\wd\hv@extern@box > \z@\relax \expandafter\fvset\expandafter{\hv@extern@lstOptions}% \tcbset{colback=\hv@extern@BGpreamble,colframe=\hv@extern@BOpreamble}% - \PreambleVerbatim{\hvExternDateiname\hv@extern@ext}% + \PreambleVerbatim{\hvExternFilename\hv@extern@ext}% \vspace{\hv@extern@belowpreambleskip}% \fi \else \edef\@@@temp{\@nameuse{\hv@extern@docType @initPreamble}}% - \savebox\hv@extern@box{\expandafter\lstinputlisting\expandafter[\@@@temp]{\hvExternDateiname\hv@extern@ext}}% + \savebox\hv@extern@box{\expandafter\lstinputlisting\expandafter[\@@@temp]{\hvExternFilename\hv@extern@ext}}% \ifdim\wd\hv@extern@box>\z@\relax \expandafter\lstset\expandafter{\hv@extern@lstOptions}% \tcbset{colback=\hv@extern@BGpreamble,colframe=\hv@extern@BOpreamble}% - \PreambleListing[\@@@temp]{\hvExternDateiname\hv@extern@ext}% + \PreambleListing[\@@@temp]{\hvExternFilename\hv@extern@ext}% \vspace{\hv@extern@belowpreambleskip}% \fi \fi @@ -998,7 +1004,7 @@ \hv@ex@typeout{Set filename in the margin!}% \noindent \hfuzz=\maxdimen - \hv@marginpar{\hvExternDateiname\hv@extern@ext}% + \hv@marginpar{\hvExternFilename\hv@extern@ext}% \fi % \hv@ex@typeout{Starting Code body ...}%} @@ -1006,12 +1012,12 @@ \@nameuse{\hv@extern@docType @initTextFancy}% \expandafter\fvset\expandafter{\hv@extern@lstOptions}% \tcbset{colback=\hv@extern@BGbody,colframe=\hv@extern@BObody}% - \expandafter\BodyVerbatim\expandafter[\hv@extern@lstOptions]{\hvExternDateiname\hv@extern@ext}% + \expandafter\BodyVerbatim\expandafter[\hv@extern@lstOptions]{\hvExternFilename\hv@extern@ext}% \else \expandafter\lstset\expandafter{\hv@extern@lstOptions}% \edef\@@@temp{\@nameuse{\hv@extern@docType @initText}}% \tcbset{colback=\hv@extern@BGbody,colframe=\hv@extern@BObody}% - \BodyListing[\@@@temp]{\hvExternDateiname\hv@extern@ext}% + \BodyListing[\@@@temp]{\hvExternFilename\hv@extern@ext}% \fi \ifdim\hv@extern@mpwidth > \z@\relax \endminipage\fi \endgroup @@ -1020,14 +1026,14 @@ \ifhv@extern@showFilename \hv@ex@typeout{Set filename in the margin!}% \noindent - \hv@marginpar{\hvExternDateiname\hv@extern@ext}% + \hv@marginpar{\hvExternFilename\hv@extern@ext}% \fi \fi \ifhv@extern@moveToExampleDir % \ShellEscape{mkdir\space\hv@extern@ExamplesDir/}% \hv@ex@typeout{Move file into example dir}% - \hv@ex@typeout{\hvExternDateiname ----> \hv@extern@ExamplesDir}% - \ShellEscape{\hv@move \hvExternDateiname.*\space \hv@extern@ExamplesDir}% + \hv@ex@typeout{\hvExternFilename.* ----> \hv@extern@ExamplesDir}% + \ShellEscape{\hv@move \hvExternFilename.*\space \hv@extern@ExamplesDir}% \fi \ifhv@extern@showoutput \ifhv@extern@includegraphic diff --git a/macros/latex/contrib/photobook/photobook.cls b/macros/latex/contrib/photobook/photobook.cls index d29c923dd3..899a488069 100644 --- a/macros/latex/contrib/photobook/photobook.cls +++ b/macros/latex/contrib/photobook/photobook.cls @@ -93,8 +93,8 @@ %%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the %%% code and the generated docs... -\edef\photobook@FILEVERSION{v0.1.23} -\edef\photobook@FILEDATE{2023-05-05} +\edef\photobook@FILEVERSION{v0.1.25} +\edef\photobook@FILEDATE{2023-08-24} %% \documentclass{ltxdoc} @@ -4270,6 +4270,8 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %%%%% Basic book information +%% \DescribeMacro{BookType=<text>} +\def\BookType{book} % XXX Document metadata -- move to globals... % XXX Use LaTeX generic metadata... %% \DescribeMacro{BookTitle=<text>} @@ -4296,8 +4298,8 @@ Copyright \textcopyright \ \BookYear \ \BookAuthors; All Rights Reserved. \ifx \License \empty% - No part of this book may be reproduced in any form without written permission - of the author except for use for brief quotation in a book review. + No part of this \BookType\ may be reproduced in any form without written permission + of the author except for use for brief quotation in a review. \else% \License\fi} @@ -4307,7 +4309,7 @@ \def\BookFonts{} %% \DescribeMacro{SoftwareNotice=<text>} \def\SoftwareNotice{% - This book was designed and laid out using open source + This \BookType\ was designed and laid out using open source \ifx \BookFonts \empty\else fonts and\fi software including: diff --git a/macros/latex/contrib/photobook/photobook.pdf b/macros/latex/contrib/photobook/photobook.pdf Binary files differindex d78e1f2b17..953e58eace 100644 --- a/macros/latex/contrib/photobook/photobook.pdf +++ b/macros/latex/contrib/photobook/photobook.pdf diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index e055add8b6..92d2a410b3 100644 --- a/macros/latex/contrib/siunitx/CHANGELOG.md +++ b/macros/latex/contrib/siunitx/CHANGELOG.md @@ -7,10 +7,22 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.3.4] - 2023-08-24 + +### Fixed +- Correct an internal variable name (see issue + [\#689](https://github.com/josephwright/siunitx/issues/689)) + +## [v3.3.3] - 2023-08-23 + +### Fixed +- Include uncertainty divider in number validation (see issue + [\#686](https://github.com/josephwright/siunitx/issues/686)) + ## [v3.3.2] - 2023-08-03 ### Fixed -- Move an `expl3` variant defintion (see issue +- Move an `expl3` variant definition (see issue [\#680](https://github.com/josephwright/siunitx/issues/680)) ## [v3.3.1] - 2023-08-01 @@ -1984,7 +1996,9 @@ 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.2...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.4...HEAD +[v3.3.4]: https://github.com/josephwright/siunitx/compare/v3.3.3...v3.3.4 +[v3.3.3]: https://github.com/josephwright/siunitx/compare/v3.3.2...v3.3.3 [v3.3.2]: https://github.com/josephwright/siunitx/compare/v3.3.1...v3.3.2 [v3.3.1]: https://github.com/josephwright/siunitx/compare/v3.3.0...v3.3.1 [v3.3.0]: https://github.com/josephwright/siunitx/compare/v3.2.9...v3.3.0 diff --git a/macros/latex/contrib/siunitx/siunitx-angle.dtx b/macros/latex/contrib/siunitx/siunitx-angle.dtx index 69bb9a53fb..da61a09fec 100644 --- a/macros/latex/contrib/siunitx/siunitx-angle.dtx +++ b/macros/latex/contrib/siunitx/siunitx-angle.dtx @@ -72,7 +72,7 @@ % may be given as expressions. The \meta{angle} should be a number as understood % by \cs{siunitx_format_number:nN}, with no uncertainty, exponent or imaginary % part. The unit symbols for degrees, minutes and seconds are |\degree|, -% |\arcminute| and |\arcsecond|, respectively +% |\arcminute| and |\arcsecond|, respectively. % \end{function} % % \subsection{Key--value options} diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf Binary files differindex 1f82d980c2..5ee4a1467b 100644 --- a/macros/latex/contrib/siunitx/siunitx-code.pdf +++ b/macros/latex/contrib/siunitx/siunitx-code.pdf diff --git a/macros/latex/contrib/siunitx/siunitx-compound.dtx b/macros/latex/contrib/siunitx/siunitx-compound.dtx index 46d2404136..0ce984f4a0 100644 --- a/macros/latex/contrib/siunitx/siunitx-compound.dtx +++ b/macros/latex/contrib/siunitx/siunitx-compound.dtx @@ -66,7 +66,7 @@ % \end{syntax} % Prints a set of numbers in the \meta{entries}, each of which should % be given as a \meta{balanced text}. Unlike \cs{siunitx_number_list:nn}, this -% function may semantically take any form +% function may semantically take any form. % \end{function} % % \begin{function}{\siunitx_compound_quantity:nn} @@ -75,7 +75,7 @@ % \end{syntax} % Prints a set of quantities in the \meta{entries}, each of which should % be given as a \meta{balanced text}. Unlike \cs{siunitx_quantity_list:nn}, this -% function may semantically take any form +% function may semantically take any form. % \end{function} % % \begin{function}{\siunitx_number_list:nn} @@ -428,6 +428,7 @@ % % \begin{variable} % { +% \l_@@_boundary_text_bool , % \l_@@_boundary_close_tl , % \l_@@_bracket_close_tl , % \l_@@_independent_bool , @@ -456,9 +457,9 @@ { compound-boundary-mode .choice: , compound-boundary-mode / number .code:n = - { \bool_set_false:N \l_@@_delim_text_bool } , + { \bool_set_false:N \l_@@_boundary_text_bool } , compound-boundary-mode / text .code:n = - { \bool_set_true:N \l_@@_delim_text_bool } , + { \bool_set_true:N \l_@@_boundary_text_bool } , compound-close-boundary .tl_set:N = \l_@@_boundary_close_tl , compound-close-bracket .tl_set:N = diff --git a/macros/latex/contrib/siunitx/siunitx-emulation.dtx b/macros/latex/contrib/siunitx/siunitx-emulation.dtx index 9cb54d21c2..887cea9d20 100644 --- a/macros/latex/contrib/siunitx/siunitx-emulation.dtx +++ b/macros/latex/contrib/siunitx/siunitx-emulation.dtx @@ -59,6 +59,8 @@ % % \begin{documentation} % +% This sub-module exposes no API. +% % \end{documentation} % % \begin{implementation} diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx index a46613e42e..5bba843ce6 100644 --- a/macros/latex/contrib/siunitx/siunitx-number.dtx +++ b/macros/latex/contrib/siunitx/siunitx-number.dtx @@ -102,7 +102,7 @@ % \begin{itemize} % \item[\texttt{S}] A single symmetrical uncertainty (\foreign{e.g.}~a % statistical standard uncertainty). The data item here is a single -% value representing the uncertainty in the least-significant digits +% value representing the uncertainty in the least-significant digits. % \item[\texttt{A}] A single unsymmetrical uncertainty. The data item here % contains two brace groups, each using the same least-significant digit % approach as the \texttt{S} type. The positive component is given first @@ -537,7 +537,7 @@ % setting |down| means that the value will be rounded toward zero. The % setting |nearest| means that the value will be rounded to the nearest % (either up or down), taking account of the setting of |round-half|. -% The standard setting is |nearest| +% The standard setting is |nearest|. % \end{function} % % \begin{function}{round-half} @@ -663,7 +663,7 @@ % the setting |down| means that the uncertainty will be rounded toward zero. % The setting |nearest| means that the uncertainty will be rounded to the % nearest (either up or down), taking account of the setting of |round-half|. -% The standard setting is |nearest| +% The standard setting is |nearest|. % \end{function} % % \begin{function}{uncertainty-separator} @@ -712,7 +712,6 @@ % \begin{macrocode} \cs_generate_variant:Nn \keys_set:nn { nx } \cs_generate_variant:Nn \tl_if_blank:nTF { f } -\cs_generate_variant:Nn \tl_if_blank_p:n { f } \cs_generate_variant:Nn \tl_if_in:NnTF { NV } \cs_generate_variant:Nn \tl_if_in:nnTF { nV } \cs_generate_variant:Nn \tl_remove_all:Nn { NV } @@ -4696,6 +4695,7 @@ \l_@@_input_uncert_open_tl \l_siunitx_number_input_sign_tl \l_@@_input_uncert_sign_tl + \l_@@_input_uncert_divide_tl \q_recursion_tail \q_recursion_stop } diff --git a/macros/latex/contrib/siunitx/siunitx-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx index 8654060651..6786aba79e 100644 --- a/macros/latex/contrib/siunitx/siunitx-print.dtx +++ b/macros/latex/contrib/siunitx/siunitx-print.dtx @@ -70,16 +70,31 @@ % take place in text or math mode. % % The printing routines assume that normal \LaTeXe{} font selection commands -% are available, in particular \cs{bfseries}, \cs{mathrm}, \cs{mathversion}, -% \cs{fontfamily}, \cs{fontseries} and \cs{fontshape}, \cs{familydefault}, -% \cs{seriesdefault}, \cs{shapedefault} and \cs{selectfont}. -% It also requires the standard -% \LaTeXe{} kernel commands \cs{ensuremath}, \cs{mbox}, \cs{textsubscript} and -% \cs{textsuperscript} for printing in text mode. The following packages are +% are available, in particular +% \begin{itemize} +% \item \cs{bfseries}, +% \item \cs{mathrm}, +% \item \cs{mathversion}, +% \item \cs{fontfamily}, +% \item \cs{fontseries}, +% \item \cs{fontshape}, +% \item \cs{familydefault}, +% \item \cs{seriesdefault}, +% \item \cs{shapedefault} and +% \item \cs{selectfont}. +% \end{itemize} +% It also requires the standard \LaTeXe{} kernel commands +% \begin{itemize} +% \item \cs{ensuremath}, +% \item \cs{mbox}, +% \item \cs{textsubscript} and +% \item \cs{textsuperscript} +% \end{itemize} +% for printing in text mode. The following packages are % also required to provide the functionality detailed. % \begin{itemize} % \item \pkg{color}: support for color using \cs{textcolor} -% \item \pkg{textcomp}: \cs{textminus}, \cs{textpm} \cs{texttimes} and +% \item \pkg{textcomp}: \cs{textminus}, \cs{textpm}, \item \cs{texttimes} and % \cs{textcenteredperiod} for printing in text mode % \item \pkg{amstext}: the \cs{text} command for printing in text mode % \end{itemize} diff --git a/macros/latex/contrib/siunitx/siunitx-symbol.dtx b/macros/latex/contrib/siunitx/siunitx-symbol.dtx index 2a359b5fe0..8a7bad09b8 100644 --- a/macros/latex/contrib/siunitx/siunitx-symbol.dtx +++ b/macros/latex/contrib/siunitx/siunitx-symbol.dtx @@ -59,6 +59,8 @@ % % \begin{documentation} % +% This sub-module exposes no API. +% % \end{documentation} % % \begin{implementation} diff --git a/macros/latex/contrib/siunitx/siunitx-unit.dtx b/macros/latex/contrib/siunitx/siunitx-unit.dtx index 398eb7187e..34ccb1ec82 100644 --- a/macros/latex/contrib/siunitx/siunitx-unit.dtx +++ b/macros/latex/contrib/siunitx/siunitx-unit.dtx @@ -648,7 +648,7 @@ % |power-half-as-sqrt| = |true|\verb"|"|false| % \end{syntax} % Used to determine whether a power of exactly half is converted to -% \cs{sqrt} in the output. The standard setting is |false| +% \cs{sqrt} in the output. The standard setting is |false|. % \end{function} % % \begin{function}{qualifier-mode} diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index a6e8b05866..96f6999841 100644 --- a/macros/latex/contrib/siunitx/siunitx.dtx +++ b/macros/latex/contrib/siunitx/siunitx.dtx @@ -112,8 +112,7 @@ {% \PackageError{siunitx}{Support package expl3 too old} {% - You need to update your installation of the bundles 'l3kernel' and - 'l3packages'.\MessageBreak + You need to update your installation of 'l3kernel'.\MessageBreak Loading~siunitx~will~abort!% }% \endinput @@ -122,7 +121,7 @@ % % Identify the package and give the over all version information. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2023-08-03} {3.3.2} +\ProvidesExplPackage {siunitx} {2023-08-24} {3.3.4} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf Binary files differindex 8d6c1a9c4c..edd301f219 100644 --- a/macros/latex/contrib/siunitx/siunitx.pdf +++ b/macros/latex/contrib/siunitx/siunitx.pdf |