diff options
Diffstat (limited to 'macros/latex')
37 files changed, 109 insertions, 48 deletions
diff --git a/macros/latex/contrib/biblatex-ms/CHANGES-ms.md b/macros/latex/contrib/biblatex-ms/CHANGES.md index 864e7304d1..a5c500a3be 100644 --- a/macros/latex/contrib/biblatex-ms/CHANGES-ms.md +++ b/macros/latex/contrib/biblatex-ms/CHANGES.md @@ -31,6 +31,10 @@ <namelist><msform><mslang>bibnamehash or <namelist><msform><mslang>fullhash and biber 4.0+ always generates specific name hashes in this format. +# RELEASE NOTES FOR VERSION 3.19 +- Added `\AtNextRefsection`. +- Added `\DeclareExtradateContext`. + # RELEASE NOTES FOR VERSION 3.18b - Reenable `\MakeUppercase`/`\MakeLowercase` "patches" for `\bibstring` based on `\CaseSwitch`. @@ -42,8 +46,7 @@ # RELEASE NOTES FOR VERSION 3.18 - New sorting name key generation macro `\visibility` which allows application of sorting name key generation to apply only to sorting - within citati - ons. + within citations. - New sorting macro `\intciteorder` which allows sorting by order internal to a cite command like \cite{a,b,c}. - New option `pluralothers` to force "et al." to be plural (i.e. only diff --git a/macros/latex/contrib/biblatex-ms/doc/biblatex-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/biblatex-ms.pdf Binary files differindex 6e1fc932b5..e427d50bae 100644 --- a/macros/latex/contrib/biblatex-ms/doc/biblatex-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/biblatex-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/biblatex-ms.tex b/macros/latex/contrib/biblatex-ms/doc/biblatex-ms.tex index 586aea9add..c3ff6b9e2d 100644 --- a/macros/latex/contrib/biblatex-ms/doc/biblatex-ms.tex +++ b/macros/latex/contrib/biblatex-ms/doc/biblatex-ms.tex @@ -425,6 +425,7 @@ compatibility matrix for the recent versions. \sffamily\bfseries\spotcolor Biber version & \sffamily\bfseries\spotcolor \biblatex\ version\\ \midrule +2.19 & 3.19\\ 2.18 & 3.18\\ 2.17 & 3.17\\ 2.16 & 3.16\\ @@ -2697,7 +2698,7 @@ The option is intended mainly for backwards compatibility, because earlier versi \boolitem[true]{dashed} -This option controls whether recurrent the same author\slash editor list in the bibliography are replaced by a dash (\cmd{bibnamdeash}, see \secref{use:fmt:fmt}). If the option is enabled, subsequent mentions of the same name list at the beginning of an entry are replaced by a dash provided the entry is not the first on the current page. If the option is disabled, name lists are never replaced by a dash. +This option controls whether recurrent the same author\slash editor list in the bibliography are replaced by a dash (\cmd{bibnamedash}, see \secref{use:fmt:fmt}). If the option is enabled, subsequent mentions of the same name list at the beginning of an entry are replaced by a dash provided the entry is not the first on the current page. If the option is disabled, name lists are never replaced by a dash. \end{optionlist} @@ -4397,7 +4398,7 @@ The \opt{refcontext} environment cannot be nested and \biblatex will generate an \cmditem{newrefcontext}[key=value, \dots]{name} -This command is similar to the \env{refcontext} environment except that it is a stand"=alone command rather than an environment. It automatically ends any previous reference context section begun with \cmd{newrefcontext} (if any) and immediately starts a new one. Note that the context section started by the last \cmd{newrefcontext} command in the document will extend to the very end of the document. Use \cmd{endrefcontext} if you want to terminate it earlier. +This command is similar to the \env{refcontext} environment except that it is a stand"=alone command rather than an environment. It automatically ends any previous reference context section begun with \cmd{newrefcontext} (if any) and immediately starts a new one. Note that the context section started by the last \cmd{newrefcontext} command in the document will extend to the end of the current refsection. Use \cmd{endrefcontext} if you want to terminate it earlier. \cmditem{localrefcontext}[key=value, \dots]{name} @@ -8612,6 +8613,11 @@ limiting source maps to specific refsections only (see \opt{refsection} option to the \cmd{map} command above). \begin{itemize} +\item If \texttt{final} is \texttt{true} for a step then no more steps + after this one are run within the current map for the current entry if + the conditions for the step so far are not satisfied. Examples are given in + the descriptions for specific steps as to what this means for their + particular semantics. \item If \texttt{entrynew} is set, a new entry is created with the entry key \texttt{entrynewkey} and the entry type given in the option \texttt{entrynewtype}. This entry is only in-scope during the processing of the current entry and can be referenced by \texttt{entrytarget}. In \texttt{entrynewkey}, you may use standard Perl regular expression @@ -8664,15 +8670,7 @@ option to the \cmd{map} command above). \texttt{match} regular expression (logic is reversed if you use \texttt{notmatch} and case-insensitive if you use the versions ending in <i>)\footnote{Regular expressions are full Perl 5.16 regular expressions. This means you may need to deal with special characters, see examples.}. You may use capture parenthesis as usual and refer to these (\$1\ldots\$9) in later \texttt{fieldvalue} specifications. This allows you to pull out parts of some fields and put these parts in other fields. \item Perform a regular expression match and replace on the value of the \texttt{fieldsource} \prm{entryfield} if \texttt{match} and \texttt{replace} are defined. \item If \texttt{matches} is defined, it should be a comma-separated list of literal strings which are replaced by corresponding locations in a comma-separated list provided in \texttt{replace}. The lists must have the same number of elements or the step will be skipped. \texttt{matchesi} is the same but case-insensitive. -\item If \texttt{fieldset} is defined, then its value is \prm{entryfield} - which will be set to a value specified by further options. If - \texttt{overwrite} is false for this step and the field to set already - exists then the map step is ignored. If \texttt{final} is also true for - this step, then processing of the parent map stops at this point. If - \texttt{append} is true, then the value to set is appended to the current - value of \prm{entryfield}. \texttt{appendstrict} only appends to - \prm{entryfield} if \prm{entryfield} is not empty. The value to set is - specified by a mandatory one and only one of the following options: +\item If \texttt{fieldset} is defined, then its value is \prm{entryfield} which will be set to a value specified by further options. If \texttt{overwrite} is false for this step and the field to set already exists then the map step is ignored. If \texttt{final} is also true when \texttt{overwrite} is false for this step, then processing of the parent map stops at this point. If \texttt{append} is true, then the value to set is appended to the current value of \prm{entryfield}. \texttt{appendstrict} only appends to \prm{entryfield} if \prm{entryfield} is not empty. The value to set is specified by a mandatory one and only one of the following options: \begin{itemize} \item\ \texttt{fieldvalue} --- The \texttt{fieldset} \prm{entryfield} is set to the \texttt{fieldvalue} \prm{string} \item\ \texttt{null} --- The \texttt{fieldset} \prm{entryfield} is ignored, as if it did not exist in the datasource @@ -10774,11 +10772,11 @@ Restores a \prm{literal list} (optionally a multiscript list of \prm{msform}/\pr Restores a \prm{name list} (optionally a multiscript name of \prm{msform}/\prm{mslang}) from a \prm{macro} defined with \cmd{savename} before. The list is restored within a local scope. -\cmditem[msform][mslang]{clearfield}{field} +\cmditem{clearfield}[msform][mslang]{field} Clears the \prm{field} (optionally a multiscript field of \prm{msform}/\prm{mslang} of which both or neither optional arguments must be provided) within a local scope. A field cleared this way is treated as undefined by subsequent data commands. When no optional \prm{msform}/\prm{mslang} arguments are provided, clears all alternates of a multiscript field. -\cmditem[msform][mslang]{clearlist}{literal list} +\cmditem{clearlist}[msform][mslang]{literal list} Clears the \prm{literal list} (optionally a multiscript list of \prm{msform}/\prm{mslang} of which both or neither optional arguments must be provided) within a local scope. A list cleared this way is treated as undefined by subsequent data commands. When no optional \prm{msform}/\prm{mslang} arguments are provided, clears all alternates of a multiscript list. Clearing only one alternate of a multiscript list does not clear the associated counters for the list. @@ -13724,6 +13722,10 @@ As \cmd{currentmslangs} but for entryfield \prm{entryfield}. It is intended for Appends the \prm{code} to an internal hook executed at the beginning of every reference section. The \prm{code} is executed just after setting the reference section number. This command may only be used in the preamble. +\cmditem{AtNextRefsection}{code} + +Appends the \prm{code} to an internal hook executed at the beginning of the next reference section. The \prm{code} is executed just after setting the reference section number. + \cmditem{AtBeginBibliography}{code} Appends the \prm{code} to an internal hook executed at the beginning of the bibliography. The \prm{code} is executed at the beginning of the list of references, immediately after the \prm{begin code} of \cmd{defbibenvironment}. This command may only be used in the preamble. @@ -15491,6 +15493,8 @@ This revision history is a list of changes relevant to users of this package. Ch \item Multiscript support\see{use:multiscript} \end{release} \begin{release}{3.19}{2022} +\begin{release}{3.19}{2023-03-05} +\item Added \cmd{AtNextRefsection}\see{aut:fmt:hok} \item Added \cmd{DeclareExtradateContext} option\see{aut:ctm:fld} \item Modified warning for using bibtex backend \item Enhanced \bibfield{extradate} tracking to fallback on \bibfield{labeltitle} when there is no author diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/02-annotations-biber-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/02-annotations-biber-ms.pdf Binary files differindex f224541c20..ae9800ec6c 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/02-annotations-biber-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/02-annotations-biber-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/02-annotations-bibtex-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/02-annotations-bibtex-ms.pdf Binary files differindex 188b707462..6341afe161 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/02-annotations-bibtex-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/02-annotations-bibtex-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/03-localization-keys-biber-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/03-localization-keys-biber-ms.pdf Binary files differindex 2fcd02a82a..7661a9cfe1 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/03-localization-keys-biber-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/03-localization-keys-biber-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/03-localization-keys-bibtex-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/03-localization-keys-bibtex-ms.pdf Binary files differindex 8278820ded..be22a12723 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/03-localization-keys-bibtex-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/03-localization-keys-bibtex-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/16-numeric-prefixed-1-biber-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/16-numeric-prefixed-1-biber-ms.pdf Binary files differindex 5eef1ea440..c7f6167d55 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/16-numeric-prefixed-1-biber-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/16-numeric-prefixed-1-biber-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/16-numeric-prefixed-1-bibtex-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/16-numeric-prefixed-1-bibtex-ms.pdf Binary files differindex 64db9af5a6..17d38864f3 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/16-numeric-prefixed-1-bibtex-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/16-numeric-prefixed-1-bibtex-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/17-numeric-prefixed-2-biber-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/17-numeric-prefixed-2-biber-ms.pdf Binary files differindex 6ae7e98faa..5a78b831a7 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/17-numeric-prefixed-2-biber-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/17-numeric-prefixed-2-biber-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/17-numeric-prefixed-2-bibtex-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/17-numeric-prefixed-2-bibtex-ms.pdf Binary files differindex 1660f1fa12..0f85b8c344 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/17-numeric-prefixed-2-bibtex-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/17-numeric-prefixed-2-bibtex-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/19-alphabetic-prefixed-biber-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/19-alphabetic-prefixed-biber-ms.pdf Binary files differindex 44fe840374..a198f5dbf4 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/19-alphabetic-prefixed-biber-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/19-alphabetic-prefixed-biber-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/19-alphabetic-prefixed-bibtex-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/19-alphabetic-prefixed-bibtex-ms.pdf Binary files differindex fd02d3ee77..b2dddeeeb4 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/19-alphabetic-prefixed-bibtex-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/19-alphabetic-prefixed-bibtex-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/20-indexing-single-biber-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/20-indexing-single-biber-ms.pdf Binary files differindex cc0daad610..b05a94b209 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/20-indexing-single-biber-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/20-indexing-single-biber-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/20-indexing-single-bibtex-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/20-indexing-single-bibtex-ms.pdf Binary files differindex b41bf9968e..52d3cbeba8 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/20-indexing-single-bibtex-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/20-indexing-single-bibtex-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/21-indexing-multiple-biber-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/21-indexing-multiple-biber-ms.pdf Binary files differindex f0c4739af3..cd3303da2b 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/21-indexing-multiple-biber-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/21-indexing-multiple-biber-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/21-indexing-multiple-bibtex-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/21-indexing-multiple-bibtex-ms.pdf Binary files differindex 2d2de8ea76..2fdd6bbc9a 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/21-indexing-multiple-bibtex-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/21-indexing-multiple-bibtex-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/40-style-alphabetic-biber-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/40-style-alphabetic-biber-ms.pdf Binary files differindex 17f5db2dce..81d00c245c 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/40-style-alphabetic-biber-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/40-style-alphabetic-biber-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/40-style-alphabetic-bibtex-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/40-style-alphabetic-bibtex-ms.pdf Binary files differindex 1095df8ce6..b6d7e8f48c 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/40-style-alphabetic-bibtex-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/40-style-alphabetic-bibtex-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/50-style-authoryear-biber-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/50-style-authoryear-biber-ms.pdf Binary files differindex dbf2370b9d..f21e332306 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/50-style-authoryear-biber-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/50-style-authoryear-biber-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/50-style-authoryear-bibtex-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/50-style-authoryear-bibtex-ms.pdf Binary files differindex 371dcc0e4c..f553a865b1 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/50-style-authoryear-bibtex-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/50-style-authoryear-bibtex-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/60-style-authortitle-biber-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/60-style-authortitle-biber-ms.pdf Binary files differindex 161e5a5ce7..a50f555d47 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/60-style-authortitle-biber-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/60-style-authortitle-biber-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/60-style-authortitle-bibtex-ms.pdf b/macros/latex/contrib/biblatex-ms/doc/examples/60-style-authortitle-bibtex-ms.pdf Binary files differindex c148d4278c..0c3a82bd9c 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/60-style-authortitle-bibtex-ms.pdf +++ b/macros/latex/contrib/biblatex-ms/doc/examples/60-style-authortitle-bibtex-ms.pdf diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/91-sorting-schemes-ms.tex b/macros/latex/contrib/biblatex-ms/doc/examples/91-sorting-schemes-ms.tex index 39498d475a..67fcce32ba 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/91-sorting-schemes-ms.tex +++ b/macros/latex/contrib/biblatex-ms/doc/examples/91-sorting-schemes-ms.tex @@ -6,7 +6,7 @@ \usepackage{hyperref} \addbibresource{biblatex-examples.bib} \begin{document} -% This demonstrates that the sorting of citations can be difference to the +% This demonstrates that the sorting of citations can be different to the % bibliography. However, this is not always advisable in case of multiple % citations in the same year for the same author list. This is because % extradate (the "a", "b" etc. in "Smith 2010a" and "Smith 2010b" etc.) diff --git a/macros/latex/contrib/biblatex-ms/doc/examples/98-multiscript-ms.tex b/macros/latex/contrib/biblatex-ms/doc/examples/98-multiscript-ms.tex index da65ed9d83..1ab5f724b5 100644 --- a/macros/latex/contrib/biblatex-ms/doc/examples/98-multiscript-ms.tex +++ b/macros/latex/contrib/biblatex-ms/doc/examples/98-multiscript-ms.tex @@ -89,7 +89,7 @@ % bibstrings being activated. \printbibliography -% Here we are citing and printing the bibliography using data contain in +% Here we are citing and printing the bibliography using data contained in % the entryfields of alternate msform="transliteration" and mslang="el" \begin{refcontext}[msform=transliteration,mslang=el] diff --git a/macros/latex/contrib/biblatex-ms/latex/biblatex-ms.sty b/macros/latex/contrib/biblatex-ms/latex/biblatex-ms.sty index 560628f8d2..eda4302551 100644 --- a/macros/latex/contrib/biblatex-ms/latex/biblatex-ms.sty +++ b/macros/latex/contrib/biblatex-ms/latex/biblatex-ms.sty @@ -12,7 +12,7 @@ % particular purpose. % Set up the version strings here -\def\abx@date{2022/08/21} +\def\abx@date{2023/03/08} \def\abx@version{4.0} \def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/MW)} \def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/MW)} @@ -10832,18 +10832,23 @@ {\blx@printbibchecks \blx@notfilter\blx@tempa{blx@catg@#1}}} +\let\blx@default@thefilter\@empty +\blx@kv@defkey{blx@bibdefaults}{filter}{% + \def\blx@default@thefilter{#1}} \blx@kv@defkey{blx@bib2}{filter}{\blx@key@filter{#1}} \blx@kv@defkey{blx@biblist2}{filter}{\blx@key@filter{#1}} \def\blx@key@filter#1{% - \ifcsdef{blx@filter@#1} - {\blx@printbibchecks - \blx@bibfilter\blx@tempa{blx@filter@#1}} - {\let\blx@tempa\@empty - \blx@error - {Filter '#1' not found} - {The filter '#1' could not be found.\MessageBreak - Use \string\defbibfilter\space to define it}}} + \ifblank{#1} + {} + {\ifcsdef{blx@filter@#1} + {\blx@printbibchecks + \blx@bibfilter\blx@tempa{blx@filter@#1}} + {\let\blx@tempa\@empty + \blx@error + {Filter '#1' not found} + {The filter '#1' could not be found.\MessageBreak + Use \string\defbibfilter\space to define it}}}} \blx@kv@defkey{blx@bib2}{check}{\blx@key@bibcheck{#1}} \blx@kv@defkey{blx@biblist2}{check}{\blx@key@bibcheck{#1}} @@ -11028,6 +11033,7 @@ \let\blx@theprenote\blx@default@theprenote \let\blx@thepostnote\blx@default@thepostnote \let\blx@thetitle\blx@default@thetitle + \let\blx@thefilter\blx@default@thefilter \undef\blx@thelabel % defaults \let\blx@tempa\@empty% before there is a .bbl, this must not be undef @@ -11053,6 +11059,7 @@ % \printbibliography following one with this set will inherit any % previous "true" value \togglefalse{blx@omitnumbers}% + \expandafter\blx@key@filter\expandafter{\blx@thefilter}% Can only be defaulted once \blx@tempa is set since it filters on this \blx@kv@setkeys{blx@bib2}{#1}% ... now we have correct \blx@tempa, set rest of options \blx@rest@actives % Add datalist to list of seen datalists to prevent duplicates @@ -11083,6 +11090,7 @@ \let\blx@theprenote\blx@default@theprenote \let\blx@thepostnote\blx@default@thepostnote \let\blx@thetitle\blx@default@thetitle + \let\blx@thefilter\blx@default@thefilter \undef\blx@thelabel \c@refsection\z@ \blx@safe@actives @@ -11123,6 +11131,7 @@ \let\blx@theprenote\blx@default@theprenote \let\blx@thepostnote\blx@default@thepostnote \let\blx@thetitle\blx@default@thetitle + \let\blx@thefilter\blx@default@thefilter \undef\blx@thelabel \c@refsegment\@ne \blx@safe@actives @@ -11168,8 +11177,8 @@ \let\blx@theprenote\blx@default@theprenote \let\blx@thepostnote\blx@default@thepostnote \let\blx@thetitle\blx@default@thetitle + \let\blx@thefilter\blx@default@thefilter \undef\blx@thelabel - \c@refsection\z@ \blx@safe@actives \blx@kv@setkeys{blx@bbc}{#1}% \blx@rest@actives @@ -11469,6 +11478,7 @@ \let\blx@theprenote\@empty \let\blx@thepostnote\@empty \let\blx@thetitle\@empty + \let\blx@thefilter\@empty \undef\blx@thelabel % defaults \let\blx@tempa\@empty% before there is a .bbl, this must not be undef @@ -11917,6 +11927,12 @@ \newrobustcmd*{\AtBeginRefsection}{\gappto\blx@hook@refsectioninit} \@onlypreamble\AtBeginRefsection +\newrobustcmd*{\AtNextRefsection}{% + \ifundef\blx@hook@refsection@next + {\gdef\blx@hook@refsection@next{\global\undef\blx@hook@refsection@next}} + {}% + \gappto\blx@hook@refsection@next} + \newrobustcmd*{\newrefsection}{% \endrefcontext \ifnum\c@refsection>\z@ @@ -11950,6 +11966,7 @@ \stepcounter{blx@maxsection}% \setcounter{refsection}{\value{blx@maxsection}}% \csuse{blx@hook@refsectioninit}% + \csuse{blx@hook@refsection@next}% \xifinlist{\the\c@refsection}\blx@allrefsections {} {\listxadd\blx@allrefsections{\the\c@refsection}}% @@ -17772,6 +17789,7 @@ \blx@bblinput \setcounter{blx@maxsection}{0}% \csuse{blx@hook@refsectioninit}% + \csuse{blx@hook@refsection@next}% \csuse{abx@preamble}% \blx@inf@refsec \blx@inf@refseg} diff --git a/macros/latex/contrib/biblatex-ms/latex/lbx/lithuanian-ms.lbx b/macros/latex/contrib/biblatex-ms/latex/lbx/lithuanian-ms.lbx index 454da7f55f..43e1e53cb6 100644 --- a/macros/latex/contrib/biblatex-ms/latex/lbx/lithuanian-ms.lbx +++ b/macros/latex/contrib/biblatex-ms/latex/lbx/lithuanian-ms.lbx @@ -12,7 +12,7 @@ {The file 'lithuanian.lbx' requires UTF-8 encoding but you seem\MessageBreak to be using a different encoding. This is a fatal error. I will\MessageBreak abort loading - russian.lbx now.}% + lithuanian.lbx now.}% \endinput} \DeclareBibliographyExtras{% diff --git a/macros/latex/contrib/frenchmath/frenchmath.dtx b/macros/latex/contrib/frenchmath/frenchmath.dtx index e2037917fb..95e872ba6f 100644 --- a/macros/latex/contrib/frenchmath/frenchmath.dtx +++ b/macros/latex/contrib/frenchmath/frenchmath.dtx @@ -20,7 +20,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{frenchmath} - [2023/02/24 v2.5 .dtx frenchmath file] + [2023/03/08 v2.6 .dtx frenchmath file] %</package> %<*driver> \documentclass{ltxdoc} @@ -65,7 +65,7 @@ %</driver> % \fi % -% \CheckSum{537} +% \CheckSum{535} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -153,12 +153,15 @@ % - simplification du code pour la mise en majuscule, % - chargement conditionnel de dotlessj pour mathptmx} % +% \changes{v2.6}{08/03/2023}{ +% - La macro curs ne doit et ne peut plus être utilisée en mode texte} +% % \GetFileInfo{frenchmath.sty} % % \title{L'extension \textsf{frenchmath}\thanks{Ce document -% correspond à \textsf{frenchmath}~\fileversion, dernière modification le 24/02/2023.}} +% correspond à \textsf{frenchmath}~\fileversion, dernière modification le 08/03/2023.}} % \author{Antoine Missier \\ \texttt{antoine.missier@ac-toulouse.fr}} -% \date{24 février 2023} +% \date{8 mars 2023} % \maketitle % % \section{Introduction} @@ -477,9 +480,7 @@ % avec |\mathcal| % \footnote{L'extension \textsf{calrsfs} fournit les mêmes cursives mais en redéfinissant % la commande \texttt{\string\mathcal}.} -% ($\mathcal{A}, \mathcal{B}, \mathcal{C}, \mathcal{D}, \ldots$). -% La commande |\curs| permet aussi de composer ces lettres en mode texte, -% sans les délimiteurs du mode mathématique.* +% ($\mathcal{A}, \mathcal{B}, \mathcal{C}, \mathcal{D}, \ldots$).* % \footnote{L'astérisque en fin d'item signale % une fonctionnalité similaire dans \textsf{mafr}.} % @@ -792,7 +793,7 @@ \AtBeginDocument{\@ifpackageloaded{pstricks-add}{\psset{comma=true}}{}} \DeclareMathSymbol{;}{\mathbin}{operators}{'73} % \mathpunct à l'origine -\newcommand*\curs[1]{\ensuremath{\mathscr{#1}}\xspace} +\newcommand*\curs[1]{\mathscr{#1}} \newcommand\infeg{\leqslant} \newcommand\supeg{\geqslant} \newcommand\vide{\varnothing} @@ -888,8 +889,8 @@ % \url{http://tug.ctan.org/info/lshort/english/lshort.pdf} % \bibitem{MAFR} \emph{La distribution \textsf{mafr}}, Christian Obrecht, % CTAN, v1.0 17/09/2006. -% \bibitem{MIS} \emph{\textsf{mismath} -- Miscellaneus mathematical macros}, -% Antoine Missier, CTAN, v2.5 24/02/2023. +% \bibitem{MIS} \emph{\textsf{mismath} -- Miscellaneous mathematical macros}, +% Antoine Missier, CTAN, v2.7 05/03/2023. % \bibitem{FRM} \emph{L'extension \textsf{tdsfrmath}}, Yvon Henel, % CTAN, v1.3 22/06/2009. % \bibitem{FOUR} \textsf{Fourier-GUT\hspace{-0.1em}\emph{enberg}}, diff --git a/macros/latex/contrib/frenchmath/frenchmath.pdf b/macros/latex/contrib/frenchmath/frenchmath.pdf Binary files differindex 27acd9e84d..217c28c43c 100644 --- a/macros/latex/contrib/frenchmath/frenchmath.pdf +++ b/macros/latex/contrib/frenchmath/frenchmath.pdf diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index d65bbfc7d0..39389f6fb8 100644 --- a/macros/latex/contrib/l3build/CHANGELOG.md +++ b/macros/latex/contrib/l3build/CHANGELOG.md @@ -7,6 +7,13 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2023-03-08] + +### Changed +- Generalize normalization of ghostscript version in PDF-based tests +- Include UNIX timestamps in generated ZIP files +- Normalize pdfTeX `.enc` file loading + ## [2023-02-26] ### Changed @@ -640,7 +647,8 @@ this project uses date-based 'snapshot' version identifiers. - Rationalise short option names: removed `-d`, `-E`, `-r` - Target `cmdcheck`: specific to LaTeX kernel work -[Unreleased]: https://github.com/latex3/l3build/compare/2023-02-26...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2023-03-08...HEAD +[2023-03-08]: https://github.com/latex3/l3build/compare/2023-02-26...2023-03-08 [2023-02-26]: https://github.com/latex3/l3build/compare/2023-02-20...2023-02-26 [2023-02-20]: https://github.com/latex3/l3build/compare/2023-02-16...2023-02-20 [2023-02-16]: https://github.com/latex3/l3build/compare/2022-11-10...2023-02-16 diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index d66bf91b0f..e1e5a05212 100644 --- a/macros/latex/contrib/l3build/README.md +++ b/macros/latex/contrib/l3build/README.md @@ -1,7 +1,7 @@ l3build: a testing and building system for LaTeX ================================================= -Release 2023-02-26 +Release 2023-03-08 Overview -------- diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua index 8c3afa4a7e..e7569b69d2 100644 --- a/macros/latex/contrib/l3build/l3build-check.lua +++ b/macros/latex/contrib/l3build/l3build-check.lua @@ -156,6 +156,10 @@ local function normalize_log(content,engine,errlevels) if match(line, "^%.+\\XeTeX.?.?.?file") then line = gsub(line, pattern, "../%1") end + -- pdfTeX .enc files + if match(line, "%.enc%}") then + line = gsub(line,"%{" .. pattern .. "%}","") + end -- Deal with dates if match(line, "[^<]%d%d%d%d[/%-]%d%d[/%-]%d%d") then line = gsub(line,"%d%d%d%d[/%-]%d%d[/%-]%d%d","....-..-..") @@ -556,7 +560,7 @@ local function normalize_pdf(content) not match(line,"^%%%%%+") then line = gsub(line,"%/ID( ?)%[<[^>]+><[^>]+>]","/ID%1[<ID-STRING><ID-STRING>]") line = gsub(line,"%/ID( ?)%[(%b())%2%]","/ID%1[<ID-STRING><ID-STRING>]") - line = gsub(line,"GhostScript %d%.%d+%.?%d*","GhostScript ...") + line = gsub(line,"Ghost[sS]cript %d+%.%d+%.?%d*","Ghostscript ...") new_content = new_content .. line .. os_newline end end diff --git a/macros/latex/contrib/l3build/l3build-zip.lua b/macros/latex/contrib/l3build/l3build-zip.lua index 06f37cd8b3..bf03439f0d 100644 --- a/macros/latex/contrib/l3build/l3build-zip.lua +++ b/macros/latex/contrib/l3build/l3build-zip.lua @@ -39,6 +39,26 @@ local function encode_time(unix) return date, time end +local function extra_timestamp(mod, access, creation) + local flags = 0 + local local_extra, central_extra = '', '' + if mod then + flags = flags | 0x1 + local_extra = pack('<I4', mod) + central_extra = local_extra + end + if access then + flags = flags | 0x2 + local_extra = local_extra .. pack('<I4', access) + end + if creation then + flags = flags | 0x4 + local_extra = local_extra .. pack('<I4', creation) + end + if flags == 0 then return '', '' end + return pack('<c2I2B', 'UT', #central_extra + 1, flags) .. central_extra, pack('<c2I2B', 'UT', #local_extra + 1, flags) .. local_extra +end + local meta = {__index = { add = function(z, filename, innername, binary, executable) innername = innername or filename @@ -55,7 +75,9 @@ local meta = {__index = { if #compressed >= #content then compressed = nil end - local date, time = encode_time(nil) + local timestamp = os.time() + local date, time = encode_time(timestamp) + local central_extra, local_extra = extra_timestamp(timestamp, nil, nil) z.f:write(pack("<c4I2I2I2I2I2I4I4I4I2I2", 'PK\3\4', compressed and 20 or 10, -- ZIP 2.0 to allow deflate @@ -67,8 +89,9 @@ local meta = {__index = { compressed and #compressed or #content, #content, #innername, - 0), + #local_extra), innername, + local_extra, compressed or content) local central = pack("<c4I2I2I2I2I2I2I4I4I4I2I2I2I2I2I4I4", 'PK\1\2', @@ -82,13 +105,13 @@ local meta = {__index = { compressed and #compressed or #content, #content, #innername, - 0, -- no extra data + #central_extra, 0, -- no comment 0, -- Disc 0 binary and 0 or 1, (executable and 0x81ED--[[0100755]] or 0x81A4--[[0100644]]) << 16, offset) - z.central[#z.central+1] = central .. innername + z.central[#z.central+1] = central .. innername .. central_extra end, close = function(z, comment) comment = comment or '' diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index 2044b290a6..746b894acc 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2023-02-26" +.TH l3build 1 "2023-03-08" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx index 6df655fb98..8ab6295ccb 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -236,7 +236,7 @@ % }^^A % } % -% \date{Released 2023-02-26} +% \date{Released 2023-03-08} % % \maketitle % \tableofcontents diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index 0aead12f95..55d6999808 100755 --- a/macros/latex/contrib/l3build/l3build.lua +++ b/macros/latex/contrib/l3build/l3build.lua @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2023-02-26" +release_date = "2023-03-08" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf Binary files differindex 617ba9b69a..da58149a23 100644 --- a/macros/latex/contrib/l3build/l3build.pdf +++ b/macros/latex/contrib/l3build/l3build.pdf |