diff options
author | Norbert Preining <norbert@preining.info> | 2019-10-07 03:00:39 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-10-07 03:00:39 +0000 |
commit | ba86549c94b1e8b6b19bc82b01e85a7e513e7586 (patch) | |
tree | a4a96c454b6e5f38834823746dde14a1101aa4a6 /macros | |
parent | 37778869d20a42439b123bb0c553953f716886b1 (diff) |
CTAN sync 201910070300
Diffstat (limited to 'macros')
40 files changed, 446 insertions, 397 deletions
diff --git a/macros/generic/tracklang/CHANGES b/macros/generic/tracklang/CHANGES index 219eab6023..416116d3ee 100644 --- a/macros/generic/tracklang/CHANGES +++ b/macros/generic/tracklang/CHANGES @@ -1,3 +1,14 @@ +v1.3.8 (2019-10-06): + + * tracklang.tex: + + - added undetermined (und) language + - added 'nil' as a dialect of 'undetermined' + + * tracklang.sty: + + - added \@tracklang@prelangpkgcheck@hook + v1.3.7 (2019-08.31): * tracklang.sty: corrected misspelt \AddTrackedLangage (should be diff --git a/macros/generic/tracklang/README b/macros/generic/tracklang/README index 6c314c6c46..bdbfd53bed 100644 --- a/macros/generic/tracklang/README +++ b/macros/generic/tracklang/README @@ -1,6 +1,6 @@ -Generic TeX Bundle : tracklang v1.3.7 +Generic TeX Bundle : tracklang v1.3.8 -Last Modified : 2019-08-31 +Last Modified : 2019-10-06 Author : Nicola Talbot diff --git a/macros/generic/tracklang/samples/animals/sample-animals-babel.pdf b/macros/generic/tracklang/samples/animals/sample-animals-babel.pdf Binary files differindex 526fd1af52..135162fdda 100644 --- a/macros/generic/tracklang/samples/animals/sample-animals-babel.pdf +++ b/macros/generic/tracklang/samples/animals/sample-animals-babel.pdf diff --git a/macros/generic/tracklang/samples/animals/sample-animals-de-poly.pdf b/macros/generic/tracklang/samples/animals/sample-animals-de-poly.pdf Binary files differindex d29a53d2ef..b041feba54 100644 --- a/macros/generic/tracklang/samples/animals/sample-animals-de-poly.pdf +++ b/macros/generic/tracklang/samples/animals/sample-animals-de-poly.pdf diff --git a/macros/generic/tracklang/samples/animals/sample-animals-de.pdf b/macros/generic/tracklang/samples/animals/sample-animals-de.pdf Binary files differindex 778e6e0e21..0fd701147b 100644 --- a/macros/generic/tracklang/samples/animals/sample-animals-de.pdf +++ b/macros/generic/tracklang/samples/animals/sample-animals-de.pdf diff --git a/macros/generic/tracklang/samples/animals/sample-animals-poly.pdf b/macros/generic/tracklang/samples/animals/sample-animals-poly.pdf Binary files differindex 8fb67bafc1..7c14bbe47f 100644 --- a/macros/generic/tracklang/samples/animals/sample-animals-poly.pdf +++ b/macros/generic/tracklang/samples/animals/sample-animals-poly.pdf diff --git a/macros/generic/tracklang/samples/animals/sample-animals.pdf b/macros/generic/tracklang/samples/animals/sample-animals.pdf Binary files differindex cac9466213..f3b1cc7ba8 100644 --- a/macros/generic/tracklang/samples/animals/sample-animals.pdf +++ b/macros/generic/tracklang/samples/animals/sample-animals.pdf diff --git a/macros/generic/tracklang/samples/animals/sample-animals2-de.pdf b/macros/generic/tracklang/samples/animals/sample-animals2-de.pdf Binary files differindex fcfa3e82ea..b2d5afa233 100644 --- a/macros/generic/tracklang/samples/animals/sample-animals2-de.pdf +++ b/macros/generic/tracklang/samples/animals/sample-animals2-de.pdf diff --git a/macros/generic/tracklang/samples/animals/sample-animals2-de2.pdf b/macros/generic/tracklang/samples/animals/sample-animals2-de2.pdf Binary files differindex 73fe437538..40a16a442a 100644 --- a/macros/generic/tracklang/samples/animals/sample-animals2-de2.pdf +++ b/macros/generic/tracklang/samples/animals/sample-animals2-de2.pdf diff --git a/macros/generic/tracklang/samples/animals/sample-animals2-de3.pdf b/macros/generic/tracklang/samples/animals/sample-animals2-de3.pdf Binary files differindex 0db2008c60..c90e064f31 100644 --- a/macros/generic/tracklang/samples/animals/sample-animals2-de3.pdf +++ b/macros/generic/tracklang/samples/animals/sample-animals2-de3.pdf diff --git a/macros/generic/tracklang/samples/animals/sample-animals2-de4.pdf b/macros/generic/tracklang/samples/animals/sample-animals2-de4.pdf Binary files differindex e09a02d474..6ff1942239 100644 --- a/macros/generic/tracklang/samples/animals/sample-animals2-de4.pdf +++ b/macros/generic/tracklang/samples/animals/sample-animals2-de4.pdf diff --git a/macros/generic/tracklang/samples/animals/sample-animals2-poly.pdf b/macros/generic/tracklang/samples/animals/sample-animals2-poly.pdf Binary files differindex 9fe91c3e1a..78d5ec39e0 100644 --- a/macros/generic/tracklang/samples/animals/sample-animals2-poly.pdf +++ b/macros/generic/tracklang/samples/animals/sample-animals2-poly.pdf diff --git a/macros/generic/tracklang/samples/animals/sample-animals2.pdf b/macros/generic/tracklang/samples/animals/sample-animals2.pdf Binary files differindex ca98c4a150..f6e3e8525a 100644 --- a/macros/generic/tracklang/samples/animals/sample-animals2.pdf +++ b/macros/generic/tracklang/samples/animals/sample-animals2.pdf diff --git a/macros/generic/tracklang/samples/regions/sample-regions.pdf b/macros/generic/tracklang/samples/regions/sample-regions.pdf Binary files differindex 126660e534..2adf3b9d03 100644 --- a/macros/generic/tracklang/samples/regions/sample-regions.pdf +++ b/macros/generic/tracklang/samples/regions/sample-regions.pdf diff --git a/macros/generic/tracklang/samples/regions/sample-regions2-manx.pdf b/macros/generic/tracklang/samples/regions/sample-regions2-manx.pdf Binary files differindex d969f2992f..e3fdc40f47 100644 --- a/macros/generic/tracklang/samples/regions/sample-regions2-manx.pdf +++ b/macros/generic/tracklang/samples/regions/sample-regions2-manx.pdf diff --git a/macros/generic/tracklang/samples/regions/sample-regions2-map.pdf b/macros/generic/tracklang/samples/regions/sample-regions2-map.pdf Binary files differindex 1a12bd1f4d..badfd23383 100644 --- a/macros/generic/tracklang/samples/regions/sample-regions2-map.pdf +++ b/macros/generic/tracklang/samples/regions/sample-regions2-map.pdf diff --git a/macros/generic/tracklang/samples/regions/sample-regions2-map2.pdf b/macros/generic/tracklang/samples/regions/sample-regions2-map2.pdf Binary files differindex 2d1dc20f20..6d659b6bc5 100644 --- a/macros/generic/tracklang/samples/regions/sample-regions2-map2.pdf +++ b/macros/generic/tracklang/samples/regions/sample-regions2-map2.pdf diff --git a/macros/generic/tracklang/samples/regions/sample-regions2-map3.pdf b/macros/generic/tracklang/samples/regions/sample-regions2-map3.pdf Binary files differindex b2591931bf..690bbf07de 100644 --- a/macros/generic/tracklang/samples/regions/sample-regions2-map3.pdf +++ b/macros/generic/tracklang/samples/regions/sample-regions2-map3.pdf diff --git a/macros/generic/tracklang/samples/regions/sample-regions2-nomap.pdf b/macros/generic/tracklang/samples/regions/sample-regions2-nomap.pdf Binary files differindex 3d44db0cf3..5d9a7c1c5c 100644 --- a/macros/generic/tracklang/samples/regions/sample-regions2-nomap.pdf +++ b/macros/generic/tracklang/samples/regions/sample-regions2-nomap.pdf diff --git a/macros/generic/tracklang/samples/regions/sample-regions2.pdf b/macros/generic/tracklang/samples/regions/sample-regions2.pdf Binary files differindex 5d140fe792..a2f66edfa4 100644 --- a/macros/generic/tracklang/samples/regions/sample-regions2.pdf +++ b/macros/generic/tracklang/samples/regions/sample-regions2.pdf diff --git a/macros/generic/tracklang/samples/sample-tracklang.pdf b/macros/generic/tracklang/samples/sample-tracklang.pdf Binary files differindex f8b99abdca..1f5c6ea8c1 100644 --- a/macros/generic/tracklang/samples/sample-tracklang.pdf +++ b/macros/generic/tracklang/samples/sample-tracklang.pdf diff --git a/macros/generic/tracklang/samples/sample-tracklang2.pdf b/macros/generic/tracklang/samples/sample-tracklang2.pdf Binary files differindex f0d8a57457..258262f906 100644 --- a/macros/generic/tracklang/samples/sample-tracklang2.pdf +++ b/macros/generic/tracklang/samples/sample-tracklang2.pdf diff --git a/macros/generic/tracklang/samples/sample-tracklang3.pdf b/macros/generic/tracklang/samples/sample-tracklang3.pdf Binary files differindex 175e007831..2609984b35 100644 --- a/macros/generic/tracklang/samples/sample-tracklang3.pdf +++ b/macros/generic/tracklang/samples/sample-tracklang3.pdf diff --git a/macros/generic/tracklang/samples/sample-tracklang4.pdf b/macros/generic/tracklang/samples/sample-tracklang4.pdf Binary files differindex 7e2f14ba1b..894b62d507 100644 --- a/macros/generic/tracklang/samples/sample-tracklang4.pdf +++ b/macros/generic/tracklang/samples/sample-tracklang4.pdf diff --git a/macros/generic/tracklang/samples/sample-tracklang5.pdf b/macros/generic/tracklang/samples/sample-tracklang5.pdf Binary files differindex 84acb9ee4e..1253e87c1b 100644 --- a/macros/generic/tracklang/samples/sample-tracklang5.pdf +++ b/macros/generic/tracklang/samples/sample-tracklang5.pdf diff --git a/macros/generic/tracklang/samples/sample-tracklang6.pdf b/macros/generic/tracklang/samples/sample-tracklang6.pdf Binary files differindex 9f2e19cc58..e8462de248 100644 --- a/macros/generic/tracklang/samples/sample-tracklang6.pdf +++ b/macros/generic/tracklang/samples/sample-tracklang6.pdf diff --git a/macros/generic/tracklang/tracklang.dtx b/macros/generic/tracklang/tracklang.dtx index 1768bcc3ce..b3415f2e22 100644 --- a/macros/generic/tracklang/tracklang.dtx +++ b/macros/generic/tracklang/tracklang.dtx @@ -1,16 +1,16 @@ %\iffalse % tracklang.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: -% -doc "tracklang-manual.tex" % -section "chapter" +% -doc "tracklang-manual.tex" +% -author "Nicola Talbot" % -src "tracklang.sty\Z=>tracklang.sty" % -src "tracklang.tex\Z=>tracklang.tex" % -src "tracklang-region-codes.tex\Z=>tracklang-region-codes.tex" % -src "tracklang-scripts.sty\Z=>tracklang-scripts.sty" % -src "tracklang-scripts.tex\Z=>tracklang-scripts.tex" -% -author "Nicola Talbot" % tracklang -% Created on 2019/8/31 16:29 +% Created on 2019/10/6 15:08 %\fi %\iffalse %<*package> @@ -59,7 +59,7 @@ pdfauthor={Nicola L.C. Talbot}, pdftitle={tracklang: tracking language options}]{hyperref} -\CheckSum{3961} +\CheckSum{3965} \appto\MacroFont{\scriptsize} \renewcommand*{\usage}[1]{\textit{\hyperpage{#1}}} @@ -278,11 +278,11 @@ and~\ref{tab:nonisoopts}} % %\MakeShortVerb{"} % -%\title{tracklang v1.3.7: +%\title{tracklang v1.3.8: %tracking language options} %\author{Nicola L. C. Talbot\\\url{http://www.dickimaw-books.com/}} % -%\date{2019-08-31} +%\date{2019-10-06} %\maketitle % %\begin{abstract} @@ -321,7 +321,10 @@ and~\ref{tab:nonisoopts}} %\styfmt{tracklang} to pick up this information, which is entirely up %to the package authors, but at the moment there's no standard method %for packages to detect the required language and region. The aim of -%\styfmt{tracklang} is to provide that method. +%\styfmt{tracklang} is to provide that method. In particular, the +%emphasis is on using ISO language and region codes rather than +%hard-coding the various language labels used by different language +%packages. % %Related article: \qt{Localisation of \TeX\ documents: %\styfmt{tracklang}.} TUGBoat, Volume~37 (2016), No.~3 @@ -2892,13 +2895,24 @@ and~\ref{tab:nonisoopts}} %The first case prevents \styfmt{tracklang} from picking up %the document class options but skips the check for known %language packages. This check is redundant since this is -%the language package, so the thing to decide is whether or +%the language package, so you need to decide is whether or %not to allow the user to set up the localisation information %through the document class options. % -%(If you just use \cs{input}, there's a test at the start of +%If you prefer \cs{RequirePackage} over \cs{input} but you want to make +%\texttt{tracklang.sty} skip the check for known +%language packages then (as from v1.3.8) define the pre-language +%package check hook as follows: +%\begin{verbatim} +%\providecommand\@tracklang@prelangpkgcheck@hook{\endinput} +%\RequirePackage{tracklang}[2019/10/06] +%\end{verbatim} +%This will still pick up languages supplied through the +%document class options. +% +%If you just use \cs{input}, there's a test at the start of %\texttt{tracklang.tex} to determine if it's already been loaded, so -%you don't need to worry if the user has already loaded it.) +%you don't need to worry if the user has already loaded it. % %When the language is set (using commands like \cs{selectlanguage} %) @@ -3250,7 +3264,7 @@ and~\ref{tab:nonisoopts}} % packages such as \styfmt{etoolbox}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tracklang}[2019/08/31 v1.3.7 (NLCT) Track Languages] +\ProvidesPackage{tracklang}[2019/10/06 v1.3.8 (NLCT) Track Languages] % \end{macrocode} %\begin{macro}{\@tracklang@declareoption} % Set up package options. @@ -3290,6 +3304,18 @@ and~\ref{tab:nonisoopts}} % provide a reliable user interface to determine which languages % (and variants) have been loaded. % +%\begin{macro}{\@tracklang@prelangpkgcheck@hook} +%In the event that any of the language packages choose to load this +%package and use \texttt{tracklang.tex}'s commands to identify the +%tracked languages and regions, then they can first define +%\cs{@tracklang@prelangpkgcheck@hook} to do \cs{endinput} which will +%skip the checks. +%\changes{1.3.8}{2019-10-06}{new} +% \begin{macrocode} +\csname @tracklang@prelangpkgcheck@hook\endcsname +% \end{macrocode} +%\end{macro} +% % \begin{macrocode} \ifx\@tracklang@languages\@empty % \end{macrocode} @@ -3534,7 +3560,7 @@ and~\ref{tab:nonisoopts}} % Version info. % \begin{macrocode} \expandafter\def\csname ver@tracklang.tex\endcsname{% - 2019/08/31 v1.3.7 (NLCT) Track Languages Generic Code} + 2019/10/06 v1.3.8 (NLCT) Track Languages Generic Code} % \end{macrocode} % Define a long command for determining the existence of a control % sequence by its name. (\cs{relax} is considered undefined.) @@ -5273,7 +5299,7 @@ and~\ref{tab:nonisoopts}} %\begin{definition} %\cs{AddTrackedLanguageIsoCodes}\marg{language} %\end{definition} -%Adds the ISO 639-1 and 639-2 ISO codes for the given language, +%Adds the ISO 639-1, 639-2 and 639-3 ISO codes for the given language, %which must have previously been declared using %\cs{TrackLangNewLanguage}. % \begin{macrocode} @@ -7714,6 +7740,15 @@ and~\ref{tab:nonisoopts}} % \end{macrocode} %\end{macro} % +%\begin{macro}{\@tracklang@add@undetermined} +%\changes{1.3.8}{2019-10-06}{new} +%Undetermined language (ISO~636-2 code `und') for unknown languages. +%There's no ISO 639-1 language code for this language. +% \begin{macrocode} +\TrackLangDeclareLanguageOption{undetermined}{}{und}{}{}{}{Latn} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\@tracklang@add@urdu} % \begin{macrocode} \TrackLangDeclareLanguageOption{urdu}{ur}{urd}{}{}{}{Arab} @@ -8714,6 +8749,14 @@ and~\ref{tab:nonisoopts}} \TrackLangDeclareDialectOption{GBwelsh}{welsh}{GB}{}{}{}{} % \end{macrocode} %\end{macro} +%\begin{macro}{\@tracklang@add@nil} +%\changes{1.3.8}{2019-10-06}{new} +%Add \sty{babel}'s \texttt{nil} as a dialect of undetermined +%language. +% \begin{macrocode} +\TrackLangDeclareDialectOption{nil}{undetermined}{}{}{}{}{} +% \end{macrocode} +%\end{macro} % %\subsection{Dialect Option Synonyms} %\label{sec:dialectsyns} @@ -10066,7 +10109,7 @@ and~\ref{tab:nonisoopts}} % Version info. % \begin{macrocode} \expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{% - 2019/08/31 v1.3.7 (NLCT) Track Languages Regions}% + 2019/10/06 v1.3.8 (NLCT) Track Languages Regions}% % \end{macrocode} % %\begin{macro}{\TrackLangRegionMap} @@ -10455,7 +10498,7 @@ and~\ref{tab:nonisoopts}} %\changes{1.3}{2016-10-07}{added tracklang-scripts.sty} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tracklang-scripts}[2019/08/31 v1.3.7 (NLCT) Track +\ProvidesPackage{tracklang-scripts}[2019/10/06 v1.3.8 (NLCT) Track Language Scripts (LaTeX)] \RequirePackage{tracklang} \input{tracklang-scripts} @@ -10497,7 +10540,7 @@ Language Scripts (LaTeX)] % Version info. % \begin{macrocode} \expandafter\def\csname ver@tracklang-scripts.tex\endcsname{% - 2019/08/31 v1.3.7 (NLCT) Track Languages Scripts (Generic)}% + 2019/10/06 v1.3.8 (NLCT) Track Languages Scripts (Generic)}% % \end{macrocode} % %\begin{macro}{\TrackLangScriptsMap} diff --git a/macros/generic/tracklang/tracklang.ins b/macros/generic/tracklang/tracklang.ins index 3158d53211..ae7dc0eb5a 100644 --- a/macros/generic/tracklang/tracklang.ins +++ b/macros/generic/tracklang/tracklang.ins @@ -1,4 +1,4 @@ -% tracklang.ins generated using makedtx version 1.2 2019/8/31 16:29 +% tracklang.ins generated using makedtx version 1.2 2019/10/6 15:08 \input docstrip \preamble diff --git a/macros/generic/tracklang/tracklang.pdf b/macros/generic/tracklang/tracklang.pdf Binary files differindex 5c33ac8fac..c7e9645d51 100644 --- a/macros/generic/tracklang/tracklang.pdf +++ b/macros/generic/tracklang/tracklang.pdf diff --git a/macros/latex/contrib/acro/README b/macros/latex/contrib/acro/README index f4872ad221..710728a81b 100644 --- a/macros/latex/contrib/acro/README +++ b/macros/latex/contrib/acro/README @@ -1,9 +1,9 @@ -------------------------------------------------------------------------- -the ACRO package v2.10a +the ACRO package v2.10b Typeset Acronyms -2019/10/02 +2019/10/06 -------------------------------------------------------------------------- Clemens Niederberger Web: https://bitbucket.org/cgnieder/acro diff --git a/macros/latex/contrib/acro/acro.history b/macros/latex/contrib/acro/acro.history new file mode 100644 index 0000000000..8d3cbdf653 --- /dev/null +++ b/macros/latex/contrib/acro/acro.history @@ -0,0 +1,268 @@ +% -------------------------------------------------------------------------- +% the ACRO package +% +% Typeset Acronyms +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: https://bitbucket.org/cgnieder/acro/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2011--2019 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- +% The acro package consists of the files +% - acro.sty, acro_en.tex, acro_en.pdf, README +% -------------------------------------------------------------------------- +% If you have any ideas, questions, suggestions or bugs to report, please +% feel free to contact me. +% -------------------------------------------------------------------------- +2012/06/22 v0.1 - first public release +2012/06/23 v0.1a - bug fix, added `strict' and `macros' option and creation of + shortcut macros + - added capitalized version of long forms + - added `sort' option +2012/06/24 v0.1b - added \Acf and \Acfp, added option `plural-ending' +2012/06/24 v0.1c - added excluded argument to \printacronyms +2012/06/24 v0.2 - renamed \NewAcronym => \DeclareAcronym + \AcronymFormat => \DeclareAcronymFormat +2012/06/25 v0.2a - new first-style's: `short' and `reversed' +2012/06/25 v0.3 - new list formats: extra-tabular, extra-longtable, + extra-tabular-rev, extra-longtable-rev + - extra precaution when using \printacronyms to avoid errors. +2012/06/27 v0.3a - new option `list-caps', \Acp added +2012/06/29 v0.3b - extended the `text' template to the `acro-first' object + - added `acro-first' instances `plain' and `plain-reversed' +2012/07/16 v0.3c - small adjustments to the documentation +2012/07/23 v0.3d - first CTAN version +2012/07/24 v0.3e - adapted to updated l3kernel +2012/09/28 v0.4 - added means to add citations to acronyms +2012/10/07 v0.4a - new options: "uc-cmd", "list-long-format" + - preliminary language support, needs package `translations' +2012/11/30 v0.5 - added starred variants of the commands that won't mark an + acronym as used + - added \acreset{<id>} + - added preliminary support for pdf strings: in pdf strings + always the singular lowercase short version is inserted + (the equivalent of \acs) +2012/12/14 v0.6 - bug with not-colored links resolved + - bug introduced with the last update (full expansion of the + short entry) resolved + - option `xspace' added +2013/01/02 v0.6a - \acuseall +2013/01/16 v1.0 - new syntax of \DeclareAcronym + - new option `version' + - new `accsupp' acronym property + - new `sort' acronym property + - new syntax of \printacronyms + - new default: `sort=true' + - new options `page-ranges', `next-page', `next-pages', + `pages-name', `record-pages' + - no automatic label placement for page number referencing + any more +2013/01/26 v1.1 - bug fix in the plural detection + - new keys `long-pre' and `long-post' + - new keys `index', `index-sort' and `index-cmd' + - new options `index' and `index-cmd' +2013/01/29 v1.1a - added `long-format' key + - renamed `format' key into `short-format', kept `format' for + compatibility reasons +2013/02/09 v1.2 - error message instead of hanging when an undefined acronym + is used + - added `first-long-format' key and `first-long-format' option + - added \acflike and \acfplike + - improvements and bug fixes to the page recording mechanism + - new option `mark-as-used' + - new keys: `short-indefinite', `alt-indefinite' and + `long-indefinite' + - new commands: \iac, \Iac, \iacs, \Iacs, \iaca, \Iaca, \iacl, + \Iacl, \iacf, \Iacf, \iacflike and \Iacflike +2013/04/04 v1.2a - added Portuguese translations +2013/05/06 v1.3 - protected internal commands where appropriate + - new option `sort' to \printacronyms + - renamed options `print-acronyms/header' and `list-header' + into `print-acronyms/heading' and `list-heading' + - fix: added missing group to \printacronyms + - add key `foreign' + - rewritten page-recording: + * most importantly: record them at shipout; this is done + when \acro@used@once or \acro@used@twice are written to + the aux file + * no restrictions regarding \pagenumbering + * options `page-ranges' and `record-pages' are deprecated + * new options `following-page' and `following-pages' + - disable \@noitemerr in the list of acronyms: we don't need + it there but there are occasions when it is annoying + - cleaned the sty file, added a few more comments +2013/05/09 v1.3a - Bug fix: corrected wrong argument checking in \Ac, thanks + to Michel Voßkuhle +2013/05/30 v1.3b - obey \if@filesw +2013/06/16 v1.3c - added \leavevmode to \acro_get:n +2013/07/08 v1.3d - corrected wrong call of \leavevmode in the list + (list-type=list) +2013/08/07 v1.3e - bug fix in the list when testing for used acronyms + - new commands \acifused, \acfirstupper +2013/08/27 v1.4 - new property `list' +2013/09/02 v1.4a - bug fix: used acronyms are added to the list when the list + is printed before the use + - \DeclareAcronym may now be used after \begin{document} +2013/09/24 v1.4b - bug fix: only-used=false works again for only declared but + unused acronyms (only if option single is not used) +2013/11/04 v1.4c - remove \hbox from the written short form + - changed \__acro_make_link:nNN in a way that it doesn't box + its when links are deactivated +2013/11/22 v1.4d - require `l3sort' independently from the `sort' option + instead of at begin document in order to avoid conflicts + with `babel' and `french' +2013/12/18 v1.5 - new option `label=true|false' that + places \label{<prefix>:<id>} the first time an acronym is + used + - new option `pages=first|all' that determines if in the list + of acronyms all appearances are listed or only the first + time; implicitly sets `label=true' +2015/02/26 v1.6 - new `acro-title' instance `none' + - change of expl3's tl uppercasing function (adapt to updates + of l3kernel and friends + - new package option `messages=silent|loud' + - fix issue https://bitbucket.org/cgnieder/acro/issue/23/ + - fix issue https://bitbucket.org/cgnieder/acro/issue/24/ + - fix issue https://bitbucket.org/cgnieder/acro/issue/28/ + - drop support for version 0 +2015/04/08 v1.6a - more generalized user command definitions, see + http://tex.stackexchange.com/q/236362/ for an application +2015/05/10 v1.6b - \ProcessKeysPackageOptions , + - correct bug http://tex.stackexchange.com/q/236860/ : + option `pages = first' works again +2015/08/16 v2.0 - fix https://bitbucket.org/cgnieder/acro/issue/36 + - implement https://bitbucket.org/cgnieder/acro/issue/39 + - implement https://bitbucket.org/cgnieder/acro/issue/40 + (=> new option `group-cite-cmd') + - add ideas for https://bitbucket.org/cgnieder/acro/issue/41 + - implement https://bitbucket.org/cgnieder/acro/issue/18 + - implement https://bitbucket.org/cgnieder/acro/issue/43 + - further generalization for defining user commands: + \NewAcroCommand, \NewPseudoAcroCommand and siblings + - bug fix in indefinite versions with first-upper + - add `short-<ending>-form' equivalent to + `long-<ending>-form' + (https://bitbucket.org/cgnieder/acro/issue/44) + - implement https://bitbucket.org/cgnieder/acro/issue/35 + - new option `single-form' +2015/08/25 v2.0a - fix https://bitbucket.org/cgnieder/acro/issue/38 and + https://bitbucket.org/cgnieder/acro/issue/49 +2015/08/29 v2.0b - fix https://bitbucket.org/cgnieder/acro/issue/44 + - fix https://bitbucket.org/cgnieder/acro/issue/45 + - implement https://bitbucket.org/cgnieder/acro/issue/42 +2015/09/05 v2.1 - add list object type `list-of' that prints the list like a + toc or lof, new option `list-short-width', + - correct bug in the `plain' extra style + - implemented `tooltip' property + - remove \tl_to_lowercase:n +2015/10/03 v2.2 - fix https://bitbucket.org/cgnieder/acro/issue/52 + - fix typo in `list-of' object + - \DeclareAcroListStyle + - \DeclareAcroListHeading + - input `acro.cfg' if present + - all acro commands have an optional argument: \ac*[]{} +2016/01/07 v2.2a - \prop_get:Nn => \prop_item:Nn +2016/01/21 v2.2b - fix issue #59 +2016/02/02 v2.2c - fix issue #60 +2016/03/14 v2.3 - foreign-format may be a macro taking an argument + - \Aca, \Acsingle + - properties `single' and `single-format', option + `single-format' => issue #62 + - property `first-style' => issue #61 + - fix issue #64: long-post entry is now added *after* the + endings + - property `foreign-lang' + - fix issue #65 +2016/03/25 v2.4 - extend class mechanism: classes can be used like tags + - add idea of `barriers' and list local to those barriers + => new option `reset-at-barriers' + => new option `local-to-barriers' for \printacronyms + => new command \acbarrier +2016/04/14 v2.4a - if undefined acronym is used and `messages = silent' is + active don't through error +2016/05/03 v2.4b - expand `pdfstring' property before saving => issue #69 + - \ProvideAcroEnding can be used twice – it then just sets + the defaults + - the option <ending>-ending has a new syntax: + * <ending>-ending = <val> sets all endings to <val> + * <ending>-ending = <val1>/<val2> sets short endings to + <val1> and long endings to <val2> + - a single appearance should be treated like a first + appearance as far as citations are concerned +2016/05/25 v2.5 - some of the entries added to the aux file need to be + written \immediate in order to avoid this trap: + http://tex.stackexchange.com/q/116001/ + - cleaner interface for first-style template definitions + - new `acro-first' instances `footnote-reversed' and + `sidenote-reversed' + - new commands \DeclareAcroFirstStyle, \DeclareAcroExtraStyle + and \DeclareAcroPageStyle + - add warning `ending-before-acronyms' to options setting the + defaults of an ending; this should avoid confusion + - property declaration for acronyms should be handled by + internal functions + - improvements in the list template code + - logging info when an acronym is declared + - remove deprecated options + - new option `use-barriers' + - new option `following-pages*' + - option `page-ref' replaced by option `page-style' +2016/05/26 v2.5a - bug fix: remove erroneous group in `<ending>-ending' option +2016/05/30 v2.5b - fix issue #72 +2016/07/20 v2.6 - \l__acro_use_acronyms_bool can be used to disable \ac + e.g. in the trial phase of a table like `tabu'; interface: + \acro_switch_off: and \acswitchoff + - fix issue #79 + - fix issue #74 + - fix error: acronyms with same sort entry are not + overwritten any more in the list of acronyms +2016/08/13 v2.6a - fix issues #80 and #81 +2016/08/13 v2.6b - version stepped by accident +2016/08/16 v2.6c - really fixes issue #81 +2016/08/30 v2.6d - fix issue #82 +2016/09/04 v2.6e - fix issue in http://tex.stackexchange.com/q/270034/ +2017/01/22 v2.7 - rename \acro_get_property:nn into \__acro_get_property:nn + - \acro_get_property:nn, \acro_get_property:nnTF, + \acro_if_property:nnTF, retrieve property without error if + not set + - make \__acro_declare_property functions public + - \acro_add_action:n (adds code to \acro_get:n) +2017/02/09 v2.7a - adapt to integration of l3sort into l3kernel +2017/06/21 v2.7b - fix issue #93 +2017/08/28 v2.7c - fix issue #96 +2018/01/30 v2.8 - fix issue #94 + - document `format-include-endings', fix issue #99 + - new property `post' + - \aciffirst + - resolve issue #95 +2019/02/17 v2.9 - small redefinition of \acro_get_foreign:n which allows + `foreign-sep' to be a & + - fix issue #116 + - implemented issue #112 +2019/09/23 v2.10 - fix issue #120 + - fix isuue #128 + - fix issue #129 + - fix issue #131 + - new: \Acs \Acsp \Aca \Acap + - new: `alt-format' + - new: `uppercase-short' + - a change to how usage is determined (see def. of + \acro_is_used:nTF) +2019/10/02 v2.10a - fix newly introduced issue #135 +2019/10/06 v2.10b - fix issue #137 + - clearer documentation of `uppercase-short' + - set the default of `uppercase-short' to `true' diff --git a/macros/latex/contrib/acro/acro.sty b/macros/latex/contrib/acro/acro.sty index b1b4947018..d5e477a0f4 100644 --- a/macros/latex/contrib/acro/acro.sty +++ b/macros/latex/contrib/acro/acro.sty @@ -23,7 +23,7 @@ % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- % The acro package consists of the files -% - acro.sty, acro_en.tex, acro_en.pdf, README +% - acro.sty, acro_en.tex, acro_en.pdf, acro.history, README % -------------------------------------------------------------------------- % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. @@ -31,8 +31,8 @@ \RequirePackage{expl3,xparse,l3keys2e,xtemplate,etoolbox} \ProvidesExplPackage {acro} - {2019/10/02} - {2.10a} + {2019/10/06} + {2.10b} {Typeset Acronyms} % -------------------------------------------------------------------------- @@ -583,7 +583,7 @@ \cs_set_eq:NN \__acro_first_upper_case:n #1 , uc-cmd .value_required:n = true , uppercase-short .bool_set:N = \l__acro_upper_short_bool , - uppercase-short .initial:n = false + uppercase-short .initial:n = true } \AtBeginDocument @@ -741,6 +741,7 @@ \l__acro_first_only_short_bool } { + \acro_soft_upper: \acro_write_indefinite:nn {#2} {short} \acro_write_compact:nn {#2} {short} } @@ -792,7 +793,12 @@ \l__acro_first_only_long_bool || !\l__acro_first_only_short_bool } - { \acro_write_expanded:nnn {#2} {first-long} {#3} } + { + \group_begin: + \bool_set_false:N \l__acro_first_upper_bool + \acro_write_expanded:nnn {#2} {first-long} {#3} + \group_end: + } } {short} { \bool_if:nT @@ -800,7 +806,12 @@ !\l__acro_first_only_long_bool || \l__acro_first_only_short_bool } - { \acro_write_compact:nn {#2} {short} } + { + \group_begin: + \bool_set_false:N \l__acro_first_upper_bool + \acro_write_compact:nn {#2} {short} + \group_end: + } } } } @@ -886,10 +897,7 @@ \__acro_open_bracket: \__acro_print_foreign:n {#1} \__acro_foreign_sep:n {#1} - { - \bool_set_false:N \l__acro_first_upper_bool - \__acro_print_form:nnn {long} {#1} {#2} - } + \__acro_print_form:nnn {long} {#1} {#2} \__acro_print_citation:n {#1} \__acro_close_bracket: \__acro_finalize_first:n {#1} @@ -899,10 +907,7 @@ \__acro_open_bracket: \__acro_print_foreign:n {#1} \__acro_foreign_sep:n {#1} - { - \bool_set_false:N \l__acro_first_upper_bool - \__acro_print_form:nnn {short} {#1} {#2} - } + \__acro_print_form:nnn {short} {#1} {#2} \__acro_print_citation:n {#1} \__acro_close_bracket: \__acro_finalize_first:n {#1} @@ -1833,13 +1838,20 @@ % -------------------------------------------------------------------------- % automatic typesetting, the internals of \ac: % #1: id - + +\cs_new_protected:Npn \acro_soft_upper: + { + \bool_if:NF \l__acro_upper_short_bool + { \bool_set_false:N \l__acro_first_upper_bool } + } + \cs_new_protected:Npn \acro_use:n #1 { % get the acronym and the plural settings: \acro_get:n {#1} \acro_is_used:nTF {#1} { + \acro_soft_upper: % this is not the first time \acro_write_indefinite:nn {#1} {short} \acro_write_compact:nn {#1} {short} @@ -1905,6 +1917,7 @@ } } { % other (e.g. short) + \acro_soft_upper: \tl_if_blank:VF \l__acro_single_tl { \tl_set_eq:cN {l__acro_#2_tl} \l__acro_single_tl } \tl_if_blank:VF \l__acro_single_format_tl @@ -2085,7 +2098,8 @@ { \acro_if_ending_form_exist:nnT {#1} {#3} { - \bool_if:nTF { \prop_item:cn {l__acro_#3_#1_form_prop} {#2} } + \bool_if:cTF + { c_ \prop_item:cn {l__acro_#3_#1_form_prop} {#2} _bool } { \prop_get:cnc {l__acro_#3_#1_prop} {#2} {l__acro_#3_tl} } { \prop_get:cnc {l__acro_#3_#1_prop} {#2} {l__acro_#3_#1_tl} } } @@ -2107,7 +2121,7 @@ { \bool_if:nT { - \prop_item:cn {l__acro_#2_##1_form_prop} {#1} + \use:c { c_ \prop_item:cn {l__acro_#2_##1_form_prop} {#1} _bool } && \use:c {l__acro_##1_bool} } @@ -2233,7 +2247,7 @@ % short-<ending>: \acro_declare_property:nnn {short_#1} {short-#1} { - \prop_put:cnn {l__acro_short_#1_form_prop} {##1} { \c_false_bool } + \prop_put:cnn {l__acro_short_#1_form_prop} {##1} {false} \prop_put:cnx {l__acro_pdfstring_short_#1_prop} {##1} { \prop_item:Nn \l__acro_short_prop {##1} \exp_not:n {##2} } } @@ -2241,14 +2255,14 @@ \acro_declare_property_generic:nnn {short_#1_form} {short-#1-form} { \__acro_property_check:nn {##1} {short-#1-form} - \prop_put:cnn {l__acro_short_#1_form_prop} {##1} { \c_true_bool } + \prop_put:cnn {l__acro_short_#1_form_prop} {##1} {true} \prop_put:cnn {l__acro_short_#1_prop} {##1} {##2} \prop_put:cnn {l__acro_pdfstring_short_#1_prop} {##1} {##2} } % alt-<ending>: \acro_declare_property:nnn {alt_#1} {alt-#1} { - \prop_put:cnn {l__acro_alt_#1_form_prop} {##1} { \c_false_bool } + \prop_put:cnn {l__acro_alt_#1_form_prop} {##1} {false} \prop_put:cnx {l__acro_pdfstring_alt_#1_prop} {##1} { \prop_item:Nn \l__acro_alt_prop {##1} \exp_not:n {##2} } } @@ -2256,28 +2270,28 @@ \acro_declare_property_generic:nnn {alt_#1_form} {alt-#1-form} { \__acro_property_check:nn {##1} {alt-#1-form} - \prop_put:cnn {l__acro_alt_#1_form_prop} {##1} { \c_true_bool } + \prop_put:cnn {l__acro_alt_#1_form_prop} {##1} {true} \prop_put:cnn {l__acro_alt_#1_prop} {##1} {##2} \prop_put:cnn {l__acro_pdfstring_alt_#1_prop} {##1} {##2} } % long-<ending>: \acro_declare_property:nnn {long_#1} {long-#1} - { \prop_put:cnn {l__acro_long_#1_form_prop} {##1} { \c_false_bool } } + { \prop_put:cnn {l__acro_long_#1_form_prop} {##1} {false} } % long-<ending>-form: \acro_declare_property_generic:nnn {long_#1_form} {long-#1-form} { \__acro_property_check:nn {##1} {long-#1-form} - \prop_put:cnn {l__acro_long_#1_form_prop} {##1} { \c_true_bool } + \prop_put:cnn {l__acro_long_#1_form_prop} {##1} {true} \prop_put:cnn {l__acro_long_#1_prop} {##1} {##2} } % foreign-<ending>: % XXX \acro_declare_property:nnn {foreign_#1} {foreign-#1} - { \prop_put:cnn {l__acro_foreign_#1_form_prop} {##1} { \c_false_bool } } + { \prop_put:cnn {l__acro_foreign_#1_form_prop} {##1} {false} } % foreign-<ending>-form: % XXX \acro_declare_property_generic:nnn {foreign_#1_form} {foreign-#1-form} { \__acro_property_check:nn {##1} {foreign-#1-form} - \prop_put:cnn {l__acro_foreign_#1_form_prop} {##1} { \c_true_bool } + \prop_put:cnn {l__acro_foreign_#1_form_prop} {##1} {true} \prop_put:cnn {l__acro_foreign_#1_prop} {##1} {##2} } % options: @@ -2365,7 +2379,7 @@ \tl_if_blank:nTF {#4} { \acro_set_ending_variables:nnn {long} {#1} {#3} - \acro_set_ending_variables:nnn {foreign} {#1} {#3} % XXX + \acro_set_ending_variables:nnn {foreign} {#1} {#3} } { \acro_set_ending_variables:nnn {long} {#1} {#2} @@ -2550,7 +2564,7 @@ \__acro_typeset:nn {short} { \bool_if:nTF - { \l__acro_first_upper_bool && \l__acro_upper_short_bool } + { \l__acro_first_upper_bool } { \exp_not:N \__acro_first_upper_case:n { \exp_not:n {#2} } } { \exp_not:n {#2} } } @@ -3702,12 +3716,12 @@ {#1} {l__acro_default_short_##1_tl} \prop_put:cnx {l__acro_pdfstring_short_##1_prop} {#1} { \exp_not:n {#2} \exp_not:v {l__acro_default_short_##1_tl} } - \prop_put:cnn {l__acro_short_##1_form_prop} {#1} { \c_false_bool } + \prop_put:cnn {l__acro_short_##1_form_prop} {#1} {false} \prop_put:cnv {l__acro_alt_##1_prop} {#1} {l__acro_default_alt_##1_tl} \prop_put:cnx {l__acro_pdfstring_alt_##1_prop} {#1} { \exp_not:n {#2} \exp_not:v {l__acro_default_short_##1_tl} } - \prop_put:cnn {l__acro_alt_##1_form_prop} {#1} { \c_false_bool } + \prop_put:cnn {l__acro_alt_##1_form_prop} {#1} {false} } \prop_put:NnV \l__acro_short_indefinite_prop {#1} \l__acro_default_indefinite_tl @@ -3723,10 +3737,10 @@ \l__acro_default_indefinite_tl \acro_for_endings_do:n { - \prop_put:cnn {l__acro_long_##1_form_prop} {#1} { \c_false_bool } + \prop_put:cnn {l__acro_long_##1_form_prop} {#1} {false} \bool_if:cF {l__acro_#1_long-##1_set_bool} { \prop_put:cnv {l__acro_long_##1_prop} {#1} {l__acro_default_long_##1_tl} } - \prop_put:cnn {l__acro_foreign_##1_form_prop} {#1} { \c_false_bool } + \prop_put:cnn {l__acro_foreign_##1_form_prop} {#1} {false} \bool_if:cF {l__acro_#1_foreign-##1_set_bool} { \prop_put:cnv {l__acro_foreign_##1_prop} {#1} {l__acro_default_foreign_##1_tl} } } @@ -4546,240 +4560,3 @@ } \file_input_stop: -% -------------------------------------------------------------------------- -% HISTORY: -2012/06/22 v0.1 - first public release -2012/06/23 v0.1a - bug fix, added `strict' and `macros' option and creation of - shortcut macros - - added capitalized version of long forms - - added `sort' option -2012/06/24 v0.1b - added \Acf and \Acfp, added option `plural-ending' -2012/06/24 v0.1c - added excluded argument to \printacronyms -2012/06/24 v0.2 - renamed \NewAcronym => \DeclareAcronym - \AcronymFormat => \DeclareAcronymFormat -2012/06/25 v0.2a - new first-style's: `short' and `reversed' -2012/06/25 v0.3 - new list formats: extra-tabular, extra-longtable, - extra-tabular-rev, extra-longtable-rev - - extra precaution when using \printacronyms to avoid errors. -2012/06/27 v0.3a - new option `list-caps', \Acp added -2012/06/29 v0.3b - extended the `text' template to the `acro-first' object - - added `acro-first' instances `plain' and `plain-reversed' -2012/07/16 v0.3c - small adjustments to the documentation -2012/07/23 v0.3d - first CTAN version -2012/07/24 v0.3e - adapted to updated l3kernel -2012/09/28 v0.4 - added means to add citations to acronyms -2012/10/07 v0.4a - new options: "uc-cmd", "list-long-format" - - preliminary language support, needs package `translations' -2012/11/30 v0.5 - added starred variants of the commands that won't mark an - acronym as used - - added \acreset{<id>} - - added preliminary support for pdf strings: in pdf strings - always the singular lowercase short version is inserted - (the equivalent of \acs) -2012/12/14 v0.6 - bug with not-colored links resolved - - bug introduced with the last update (full expansion of the - short entry) resolved - - option `xspace' added -2013/01/02 v0.6a - \acuseall -2013/01/16 v1.0 - new syntax of \DeclareAcronym - - new option `version' - - new `accsupp' acronym property - - new `sort' acronym property - - new syntax of \printacronyms - - new default: `sort=true' - - new options `page-ranges', `next-page', `next-pages', - `pages-name', `record-pages' - - no automatic label placement for page number referencing - any more -2013/01/26 v1.1 - bug fix in the plural detection - - new keys `long-pre' and `long-post' - - new keys `index', `index-sort' and `index-cmd' - - new options `index' and `index-cmd' -2013/01/29 v1.1a - added `long-format' key - - renamed `format' key into `short-format', kept `format' for - compatibility reasons -2013/02/09 v1.2 - error message instead of hanging when an undefined acronym - is used - - added `first-long-format' key and `first-long-format' option - - added \acflike and \acfplike - - improvements and bug fixes to the page recording mechanism - - new option `mark-as-used' - - new keys: `short-indefinite', `alt-indefinite' and - `long-indefinite' - - new commands: \iac, \Iac, \iacs, \Iacs, \iaca, \Iaca, \iacl, - \Iacl, \iacf, \Iacf, \iacflike and \Iacflike -2013/04/04 v1.2a - added Portuguese translations -2013/05/06 v1.3 - protected internal commands where appropriate - - new option `sort' to \printacronyms - - renamed options `print-acronyms/header' and `list-header' - into `print-acronyms/heading' and `list-heading' - - fix: added missing group to \printacronyms - - add key `foreign' - - rewritten page-recording: - * most importantly: record them at shipout; this is done - when \acro@used@once or \acro@used@twice are written to - the aux file - * no restrictions regarding \pagenumbering - * options `page-ranges' and `record-pages' are deprecated - * new options `following-page' and `following-pages' - - disable \@noitemerr in the list of acronyms: we don't need - it there but there are occasions when it is annoying - - cleaned the sty file, added a few more comments -2013/05/09 v1.3a - Bug fix: corrected wrong argument checking in \Ac, thanks - to Michel Voßkuhle -2013/05/30 v1.3b - obey \if@filesw -2013/06/16 v1.3c - added \leavevmode to \acro_get:n -2013/07/08 v1.3d - corrected wrong call of \leavevmode in the list - (list-type=list) -2013/08/07 v1.3e - bug fix in the list when testing for used acronyms - - new commands \acifused, \acfirstupper -2013/08/27 v1.4 - new property `list' -2013/09/02 v1.4a - bug fix: used acronyms are added to the list when the list - is printed before the use - - \DeclareAcronym may now be used after \begin{document} -2013/09/24 v1.4b - bug fix: only-used=false works again for only declared but - unused acronyms (only if option single is not used) -2013/11/04 v1.4c - remove \hbox from the written short form - - changed \__acro_make_link:nNN in a way that it doesn't box - its when links are deactivated -2013/11/22 v1.4d - require `l3sort' independently from the `sort' option - instead of at begin document in order to avoid conflicts - with `babel' and `french' -2013/12/18 v1.5 - new option `label=true|false' that - places \label{<prefix>:<id>} the first time an acronym is - used - - new option `pages=first|all' that determines if in the list - of acronyms all appearances are listed or only the first - time; implicitly sets `label=true' -2015/02/26 v1.6 - new `acro-title' instance `none' - - change of expl3's tl uppercasing function (adapt to updates - of l3kernel and friends - - new package option `messages=silent|loud' - - fix issue https://bitbucket.org/cgnieder/acro/issue/23/ - - fix issue https://bitbucket.org/cgnieder/acro/issue/24/ - - fix issue https://bitbucket.org/cgnieder/acro/issue/28/ - - drop support for version 0 -2015/04/08 v1.6a - more generalized user command definitions, see - http://tex.stackexchange.com/q/236362/ for an application -2015/05/10 v1.6b - \ProcessKeysPackageOptions , - - correct bug http://tex.stackexchange.com/q/236860/ : - option `pages = first' works again -2015/08/16 v2.0 - fix https://bitbucket.org/cgnieder/acro/issue/36 - - implement https://bitbucket.org/cgnieder/acro/issue/39 - - implement https://bitbucket.org/cgnieder/acro/issue/40 - (=> new option `group-cite-cmd') - - add ideas for https://bitbucket.org/cgnieder/acro/issue/41 - - implement https://bitbucket.org/cgnieder/acro/issue/18 - - implement https://bitbucket.org/cgnieder/acro/issue/43 - - further generalization for defining user commands: - \NewAcroCommand, \NewPseudoAcroCommand and siblings - - bug fix in indefinite versions with first-upper - - add `short-<ending>-form' equivalent to - `long-<ending>-form' - (https://bitbucket.org/cgnieder/acro/issue/44) - - implement https://bitbucket.org/cgnieder/acro/issue/35 - - new option `single-form' -2015/08/25 v2.0a - fix https://bitbucket.org/cgnieder/acro/issue/38 and - https://bitbucket.org/cgnieder/acro/issue/49 -2015/08/29 v2.0b - fix https://bitbucket.org/cgnieder/acro/issue/44 - - fix https://bitbucket.org/cgnieder/acro/issue/45 - - implement https://bitbucket.org/cgnieder/acro/issue/42 -2015/09/05 v2.1 - add list object type `list-of' that prints the list like a - toc or lof, new option `list-short-width', - - correct bug in the `plain' extra style - - implemented `tooltip' property - - remove \tl_to_lowercase:n -2015/10/03 v2.2 - fix https://bitbucket.org/cgnieder/acro/issue/52 - - fix typo in `list-of' object - - \DeclareAcroListStyle - - \DeclareAcroListHeading - - input `acro.cfg' if present - - all acro commands have an optional argument: \ac*[]{} -2016/01/07 v2.2a - \prop_get:Nn => \prop_item:Nn -2016/01/21 v2.2b - fix issue #59 -2016/02/02 v2.2c - fix issue #60 -2016/03/14 v2.3 - foreign-format may be a macro taking an argument - - \Aca, \Acsingle - - properties `single' and `single-format', option - `single-format' => issue #62 - - property `first-style' => issue #61 - - fix issue #64: long-post entry is now added *after* the - endings - - property `foreign-lang' - - fix issue #65 -2016/03/25 v2.4 - extend class mechanism: classes can be used like tags - - add idea of `barriers' and list local to those barriers - => new option `reset-at-barriers' - => new option `local-to-barriers' for \printacronyms - => new command \acbarrier -2016/04/14 v2.4a - if undefined acronym is used and `messages = silent' is - active don't through error -2016/05/03 v2.4b - expand `pdfstring' property before saving => issue #69 - - \ProvideAcroEnding can be used twice – it then just sets - the defaults - - the option <ending>-ending has a new syntax: - * <ending>-ending = <val> sets all endings to <val> - * <ending>-ending = <val1>/<val2> sets short endings to - <val1> and long endings to <val2> - - a single appearance should be treated like a first - appearance as far as citations are concerned -2016/05/25 v2.5 - some of the entries added to the aux file need to be - written \immediate in order to avoid this trap: - http://tex.stackexchange.com/q/116001/ - - cleaner interface for first-style template definitions - - new `acro-first' instances `footnote-reversed' and - `sidenote-reversed' - - new commands \DeclareAcroFirstStyle, \DeclareAcroExtraStyle - and \DeclareAcroPageStyle - - add warning `ending-before-acronyms' to options setting the - defaults of an ending; this should avoid confusion - - property declaration for acronyms should be handled by - internal functions - - improvements in the list template code - - logging info when an acronym is declared - - remove deprecated options - - new option `use-barriers' - - new option `following-pages*' - - option `page-ref' replaced by option `page-style' -2016/05/26 v2.5a - bug fix: remove erroneous group in `<ending>-ending' option -2016/05/30 v2.5b - fix issue #72 -2016/07/20 v2.6 - \l__acro_use_acronyms_bool can be used to disable \ac - e.g. in the trial phase of a table like `tabu'; interface: - \acro_switch_off: and \acswitchoff - - fix issue #79 - - fix issue #74 - - fix error: acronyms with same sort entry are not - overwritten any more in the list of acronyms -2016/08/13 v2.6a - fix issues #80 and #81 -2016/08/13 v2.6b - version stepped by accident -2016/08/16 v2.6c - really fixes issue #81 -2016/08/30 v2.6d - fix issue #82 -2016/09/04 v2.6e - fix issue in http://tex.stackexchange.com/q/270034/ -2017/01/22 v2.7 - rename \acro_get_property:nn into \__acro_get_property:nn - - \acro_get_property:nn, \acro_get_property:nnTF, - \acro_if_property:nnTF, retrieve property without error if - not set - - make \__acro_declare_property functions public - - \acro_add_action:n (adds code to \acro_get:n) -2017/02/09 v2.7a - adapt to integration of l3sort into l3kernel -2017/06/21 v2.7b - fix issue #93 -2017/08/28 v2.7c - fix issue #96 -2018/01/30 v2.8 - fix issue #94 - - document `format-include-endings', fix issue #99 - - new property `post' - - \aciffirst - - resolve issue #95 -2019/02/17 v2.9 - small redefinition of \acro_get_foreign:n which allows - `foreign-sep' to be a & - - fix issue #116 - - implemented issue #112 -2019/09/23 v2.10 - fix issue #120 - - fix isuue #128 - - fix issue #129 - - fix issue #131 - - new: \Acs \Acsp \Aca \Acap - - new: `alt-format' - - new: `uppercase-short' - - a change to how usage is determined (see def. of - \acro_is_used:nTF) -2019/10/02 v2.10 - fix newly introduced issue #135 diff --git a/macros/latex/contrib/acro/acro_en.pdf b/macros/latex/contrib/acro/acro_en.pdf Binary files differindex fe818a934f..3b7332abbb 100644 --- a/macros/latex/contrib/acro/acro_en.pdf +++ b/macros/latex/contrib/acro/acro_en.pdf diff --git a/macros/latex/contrib/acro/acro_en.tex b/macros/latex/contrib/acro/acro_en.tex index c7caf4b7bc..1df3caab9b 100644 --- a/macros/latex/contrib/acro/acro_en.tex +++ b/macros/latex/contrib/acro/acro_en.tex @@ -275,6 +275,8 @@ \pkg{zref-abspage}\footnote{\CTANurl{oberdiek}} and \needpackage{translations}~\cite{pkg:translations}. + + \section{Basics} \subsection{Creating New Acronyms} Acronyms are created with the command \cs{DeclareAcronym}. @@ -529,7 +531,8 @@ Acronyms are used with one of the following commands: \command{ac}[\sarg\marg{id}] basic command; the first output is different from subsequent ones. \command{Ac}[\sarg\marg{id}] - same as \cs{ac} but capitalizes the first letter. + same as \cs{ac} but capitalizes the first letter. Obeys the option + \option{uppercase-short}. %% \command{acs}[\sarg\marg{id}] \h{s}hort form; the actual acronym. @@ -551,12 +554,14 @@ Acronyms are used with one of the following commands: \command{acf}[\sarg\marg{id}] first form; output like the first time \cs{ac} is output. \command{Acf}[\sarg\marg{id}] - same as \cs{acf} but capitalizes first letter. + same as \cs{acf} but capitalizes first letter. Obeys the option + \option{uppercase-short}. %% \command{acp}[\sarg\marg{id}] \h{p}lural form of \cs{ac}; \command{Acp}[\sarg\marg{id}] - same as \cs{acp} but capitalizes first letter. + same as \cs{acp} but capitalizes first letter. Obeys the option + \option{uppercase-short}. %% \command{acsp}[\sarg\marg{id}] plural form of \cs{acs}; @@ -576,7 +581,8 @@ Acronyms are used with one of the following commands: \command{acfp}[\sarg\marg{id}] plural form of \cs{acf}; \command{Acfp}[\sarg\marg{id}] - same as \cs{acfp} but capitalizes first letter of the long form. + same as \cs{acfp} but capitalizes first letter of the long form. Obeys + the option \option{uppercase-short}. \end{commands} If an acronym is used the first time with \cs{ac} its output is different from subsequent uses. To be clear on this: the first time! If the acronym has @@ -787,6 +793,19 @@ corresponding indefinite article. \pkg{mfirstuc} package~\cite{pkg:mfirstuc} but it is expandable. Obvious downsides are for example that it does not uppercase accented letters. \end{commands} +The following options control the behaviour of the uppercasing commands: +\begin{options} + \keyval{uc-cmd}{control sequence}\Default{\cs{acfirstupper}} + The command that is used to capitalize the first word in the \cs{Ac} and + the like commands. You can change it to another one like for example + \cs*{makefirstuc}\footnote{from the \pkg{mfirstuc} package} or + \cs*{MakeTextUppercase}\footnote{from the \pkg*{textcase} package}. + %% + \keybool{uppercase-short}\Default{true} + If\sinceversion{2.10} set to \code{true} commands like \cs{Ac} or \cs{Acp} + will uppercase the first letter of the short form. Commands like \cs{Acs} + or \cs{Acsp} will uppercase the short form in any case. +\end{options} \subsection{Simulating the First Appearance}\label{sec:simul-first-appe} Users told me\footnote{Well -- one, to be precise ;)} that there are cases @@ -1196,10 +1215,9 @@ There are a few options which change the general behaviour of \acro. \cs*{makefirstuc}\footnote{from the \pkg{mfirstuc} package} or \cs*{MakeTextUppercase}\footnote{from the \pkg*{textcase} package}. %% - \keybool{uppercase-short}\Default{false} - If\sinceversion{2.10} set to \code{true} commands like \cs{Ac}, \cs{Acs} or - \cs{Aca} will uppercase the first letter of the short or alternative - version. + \keybool{uppercase-short}\Default{true} + If\sinceversion{2.10} set to \code{true} commands like \cs{Ac} or \cs{Acp} + will uppercase the first letter of the short version. \end{options} All options of this and the following sections can be set via the setup command: diff --git a/macros/latex/contrib/bxpapersize/LICENSE b/macros/latex/contrib/bxpapersize/LICENSE index 8ada757fbc..534324b756 100644 --- a/macros/latex/contrib/bxpapersize/LICENSE +++ b/macros/latex/contrib/bxpapersize/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2017 Takayuki YATO (aka. "ZR") +Copyright (c) 2019 Takayuki YATO (aka. "ZR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/macros/latex/contrib/bxpapersize/README.md b/macros/latex/contrib/bxpapersize/README.md index 97c65e5d8a..9575d883a7 100644 --- a/macros/latex/contrib/bxpapersize/README.md +++ b/macros/latex/contrib/bxpapersize/README.md @@ -24,6 +24,7 @@ should have higher or lower priority over the settings made by others. - ifpdf, ifxetex, ifluatex, ifvtex - xkeyval - atbegshi + - pxatbegshi (when priority setting is used on (u)pTeX) ### Installation @@ -59,6 +60,7 @@ The available options are described hereafter. - `low`: Priotizes specials by others. - `middle`/`default` (default): Does not care about priority. - `high`: Priotizes specials by this package. + Note: The priority setting will be ignored in PDF mode. * `olddvips`: Must be specified when you use dvips older than that included in TeX Live 2017, so as to make the `priority` option work correctly. @@ -133,6 +135,9 @@ but `\bxpapersizesetup` will be always provided. Revision History ---------------- + * Version 0.4 ‹2019/10/05› + - Load pxatbegshi to properly handle pTeX tate mode. + - Remove (experimental) `adjustmag` option. * Version 0.3b ‹2017/10/08› - Support pTeX-ng (ApTeX) engine properly. - (Experimental) Add `adjustmag` option. diff --git a/macros/latex/contrib/bxpapersize/bxpapersize.sty b/macros/latex/contrib/bxpapersize/bxpapersize.sty index 1370314a8a..4fe8782cfc 100644 --- a/macros/latex/contrib/bxpapersize/bxpapersize.sty +++ b/macros/latex/contrib/bxpapersize/bxpapersize.sty @@ -1,7 +1,7 @@ %% %% This is file 'bxpapersize.sty'. %% -%% Copyright (c) 2017 Takayuki YATO (aka. "ZR") +%% Copyright (c) 2019 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxpapersize}[2017/10/08 v0.3b] +\ProvidesPackage{bxpapersize}[2019/10/05 v0.4] %% preparation \def\bxpr@pkgname{bxpapersize} @@ -48,12 +48,13 @@ %% load packages \RequirePackage{xkeyval}[2008/08/10]% v2.6 \RequirePackage{atbegshi} -\RequirePackage{ifpdf,ifxetex,ifluatex,ifvtex} +\RequirePackage{ifpdf,ifxetex,ifluatex,ifvtex,ifptex} %% variables \newdimen\bxpr@dima \let\bxpr@width\relax \let\bxpr@height\relax +\newif\ifbxpr@pxatbegshi %% constants \chardef\bxpr@mode@@dvimode=0 @@ -62,11 +63,6 @@ %% unique tokens \def\bxpr@end{\bxpr@end@} -%% \bxpr@ptexng -\chardef\bxpr@ptexng=0 -\edef\bxpr@tmpa{\string\ngbanner}\edef\bxpr@tmpb{\meaning\ngbanner} -\ifx\bxpr@tmpa\bxpr@tmpb \chardef\bxpr@ptexng=1 \fi - %% \bxpr@pagewidth / \bxpr@pageheight %% \bxpr@horigin / \bxpr@vorigin \ifluatex % LuaTeX @@ -89,7 +85,7 @@ \else\ifvtex % VTeX \let\bxpr@pagewidth\mediawidth \let\bxpr@pageheight\mediaheight -\else\ifnum0\the\bxpr@ptexng\ifpdf1\fi>0 % pdfTeX in PDF mode +\else\ifnum0\ifptexng1\fi\ifpdf1\fi>0 % pdfTeX in PDF mode \let\bxpr@pagewidth\pdfpagewidth \let\bxpr@pageheight\pdfpageheight \let\bxpr@horigin\pdfhorigin @@ -170,11 +166,6 @@ \def\bxpr@set@priority#1{% invalidate \bxpr@err@nlprm{priority}}} -%% 'adjustmag' -\define@boolkey+[bxpr]{prm}{adjustmag}[true]% - {}% - {\bxpr@err@ivval{adjustmag}{#1}} - %% 'truedimen' \define@boolkey+[bxpr]{prm}{truedimen}[true]% {\bxpr@needs@reset@sizetrue}% @@ -287,6 +278,18 @@ \noexpand\bxpapersizesetup{\bxpr@kvopt}% }\bxpr@tmpa +% if priority is not middle... +\ifnum\bxpr@priority=\bxpr@priority@@default\else + \ifcase\bxpr@mode % dvi + \ifptex + \RequirePackage{pxatbegshi}[] + \fi + \or % pdf + \PackageWarningNoLine\bxpr@pkgname + {The priority setting will be ignored in PDF mdoe} + \fi +\fi + %--------------------------------------- page hook %% \bxpr@begindoc@first@hook @@ -399,12 +402,7 @@ \edef\bxpr@special@chunk{\special{papersize=\bxpr@tmpb}}}% \else %pdf \def\bxpr@set@page@size#1#2{% - \let\bxpr@tmpb\@empty - \ifbxpr@prm@adjustmag - \bxpr@let@real@mag@to\bxpr@tmpb - \fi - \bxpr@pagewidth=#1\relax \bxpr@pagewidth=\bxpr@tmpb\bxpr@pagewidth - \bxpr@pageheight=#2\relax \bxpr@pageheight=\bxpr@tmpb\bxpr@pageheight + \bxpr@pagewidth=#1\relax \bxpr@pageheight=#2\relax \bxDebug{papersize=\the\bxpr@pagewidth,\the\bxpr@pageheight}}% \fi @@ -469,79 +467,6 @@ \advance\bxpr@dima\dp\AtBeginShipoutBox \edef\bxpr@height{\the\bxpr@dima}} -%--------------------------------------- cope with tate-direction - -% In (u)pTeX engine, boxes and lists have the direction attribute, -% and yoko boxes cannot be unboxed in tate lists (and vice versa). -% This restriction can cause the atbegshi package to fail, and thus -% the 'priority=low' setting results in an error when used together -% with document classes of tate direction. - -% if '\tate' is invalid then quit now -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname tate\endcsname\relax -\expandafter\endinput\fi\relax - -% if priority is middle then quit -\ifnum\bxpr@priority=\bxpr@priority@@default -\expandafter\endinput\fi\relax - -% check in advance -\ifx\AtBegShi@Output\@undefined - \PackageWarningNoLine\bxpr@pkgname - {The patch to atbegshi failed, so\MessageBreak - the package might not work well} -\expandafter\endinput\fi\relax - -%% \ifbxpr@ddir -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname ifddir\endcsname\relax - \bxpr@csletcs{ifbxpr@ddir}{iffalse} -\else - \bxpr@csletcs{ifbxpr@ddir}{ifddir} -\fi - -%% \bxpr@patch -% Patches the internal macro \AtBegShi@Output of atbegshi package, -% so that the macro is prepended by a `\yoko` primitive and appended -% by a direction primitive to switch back to the original. -\@onlypreamble\bxpr@patch -\def\bxpr@patch{% - \expandafter\bxpr@patch@a\AtBegShi@Output\bxpr@end} -\@onlypreamble\bxpr@patch@a -\def\bxpr@patch@a{% - \futurelet\bxpr@tok\bxpr@patch@b} -\@onlypreamble\bxpr@patch@b -\def\bxpr@patch@b{% - \ifx\bxpr@tok\egroup \expandafter\@firstoftwo - \else \expandafter\@secondoftwo - \fi{\bxpr@patch@c}{\bxpr@patch@d{}}} -\@onlypreamble\bxpr@patch@c -\def\bxpr@patch@c#1#2{% - \bxpr@patch@d{#1#2}} -\@onlypreamble\bxpr@patch@d -\def\bxpr@patch@d#1#2\bxpr@end{% - \def\AtBegShi@Output{#1\bxpr@ABS@prehook#2\bxpr@ABS@posthook}} -% do patch -\bxpr@patch - -%% \bxpr@restore@dir -\let\bxpr@restore@dir\relax - -%% \bxpr@ABS@prehook -\def\bxpr@ABS@prehook{% - \iftdir \yoko \let\bxpr@restore@dir\tate - \else\ifbxpr@ddir \yoko \let\bxpr@restore@dir\dtou - \else \let\bxpr@restore@dir\relax - \fi\fi - \ifx\bxpr@restore@dir\relax\else - \bxDebug{Temporarily switching \meaning\bxpr@restore@dir - \space to \string\yoko}% - \fi} -%% \bxpr@ABS@posthook -\def\bxpr@ABS@posthook{% - \bxpr@restore@dir} - %--------------------------------------- all done \endinput %% EOF diff --git a/macros/latex/contrib/tasks/README b/macros/latex/contrib/tasks/README index fd70c08428..dfede84db1 100644 --- a/macros/latex/contrib/tasks/README +++ b/macros/latex/contrib/tasks/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the TASKS package v1.0a 2019/10/05 +the TASKS package v1.0b 2019/10/06 horizontally columned lists diff --git a/macros/latex/contrib/tasks/tasks.sty b/macros/latex/contrib/tasks/tasks.sty index 8fbdf9473f..571d17775b 100644 --- a/macros/latex/contrib/tasks/tasks.sty +++ b/macros/latex/contrib/tasks/tasks.sty @@ -28,10 +28,10 @@ \RequirePackage {expl3,xparse,xtemplate} \ExplSyntaxOn -\tl_const:Nn \c_tasks_date_tl {2019/10/05} +\tl_const:Nn \c_tasks_date_tl {2019/10/06} \tl_const:Nn \c_tasks_version_major_number_tl {1} \tl_const:Nn \c_tasks_version_minor_number_tl {0} -\tl_const:Nn \c_tasks_version_subrelease_tl {a} +\tl_const:Nn \c_tasks_version_subrelease_tl {b} \tl_const:Nx \c_tasks_version_number_tl { \c_tasks_version_major_number_tl . @@ -610,14 +610,15 @@ style .tl_set:N = \l__tasks_instance_tl , style .initial:n = alphabetize , counter-format .code:n = - \msg_warning:nnnnn {tasks} {deprecated} {option} {counter-format} {label} - \keys_set:nn {tasks/list} { label = #1 } , + \msg_warning:nnnnn {tasks} {deprecated} {option} {counter-format} + {label} , + % \keys_set:nn {tasks/list} { label = #1 } , label .code:n = \bool_set_true:N \l__tasks_custom_label_bool \tl_set:Nn \l__tasks_custom_label_tl {#1} , label-format .code:n = \bool_set_true:N \l__tasks_custom_label_format_bool - \tl_set:Nn \l__tasks_custom_label_format_tl , + \tl_set:Nn \l__tasks_custom_label_format_tl {#1} , label-width .code:n = \dim_set:Nn \l__tasks_label_width_dim {#1} \bool_set_true:N \l__tasks_label_width_bool , @@ -806,3 +807,4 @@ - rename \NewTasks and \RenewTasks - the option `counter-format' is deprecated 2019/10/05 v1.0a - fix small bug in deprecation message +2019/10/06 v1.0b - fix bug in `label-format' definition diff --git a/macros/latex/contrib/tasks/tasks_en.pdf b/macros/latex/contrib/tasks/tasks_en.pdf Binary files differindex 99e6084ad3..2067bc4d07 100644 --- a/macros/latex/contrib/tasks/tasks_en.pdf +++ b/macros/latex/contrib/tasks/tasks_en.pdf |