diff options
| author | Norbert Preining <norbert@preining.info> | 2020-02-26 03:01:01 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2020-02-26 03:01:01 +0000 |
| commit | 2dfd6df5d1db270dc874c6c319d51eed43defb91 (patch) | |
| tree | 771360801233f1bd518937e92f71184debc2c95e /macros | |
| parent | e55e56ce482cc9d01a0b83f22dac4851eb4c0357 (diff) | |
CTAN sync 202002260301
Diffstat (limited to 'macros')
117 files changed, 947 insertions, 830 deletions
diff --git a/macros/latex/contrib/beilstein/CHANGELOG.md b/macros/latex/contrib/beilstein/CHANGELOG.md index 2f93736f68..89658a9733 100644 --- a/macros/latex/contrib/beilstein/CHANGELOG.md +++ b/macros/latex/contrib/beilstein/CHANGELOG.md @@ -4,22 +4,40 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## 2.0 - 2020-02-22 + +### Added +- Support for field `doi` in `@WWW` + +### Changed +- New font scheme: `newtxtext`, `newtxtt` and `newtxmath` +- `utf8` is now the standard encoding for `inputenc` +- CODEN strings were removed from the BiBTeX style file +- Update documentation + + ## 1.5 - 2019-10-30 ### Added - New environment `funding` +### Changed +- Update documentation + -## 1.4 - 2018-01-20 +## 1.4 - 2018-01-29 ### Added - New manuscript type `suppinfo` +### Changed +- Update documentation + ## 1.3 - 2017-11-09 ### Changed -- Loading of `cleveref` was postponed till the end of the preamble in order to avoid problems with `hyperref` +- Loading of `cleveref` postponed till the end of the preamble in order to avoid problems with `hyperref` ## 1.2 - 2017-08-21 @@ -28,7 +46,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Structure modified and files added for CTAN publication ### Changed -- Updated documentation +- Update documentation ### Fixed - Option handling now compatible to recent `babel` versions @@ -44,3 +62,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## 1.0 - 2010-05-11 First official release at BJNANO public website + diff --git a/macros/latex/contrib/beilstein/README.md b/macros/latex/contrib/beilstein/README.md index f59840b2ca..c6dfda734b 100644 --- a/macros/latex/contrib/beilstein/README.md +++ b/macros/latex/contrib/beilstein/README.md @@ -2,8 +2,8 @@ beilstein -- Support for submissions to the ``Beilstein Journal of Nanotechnology'' published by the Beilstein-Institut - for the Advancement of Chemical Sciences - Version: 1.5 + zur Foerderung der Chemischen Wissenschaften + Version: 2.0 E-mail: journals-support@beilstein-institut.de License: Released under the LaTeX Project Public License v1.3c or later See http://www.latex-project.org/lppl.txt @@ -15,11 +15,11 @@ files can be used for any kind of document, they have only been designed and tested to be suitable for submission to the [Beilstein Journal of Nanotechnology]. -Stable versions are uploaded to CTAN (https://www.ctan.org/pkg/beilstein). From there they usually +Stable versions are uploaded to CTAN (https://www.ctan.org/pkg/beilstein). From there they usually make their way into TeX Live and MiKTeX rather quickly. In addition you will find the most recent version at https://www.beilstein-journals.org/bjnano/templates. -The most recent documentation is available at BJNANO_Technical_Handbook.pdf within the doc directory. -`texdoc beilstein` should give you this file. It includes a short description how to use the template and +The most recent documentation is available at BJNANO_Technical_Handbook.pdf within the doc directory. +`texdoc beilstein` should give you this file. It includes a short description how to use the template and also provides trouble shooting hints. Please see [CHANGELOG.md](CHANGELOG.md) for a version history diff --git a/macros/latex/contrib/beilstein/beilstein.dtx b/macros/latex/contrib/beilstein/beilstein.dtx index 426321f2e1..85b27a387a 100644 --- a/macros/latex/contrib/beilstein/beilstein.dtx +++ b/macros/latex/contrib/beilstein/beilstein.dtx @@ -18,8 +18,8 @@ ---------------------------------------------------------------- beilstein -- Support for submissions to the ``Beilstein Journal of Nanotechnology'' published by the Beilstein-Institut -for the Advancement of Chemical Sciences -Version: 1.5 +zur Foerderung der Chemischen Wissenschaften +Version: 2.0 E-mail: journals-support@beilstein-institut.de License: Released under the LaTeX Project Public License v1.3c or later See http://www.latex-project.org/lppl.txt @@ -29,8 +29,7 @@ See http://www.latex-project.org/lppl.txt \postamble Originally developed by Martin Sievers (info@schoenerpublizieren.de) -Copyright (C) 2009-2019 by Beilstein-Institut for the Advancement of Chemical -Sciences (Beilstein) +Copyright (C) 2009-2020 by Beilstein-Institut zur Foerderung der Chemischen Wissenschaften (Beilstein) Part of this bundle is derived from cite.sty, to which the following license applies: @@ -91,7 +90,7 @@ This work consists of the files beilstein.dtx, %</internal> %<*driver> \ProvidesFile{beilstein.dtx}% -[2019/12/09 v1.5 Bundle for submissions to the\MessageBreak ``Beilstein Journal +[2020/02/22 v2.0 Bundle for submissions to the\MessageBreak ``Beilstein Journal of Nanotechnology'' (BJNANO)] \documentclass[a4paper]{ltxdoc} \usepackage[american]{babel} @@ -103,7 +102,7 @@ This work consists of the files beilstein.dtx, \usepackage{array,booktabs,tabularx,longtable} \usepackage{fancyhdr} \pagestyle{fancy} -\lfoot{\footnotesize BJNANO Technical Handbook (Version 1.5)} +\lfoot{\footnotesize BJNANO Technical Handbook (Version 2.0)} \cfoot{} \rfoot{\thepage} \rhead{\small\rightmark} @@ -128,8 +127,7 @@ This work consists of the files beilstein.dtx, \usepackage[% pdftitle={A LaTeX class for submissions to the ``Beilstein Journal of Nanotechnology'' (BJNANO)}, - pdfauthor={Beilstein-Institut for the Advancement of Chemical - Sciences}, + pdfauthor={Beilstein-Institut zur Foerderung der Chemischen Wissenschaften}, urlcolor=blue,% linktocpage,% a4paper,% @@ -168,14 +166,22 @@ This work consists of the files beilstein.dtx, % \changes{v1.2}{2017/08/16}{Fix for recent babel versions} % \changes{v1.2}{2017/08/16}{Fix for @misc bib entries} % \changes{v1.2}{2017/08/16}{All files converted to UTF-8} -% \changes{v1.2}{2017/08/21}{Fix for the declaration of \cs{-} as a robust -% command. There is a conflict between package bpchem and the latest +% \changes{v1.2}{2017/08/21}{Fix for the declaration of \cs{-} as a robust +% command. There is a conflict between package bpchem and the latest % \LaTeX{} release} % \changes{v1.3}{2017/11/09}{Fix: Loading of \pkg{cleveref} is postponed to the % very end of the preamble in order to avoid problems with \pkg{hyperref}} % \changes{v1.4}{2018/01/20}{Add new manuscript type \opt{suppinfo}} % \changes{v1.5}{2019/10/30}{Add new environment \env{funding}} % \changes{v1.5}{2019/09/12}{Update documentation} +% \changes{v2.0}{2020/02/05}{Update documentation} +% \changes{v2.0}{2020/02/05}{New font scheme: \pkg{newtxtext}, \pkg{newtxtt} +% and \pkg{newtxmath}} +% \changes{v2.0}{2020/02/05}{utf8 is now the standard encoding for +% \pkg{inputenc}} +% \changes{v2.0}{2020/02/05}{CODEN strings were removed from the BiBTeX style +% file} +% \changes{v2.0}{2020/02/11}{Add support for doi in @www} % \GetFileInfo{\jobname.dtx} % \DoNotIndex{\newcommand,\newenvironment} % \DoNotIndex{\def,\edef,\gdef,\xdef,\global,\long,\let} @@ -374,7 +380,8 @@ This work consists of the files beilstein.dtx, % \begin{titlepage} % \setstretch{1.8} % \renewcommand\thefootnote{\fnsymbol{footnote}} -% \vspace*{-2.5cm}{\includegraphics*[width=7.7cm,keepaspectratio]{bjnano_logo}}\\[1cm] +% \vspace*{-2.5cm}% +% {\includegraphics*[width=7.7cm,keepaspectratio]{bjnano_logo}}\\[1cm] % \begin{center} % {\bfseries\LARGE Technical Handbook}\\[3ex] % {\Large The \LaTeX\ \pkg{Beilstein} bundle for submissions to the\\% @@ -389,7 +396,7 @@ This work consists of the files beilstein.dtx, % \begin{abstract} % \noindent The \pkg{Beilstein} bundle provides a \LaTeX\ class file and a % \BibTeX\ style file in accordance with the requirements of -% submissions to the \BJNANO. Although the files can be used for any kind of +% submissions to the \BJNANO. Although the files can be used for any kind of % document, they have only been designed and tested to be suitable for % submissions to the \BJNANO. % \end{abstract} @@ -401,7 +408,7 @@ This work consists of the files beilstein.dtx, % based on the standard \pkg{article} class, but was modified % to meet the requirements for submissions to the \BJNANO as % published in the ``Instructions for Authors'' \cite{Beilstein-MSG}. -% Moreover the \LaTeX\ class \file{beilstein.cls} facilitates ease of use by +% Moreover the \LaTeX\ class \file{beilstein.cls} facilitates ease of use by % providing the authors with a set of useful macros and environments. % % The \BibTeX\ style \file{bjnano.bst} is used by the class to format @@ -409,28 +416,27 @@ This work consists of the files beilstein.dtx, % \file{achemso.bst}, but was largely adjusted to work exactly on % \BJNANO submissions. % -% Finally an example document is included in the \pkg{Beilstein} bundle. It is -% intended to act as a potential template for submissions, and illustrates the +% Finally, an example document is included in the \pkg{Beilstein} bundle. It is +% intended to be used as a template for submissions, and illustrates the % usage of the class and the \BibTeX\ file. % % \section{Installation} % \subsection{Global installation via your \TeX{} distribution} -% From version 1.2 onwards, the \pkg{Beilstein} bundle is distributed via CTAN -% and the major \TeX{} distribution. Therefore after having updated your \TeX{} -% Live or MiKTeX installation -% you can use the \pkg{Beilstein} files rightaway. +% From version 1.2 onwards, the \pkg{Beilstein} bundle is distributed via CTAN +% and the major \TeX{} distributions. Therefore after having updated your \TeX{} +% Live or MiKTeX installation you can use the \pkg{Beilstein} files right away. % % \subsection{Local TDS installation} % The \pkg{Beilstein} bundle is supplied with the TDS-ready ZIP file, % \file{beilstein-tds.zip}. Simply unzip this file into your local texmf -% tree and run your hash program (e.g. \texttt{texhash} for recent +% tree and run your hash program (e.g., \texttt{texhash} for recent % \TeX{}Live or MiK\TeX\ systems). % % To extract the bundle of files and to build the documentation % yourself, run pdf\LaTeX\ on \texttt{beilstein.dtx}. % The files can then be installed either by putting them into the -% current working directory (where the main \TeX\ file is) or -- much -% better -- as described above by moving the files to suitable places +% current working directory (where the main \TeX\ file is) or --- much +% better --- as described above by moving the files to suitable places % in a local texmf tree \$LOCALTEXMF according to % Table~\ref{tab:install}. % \begin{table} @@ -471,7 +477,7 @@ This work consists of the files beilstein.dtx, % \end{itemize} % \item Fonts % \begin{itemize} -% \item \pkg{mathptmx}, \pkg{helvet}, \pkg{courier}, +% \item \pkg{newtxtext}, \pkg{tgheros}, \pkg{newtxtt} % \item \pkg{textcomp}. % \end{itemize} % \item Page layout @@ -483,7 +489,8 @@ This work consists of the files beilstein.dtx, % \end{itemize}\pagebreak % \item Math and science % \begin{itemize} -% \item \pkg{amsmath, amstext, amssymb, amsgen, amsbsy, amsopn, amsfonts}. +% \item \pkg{amsmath, amstext, amssymb, amsgen, amsbsy, amsopn, amsfonts, +% newtxmath}. % \end{itemize} % \item Floats % \begin{itemize} @@ -502,29 +509,33 @@ This work consists of the files beilstein.dtx, % % All these packages should be present in any major \TeX\ % distribution and are also available from \emph{The Comprehensive -% TeX Archive Network} (CTAN) at \url{http://www.ctan.org}. +% TeX Archive Network} (CTAN) at \url{https://www.ctan.org}. % % A complete list of used files and tested versions can be found in -% the appendix on p.~\pageref{appendix}. +% the Appendix section on page~\pageref{appendix}. % % \section{The class file} % \subsection{Class options} % Most of the things to be considered for submissions to the \BJNANO are -% directly included into the class file. There is only one major choice an -% author has to make, i.e.\ to determine the type of manuscript he -% wants to submit. +% directly included into the class file. There is only one major choice authors +% have to make, i.e., to determine the type of manuscript they +% want to submit. % % \DescribeOption{manuscript=}% % The Beilstein-Institut has defined five such types and each type % has a special purpose and structure. The chosen option is used -% internally to check for mandatory sections and elements. The types are designed -% to give the author a slight control of the article's structure. +% internally to check for mandatory sections and elements. The types are +% designed to give the author a slight control over the article structure. +% +% The selection of the type is done by the key-value-option \opt{manuscript}, +% which can take the values listed in Table~\ref{tab:optionsmanuscript}. +% To switch your document to a ``Book Review Article'' e.g., +% simply use \cs{documentclass[manuscript=bookreview]\{beilstein\}}. +% In case of an unknown value, the class will use the default option. % -% The selection of the type is done by the key-value-option \opt{manuscript} -% which takes the values listed in Table~\ref{tab:optionsmanuscript}. % \begin{table} % \centering -% \caption{Possible values for key-value option +% \caption{Possible values for key-value option % ``manuscript''.\textsuperscript{\textit{a}}} % \label{tab:optionsmanuscript} % \begin{tabular}{ll} @@ -544,15 +555,13 @@ This work consists of the files beilstein.dtx, % \textsuperscript{\textit{a}}Default option is printed in italics. % \end{flushleft} % \end{table} -% -% To switch your document to a ``Book Review Article'' e.g.\ you -% simply use \cs{documentclass[manuscript=bookreview]\{beilstein\}}. -% In case of an unknown value, the class will use the default option. +% \newpage % % \DescribeOption{american}\DescribeOption{british} -% Two other options of a more technical aspect exist. Firstly you can -% tell \LaTeX\ whether you use American or British English (see Table \ref{tab:language}). -% Internally only different hyphenation patterns are used. So you might not see +% Two other options of a more technical aspect exist. Firstly, you can +% tell \LaTeX\ whether you use American or British English (see +% Table~\ref{tab:language}). +% Internally only different hyphenation patterns are used. So you might not see % a difference in the output at first sight. % \begin{table} % \centering @@ -569,33 +578,32 @@ This work consists of the files beilstein.dtx, % \textsuperscript{\textit{a}}Default option is printed in italics. % \end{flushleft} % \end{table} -% +% % \DescribeOption{applemac}\DescribeOption{latin1}% % \DescribeOption{utf8}% % Secondly, you might want to change the input encoding of your -% document, e.g.\ when using accented characters. Therefore, the class -% offers a small set of options (see Table~\ref{tab:inputenc}). In most -% cases no change is necessary. However, you should consider using the -% \opt{utf8} option as this the standard encoding nowadays. +% document, e.g., when using accented characters. Therefore, the class +% offers a small set of options (see Table~\ref{tab:inputenc}). The option +% \opt{utf8} is set as default beginning with version 2.0. % \begin{table} % \centering -% \caption{Options for input encoding.\textsuperscript{\textit{a}}} +% \caption{Options for input encoding.%\textsuperscript{\textit{a}}} % \label{tab:inputenc} % \begin{tabular}{ll} % \toprule % Option & Meaning\\\midrule % \opt{applemac} & Use special Mac encoding\\ -% \itshape \opt{latin1} & \itshape Use ISO8859-1 encoding\\ -% \opt{utf8} & Use UTF-8 encoding\\ +% \opt{latin1} & Use ISO8859-1 encoding\\ +% \itshape \opt{utf8} & \itshape Use UTF-8 encoding\\ % \bottomrule % \end{tabular}\\ % \begin{flushleft}\footnotesize % \textsuperscript{\textit{a}}Default option is printed in italics. % \end{flushleft} % \end{table} -% +% % \noindent Further options have been added to the recent version of the class:% -% +% % \DescribeOption{sectionnumbering}% % The \pkg{Beilstein} class disables the usual section numbering % mechanism by changing the counter ``secnumdepth'' appropriately. You @@ -606,9 +614,8 @@ This work consists of the files beilstein.dtx, % \DescribeOption{fnpara} % By default footnotes can only be used in tables and are printed one % per line. This can be changed to paragraph mode, either locally (see -% page~\pageref{pg:fnpara}), -% or globally. For that purpose the \pkg{Beilstein} class -% offers the option \opt{fnpara=true} or just \opt{fnpara}. +% page~\pageref{pg:fnpara}) or globally. To this purpose the \pkg{Beilstein} +% class offers the option \opt{fnpara=true} or just \opt{fnpara}. % % \DescribeOption{Global options} % The \pkg{Beilstein} class was developed to include all necessary @@ -623,19 +630,19 @@ This work consists of the files beilstein.dtx, % % \DescribeMacro{\title} % The title of your manuscript is given with \cs{title\marg{title}}. -% There is also an optional argument which can be used when writing -% a document for supporting information, e.g.\ -% \cs{title\oarg{sititle}\marg{title}}. Both information are -% automatically used on the titlepage of supporting information. +% There is also an optional argument that can be used when writing +% a document for the Supporting Information, e.g., +% \cs{title\oarg{sititle}\marg{title}}. Both information are +% automatically used on the title page of the Supporting Information. % For more information about creating Supporting Information files -% please see p.~\pageref{suppinfo}. +% please see page~\pageref{suppinfo}. % % \DescribeMacro{\sititle} -% As an alternative to the optional argument of \cs{title} -% you can use macro \cs{sititle\marg{sititle}}. +% As an alternative to the optional argument of \cs{title} +% you can use the macro \cs{sititle\marg{sititle}}. % % \DescribeMacro{\author}\DescribeMacro{\author*} -% Each author of the article is named within its own \cs{author} +% Each author of the article is named within their own \cs{author} % command. For a corresponding author the extended version % \cs{author*} must be used. It has an additional second mandatory % argument holding the author's email address. @@ -652,21 +659,23 @@ This work consists of the files beilstein.dtx, % there is a second optional argument:\\ % \cs{author\oarg{affiliation number}\oarg{email address}\marg{author's name}} % -% \marginpar{CAUTION}% -% To add an email address the first optional argument -% has to be present in any case, e.g.\ empty if there is no extra -% affiliation number. +% \vspace{0.3em} +% \noindent\fcolorbox{black}{red!40}{\parbox{% +% \dimexpr\textwidth-2\fboxsep-2\fboxrule\relax}{ +% In order to add an email address the first optional argument +% has to be present in any case. If there is no affiliation number, empty +% square brackets need to be given.}} % +% \vspace{0.3em} % \DescribeMacro{\affiliation} % The affiliations are given with \cs{affiliation\marg{postal address}} -% and are numbered consecutively. Each \cs{author} with an own address +% and are numbered consecutively. Each \cs{author} with dedicated affiliation(s) % is followed by one or more \cs{affiliation} commands (see example % below). This can also be combined with the optional affiliation number. % % \DescribeMacro{\maketitle} % To print the title page use the command % \cs{maketitle}. -% \newpage % A complete title block might look like this: % \begin{LaTeXdemo}[code only] % \begin{document} @@ -681,16 +690,16 @@ This work consists of the files beilstein.dtx, % \author[][Ducept@...]{Pascal C. Ducept} % \affiliation{Department of Chemistry, Imperial College London, % London SW7 2AY, United Kingdom} -% \affiliation{An alternative Address could be here} +% \affiliation{An alternative address can be given here.} % %A third author with the same affiliation as the second: % \author[2]{X. Y.} % \maketitle %print the title page % \end{LaTeXdemo} % -% For abstract and keywords please have a look at section~\ref{sec:special}. +% For abstract and keywords please see section~\ref{sec:special}. % % \subsection{Section headers} -% You can use the standard \LaTeX\ sectioning commands (except for +% You can use the standard \LaTeX\ sectioning commands (with the exception of % \cs{chapter}) to structure your document. Depending on the type of % manuscript some sections are mandatory while others are optional. % @@ -706,12 +715,13 @@ This work consists of the files beilstein.dtx, % \section{Conclusion} % \end{LaTeXdemo} % -% Table \ref{tab:specialsections} gives an overview of all allowed section headings for the -% different \pkg{Beilstein} class manuscript types. +% Table \ref{tab:specialsections} gives an overview of all allowed section +% headings for the different \pkg{Beilstein} class manuscript types. +% \clearpage % \begin{table} % \centering % \begin{minipage}{\linewidth} -% \caption{Allowed section headings for the different \pkg{Beilstein} class +% \caption{Allowed section headings for the different \pkg{Beilstein} class % manuscript types.} % \label{tab:specialsections} % \begin{tabular}{@{}l*{5}{>{$}c<{$}}@{}} @@ -722,8 +732,8 @@ This work consists of the files beilstein.dtx, % \textsuperscript{\textit{c}}&\mbox{FR}\textsuperscript{\textit{d}}& % \mbox{LA}\textsuperscript{\textit{e}} & \mbox{RA}% % \textsuperscript{\textit{f}}\\\midrule -% \texttt{Conclusion} & - & + & o & - & + \\ % \texttt{Book Details} & + & - & - & - & - \\ +% \texttt{Conclusion} & - & + & o & - & + \\ % \texttt{Discussion} & - & + & - & - & - \\ % \texttt{Experimental} & - & - & o & - & - \\ % \texttt{Findings} & - & - & - & + & - \\ @@ -747,17 +757,16 @@ This work consists of the files beilstein.dtx, % % \subsection{Special sections}\label{sec:special} % \DescribeEnv{abstract} -% After the title page an abstract must be inserted (except for -% ``Book Reports'' and ``Commentaries''). To meet the specifications for -% \BJNANO submissions \LaTeX\ redefines the usual \env{abstract} environment +% After the title page an abstract must be given (with the exception of +% ``Book Reports'' and ``Commentaries''). To meet the specifications for +% \BJNANO submissions \LaTeX\ redefines the usual \env{abstract} environment % internally. % % \DescribeMacro{\keywords} -% Although the ``Keywords'' could be considered as a part of the title page -% they are inserted right after the abstract. There can be an -% arbitrary number of keywords (at least five keywords are recommended), and -% therefore the \cs{keywords} macro has only one -% mandatory argument holding the keywords separated by semicolons. +% The ``Keywords'' need to be given right after the abstract. There can be an +% arbitrary number of keywords (at least five keywords are recommended), and +% therefore the \cs{keywords} macro has only one mandatory argument holding the +% keywords separated by semicolons. % % An abstract with keywords should look like this: % \begin{LaTeXdemo}[code only] @@ -767,18 +776,22 @@ This work consists of the files beilstein.dtx, % \keywords{allenylsilanes; rhodium(II) octanoate-mediated % rearrangement; silylketenes; titanium carbenoids; ylide} % \end{LaTeXdemo} +% \clearpage % % \DescribeEnv{acknowledgements} % \DescribeEnv{funding} % The sections ``Acknowledgements'' and ``Funding'' are optional parts of all % article types. % +% \vspace{0.3em} % \noindent\fcolorbox{black}{red!40}{\parbox{% % \dimexpr\textwidth-2\fboxsep-2\fboxrule\relax}{% -% All financial disclosures are supposed to be part of the ``Funding'' -% section.}} As the layout differs from that of the main text, they should be +% All financial disclosures are supposed to be part of the ``Funding'' +% section.}} +% +% As the layout differs from that of the main text, these sections should be % written using the environments \env{acknowledgements} and \env{funding}: -% \pagebreak +% % \begin{LaTeXdemo}[code only] % \begin{acknowledgements} % We would like to thank ... @@ -794,18 +807,17 @@ This work consists of the files beilstein.dtx, % % \DescribeEnv{suppinfo}\label{suppinfo}% % Another optional section of an article is the -% ``Supporting Information'' which may consist of various ``Supporting -% Information Files'' containing information about additional external -% data. To begin this section simply use \cs{begin\{suppinfo\}}. +% ``Supporting Information'', which may consist of various ``Supporting +% Information Files''. To begin this section simply use \cs{begin\{suppinfo\}}. % % \DescribeMacro{\sifile} -% Inside the \env{suppinfo} environment the command \cs{sifile} can be -% used to add a ``Supporting Information File''. Its syntax is:\\ -% \cs{sifile\oarg{long description}\marg{filename}\marg{format}\marg{short +% Inside the \env{suppinfo} environment the command \cs{sifile} is +% used to add a ``Supporting Information File''. The syntax is:\\ +% \cs{sifile\oarg{long description}\marg{filename}\marg{format}\marg{short % description}} % % Each \cs{sifile} can be followed by a \cs{label\marg{labelname}} to -% cross-reference to that file in the main text using +% cross-reference that file in the main text using % \cs{ref\marg{labelname}}. % % The complete section could look like this: @@ -813,17 +825,17 @@ This work consists of the files beilstein.dtx, % \begin{suppinfo} % \sifile{experimental_part.pdf}{PDF}{Experimental part} % \label{si:experimental-part} -% \sifile[A long description about the experimental data stored in +% \sifile[A long description about the experimental data given in % this file]{nmr1.pdf}{PDF}{NMR spectra of compounds \CN{1}, % \CN{2}, \CN{6} and \CN{7}.} % \end{suppinfo} % \end{LaTeXdemo} % % \DescribeEnv{\LaTeX\ source}A Supporting Information File can be created from -% a \LaTeX\ source using the Beilstein \LaTeX\ class. The same syntax that was -% used for the title page of the main manuscript -% can be used for the Supporting Information. An additional title for the -% Supporting Information (e.g.\ ``Additional experimental data'') can be added +% a \LaTeX\ source using the Beilstein \LaTeX\ class. The same syntax that is +% used for the title page of the main manuscript can be used for the +% Supporting Information. An additional title for the +% Supporting Information (e.g., ``Additional experimental data'') can be added % by using the \oarg{sititle} option of the \cs{title} command: % \cs{title\oarg{sititle}\marg{manuscript title}}.\\ % \DescribeMacro{\sititle} @@ -833,8 +845,8 @@ This work consists of the files beilstein.dtx, % \DescribeEnv{figure} % \DescribeEnv{table} % \DescribeEnv{scheme} -% \LaTeX\ already knows about the built-in environments \env{table} -% and \env{figure}. For \BJNANO publications a third environment is added: +% In addition to the environments \env{table} and \env{figure} already included +% in \LaTeX , there is a third environment for \BJNANO publications, i.e., % \env{scheme}. There is no difference in usage between \env{scheme} % and the former two. To add a scheme ``AScheme.pdf'' you can enter the % following: @@ -848,14 +860,13 @@ This work consists of the files beilstein.dtx, % % \noindent\fcolorbox{black}{red!40}{\parbox{% % \dimexpr\textwidth-2\fboxsep-2\fboxrule\relax}{% -% PDF\LaTeX\ is limited to a small set of graphic formats. All files have -% to be either in the PDF, PNG or JPG format. The EPS format is fine as well, -% because it can be converted easily to PDF (e.g.\ using \textsf{epstopdf}).}} +% pdf\LaTeX\ is limited to a small set of graphic formats. All files have +% to be either in the PDF, PNG or JPG format.\\ +% Using EPS graphics will lead to an error during upload to the submission +% system. EPS graphics need to be converted to PDF, e.g., by using the package +% \pkg{epstopdf}, before uploading the manuscript to the submission system.}} % % \vspace{\baselineskip} -% Other formats such as SVG or WMF have to be processed with a converter such as -% \textsf{ImageMagick} \cite{ImageMagick}. -% % \DescribeMacro{\caption}\DescribeMacro{\label} % Please note that it does not matter whether \cs{caption} is put above or % below \cs{includegraphics}. The caption will always be below the scheme in @@ -881,9 +892,7 @@ This work consists of the files beilstein.dtx, % floats without bothering about the correct width. For single-column % floats you can use \cs{sglcolfigure\marg{filename}} and % \cs{sglcolscheme\marg{filename}} as well as the environments -% \env{sglcoltabular} and \env{sglcoltabularx}. The latter two are -% meant as a replacement for \env{tabular} and \env{tabularx} -% respectively. +% \env{sglcoltabular} and \env{sglcoltabularx}. % % A single-column scheme containing ``results-sil.pdf'' can % then be inserted as: @@ -896,9 +905,11 @@ This work consists of the files beilstein.dtx, % \label{scheme:silylketenes} % \end{scheme} % \end{LaTeXdemo} -% \pagebreak -% \DescribeMacro{\dblcolfigure}\DescribeMacro{\dblcolscheme} -% \DescribeEnv{dblcoltabular}\DescribeEnv{dblcoltabularx} +% \newpage +% \DescribeMacro{\dblcolscheme}% +% \DescribeMacro{\dblcolfigure}% +% \DescribeEnv{dblcoltabular}% +% \DescribeEnv{dblcoltabularx} % The same macros and environments with ``dbl'' instead of ``sgl'' are % defined for double-column floats. Thus for a table you can use: % \begin{LaTeXdemo}[code only] @@ -925,12 +936,12 @@ This work consists of the files beilstein.dtx, % % \DescribeEnv{longtable} % If you have a table that is longer than one page, please use the -% \env{longtable} environment. Have a look at the package's -% documentation for more information. +% \env{longtable} environment. Please see the documentation of the package +% for more information. % % \DescribeMacro{\footnote} -% Footnotes are only allowed in tables (see appendix). -% You can use them in the legend as well as within the table. +% Footnotes are only allowed in tables (see Appendix section). +% You can use them in the caption as well as within the table. % Lowercase letters are used automatically and the footnote text is % written below the table. % @@ -952,52 +963,22 @@ This work consists of the files beilstein.dtx, % \end{table} % \end{LaTeXdemo} % -% \subsection{Cross-references} -% One of \LaTeX\ biggest advantages is its -% powerful mechanism for cross-references. Therefore you should use it -% for each of the different objects. This includes among others -% floats, Supporting Information files and other sections. Just add the -% standard \cs{label\marg{labelname}} command right after \cs{caption} -% or \cs{sifile} and call the \cs{ref\marg{labelname}} -% macro to get the correct number of the referenced object. In the -% example table above, \cs{ref\{tab:silylketenes\}} gives the actual -% number of the table. -% -% \DescribeMacro{\cref} -% To make this mechanism even more comfortable, the \pkg{Beilstein} class -% loads the package \pkg{cleveref} (only if installed already) which -% defines a command \cs{cref}. -% In addition to the number of the object its type is printed as well, -% i.e.\ instead of writing ``see table \cs{ref\{tab:silylketenes\}}'' -% a simple ``see \cs{cref\{tab:silylketenes\}}'' gives the same -% result. Note that \cs{cref} can also be used for cross-referencing -% to a ``Supporting Information File''. -% % \subsection{Writing chemistry} % \LaTeX\ is a very powerful tool for mathematical -% typesetting. All built-in commands and structures +% typesetting. All commands and structures included in % are provided by the \pkg{Beilstein} class as well. In addition, the -% packages of the \AmS, \pkg{amsmath, amssymb} etc., are loaded. +% packages of the \AmS, such as \pkg{amsmath} and \pkg{amssymb}, are loaded. % % \DescribeEnv{\$...\$}\DescribeEnv{equation} -% You can use the standard delimiters \$\ldots\$ like \$\cs{delta}\$ -% for $\delta$ for inline math and environments like -% \env{equation} for displayed math. Please use the inline math mode -% for single numbers like $-2$ as well to get the correct minus sign. -% Please note that -- as described in the ``Instructions for Authors'' -- -% equations must fit a width of 8.2\,cm (single column), and longer -% equations should be split accordingly. -% -% \DescribeMacro{\up...} -% Small Greek letters are usually printed in italics. If the letters should be -% in an upright font, please use \cs{up...}, e.g.\ \cs{upalpha} for $\upalpha$. -% -% \DescribeMacro{\var...} -% \pkg{amsmath} provides special commands for upper Greek letters in -% italics, e.g.\ \cs{varTheta} for $\varTheta$. +% You can use the standard delimiters \$\ldots\$ for inline math and +% environments such as \env{equation} for math floats. Please use the inline +% math mode for single numbers such as $-2$ to obtain the correct minus sign. +% Please note that --- as described in the ``Instructions for Authors'' --- +% equations must fit a width of 8.2\,cm (single column). Wider equations need to +% be split accordingly. % % \DescribeMacro{\text} -% If you have text inside a formula, e.g.\ as an index, you can use +% If you have text inside a formula, e.g., as an index, you can use % \cs{text} to typeset it in an upright font and in the correct size. % \begin{LaTeXdemo}[code only] % $\text{amplitude sensitivity}=10$\\ @@ -1006,28 +987,25 @@ This work consists of the files beilstein.dtx, % % However, for chemical elements and reactions the \LaTeX\ math mode is not % sufficient, because many chemical expressions have to be typeset -% in an upright font and not in italics. For example, have a look at -% \texttt{\$O\_2\$} which results in $O_2$ instead of O$_2$. Using -% \cs{text} as mentioned is possible as well as writing -% \texttt{O\$\_2\$}, but both methods are not very -% comfortable when they have to be applied at several places. -% On the other hand the commands \texttt{\_} for subscripts and -% \texttt{\^} for superscripts should remain. Therefore a special \cs{chem} -% macro is provided by the \pkg{Beilstein} class. +% in an upright font and not in italics. For example, \texttt{\$O\_2\$} +% results in $O_2$ instead of O$_2$. Using \cs{text} or writing +% \texttt{O\$\_2\$} can solve this issue, but both methods are not very +% comfortable when they have to be applied multiple times. Therefore a +% special \cs{chem} macro is provided by the \pkg{Beilstein} class. % % \vskip2ex% % \noindent\textbf{Chemical specialities: the \cs{chem} and \cs{unit} macros}\\ -% Although there already exist many powerful packages like +% Although there are already many powerful packages such as % \pkg{siunitx} or \pkg{chemsym} to write physical and chemical units % and symbols, the \pkg{Beilstein} class implements its own rather % simple interface to keep all submitted documents consistent and make -% it easier to process them during the final typesetting. +% it easier to process them during final typesetting. % % \DescribeMacro{\chem} % \DescribeMacro{^}\DescribeMacro{_} % For chemical formulas the macro \cs{chem} is defined. Inside its -% argument \texttt{\_} and \texttt{\^} are active like in the math -% mode. The rest, e.g.\ element names are written in an upright format. +% argument \texttt{\_} and \texttt{\^} are active in the same way as in the math +% mode. All text, e.g., element names is typeset in an upright font. % \begin{LaTeXdemo}[code and example]% % \chem{CuCl_2} and \chem{{SO_4}^{2-}}\\ % \chem{^2_1H+{^3_1H}}\\ @@ -1035,10 +1013,10 @@ This work consists of the files beilstein.dtx, % \end{LaTeXdemo} % % \DescribeMacro{\unit} -% For units more or less the same is valid. For instance, writing +% The same applies to physical units. For instance, writing % \texttt{\$cm\^{}2\$} does not result in cm$^2$, but $cm^2$. Thus, -% you should use \cs{unit} to enter all units correct and more -% comfortable. If more than one unit is needed, +% \cs{unit} can be used to enter all units correctly and more +% comfortably. If more than one unit is needed, % \texttt{\textasciitilde} can be used to separate them. % % \begin{LaTeXdemo}[code and example] @@ -1046,31 +1024,6 @@ This work consists of the files beilstein.dtx, % $C_\text{PEG}=170\unit{mg/ml}$ % \end{LaTeXdemo} % -% \DescribeMacro{\angstrom} -% \DescribeMacro{\celsius} -% \DescribeMacro{\degree} -% \DescribeMacro{\permil} -% \DescribeMacro{\percent} -% Some units have special macros to make their use easier (see -% Table~\ref{tab:units}). The commands \cs{percent} and \cs{permil} can -% be used in the main text as well. -% \begin{table} -% \centering -% \caption{Special macros for units.} -% \label{tab:units} -% \begin{tabular}{lll} -% \toprule -% Unit name & \LaTeX\ macro & Output\\\midrule -% \r{a}ngstr\"{o}m & \cs{angstrom} & \AA\\ -% celsius & \cs{celsius} & \ensuremath{{}^{\circ}}\kern-\scriptspace C\\ -% degree & \cs{degree} & \ensuremath{{}^{\circ}}\\ -% permil & \cs{permil} & \textperthousand\\ -% percent & \cs{percent} & \%\\ -% \bottomrule -% \end{tabular} -% \end{table} -% -% \pagebreak % \DescribeMacro{\rightarrow} % \DescribeMacro{\rightleftarrows} % \DescribeMacro{\rightleftharpoons} @@ -1088,8 +1041,7 @@ This work consists of the files beilstein.dtx, % % \begin{LaTeXdemo}[code and example] % \chem{CH_4+2O_2\rightarrow CO_2 + 2H_2O}\\ -% \chem{2H_{2(g)}+O_{2(g)}\to 2H_2 O_{(l)}\ \Delta H=-286 % -% \unit{\frac{kJ}{mol}}}\\ +% \chem{2H_{2(g)}+O_{2(g)}\to 2H_2 O_{(l)}} $\Delta H=-286$\unit{kJ/mol}\\ % \chem{N_{2(g)}+3H_{2(g)}\rightleftharpoons 2NH_{3(g)}} % \end{LaTeXdemo} % @@ -1120,60 +1072,46 @@ This work consists of the files beilstein.dtx, % % \DescribeMacro{\IUPAC} % \DescribeMacro{\-}\DescribeMacro{\|} -% Some chemical products have quite a long name which sometimes -% results in a bad hyphenation. If you want to influence this you -% can use \cs{-} for breakable hyphens and \cs{|} for invisible -% breakpoints and then pass it as an argument to \cs{IUPAC}, e.g.\\\ -% \cs{IUPAC\{4,7-dimethyl\cs{-}3,5,7-tri\cs{|}hydro-1,2,4,7-tetrazocin\cs{-}3,8-dione\}}. +% Long names of chemical compounds sometimes are hyphenated badly. +% This can be controlled by using \cs{-} for hyphens and \cs{|} +% for soft hyphens as arguments in \cs{IUPAC}, e.g.,\\ +%\cs{IUPAC\{4,7-dimethyl\cs{-}3,5,7-tri\cs{|}hydro-1,2,4,7-tetrazocin\cs{-}3,8-dione\}}. % +% \vspace{\baselineskip}% % \noindent\textbf{Chemical structures from external programs}\\ -% There are a lot of highly specified software programs like -% \textsf{ChemDraw\textsuperscript{\textregistered}} to draw complex chemical -% structures. You should -% always use such programs and then export your drawings to a pdf file -% and include it into your \LaTeX\ document as described in +% There is a lot of highly specified software such as +% \textsf{ChemDraw\textsuperscript{\textregistered}} to draw complex chemical +% structures. You should always use such programs and then export your drawings +% to the PDF format to be included in your \LaTeX\ document as described in % section~\ref{sec:floats}. -% If you get an eps file that is fine as well. You just have to convert it -% with \textsf{epstopdf}~\texttt{file.eps} from the command line (shell). -% You can export your graphic file to more or less every format -% and convert it to pdf, but using a vector format right away is -% highly recommended. % % \section{Managing references with \texorpdfstring{\BibTeX}{BiBTeX}} % \subsection{The \texorpdfstring{\BibTeX}{BiBTeX} style files} % The \pkg{Beilstein} bundle includes a special \BibTeX\ style -% \file{bjnano.bst} which implements all needed entry types and fields -% as well as format specifications of the \BJNANO. -% It is always used -% automatically by the \pkg{Beilstein} class. The only thing -% you have to do is to store all your bibliography data in a \BibTeX\ file. -% The exact structure of this \BibTeX\ database is described in +% \file{bjnano.bst}, which implements all needed entry types and fields +% as well as format specifications of the \BJNANO. It is always used +% automatically by the \pkg{Beilstein} class. The exact structure of a suitable +% \BibTeX\ database for \BJNANO is described in % section~\ref{sec:structure}. % -% \DescribeMacro{\cite} -% To cite any of your references the \LaTeX\ macro \cs{cite} gets a -% single key or a list of keys for those entries, i.e.\ -% \cs{cite\marg{key}} or \cs{cite\marg{key1,...,keyN}}. -% % \DescribeMacro{\bibliography} -% To output the section ``References'' containing all information -% from the \BibTeX\ database for all citations given with -% the \cs{cite} command, the standard call -% \cs{bibliography\marg{database}} has to be used just before +% To generate the section ``References'' containing all information +% from the \BibTeX\ database for all citations, the command +% \cs{bibliography\marg{database}} is to be used just before % \cs{end\{document\}}. % % \subsection{Structure of a \texorpdfstring{\BibTeX}{BibTeX} database} % \label{sec:structure} % The \BibTeX\ programming language knows the most common entry -% types cited in academic papers. However, a few like ``WWW'' for +% types cited in academic papers. However, a few such as ``WWW'' for % internet resources and links or ``SOFTWARE'' are missing. They % could be emulated, but it is much better to directly introduce them to % \BibTeX. The same is valid for special data fields. % -% On the other hand, not all entry types and fields, that are in included in -% \BibTeX, are needed and allowed in \BJNANO submissions. They could even mess -% up the output when not treated correctly. Therefore the entry types are -% restricted to the following ones: +% Not all entry types and fields that are in included in \BibTeX +% are needed and allowed in \BJNANO submissions. They could even lead to +% erroneous output when not treated correctly. Therefore the entry types are +% restricted to the following: % \begin{multicols}{3} % \small % \begin{itemize}\ttfamily @@ -1188,42 +1126,39 @@ This work consists of the files beilstein.dtx, % \item @PROCEEDINGS % \item @SOFTWARE % \item @WWW -% \item[]~ +% \item []~ % \end{itemize} % \end{multicols} % -% \noindent In addition to the well known data fields the following ones were +% \noindent In addition to the well-known data fields the following data fields were % added: % \begin{description} -% \item[doi] Digital Object Identifier, e.g.\ -% \verb+doi = {10.1080/02678290500291699}+\\(optional for \texttt{@article} -% and \texttt{@inpress}) -% \item[url] URL for any internet source, e.g.\\ -% \verb+url = {http://www.beilstein-journals.org/bjnano}+ (mandatory for +% \item[doi] Digital Object Identifier, e.g.,\\ +% \verb+doi = {10.1080/02678290500291699}+\\ +% (optional for all references) +% \item[url] URL for any internet source, e.g.,\\ +% \verb+url = {https://www.beilstein-journals.org/bjnano}+\\(mandatory for % \texttt{@WWW}) -% \item[urldate] Date when the url was visited last, e.g.\ -% \verb+urldate = {Sep 12, 2007}+ (mandatory for \texttt{@WWW}) -% \item[venue] Information about a conference (place and time), e.g.\\ -% \verb+venue = {Baltimore, MD, June 27--30, 1996}+\\(mandatory for -% \texttt{@PROCEEDINGS} and \texttt{@INPROCEEDINGS} -% \item[version] Version of a software, e.g.\ -% \verb+version = {Revision C.02}+ (mandatory for \texttt{@SOFTWARE}) +% \item[urldate] Date when the url was visited last, e.g.,\\ +% \verb+urldate = {Sep 12, 2007}+\\(mandatory for \texttt{@WWW}) +% \item[venue] Information about a conference (place and time), e.g.,\\ +% \verb+venue = {Baltimore, MD, June 27--30, 1996}+\\(optional for +% \texttt{@PROCEEDINGS} and \texttt{@INPROCEEDINGS}) +% \item[version] Version of a software, e.g., +% \verb+version = {Revision C.02}+\\(mandatory for \texttt{@SOFTWARE}) % \end{description}% % % \noindent\fcolorbox{black}{red!40}{\parbox{% % \dimexpr\textwidth-2\fboxsep-2\fboxrule\relax}{The% % \pkg{Beilstein} bundle contains the file ``beilstein-template.bib'' with % example entries for all types of references -% described in \cite[pp 5--6]{Beilstein-MSG}.}}% -% \newpage +% described in \cite{Beilstein-MSG}.}}% % \begin{thebibliography}{9} -% \bibitem{Beilstein-MSG}\emph{Beilstein-Institut:} Instructions for Authors -% for the \BJNANO, Version 1.1. +% \bibitem{Beilstein-MSG}\BJNANO Instructions for Authors. +% \url{https://www.beilstein-journals.org/bjnano/authorInstructions} % \bibitem{doc-tabularx}\emph{David Carlisle:} The \pkg{tabularx} -% package, v2.07 (1999/01/07), % -% \url{http://www.ctan.org/tex-archive/help/Catalogue/entries/tabularx.html}. -% \bibitem{ImageMagick}\emph{ImageMagick:} Convert, Edit, and Compose -% Images, \url{http://www.imagemagick.org}. +% package, v2.11 (2016-02-03), % +% \url{https://ctan.org/pkg/tabularx}. % \end{thebibliography} % % \newpage @@ -1232,7 +1167,7 @@ This work consists of the files beilstein.dtx, % \section*{Appendix}\label{appendix}\markboth{\appendixname}{\appendixname} % \subsection*{Deactivated macros}\label{sec:forbidden} % A few macros were -% ``deactivated'', i.e.\ their usage results in an error. Right now +% ``deactivated'', i.e., their usage results in an error. Right now % this is valid for the standard commands listed in % Table~\ref{tab:forbidden}. % \begin{table} @@ -1250,7 +1185,7 @@ This work consists of the files beilstein.dtx, % \bottomrule % \end{tabular} % \begin{flushleft}\footnotesize -% \textsuperscript{\textit{a}}\cs{footnote} remains active in the \env{table} +% \textsuperscript{\textit{a}}\cs{footnote} remains active in the \env{table} % environment. % \end{flushleft} % \end{minipage} @@ -1265,79 +1200,91 @@ This work consists of the files beilstein.dtx, % \endfoot % \bottomrule % \endlastfoot -% beilstein.cls & 2019/10/30 v1.5 Template for submissions to the ``Beilstein +% beilstein.cls & 2020/02/11 v2.0 Template for submissions to the ``Beilstein % Journal of Nanotechnology'' (BJNANO)\\ % xkeyval.sty & 2014/12/03 v2.7a package option processing (HA)\\ % xkeyval.tex & 2014/12/03 v2.7a key=value parser (HA)\\ % ifthen.sty & 2014/09/29 v1.1c Standard LaTeX ifthen package (DPC)\\ -% article.cls & 2018/09/03 v1.4i Standard LaTeX document class\\ -% size12.clo & 2018/09/03 v1.4i Standard LaTeX file (size option)\\ -% babel.sty & 2019/07/19 3.33 The Babel package\\ -% bblopts.cfg & 2005/09/08 v0.1 add Arabic and Farsi to ``declared'' options of +% article.cls & 2019/10/25 v1.4k Standard LaTeX document class\\ +% size12.clo & 2019/10/25 v1.4k Standard LaTeX file (size option)\\ +% babel.sty & 2020/01/15 3.38 The Babel package\\ +% bblopts.cfg & 2005/09/08 v0.1 add Arabic and Farsi to "declared" options of % babel\\ % american.ldf & 2017/06/06 v3.3r English support from the babel system\\ % inputenc.sty & 2018/08/11 v1.3c Input encoding file\\ % fontenc.sty\\ % t1enc.def & 2018/08/11 v2.0j Standard LaTeX file\\ -% mathptmx.sty & 2005/04/12 PSNFSS-v9.2a Times w/ Math, improved (SPQR, WaS) \\ -% helvet.sty & 2005/04/12 PSNFSS-v9.2a (WaS) \\ -% courier.sty & 2005/04/12 PSNFSS-v9.2a (WaS) \\ % textcomp.sty & 2018/08/11 v2.0j Standard LaTeX package\\ % ts1enc.def & 2001/06/05 v3.0e (jk/car/fm) Standard LaTeX file\\ -% ts1enc.dfu & 2018/10/05 v1.2f UTF-8 support for inputenc\\ -% geometry.sty & 2018/04/16 v5.8 Page Geometry\\ -% ifpdf.sty & 2018/09/07 v3.3 Provides the ifpdf switch\\ -% ifvtex.sty & 2016/05/16 v1.6 Detect VTeX and its facilities (HO)\\ -% ifxetex.sty & 2010/09/12 v0.6 Provides ifxetex conditional\\ -% geometry.cfg\\ -% setspace.sty & 2011/12/19 v6.7a set line spacing\\ -% ragged2e.sty & 2019/07/28 v2.2 ragged2e Package (MS)\\ -% everysel.sty & 2011/10/28 v1.2 EverySelectfont Package (MS)\\ -% footmisc.sty & 2011/06/06 v5.5b a miscellany of footnote facilities\\ -% lineno.sty & 2005/11/02 line numbers on paragraphs v4.41\\ -% amsmath.sty & 2018/12/01 v2.17b AMS math features\\ +% ts1enc.dfu & 2019/07/11 v1.2j UTF-8 support for inputenc\\ +% tgheros.sty & 2009/09/27 v1.2 TeX Gyre Heros as default sans serif family\\ +% kvoptions.sty & 2019/11/29 v3.13 Key value format for package options (HO)\\ +% ltxcmds.sty & 2019/12/15 v1.24 LaTeX kernel commands for general use (HO)\\ +% kvsetkeys.sty & 2019/12/15 v1.18 Key value parser (HO)\\ +% amsmath.sty & 2019/11/16 v2.17d AMS math features\\ % amstext.sty & 2000/06/29 v2.01 AMS text\\ % amsgen.sty & 1999/11/30 v2.0 generic functions\\ % amsbsy.sty & 1999/11/29 v1.2d Bold Symbols\\ % amsopn.sty & 2016/03/08 v2.02 operator names\\ % amssymb.sty & 2013/01/14 v3.01 AMS font symbols\\ % amsfonts.sty & 2013/01/14 v3.01 Basic AMSFonts support\\ -% multicol.sty & 2018/12/27 v1.8v multicolumn formatting (FMi)\\ +% newtxtext.sty & 2018/03/27 v1.531\\ +% fontaxes.sty & 2014/03/23 v1.0d Font selection axes\\ +% etoolbox.sty & 2019/09/21 v2.5h e-TeX tools for LaTeX (JAW)\\ +% mweights.sty & 2017/03/30 (Bob Tennent) Support package for multiple-weight +% font packages. \\ +% fontenc.sty\\ +% t1enc.def & 2018/08/11 v2.0j Standard LaTeX file\\ +% newtxtt.sty & 2014/12/23 v1.051\\ +% newtxmath.sty & 2020/01/11 v1.623\\ +% ifxetex.sty & 2019/10/25 v0.7 ifxetex legacy package. Use iftex instead.\\ +% iftex.sty & 2019/11/07 v1.0c TeX engine tests\\ +% ifluatex.sty & 2019/10/25 v1.5 ifluatex legacy package. Use iftex instead.\\ +% centernot.sty & 2016/05/16 v1.4 Centers the not symbol horizontally (HO)\\ +% binhex.tex\\ +% geometry.sty & 2020/01/02 v5.9 Page Geometry\\ +% ifvtex.sty & 2019/10/25 v1.7 ifvtex legacy package. Use iftex instead.\\ +% geometry.cfg\\ +% setspace.sty & 2011/12/19 v6.7a set line spacing\\ +% ragged2e.sty & 2019/07/28 v2.2 ragged2e Package (MS)\\ +% everysel.sty & 2011/10/28 v1.2 EverySelectfont Package (MS)\\ +% footmisc.sty & 2011/06/06 v5.5b a miscellany of footnote facilities\\ +% lineno.sty & 2005/11/02 line numbers on paragraphs v4.41\\ +% multicol.sty & 2019/03/01 v1.8w multicolumn formatting (FMi)\\ % float.sty & 2001/11/08 v1.3d Float enhancements (AL)\\ % flafter.sty & 2018/11/28 v1.4d Standard LaTeX floats after reference (FMi)\\ % graphicx.sty & 2017/06/01 v1.1a Enhanced LaTeX Graphics (DPC,SPQR)\\ -% graphics.sty & 2017/06/25 v1.2c Standard LaTeX Graphics (DPC,SPQR)\\ +% graphics.sty & 2019/11/01 v1.3d Standard LaTeX Graphics (DPC,SPQR)\\ % trig.sty & 2016/01/03 v1.10 sin cos tan (DPC)\\ % graphics.cfg & 2016/06/04 v1.11 sample graphics configuration\\ % pdftex.def & 2018/01/08 v1.0l Graphics/color driver for pdftex\\ -% array.sty & 2018/12/30 v2.4k Tabular extension package (FMi)\\ +% array.sty & 2019/08/31 v2.4l Tabular extension package (FMi)\\ % tabularx.sty & 2016/02/03 v2.11b `tabularx' package (DPC)\\ -% longtable.sty & 2014/10/28 v4.11 Multi-page Table package (DPC)+ FMi change\\ -% etoolbox.sty & 2019/09/21 v2.5h e-TeX tools for LaTeX (JAW)\\ +% longtable.sty & 2019/02/06 v4.12 Multi-page Table package (DPC)\\ % natbib.sty & 2010/09/13 8.31b (PWD, AO)\\ % url.sty & 2013/09/16 ver 3.4 Verb mode for urls, etc.\\ % xspace.sty & 2014/10/28 v1.13 Space after command names (DPC,MH)\\ +% t1ntxtlf.fd & 2015/01/17 v1.0 font definition file for T1/ntx/tlf\\ % cleveref.sty & 2018/03/27 v0.21.4 Intelligent cross-referencing\\ +% omlntxmi.fd & 2015/08/25 Fontinst v1.933 font definitions for OML/ntxmi.\\ +% untxexa.fd & 2012/04/16 Fontinst v1.933 font definitions for U/ntxexa.\\ % ts1cmr.fd & 2014/09/29 v2.5h Standard LaTeX font definitions\\ -% t1ptm.fd & 2001/06/04 font definitions for T1/ptm.\\ +% lmsntxsy.fd & 2016/07/02 Fontinst v1.933 font definitions for LMS/ntxsy.\\ +% lmxntxexx.fd & 2016/07/03 Fontinst v1.933 font definitions for LMX/ntxexx.\\ % supp-pdf.mkii\\ -% epstopdf-base.sty & 2016/05/15 v2.6 Base part for package epstopdf\\ -% infwarerr.sty & 2016/05/16 v1.4 Providing info/warning/error messages (HO)\\ -% grfext.sty & 2016/05/16 v1.2 Manage graphics extensions (HO)\\ -% kvdefinekeys.sty & 2016/05/16 v1.4 Define keys (HO)\\ -% ltxcmds.sty & 2016/05/16 v1.23 LaTeX kernel commands for general use (HO)\\ -% kvoptions.sty & 2016/05/16 v3.12 Key value format for package options (HO)\\ -% kvsetkeys.sty & 2016/05/16 v1.17 Key value parser (HO)\\ -% etexcmds.sty & 2016/05/16 v1.6 Avoid name clashes with e-TeX commands (HO)\\ -% ifluatex.sty & 2016/05/16 v1.4 Provides the ifluatex switch (HO)\\ -% pdftexcmds.sty & 2019/07/25 v0.30 Utility functions of pdfTeX for LuaTeX +% epstopdf-base.sty & 2019-12-09 v2.10 Base part for package epstopdf\\ +% infwarerr.sty & 2019/12/03 v1.5 Providing info/warning/error messages (HO)\\ +% grfext.sty & 2019/12/03 v1.3 Manage graphics extensions (HO)\\ +% kvdefinekeys.sty & 2019-12-19 v1.6 Define keys (HO)\\ +% pdftexcmds.sty & 2019/11/24 v0.31 Utility functions of pdfTeX for LuaTeX % (HO)\\ -% t1phv.fd & 2001/06/04 scalable font definitions for T1/phv.\\ -% ot1ztmcm.fd & 2000/01/03 Fontinst v1.801 font definitions for OT1/ztmcm.\\ -% omlztmcm.fd & 2000/01/03 Fontinst v1.801 font definitions for OML/ztmcm.\\ -% omsztmcm.fd & 2000/01/03 Fontinst v1.801 font definitions for OMS/ztmcm.\\ -% omxztmcm.fd & 2000/01/03 Fontinst v1.801 font definitions for OMX/ztmcm.\\ -% ot1ptm.fd & 2001/06/04 font definitions for OT1/ptm.\\ +% t1qhv.fd & 2009/09/25 v1.2 font definition file for T1/qhv\\ +% ot1ntxtlf.fd & 2015/01/17 v1.0 font definition file for OT1/ntx/tlf\\ +% umsa.fd & 2013/01/14 v3.01 AMS symbols A\\ +% umsb.fd & 2013/01/14 v3.01 AMS symbols B\\ +% untxmia.fd & 2018/04/14 Fontinst v1.933 font definitions for U/ntxmia.\\ +% untxsym.fd & 2015/03/20 Fontinst v1.933 font definitions for U/ntxsym.\\ +% untxsyc.fd & 2012/04/12 Fontinst v1.933 font definitions for U/ntxsyc.\\ % \end{longtable} % % \normalsize @@ -1350,7 +1297,7 @@ This work consists of the files beilstein.dtx, % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{beilstein} -[2019/10/30 v1.5 Template for submissions to the ``Beilstein Journal % +[2020/02/22 v2.0 Template for submissions to the ``Beilstein Journal % of Nanotechnology'' (BJNANO)] % \end{macrocode} % For class options key-value pairs are used. They are provided by the @@ -1366,7 +1313,7 @@ This work consists of the files beilstein.dtx, \newif\iflangamerican \DeclareOptionX<beilstein>{american}{% \langamericantrue% -}% +}% \DeclareOptionX<beilstein>{british}{% \langamericanfalse% } @@ -1381,8 +1328,9 @@ This work consists of the files beilstein.dtx, \DeclareOptionX<beilstein>{applemac}{\def\beilstein@inputenc{applemac}} % \end{macrocode} % Setup the defaults +% \changes{v2.0}{2020/02/05}{utf8 is now the default option} % \begin{macrocode} -\ExecuteOptionsX<beilstein>{american,latin1} +\ExecuteOptionsX<beilstein>{american,utf8} % \end{macrocode} % There are five types of documents which differ in their structure. To % check it the concrete manuscript type can be given with the type @@ -1434,18 +1382,21 @@ This work consists of the files beilstein.dtx, \else% \RequirePackage[british]{babel}% \ClassInfo{beilstein}{Language has been set to British English}% -\fi% +\fi% \RequirePackage[\beilstein@inputenc]{inputenc} -\ClassInfo{beilstein}{Input encoding has been set to \beilstein@inputenc}\RequirePackage{inputenc} +\ClassInfo{beilstein}{Input encoding has been set to \beilstein@inputenc} \RequirePackage[T1]{fontenc} % \end{macrocode} -% Set up fonts. The document is typeset in Times, for sans serif and % -% typewriter Helvetica and Courier will be used. +% Set up fonts. The document is typeset using TX fonts, for sans serif TeX +% Gyre Heros will be used. % \begin{macrocode} -\RequirePackage{mathptmx} -\RequirePackage[scaled=0.91]{helvet} -\RequirePackage{courier} -\RequirePackage{textcomp} +\RequirePackage[full]{textcomp} +\RequirePackage[scale]{tgheros} +\RequirePackage[intlimits,sumlimits,namelimits,fleqn]{amsmath} +\RequirePackage{amssymb} +\RequirePackage{newtxtext} +\RequirePackage[zerostyle=a]{newtxtt} +\RequirePackage{newtxmath} % \end{macrocode} % Set up the page geometry. All articles are typeset doublespaced and % % flushleft. The \pkg{ragged2e} package gives better results for ragged % @@ -1465,7 +1416,7 @@ This work consists of the files beilstein.dtx, % \end{macrocode} % For the Referee's version line numbers are pretty useful. Some % modifications must be done to make \pkg{lineno} work with -% \pkg{amsmath} (see e.g.\ \url{http://phaseportrait.blogspot.com/2007/ +% \pkg{amsmath} (see e.g., \url{http://phaseportrait.blogspot.com/2007/ % 08/lineno-and-amsmath-compatibility.html}) % Additionally all equations' width can be limited. The environment % widetext allows equations of the whole text width. @@ -1548,9 +1499,7 @@ This work consists of the files beilstein.dtx, % \cs{chem} and \cs{unit}. Additionally macros for some special units % are defined. % \begin{macrocode} -\RequirePackage[intlimits,sumlimits,namelimits,fleqn]{amsmath} \setlength{\mathindent}{1.6cm}% -\RequirePackage{amssymb} \DeclareFontFamily{U}{eur}{\skewchar\font'177} \DeclareFontShape{U}{eur}{m}{n}{% <-6> eurm5 <6-8> eurm7 <8-> eurm10}{} @@ -1644,7 +1593,7 @@ This work consists of the files beilstein.dtx, {} }% % \end{macrocode} -% If the \pkg{bpchem} has not been loaded we take some of its definitions +% If the \pkg{bpchem} has not been loaded we take some of its definitions % and add them to the beginning of the document. % \begin{macrocode} \AtBeginDocument{% @@ -1666,13 +1615,13 @@ This work consists of the files beilstein.dtx, \Prep}% \expandafter\DeclareRobustCommand\expandafter\|\expandafter{\|} % \end{macrocode} -% \changes{v1.2}{2017/08/21}{Removed definition for robust \cs{-} due to +% \changes{v1.2}{2017/08/21}{Removed definition for robust \cs{-} due to % conflict with recent \LaTeX{} versions.} % \begin{macrocode} }% % \end{macrocode} -% Recent \LaTeX{} versions define \cs{-} as robust. \pkg{bpchem} up to v1.06 -% does this as well, which results in a infinite loop. We therefore take the +% Recent \LaTeX{} versions define \cs{-} as robust. \pkg{bpchem} up to v1.06 +% does this as well, which results in a infinite loop. We therefore take the % definition from the latest LaTeX version and use it in all cases. % \begin{macrocode} \DeclareRobustCommand{\-}{% @@ -1808,7 +1757,7 @@ This work consists of the files beilstein.dtx, \restylefloat{table} \floatstyle{plain} \restylefloat{figure} -% Try to place figures and tables ``here'', i.e.\ after the current % +% Try to place figures and tables ``here'', i.e., after the current % % paragraph, first. The \pkg{flafter} package automatically places % % floats after the first reference. % \begin{macrocode} @@ -1837,7 +1786,7 @@ This work consists of the files beilstein.dtx, \newfloat{scheme}{htb}{los} \floatname{scheme}{Scheme} % \end{macrocode} -% For graphics (PDF,PNG and JPG) the standard package \pkg{graphicx} % +% For graphics (PDF, PNG and JPG) the standard package \pkg{graphicx} % % is loaded. % \begin{macrocode} \RequirePackage{graphicx} @@ -1872,7 +1821,7 @@ This work consists of the files beilstein.dtx, % Referencing floats is one of LaTeXs advantages. The \pkg{cleveref} % % package extends those abilities even further. % -% To avoid problems when \pkg{hyperref} is used as well, we postpone the +% To avoid problems when \pkg{hyperref} is used as well, we postpone the % packages's loading to the very end of the preamble. % \changes{1.3}{2017/11/09}{Postpone loading of \pkg{cleveref}} % \begin{macrocode} @@ -1975,7 +1924,7 @@ This work consists of the files beilstein.dtx, \else \ifcase\NAT@ctype \ifx\NAT@last@nm\NAT@nm \NAT@yrsep\NAT@penalty\NAT@space\else - \@citea + \@citea \NAT@test{\@ne}\NAT@spacechar\NAT@mbox{\NAT@super@kern\NAT@@open}% \fi \if*#1*\else#1\NAT@spacechar\fi @@ -2271,7 +2220,7 @@ This work consists of the files beilstein.dtx, \Large\bfseries {Supporting Information}\\ \textmd{for}\\ - \@title\par\vspace{\baselineskip}% + \@title\par\vspace{\baselineskip}% \end{center} \normalsize \authors% @@ -2285,19 +2234,19 @@ This work consists of the files beilstein.dtx, \ifthenelse{\boolean{corauth}}% {}% {\ifthenelse{\value{c@totauthor}>1}% - {\ClassError{beilstein}{At least one corresponding author has to be + {\ClassError{beilstein}{At least one corresponding author has to be given.\MessageBreak Please use \string\author*\space for that}% - {Please use at least one \string\author* command to set + {Please use at least one \string\author* command to set information % - about the corresponding author.\MessageBreak Have a look at + about the corresponding author.\MessageBreak Have a look at the % documentation for more details}% }% {\ifthenelse{\equal{\emails}{}}% - {\ClassError{beilstein}{The author has been made corresponding - author.\MessageBreak Therefore please provide an email address + {\ClassError{beilstein}{The author has been made corresponding + author.\MessageBreak Therefore please provide an email address for the author}% - {Use the second optional argument for that or use + {Use the second optional argument for that or use \string\author* instead}}{}% }% }% @@ -2307,11 +2256,11 @@ This work consists of the files beilstein.dtx, \par\vskip3ex \normalsize Email:\space\emails\par\vskip2ex \textsuperscript{$\ast$}\space{\small Corresponding author}% - \par\vfill% + \par\vfill% \begin{center} \Large\bfseries\@suppinfotitle% \end{center} - \clearpage% + \clearpage% }% }% {% @@ -2328,20 +2277,20 @@ This work consists of the files beilstein.dtx, \par\vskip2ex% \ifthenelse{\boolean{corauth}}{}% {\ifthenelse{\value{c@totauthor}>1}% - {\ClassError{beilstein}{At least one corresponding author has to - be given.\MessageBreak Please use \string\author*\space for + {\ClassError{beilstein}{At least one corresponding author has to + be given.\MessageBreak Please use \string\author*\space for that}% - {Please use at least one \string\author* command to set + {Please use at least one \string\author* command to set information % - about the corresponding author.\MessageBreak Have a look + about the corresponding author.\MessageBreak Have a look at the % documentation for more details}% }% {\ifthenelse{\equal{\emails}{}}% - {\ClassError{beilstein}{The author has been made - corresponding author.\MessageBreak Therefore please provide + {\ClassError{beilstein}{The author has been made + corresponding author.\MessageBreak Therefore please provide an email address for the author}% - {Use the second optional argument for that or use + {Use the second optional argument for that or use \string\author* instead}}{}% }% }% @@ -2377,7 +2326,7 @@ This work consists of the files beilstein.dtx, }% {% \renewenvironment{abstract}{\ClassWarning{beilstein}{An abstract % - should not be part of the chosen document type + should not be part of the chosen document type \beilstein@manuscript}}{}% \newcommand*{\background}{\relax}% \newcommand*{\results}{\relax}% @@ -2393,7 +2342,7 @@ This work consists of the files beilstein.dtx, \and\not\equal{\beilstein@manuscript}{\beilstein@manuscript@suppinfo}}% {\newcommand{\keywords}[1]{\textbf{\large Keywords}\\*#1}}% {\newcommand{\keywords}[1]{% - \ClassWarning{beilstein}{Keywords should not be part of the + \ClassWarning{beilstein}{Keywords should not be part of the chosen document type \beilstein@manuscript}}} % \end{macrocode} % Acknowledgments should be made inside the special environment. @@ -3769,6 +3718,7 @@ FUNCTION {www} format.url output after.item 'output.state := format.urldate output + format.doi output fin.entry } @@ -3813,72 +3763,6 @@ FUNCTION {other} {patent} FUNCTION {default.type} {misc} -MACRO {jan} {"Jan."} -MACRO {feb} {"Feb."} -MACRO {mar} {"Mar."} -MACRO {apr} {"Apr."} -MACRO {may} {"May"} -MACRO {jun} {"June"} -MACRO {jul} {"July"} -MACRO {aug} {"Aug."} -MACRO {sep} {"Sept."} -MACRO {oct} {"Oct."} -MACRO {nov} {"Nov."} -MACRO {dec} {"Dec."} - -%% The ACS journals by CODEN -MACRO {achre4} {"Acc.\ Chem.\ Res."} -MACRO {acbcct} {"ACS Chem.\ Biol."} -MACRO {ancac3} {"ACS Nano"} -MACRO {ancham} {"Anal.\ Chem."} -MACRO {armcbi} {"Annu.\ Rep.\ Med.\ Chem."} -MACRO {bichaw} {"Biochemistry"} -MACRO {bcches} {"Bioconjugate Chem."} -MACRO {bjocbh} {"Beilstein J.~Org.\ Chem."} -MACRO {bomaf6} {"Biomacromolecules"} -MACRO {bipret} {"Biotechnol.\ Prog."} -MACRO {ccccak} {"Collect.\ Czech.\ Chem.\ Commun."} -MACRO {crtoec} {"Chem.\ Res.\ Toxicol."} -MACRO {chlsac} {"Chem.\ Listy"} -MACRO {chreay} {"Chem.\ Rev."} -MACRO {cmatex} {"Chem.\ Mater."} -MACRO {cmltag} {"Chem.\ Lett."} -MACRO {cgdefu} {"Cryst.\ Growth Des."} -MACRO {enfuem} {"Energy Fuels"} -MACRO {eoider} {"Expert Opin.\ Invest.\ Drugs"} -MACRO {eotpeg} {"Expert Opin.\ Ther.\ Pat."} -MACRO {esthag} {"Environ.\ Sci.\ Technol."} -MACRO {htcyam} {"Heterocycles"} -MACRO {iechad} {"Ind.\ Eng.\ Chem.\ Res."} -MACRO {inoraj} {"Inorg.\ Chem."} -MACRO {jafcau} {"J.~Agric.\ Food Chem."} -MACRO {jceaax} {"J.~Chem.\ Eng.\ Data"} -MACRO {jcisd8} {"J.~Chem.\ Inf.\ Model."} -MACRO {jctcce} {"J.~Chem.\ Theory Comput."} -MACRO {jcchff} {"J. Comb. Chem."} -MACRO {jmcmar} {"J. Med. Chem."} -MACRO {jnprdf} {"J. Nat. Prod."} -MACRO {joceah} {"J.~Org.\ Chem."} -MACRO {jpcafh} {"J.~Phys.\ Chem.~A"} -MACRO {jpcbfk} {"J.~Phys.\ Chem.~B"} -MACRO {jpccck} {"J.~Phys.\ Chem.~C"} -MACRO {jprobs} {"J.~Proteome Res."} -MACRO {jacsat} {"J.~Am.\ Chem.\ Soc."} -MACRO {langd5} {"Langmuir"} -MACRO {mamobx} {"Macromolecules"} -MACRO {mpohbp} {"Mol.\ Pharm."} -MACRO {nalefd} {"Nano Lett."} -MACRO {namefi} {"Nat.\ Med."} -MACRO {obcrak} {"Org.\ Biomol.\ Chem."} -MACRO {orlef7} {"Org.\ Lett."} -MACRO {oprdfk} {"Org.\ Proc.\ Res.\ Dev."} -MACRO {orgnd7} {"Organometallics"} -MACRO {pachas} {"Pure Appl.\ Chem."} -MACRO {phreeb} {"Pharm.\ Res."} -MACRO {syntbf} {"Synthesis"} -MACRO {teleay} {"Tetrahedron Lett."} -MACRO {tetrab} {"Tetrahedron"} - READ FUNCTION {initialize.controls} @@ -3909,7 +3793,7 @@ FUNCTION {format.lab.names} 'skip$ { s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" = { bbl.etal space.connect } - { bbl.and space.connect s #2 "{vv~}{ll}" format.name$ space.connect + { bbl.and space.connect s #2 "{vv~}{ll}" format.name$ space.connect } if$ } @@ -4069,12 +3953,12 @@ documents listed in the ``Instructions for Authors'', pp 5--6} @ARTICLE{Constantino2001, author = {Constantino, M. G. and V. Lacerda, Jr. and Aragao, V.}, year ={2001}, -journal = Molecules, +journal = {Molecules}, volume = 6, pages = {770--776} } -@COMMENT{Article within a journal with non-continuos (i.e.\ issue-based) pagination} +@COMMENT{Article within a journal with non-continuos (i.e., issue-based) pagination} @ARTICLE{Groeger2000, author = {Gr\"{o}ger, H. and Sans, J. and G\"{u}thner, T.}, journal = {Chim. Oggi}, @@ -4130,12 +4014,11 @@ pages = {770--776} } @COMMENT{Patent} -@COMMENT{``pages'' holds the patent number, ``journal'' the type of patent} +@COMMENT{``pages'' holds the patent number} @PATENT{Schimmel, author = {Schimmel, T. and Xie, F. and Obermair, C.}, title = {Gate controlled atomic switch}, - journal = {U.S. Pat. Appl.}, - pages = {20090195300}, + pages = {US20100128342A1}, year = {Aug 6, 2009} } @@ -4280,7 +4163,7 @@ school = {University of Karlsruhe, Germany} @ARTICLE{Masse1995, author = {Masse, C. E. and Panek, J. S.}, - journal = chreay, + journal = {Chem. Rev. (Washington, DC, U. S.)}, year = 1995, volume = 95, pages = {1293--1316} @@ -4289,7 +4172,7 @@ school = {University of Karlsruhe, Germany} @ARTICLE{Jian1995, author = {Jian, J. and Smith, D. T. and Weinreb, S. M.}, year ={1995}, -journal = joceah, +journal = {J. Org. Chem.}, volume = 60, pages = {5366--5367} } @@ -4297,14 +4180,14 @@ pages = {5366--5367} @ARTICLE{Weinreb1998, author = {Weinreb, S. M. and Smith, D. T. and Jian, J.}, year ={1998}, -journal = syntbf, +journal = {Synthesis}, pages = {509--521} } @ARTICLE{Danheiser1980, author = {Danheiser, R. L. and Carini, D. J.}, year ={1980}, -journal = joceah, +journal = {J. Org. Chem.}, volume = 45, pages = {3925--3927} } @@ -4312,7 +4195,7 @@ pages = {3925--3927} @ARTICLE{Danheiser1986, author = {Danheiser, R. L. and Carini, D. J. and Kwasigroch, C. A.}, year ={1986}, -journal = joceah, +journal = {J. Org. Chem.}, volume = 51, pages = {3870--3878} } @@ -4320,7 +4203,7 @@ pages = {3870--3878} @ARTICLE{Danheiser1985, author = {Danheiser, R. L. and Kwasigroch, C. A. and Tsai, Y.-M.}, year ={1985}, -journal = jacsat, +journal = {J. Am. Chem. Soc.}, volume = 107, pages = {7233--7235} } @@ -4336,14 +4219,14 @@ volume = 26, @ARTICLE{Daidouji2005, author = {Daidouji, K. and Fuchibe, K. and Akiyama, T.}, year ={2005}, -journal = orlef7, +journal = {Org. Lett.}, volume = 7, pages = {1051--1053} } @ARTICLE{Danheiser1981, author = {Danheiser, R. L. and Carini, D. J. and Basak, A.}, year ={1981}, -journal = jacsat, +journal = {J. Am. Chem. Soc.}, volume = 103, pages = {1604--1606} } @@ -4351,7 +4234,7 @@ pages = {1604--1606} @ARTICLE{Danheiser1983, author = {Danheiser, R. L. and Carini, D. J. and Fink, D. M.}, year ={1983}, -journal = tetrab, +journal = {Tetrahedron}, volume = 39, pages = {935--947} } @@ -4382,6 +4265,16 @@ pages="1-4", } %</bib> %<*demo> +%% !TeX TS-program = pdflatex +%% !BIB TS-program = bibtex +%% !TeX spellcheck = en_US +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% Many modern TeX editors understand the above lines to overwrite % +%% globally set settings for individual documents. Just leave one % +%% percent sign at the beginning of the line to activate that meta % +%% comment. % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% This is a (brief) example using the beilstein class. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4411,15 +4304,13 @@ pages="1-4", %% british, english -> British English. %% %% For the input encoding: -%% latin1 (default), -%% utf8, +%% latin1, +%% utf8 (default), %% applemac. %% -%% The defaults are [manuscript=fullresearchpaper,american,latin1]. -%% Please note, that you should consider using the utf8 option as this -%% is the standard encoding nowadays. +%% The defaults are [manuscript=fullresearchpaper,american,utf8]. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\documentclass[utf8]{beilstein} +\documentclass[]{beilstein} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Place any additional packages needed here. Only include packages @@ -4446,18 +4337,18 @@ pages="1-4", %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Meta-data block %% --------------- -%% The title of the article is given with the usual \title command. -%% The title of an article should be clear, concise and comprehensible to all -%% readers with the purpose of quickly identifying the focus of the reported -%% work. It should be brief and contain the most important keywords for search -%% engine optimization. The use of capitals should be restricted to the first +%% The title of the article is given with the usual \title command. +%% The title of an article should be clear, concise and comprehensible to all +%% readers with the purpose of quickly identifying the focus of the reported +%% work. It should be brief and contain the most important keywords for search +%% engine optimization. The use of capitals should be restricted to the first %% word and proper nouns. As far as possible abbreviations should be avoided. %% -%% If you write a file for supporting information using manuscript=suppinfo, +%% If you write a file for Supporting Information using manuscript=suppinfo, %% you should give an additional title using the macro \sititle or the %% optional argument of \title %% -%% Each author should be given as a separate \author command. +%% Each author needs to be given with a separate \author command. %% %% For corresponding authors please use \author* and give the email %% address as a second mandatory argument. @@ -4484,30 +4375,30 @@ pages="1-4", %% The document should begin with an abstract, if appropriate. If one %% is given and should not be, a warning is issued. %% The abstract should summarize the context and purpose of the study, -%% the main findings and provide a brief summary and potential -%% implications. Abbreviations should be used sparingly in the abstract. -%% Citations and references should not be given in abstracts. Only +%% the main findings and provide a brief summary and potential +%% implications. Abbreviations should be used sparingly in the abstract. +%% Citations and references should not be given in abstracts. Only %% standard characters are allowed. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{abstract} -Allenylsilanes are useful intermediates in organic synthesis. An attractive, -convergent but little used approach for their synthesis is the alkylidenation -of stable silylketenes. Reactions thus far have been limited to the use of -unsubstituted silylketenes (or equivalents) with stabilised or semi-stabilised -ylides only. The current study explores the reactions of substituted ketenes -prepared through rhodium(II)-mediated rearrangement of silylated diazoketones. -A range of novel 1,3-disubstituted and 1,3,3-trisubstituted allenylsilanes were -prepared using stabilised and semi-stabilised ylides. Alkylidenation with -non-stabilised phosphorus ylides was not viable, but the use of titanium-based -methylenating reagents was successful, allowing access to 1-substituted -allenylsilanes. Many novel allenylsilanes may be accessed by alkylidenation of -substituted silylketenes. Importantly, for the first time, simple methylenation +Allenylsilanes are useful intermediates in organic synthesis. An attractive, +convergent but little used approach for their synthesis is the alkylidenation +of stable silylketenes. Reactions thus far have been limited to the use of +unsubstituted silylketenes (or equivalents) with stabilised or semi-stabilised +ylides only. The current study explores the reactions of substituted ketenes +prepared through rhodium(II)-mediated rearrangement of silylated diazoketones. +A range of novel 1,3-disubstituted and 1,3,3-trisubstituted allenylsilanes were +prepared using stabilised and semi-stabilised ylides. Alkylidenation with +non-stabilised phosphorus ylides was not viable, but the use of titanium-based +methylenating reagents was successful, allowing access to 1-substituted +allenylsilanes. Many novel allenylsilanes may be accessed by alkylidenation of +substituted silylketenes. Importantly, for the first time, simple methylenation of silylketenes has been achieved using titanium carbenoid-based reagents. \end{abstract} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Keywords can be given with the \keywords command. Any number of -%% keywords can be given, but a number of at least five keywords is +%% Keywords can be given with the \keywords command. Any number of +%% keywords can be given, but a number of at least five keywords is %% recommended. The arguments are to be sorted alphabetically. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \keywords{allenylsilanes; rhodium(II) octanoate-mediated rearrangement; silylketenes; titanium carbenoids; ylide} @@ -4560,7 +4451,7 @@ Our investigations began with the preparation of substituted silylketenes \CN{1} [\ldots] -With the requisite silylketenes in hand, attention turned to their reaction with the carboethoxy-stabilised phosphoranes \CN{4} and \CN{5}. At the outset, it was by no means certain that these would react efficiently with substituted silylketenes \CN{1} since it is well documented that nucleophiles attack silylketenes \textit{anti} to the silicon, i.e.\ the phosphoranes would be approaching from the same side as the \chem{R^1}-substituent. Since in all previous examples this substituent has been a hydrogen atom, the extension to bulkier substituents could not be taken for granted. In the event, however, we were pleased to find that in nearly all cases the desired allenylsilanes were formed in moderate to excellent yield (\cref{scheme:2}, \cref{tab:1}, see \cref{si:1} for full experimental data). +With the requisite silylketenes in hand, attention turned to their reaction with the carboethoxy-stabilised phosphoranes \CN{4} and \CN{5}. At the outset, it was by no means certain that these would react efficiently with substituted silylketenes \CN{1} since it is well documented that nucleophiles attack silylketenes \textit{anti} to the silicon, i.e., the phosphoranes would be approaching from the same side as the \chem{R^1}-substituent. Since in all previous examples this substituent has been a hydrogen atom, the extension to bulkier substituents could not be taken for granted. In the event, however, we were pleased to find that in nearly all cases the desired allenylsilanes were formed in moderate to excellent yield (\cref{scheme:2}, \cref{tab:1}, see \cref{si:1} for full experimental data). \begin{scheme} \includegraphics[width=8.2cm,keepaspectratio]{scheme2} \caption{Reaction of substituted silylketenes with ester-stabilised phosphoranes.} @@ -4621,9 +4512,9 @@ Supporting information features copies of \HNMR spectra of silylated diazoketone \end{suppinfo} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% The sections "Acknowledgements" and "Funding" can be given in all +%% The sections "Acknowledgements" and "Funding" can be given in all %% manuscripts. -%% This should be done within the environments ``acknowledgements'' +%% This should be done within the environments ``acknowledgements'' %% and ``funding'', which will produce the correct section titles. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{acknowledgements} @@ -4640,11 +4531,10 @@ The following sources of funding are acknowledged: National Natural Science Foun %% and also names the section correctly. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \bibliography{beilstein-template} -\vspace{3cm} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% That's it. Ending the document finishes the article. Happy TeXing! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \end{document} %</demo> -%\fi +%\fi diff --git a/macros/latex/contrib/beilstein/beilstein.ins b/macros/latex/contrib/beilstein/beilstein.ins deleted file mode 100644 index ade7d91531..0000000000 --- a/macros/latex/contrib/beilstein/beilstein.ins +++ /dev/null @@ -1,66 +0,0 @@ -\input docstrip.tex -\keepsilent -\askforoverwritefalse -\preamble ----------------------------------------------------------------- -beilstein -- Support for submissions to the ``Beilstein Journal -of Nanotechnology'' published by the Beilstein-Institut -for the Advancement of Chemical Sciences -Version: 1.5 -E-mail: journals-support@beilstein-institut.de -License: Released under the LaTeX Project Public License v1.3c or later -See http://www.latex-project.org/lppl.txt ----------------------------------------------------------------- - -\endpreamble -\postamble - -Originally developed by Martin Sievers (info@schoenerpublizieren.de) -Copyright (C) 2009-2019 by Beilstein-Institut for the Advancement of Chemical -Sciences (Beilstein) - -Part of this bundle is derived from cite.sty, to which the -following license applies: - Copyright (C) 1989-2003 by Donald Arseneau - These macros may be freely transmitted, reproduced, or - modified provided that this notice is left intact. - -It may be distributed and/or modified under the conditions of -the LaTeX Project Public License (LPPL), either version 1.3c of -this license or (at your option) any later version. The latest -version of this license is in the file: - - http://www.latex-project.org/lppl.txt - -This work has the LPPL maintenancce status "author-maintained". - -This work consists of the files beilstein.dtx, - CHANGELOG.md, - README.md - and the derived files beilstein.pdf, - beilstein.cls, - beilstein.ins, - bjnano.bst, - beilstein-template.tex, - beilstein-template.bib. - Some graphic files for the documentation and template are also added: - bjnano_logo.pdf - scheme1.pdf - scheme2.pdf - figure1.pdf -\endpostamble -\usedir{tex/latex/beilstein} -\generate{ - \file{\jobname.cls}{\from{\jobname.dtx}{class}} -} -\usedir{bibtex/bst/beilstein} -\generate{ - \file{bjnano.bst}{\from{\jobname.dtx}{bst}} -} -\nopreamble\nopostamble -\usedir{tex/latex/beilstein} -\generate{ - \file{beilstein-template.tex}{\from{\jobname.dtx}{demo}} - \file{beilstein-template.bib}{\from{\jobname.dtx}{bib}} -} -\endbatchfile diff --git a/macros/latex/contrib/beilstein/beilstein.pdf b/macros/latex/contrib/beilstein/beilstein.pdf Binary files differindex 3bc8f9648c..5570eb60fc 100644 --- a/macros/latex/contrib/beilstein/beilstein.pdf +++ b/macros/latex/contrib/beilstein/beilstein.pdf diff --git a/macros/latex/contrib/cases/README b/macros/latex/contrib/cases/README new file mode 100644 index 0000000000..ee694332bf --- /dev/null +++ b/macros/latex/contrib/cases/README @@ -0,0 +1,14 @@ +cases.sty version 3.0 2020/02/22 + +Copyright 1993, 1994, 1995, 2000, 2002, 2020 by Donald Arseneau, +asnd@triumf.ca, Vancouver, Canada. +These macros may be freely transmitted, reproduced, or modified +provided that this notice is left intact. Sub-equation numbering +is based on subeqn.sty by Stephen Gildea; parts are based on LaTeX's +eqnarray by Leslie Lamport and the LaTeX3 team; and some on +amsmath.sty by the American Mathematical Society. + +This package provides a LaTeX environment "numcases" to produce +multi-case equations with a separate equation number for each case. +There is also a "subnumcases" environment which numbers each case +with the overall equation number plus a letter [8a, 8b, etc.]. diff --git a/macros/latex/contrib/cases/cases.pdf b/macros/latex/contrib/cases/cases.pdf Binary files differindex 2274952e82..21e48d54ff 100644 --- a/macros/latex/contrib/cases/cases.pdf +++ b/macros/latex/contrib/cases/cases.pdf diff --git a/macros/latex/contrib/cases/cases.sty b/macros/latex/contrib/cases/cases.sty index b82f010a02..66609ee492 100644 --- a/macros/latex/contrib/cases/cases.sty +++ b/macros/latex/contrib/cases/cases.sty @@ -1,11 +1,12 @@ -% C A S E S . S T Y ver 2.5 May 2002 +% C A S E S . S T Y ver 3.0 Feb 2020 % -% Copyright (C) 1993,1994,1995,2000,2002 by Donald Arseneau +% Copyright (C) 1993,1994,1995,2000,2002,2020 by Donald Arseneau % asnd@triumf.ca % These macros may be freely transmitted, reproduced, or modified % provided that this notice is left intact. Sub-equation numbering % is based on subeqn.sty by Stephen Gildea; most of the rest is based -% on LaTeX's \eqnarray by Leslie Lamport and the LaTeX3 team. +% on LaTeX's \eqnarray by Leslie Lamport and the LaTeX3 team, +% and parts of amsmath.sty by the American Mathematical Society. % % This provides a LaTeX environment {numcases} to produce multi-case % equations with a separate equation number for each case. There is @@ -27,96 +28,111 @@ % case. In a subnumcases environment, a \label in the left_side of the % equation gives the overall equation number, without any letter. % -% To use this package, -% include "\usepackage{cases}" after \documentclass. You may also -% specify "\usepackage[subnum]{cases}" to force *all* numcases -% environments to be treated as subnumcases. -% -% Question: Is there a {numcases*} environment for unnumbered cases? -% Answer: There is a {cases} environment in AMS-LaTeX, but it is just as -% convenient to stick with the canonical LaTeX array: -% \[ left side = \left\{ \begin{array}...\end{array} \right. \] -% -% Speaking of AMS-math, they use an entirely different system of equation -% numbering, and this package uses ordinary LaTeX numbering. -% -% - - - - - -% A simple example is: -% \begin{numcases}{|x|=} -% x, & for $x \geq 0$\\ -% -x, & for $x < 0$ -% \end{numcases} -% -% Giving: -% / x for x > 0 (1) -% |x| = < - -% \ -x for x < 0 (2) -% -% - - - - - -% -% Another example is calculating the square root of $c+id$. First compute -% \begin{subnumcases}{\label{w} w\equiv} -% 0 & $c = d = 0$\label{wzero}\\ -% \sqrt{|c|}\,\sqrt{\frac{1 + \sqrt{1+(d/c)^2}}{2}} & $|c| \geq |d|$ \\ -% \sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} & $|c| < |d|$ -% \end{subnumcases} -% Then, using $w$ from eq.~(\ref{w}), the square root is -% \begin{subnumcases}{\sqrt{c+id}=} -% 0 & $w=0$ (case \ref{wzero})\\ -% w+i\frac{d}{2w} & $w \neq 0$, $c \geq 0$ \\ -% \frac{|d|}{2w} + iw & $w \neq 0$, $c < 0$, $d \geq 0$ \\ -% \frac{|d|}{2w} - iw & $w \neq 0$, $c < 0$, $d < 0$ -% \end{subnumcases} -% -% - - - begin definitions - - - +% For detailed description and package options, see cases.pdf (cases.tex). -\ProvidesPackage{cases}[2002/05/02 ver 2.5 ] +\ProvidesPackage{cases}[2020/02/22 ver 3.0] + +\newdimen\numc@numwid + +% copy \@@eqncr but change error message and handle \tag{} for amsmath: +\def\@@numc@cr{\let\reserved@a\relax + \ifcase\@eqcnt \def\reserved@a{& & &}\or \def\reserved@a{& &}% + \or \def\reserved@a{&}\else + \let\reserved@a\@empty + \@latex@error{Too many columns in numcases environment}\@ehc\fi + \reserved@a \if@eqnsw\@eqnnum\stepcounter{equation}\else \iftag@ \df@tag\fi\fi + \global\@eqnswtrue\global\@eqcnt\z@\cr} + +\let\iftag@=\iffalse \newenvironment{numcases}[1]% -{$$\numc@opts \setbox\z@\hbox - {\advance\c@equation\@ne\def\@currentlabel{\p@equation\theequation}% local - $\displaystyle {#1\null}\m@th$}% - \numc@setsub +{$$\numc@opts + \refstepcounter{equation}% Needed for LHS \label + \setbox\z@\hbox {% typeset LHS + \def\@currentlabel{\p@equation\theequation}% local def + $\displaystyle {#1{}}\m@th$}% + \numc@setsub % maybe \subequations (handling \refstepcounter) + \def\@currentlabel{\p@equation\theequation}% + \global\@eqnswtrue\m@th + \def\tag##1{\def\@currentlabel{##1}\tag@in@align{##1}}% + \settowidth{\numc@numwid}{\ \advance\c@equation\tw@\numc@eqnnum}% + \@tempskipb\@centering + \ifx\numc@left\mathindent % fleqn: + \@tempskipa=\@ne\mathindent\@minus\@ne\mathindent + \ifx\numc@forcenumwid\z@ % leqno + \ifdim \numc@numwid>\mathindent % enlarge left space for equation number + \@tempskipa=\numc@numwid\@minus\numc@numwid + \fi\fi + \else % not fleqn: + \@tempskipa=\@centering + \advance\@tempskipa \numc@numwid\@minus\numc@numwid + \advance\@tempskipa \numc@numwid\@minus\numc@forcenumwid + \advance\@tempskipb \tw@\numc@numwid\@minus\tw@\numc@numwid + \advance\@tempskipb -\numc@forcenumwid\@minus-\numc@forcenumwid + \fi \setbox\tw@\vbox\bgroup - \stepcounter{equation}\def\@currentlabel{\p@equation\theequation}% - \global\@eqnswtrue\m@th \everycr{}\tabskip\numc@left\let\\\@eqncr - \halign to\dimen@ii \bgroup \kern\wd\z@ \kern14\p@ % assume width of brace - \tabskip\z@skip \global\@eqcnt\@ne $\displaystyle{##}$\hfil - &\global\@eqcnt\tw@ \skip@10\p@ \advance\skip@\tw@\arraycolsep \hskip\skip@ - ##\unskip\hfil\tabskip\@centering% \unskip removes space if no explanations - &\global\@eqcnt\thr@@\hbox to\z@\bgroup\hss##\egroup\tabskip\z@skip\cr -}{\@@eqncr \egroup % end \halign, which does not contain first column or brace - \global\advance\c@equation\m@ne -%Measure the natural width of the alignment - \unskip\unpenalty\unskip\unpenalty \setbox\z@\lastbox % grab last line - \nointerlineskip \copy\z@ % then put it back - \global\dimen@i\wd\z@ - \setbox\z@\hbox{\hskip-\numc@left\unhbox\z@}% Measure its natural width - \ifdim \wd\z@<\dimen@i \global\dimen@i\wd\z@ \fi -\egroup% end \vbox (box\tw@, box\z@ is restored to LHS) -\hbox to\dimen@ii{\m@th % assemble the whole equation - \hskip\numc@left - \hbox to\dimen@i{$\displaystyle \box\z@ % parameter #1 + \everycr{}\let\\\@eqncr \let\@@eqncr\@@numc@cr + \tabskip\@tempskipa + \halign to\dimen@ii \bgroup % white space for LHS followed by RHS + \kern\wd\z@ \kern10\p@ % assume width of brace + \global\let\iftag@=\iffalse % for amsmath (make sure this is not in if block) + \global\@eqcnt\@ne $\numc@dispstyle{##}$\hfil + \tabskip\z@skip &% explanation + \global\@eqcnt\tw@ + \numc@expstyle\quad ##\unskip\numc@expstyle\hfil % \unskip removes quad if no explanation + \tabskip\@tempskipb &% equation number + \global\@eqcnt\thr@@\hbox to\numc@forcenumwid\bgroup\hss##\egroup + \tabskip\z@skip\cr +}{% + \@@numc@cr \egroup % end \halign, which does not contain first column or brace + \global\advance\c@equation\m@ne + % Measure the natural width of the alignment + \unskip\unpenalty\unskip\unpenalty \setbox\z@\lastbox % grab last line + \nointerlineskip \copy\z@ % then put it back + \global\dimen@i\wd\z@ + \setbox\z@\hbox{\unhbox\z@}% Measure its natural width in \dimen@i + \global\dimen@i\wd\z@ + \egroup% end \vbox (\tw@) box\z@ is restored to LHS; \dimen@i is retained + \advance\dimen@i-\@tempskipa \advance\dimen@i-\wd\z@ \advance\dimen@i-10\p@ + \advance\dimen@i-\@tempskipb + % now \@dimen@i is natural width of RHS + explanation + eqno columns + \hbox to\wd\tw@{\m@th % assemble the whole equation stretched to display width + \hskip\@tempskipa + \box\z@ % LHS - parameter #1 + \hbox to10\p@{\hss$\displaystyle \dimen@\ht\tw@ \advance\dimen@\dp\tw@ % get size of brace - \left\{\vcenter to\dimen@{\vfil}\right.\n@space % make brace - $\hfil}\hskip\@centering % finished first part (filled whole line) - \kern-\dimen@ii % backspace the full width - $\vcenter{\box\tw@}$% overlay the alignment - }% end the \hbox to\dimen@ii + \ifdim\dimen@<1.5em\dimen@=1.5em\fi % don't allow really small brace + \left\lbrace\vcenter to\dimen@{\vfil}\,\right.\n@space % make brace + $\hss}% end 10pt brace box + \kern\dimen@i + \hskip\@tempskipb + }% finished first part (filled whole line) end the \hbox to\wd\tw@ + \kern-\wd\tw@ % backspace the full width + \vcenter{\box\tw@}% overlay the alignment \numc@resetsub $$\global\@ignoretrue} +% a wrapper around \subequations so it works in cases with hyperref and amsmath +\def\numc@subequations{% skip the \refstepcounter inside \subequations + \let\numc@opts\refstepcounter + \def\refstepcounter##1{\let\refstepcounter\numc@opts}% + \subequations + \refstepcounter{equation}} + \let\numc@setsub\relax \let\numc@resetsub\relax -\def\subnumcases{\let\numc@setsub\subequations - \let\numc@resetsub\endsubequations \numcases} +\def\subnumcases{% + \let\numc@setsub\numc@subequations + \let\numc@resetsub\endsubequations + \numcases} \let\endsubnumcases\endnumcases % declare subequations -- either defining them following the style of -% Gildea's subeqn.sty, or using the syntax of AMS-LaTeX if that is loaded. +% Gildea's subeqn.sty, or using the version from AMS-LaTeX if that is loaded. -\@ifundefined{c@parentequation}{% No AMS, define subequations from scratch: +\@ifundefined{c@parentequation}{% No AMS +\def\numc@eqnnum{\@eqnnum} % % These versions of subequations follow the style of Gildea's subeqn.sty, % but are thoroughly rewritten. @@ -163,21 +179,82 @@ $$\global\@ignoretrue} \def\@lab@subeqnarray#1#2{\begingroup \let\@currentlabel\themainequation #1{#2}\endgroup} % -}{}% AMS \subequations already defined +}{% AMS + +% \subequations already defined; +% use tag format +\def\numc@eqnnum{\tagform@{\theequation}} +% add little space after brace to amsmath's cases + +\def\@tempa{% + \let\@ifnextchar\new@ifnextchar + \left\lbrace + \def\arraystretch{1.2}% + \array{@{}l@{\quad}l@{}}% +} +\ifx \env@cases\@tempa % add a bit of space after brace in amsmath cases env +\def\env@cases{% + \let\@ifnextchar\new@ifnextchar + \left\lbrace\hskip 2\p@ + \def\arraystretch{1.2}% + \array{@{}l@{\quad}l@{}}% +} +\fi +}% end amsmath branch \def\numc@left{\@centering} \def\numc@opts{\dimen@ii\displaywidth} +\def\numc@forcenumwid{\numc@numwid} -\DeclareOption{subnum}{ - \let\numc@setsub\subequations - \let\numc@resetsub\endsubequations } +\DeclareOption{subnum}{% + \let\numc@setsub\numc@subequations + \let\numc@resetsub\endsubequations +} \DeclareOption{fleqn}{ - \def\numc@left{\mathindent} - \def\numc@opts{\displaywidth\linewidth - \dimen@ii\linewidth } + \let\numc@left\mathindent + \def\numc@opts{\displaywidth\linewidth + \dimen@ii\linewidth } +} + +\DeclareOption{leqno}{ + \let\numc@forcenumwid\z@ } -\ProcessOptions + +\let\numc@expstyle\@empty +\let\numc@dispstyle\displaystyle +\DeclareOption{amsstyle}{ + \def\numc@expstyle{$}% used in pairs for math-mode ($) explanation + \let\numc@dispstyle\textstyle +} + +\DeclareOption{casesstyle}{ + \newcommand\@unnc@casecr[1][\z@skip]{% + \cr \noalign{\vskip #1}% + } + \renewenvironment{cases}{% + \let\@ifnextchar\new@ifnextchar + \left\lbrace\hskip 2\p@ + \vcenter to1.3em{}% + \vcenter\bgroup + \let\\\@unnc@casecr + \openup\jot + \tabskip\z@skip + \halign \bgroup + $\numc@dispstyle{##}\m@th$\hfil + &\numc@expstyle\quad ##\unskip\numc@expstyle\hfil % \unskip removes space if no explanations + \cr + }{% + \crcr + \egroup + \egroup + \right.\n@space + } +} + +\DeclareOption{cases}{\ExecuteOptions{casesstyle}} + +\ProcessOptions \endinput diff --git a/macros/latex/contrib/cases/cases.tex b/macros/latex/contrib/cases/cases.tex index 93311c2b1d..f2bb343590 100644 --- a/macros/latex/contrib/cases/cases.tex +++ b/macros/latex/contrib/cases/cases.tex @@ -1,148 +1,210 @@ \documentclass[DIV=9, pagesize=auto]{scrartcl} -\usepackage{fixltx2e} \usepackage{lmodern} \usepackage[T1]{fontenc} \usepackage{textcomp} \usepackage{amsmath} \usepackage{cases} \usepackage{microtype} -\usepackage{hyperref} - +\usepackage{shortvrb} +\usepackage[colorlinks]{hyperref} +\MakeShortVerb" +\newcommand*\kp[1]{\kern#1pt} \newcommand*{\fancybreak}{% - \par - \nopagebreak\medskip\nopagebreak - \noindent\null\hfill$*\quad*\quad*\quad$\hfill\null\par - \nopagebreak\medskip\pagebreak[0]% + \par \medbreak \vspace{0pt plus 1cm}\penalty 500 \vspace{0pt plus -1cm}% } \newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}} \newcommand*{\pkg}[1]{\textsf{#1}} \newcommand*{\cmd}[1]{\texttt{\string#1}} \newcommand*{\env}[1]{\texttt{#1}} \newcommand*{\meta}[1]{\textlangle\textsl{#1}\textrangle} +\newcommand*{\opt}[1]{\texttt{[#1]}} -\addtokomafont{title}{\rmfamily} +%\addtokomafont{title}{\rmfamily} -\title{The \pkg{cases} package\thanks{This manual corresponds to \pkg{cases}~v2.5, dated~May 2002.}} +\title{The \pkg{cases} package% + \textnormal{\thanks{~~This manual corresponds to \pkg{cases}~v3.0, dated 2020/02/22.}}} \author{Donald Arseneau\\\mail{asnd@triumf.ca}} -\date{May 2002} +\date{Feb 2020} \begin{document} \maketitle -\begingroup -\small +\begin{small} \noindent -Copyright \textcopyright~1993, 1994, 1995, 2000, 2002 by Donald Arseneau, \mail{asnd@triumf.ca}. +Copyright \textcopyright~1993, 1994, 1995, 2000, 2002, 2020 by Donald Arseneau, \mail{asnd@triumf.ca}. These macros may be freely transmitted, reproduced, or modified provided that this notice is left intact. Sub-equation numbering -is based on \pkg{subeqn.sty} by Stephen Gildea; most of the rest is based -on \LaTeX's \cmd{\eqnarray} by Leslie Lamport and the \LaTeX3 team. +is based on \pkg{subeqn.sty} by Stephen Gildea; parts are based +on \LaTeX's \env{eqnarray} by Leslie Lamport and the \LaTeX3 team; +and some on amsmath.sty by the American Mathematical Society. \par -\endgroup +\end{small} -\fancybreak +\section*{Description} -This provides a \LaTeX\ environment \verb+{numcases}+ to produce multi-case -equations with a separate equation number for each case. There is -also \verb+{subnumcases}+ which numbers each case with the overall equation +The \pkg{cases} package provides a \LaTeX\ environment \env{numcases} to produce +multi-case equations with a separate equation number for each case. There is +also \env{subnumcases} which numbers each case with the overall equation number plus a letter [8a, 8b, etc.]. The syntax is % -\begin{verbatim} -\begin{numcases}{left_side} - case_1 & explanation_1 \\ - case_2 & explanation_2 \\ - ... - case_n & explanation_n -\end{numcases} -\end{verbatim} +\begin{flushleft} +"\begin{numcases}{"~\meta{left side}~"}"\\ +\quad \meta{case 1\kp1} "&" \meta{explanation 1\kp1} "\\" \\ +\quad \meta{case 2\kp2} "&" \meta{explanation 2\kp2} "\\" \\ +\quad .~.~.\\ +\quad \meta{case $n$} "&" \meta{explanation $n$} \\ +"\end{numcases}" +\end{flushleft} % -Each \meta{case} is a math formula, and each \meta{explanation} is a piece of lr mode -text (which may contain math mode in \verb+\(...\)+ or \verb+$...$+). The explanations +Each \meta{case} is a math formula, to be typeset in display-math mode, like +in a regular numbered equation. Each \meta{explanation} is a piece of lr-mode +text (which may contain math mode in "\("\,\dots"\)" or "$"\,\dots"$"). The explanations are optional. Equation numbers are inserted automatically, just as for the \env{eqnarray} environment. In particular, the \cmd{\nonumber} command suppresses an equation number and the \cmd{\label} command allows reference to a particular -case. In a \env{subnumcases} environment, a \cmd{\label} in the \meta{left\_side} of the +case. In a \env{subnumcases} environment, a \cmd{\label} in the \meta{left side} of the equation gives the overall equation number, without any letter. To use this package, -include ``\verb+\usepackage{cases}+'' after ``\cmd{\documentclass}''. You may also -specify ``\verb+\usepackage[subnum]{cases}+'' to force \emph{all} \env{numcases} -environments to be treated as \env{subnumcases}. - -\emph{Question:} Is there a \verb+{numcases*}+ environment for -unnumbered cases?\\ -\emph{Answer:} There is a \verb+{cases}+ -environment in \AmS-\LaTeX, but it is just as convenient to stick -with the canonical \LaTeX\ array: -% -\begin{verbatim} -\[ left side = \left\{ \begin{array}...\end{array} \right. \] -\end{verbatim} -% -Speaking of \pkg{\AmS-math}, they use an entirely different system -of equation numbering, and this package uses ordinary \LaTeX\ % -numbering. +include "\usepackage{cases}" after \cmd{\documentclass}, and also after +"\usepackage{amsmath}" if you are using that. \fancybreak -\noindent +\noindent \emph{Question:} Is there a \env{numcases*} environment for +unnumbered cases?\\ +\emph{Answer:} That would have the natural name \env{cases}, and it is +provided by \AmS-\LaTeX\ (\pkg{amsmath} package), or by this package given +the \opt{cases} option. It can also be achieved by using an ordinary \LaTeX\ array +between `"\left\lbrace\ "' and `"\right."'. + +Speaking of \pkg{amsmath} and package options, there are differences between the +style used for this package and the cases done by \pkg{amsmath} (see below), but cases.sty +has options to increase compatibility. Here is the full list of options for +this package. +\begin{description} +\item[\opt{subnum}] Force all \env{numcases} environments to be treated as + \env{subnumcases}. +\item[\opt{amsstyle}] For compatibility with \pkg{amsmath}'s \env{cases}, make \env{numcases} + use cramped math style ("\textstyle"), and put explanations in the same math style. +\item[\opt{casesstyle}] Change \pkg{amsmath}'s \env{cases} environment to work in the text/math style + of \env{numcases}. +\item[\opt{cases}] Define a \env{cases} environment for use without \pkg{amsmath}. (This + is actually the same as the \opt{casesstyle} option.) +\item[\opt{fleqn}] Flush-left equation alignment, indented by \cmd{\mathindent} + or \cmd{\mathmargin}. (Usually inherited from the \cmd{\documentclass} options.) +\item[\opt{leqno}] Left-side equation numbering (usually inherited from the \cmd{\documentclass} + options). This looks silly with numbered cases! +\end{description} + +\section*{Examples} + A simple example is: % \begin{verbatim} -\begin{numcases}{|x|=} - x, & for $x \geq 0$\\ - -x, & for $x < 0$ -\end{numcases} + \begin{numcases} {|x|=} + x, & for $x \geq 0$\\ + -x, & for $x < 0$ + \end{numcases} \end{verbatim} % Giving: % -\begin{numcases}{|x|=} +\begin{numcases} {|x|=} x, & for $x \geq 0$\\ -x, & for $x < 0$ \end{numcases} \fancybreak - \noindent -Another example is calculating the square root of $c+id$. First compute -\phantomsection -\begin{subnumcases}{\label{w} w\equiv} - 0 & $c = d = 0$\label{wzero}\\ - \sqrt{|c|}\,\sqrt{\frac{1 + \sqrt{1+(d/c)^2}}{2}} & $|c| \geq |d|$ \\ - \sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} & $|c| < |d|$ +Another example, employing sub-numbering, is calculating the square root +of a complex number $c+id$. First compute +\begin{subnumcases} {\label{weqn} w\equiv} + 0 & for $c = d = 0$\label{wzero}\\ + \sqrt{|c|}\,\sqrt{\frac{1 + \sqrt{1+(d/c)^2}}{2}} & for $|c| \geq |d|$ \\ + \sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} & for $|c| < |d|$ \end{subnumcases} -Then, using $w$ from eq.~(\ref{w}), the square root is -\begin{subnumcases}{\sqrt{c+id}=} - 0 & $w=0$ (case \ref{wzero})\\ - w+i\frac{d}{2w} & $w \neq 0$, $c \geq 0$ \\ - \frac{|d|}{2w} + iw & $w \neq 0$, $c < 0$, $d \geq 0$ \\ - \frac{|d|}{2w} - iw & $w \neq 0$, $c < 0$, $d < 0$ +Then, using $w$ from eq.~(\ref{weqn}), the square root is +\begin{subnumcases}{\label{sqrteqn} \sqrt{c+id}=} + 0\,, \label{aaa} & $w=0$ (case \ref{wzero})\\ + w+i\frac{d}{2w}\,, & $w \neq 0$, $c \geq 0$ \\ + \frac{|d|}{2w} + iw\,, & $w \neq 0$, $c < 0$, $d \geq 0$ \\ + \frac{|d|}{2w} - iw\,,\label{ddd} & $w \neq 0$, $c < 0$, $d < 0$ \end{subnumcases} - -\pagebreak[2] - -\noindent -This was produced by: -% -\small +These equations, eq.~(\ref{weqn}) and (\ref{sqrteqn}), were produced by: +\begin{small} \begin{verbatim} -Another example is calculating the square root of $c+id$. First compute -\begin{subnumcases}{\label{w} w\equiv} - 0 & $c = d = 0$\label{wzero}\\ -\sqrt{|c|}\,\sqrt{\frac{1 + \sqrt{1+(d/c)^2}}{2}} & $|c| \geq |d|$ \\ -\sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} & $|c| < |d|$ +Another example, employing sub-numbering, is calculating the square root +of a complex number $c+id$. First compute +\begin{subnumcases} {\label{weqn} w\equiv} + 0 & for $c = d = 0$\label{wzero}\\ + \sqrt{|c|}\,\sqrt{\frac{1 + \sqrt{1+(d/c)^2}}{2}} & for $|c| \geq |d|$ \\ + \sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} & for $|c| < |d|$ \end{subnumcases} -Then, using $w$ from eq.~(\ref{w}), the square root is -\begin{subnumcases}{\sqrt{c+id}=} -0 & $w=0$ (case \ref{wzero})\\ -w+i\frac{d}{2w} & $w \neq 0$, $c \geq 0$ \\ -\frac{|d|}{2w} + iw & $w \neq 0$, $c < 0$, $d \geq 0$ \\ -\frac{|d|}{2w} - iw & $w \neq 0$, $c < 0$, $d < 0$ +Then, using $w$ from eq.~(\ref{weqn}), the square root is +\begin{subnumcases}{\label{sqrteqn} \sqrt{c+id}=} + 0\,, & $w=0$ (case \ref{wzero})\\ + w+i\frac{d}{2w}\,, & $w \neq 0$, $c \geq 0$ \\ + \frac{|d|}{2w} + iw\,, & $w \neq 0$, $c < 0$, $d \geq 0$ \\ + \frac{|d|}{2w} - iw\,, & $w \neq 0$, $c < 0$, $d < 0$ \end{subnumcases} \end{verbatim} +\end{small} + +\section*{Compatibilibility with amsmath} + +When used in conjunction with amsmath.sty, the cases package will obey the the variant +commands \cmd{\tag}, \cmd{\notag}, and \cmd{\mathmargin}, however the formatting details +differ between \pkg{amsmath}'s \env{cases} environment and \env{numcases}. +For comparison, equation~(\ref{weqn}) formatted by \pkg{amsmath} and its \env{cases} environment +may be entered as +\begin{flushleft}\small +\begin{verbatim} +\begin{equation} +\label{wams} w \equiv +\begin{cases} + 0 & \text{for}\ c = d = 0\\ + \sqrt{|c|}\,\sqrt{\frac{1+\sqrt{1+(d/c)^2}}{2}} &\text{for}\ |c| \geq |d|\\ + \sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} &\text{for}\ |c|<|d| +\end{cases} +\end{equation} +\end{verbatim} +\end{flushleft} +which produces +\begin{equation} +\label{wams} w\equiv +\begin{cases} + 0 & \text{for }c = d = 0\\ + \sqrt{|c|}\,\sqrt{\frac{1+\sqrt{1+(d/c)^2}}{2}} & \text{for}\ |c| \geq |d| \\ + \sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} & \text{for}\ |c| < |d| +\end{cases} +\end{equation} +To get this more compact layout with \env{numcases} you can insert "\textstyle" +at the beginning of each case, as needed, or use the \pkg{cases} +package option \opt{amsstyle}. +To have the \env{cases} environment give the more open layout of eq.~(\ref{weqn}) +you can put "\displaystyle" at the beginning of each case, or use the +option \opt{casesstyle} for the \pkg{cases} package. (Yes these go with the cases package, they +are not options for amsmath.) + +For full disclosure, even without any relevant package options, cases.sty will +slightly adjust the \env{cases} environment from \pkg{amsmath}, by adding a little +space after the left brace. + +\section*{Sub-numbering} +For control of the sub-equation-numbering style, see the +\AmS-\LaTeX\ documentation for \env{subequations}, currently +in section 3.11.3. If you are not using amsmath, that documentation +still mostly applies, except the name for regular equation numbers +is then `mainequation' instead of `parentequation'. Also, the +sub-numbering style can be controlled more easily by defining +\cmd{\thesubequation}. An example for capitalized letters is +\begin{verbatim} +\renewcommand\thesubequation{\themainequation.\Alph{equation}} % 13.C +\end{verbatim} + \end{document} diff --git a/macros/latex/contrib/els-cas-templates/README b/macros/latex/contrib/els-cas-templates/README index 71a1540b66..b097d0b412 100644 --- a/macros/latex/contrib/els-cas-templates/README +++ b/macros/latex/contrib/els-cas-templates/README @@ -16,8 +16,9 @@ elsarticle-cas bundle. The following are the main files available: - cas-dc-template.pdf, PDF of the cas-ddc-template.tex - cas-common.sty, additional macro package for formatting model2-names.bst, BibTeX style file -- twitter.jpeg, linkedin.jpeg, url.jpeg, gplus.jpeg, facebook.jpeg, - email.jpeg - thumbnail images of social networking sites +- cas-twitter.jpeg, cas-linkedin.jpeg, cas-url.jpeg, cas-gplus.jpeg, + cas-facebook.jpeg, cas-email.jpeg - thumbnail images of social + networking sites The documentation file is elsdoc-cas.tex in the doc directory. To compile it: diff --git a/macros/latex/contrib/els-cas-templates/cas-common.sty b/macros/latex/contrib/els-cas-templates/cas-common.sty index cbb226fd3f..7d74d5a76d 100644 --- a/macros/latex/contrib/els-cas-templates/cas-common.sty +++ b/macros/latex/contrib/els-cas-templates/cas-common.sty @@ -15,11 +15,11 @@ %% given in the file `manifest.txt'. %% -% $Id: cas-common.sty 12 2019-03-19 06:03:53Z rishi $ +% $Id: cas-common.sty 38 2020-02-25 09:10:36Z rishi $ \def\RCSfile{cas-common}% - \def\RCSversion{1.0}% - \def\RCSdate{2019/02/11}% + \def\RCSversion{1.2}% + \def\RCSdate{2020/02/24}% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ExplSyntaxOn @@ -32,6 +32,8 @@ % Usage of those macros and methods are gratefully acknowledged. % +\tl_set:Nn \l_stm_title_color_tl { black } + \keys_define:nn { stm / title } { mode .choice: , @@ -143,7 +145,7 @@ \l_stm_title_shape_tl \l_stm_title_weight_tl \color { \l_stm_title_color_tl } - #2 + \noindent \unskip \ignorespaces #2 \tl_set:Nn \l_tmpa_tl { title } \tl_if_eq:NNTF \l_stm_title_type_tl \l_tmpa_tl { \processTmarks } { } @@ -460,7 +462,7 @@ { \int_set:Nn \l_tmpa_int { 0 } \clist_map_inline:nn { #1 } { -% \msg_term:n { ##1 .. [\cs:w X@##1:\cs_end:] } +% \iow_term:n { ##1 .. [\cs:w X@##1:\cs_end:] } \cs_if_free:cTF { X@##1: } { \csdef{X@##1:}{0} } { @@ -482,7 +484,7 @@ { \tl_if_head_eq_catcode:nNTF { #1 } a { - \msg_term:n { [TNOTE:~alpha] }% +% \iow_term:n { [TNOTE:~alpha] }% \seq_gput_right:Nn \g_stm_tnote_seq { \int_incr:N \g_stm_tnote_int \str_set:Nx \@currentlabel { \int_use:N \g_stm_tnote_int } @@ -499,7 +501,7 @@ } } { - \msg_term:n { [TNOTE:~Number] } +% \iow_term:n { [TNOTE:~Number] } \seq_gput_right:Nn \g_stm_tnote_seq { \int_set:Nn \l_tmpa_int { #1 } @@ -540,7 +542,7 @@ { \tl_if_head_eq_catcode:nNTF { #1 } a { - \msg_term:n { [FN:~alpha] }% +% \iow_term:n { [FN:~alpha] }% \seq_gput_right:Nn \g_stm_fnote_seq { \int_incr:N \g_stm_fnote_int \str_set:Nx \@currentlabel { \int_use:N \g_stm_fnote_int } @@ -550,7 +552,7 @@ } } { - \msg_term:n { [FN:~Number] } +% \iow_term:n { [FN:~Number] } \seq_gput_right:Nn \g_stm_fnote_seq { \int_set:Nn \l_tmpa_int { #1 } @@ -569,7 +571,7 @@ { \tl_if_head_eq_catcode:nNTF { #1 } a { - \msg_term:n { [COR:~alpha] }% +% \iow_term:n { [COR:~alpha] }% \seq_gput_right:Nn \g_stm_cor_seq { \int_incr:N \g_stm_cor_int \str_set:Nx \@currentlabel { \int_use:N \g_stm_cor_int } @@ -586,7 +588,7 @@ } } { - \msg_term:n { [COR:~Number] } +% \iow_term:n { [COR:~Number] } \seq_gput_right:Nn \g_stm_cor_seq { \int_set:Nn \l_tmpa_int { #1 } @@ -896,13 +898,13 @@ \tl_if_empty:NF \l_stm_au_prefix { \l_stm_au_prefix_tl \c_space_token } \str_if_eq:VnTF \l_stm_au_style_tl { chinese } - { %\msg_term:n {STYLE~T=\l_stm_au_style_tl........} + { %\iow_term:n {STYLE~T=\l_stm_au_style_tl........} \invparsename { #2 } \textcolor{\l_stm_augroup_color_tl}{\surname} \no_break_space: \textcolor{\l_stm_augroup_color_tl !50}{\firstname} } - { %\msg_term:n {STYLE~F=\l_stm_au_style_tl........} + { %\iow_term:n {STYLE~F=\l_stm_au_style_tl........} \parsename { #2 } \textcolor{\l_stm_augroup_color_tl !50}{\firstname} \no_break_space: @@ -1215,7 +1217,7 @@ \seq_new:c {g_stm_aff\int_use:N \g_stm_augr_int _seq} \seq_new:c {g_stm_collab\int_use:N \g_stm_augr_int _seq} \seq_new:c {g_stm_clau\int_use:N \g_stm_augr_int _seq} - \msg_term:n { AUGR:~\int_use:N \g_stm_augr_int ... } +% \iow_term:n { AUGR:~\int_use:N \g_stm_augr_int ... } } { \seq_gput_right:Nn \g_stm_augr_seq @@ -1247,7 +1249,7 @@ \seq_use:cn { g_stm_aff\int_use:N \g_stm_aaugr_int _seq } { \par \smallskip } \par\vskip\l_stm_aff_after_dim - \msg_term:n { AAUGR:~\int_use:N \g_stm_aaugr_int ... } +% \iow_term:n { AAUGR:~\int_use:N \g_stm_aaugr_int ... } \group_end: % \group_begin: @@ -1862,6 +1864,15 @@ abovetbl .skip_set:N = \l_tbl_abovetbl_skip , belowtbl .skip_set:N = \l_tbl_belowtbl_skip , full .bool_gset:N = \g_tbl_full_bool , + unknown .code:n = { + \ifstrempty { #1 } + { + \tl_set:Nn \l_fig_pos_tl { \l_keys_key_tl } + } + { + \l_keys_key_tl=#1 + } + } } \cs_set:Npn \__reset_tbl: @@ -1938,6 +1949,15 @@ abovefig .skip_set:N = \l_fig_abovefig_skip , belowfig .skip_set:N = \l_fig_belowfig_skip , full .bool_gset:N = \g_fig_full_bool , + unknown .code:n = { + \ifstrempty { #1 } + { + \tl_set:Nn \l_fig_pos_tl { \l_keys_key_tl }, + } + { + \l_keys_key_tl=#1 + } + } } \cs_set:Npn \__reset_fig: diff --git a/macros/latex/contrib/els-cas-templates/cas-dc-template.tex b/macros/latex/contrib/els-cas-templates/cas-dc-template.tex index 7e9a446ff3..de0f8dceed 100644 --- a/macros/latex/contrib/els-cas-templates/cas-dc-template.tex +++ b/macros/latex/contrib/els-cas-templates/cas-dc-template.tex @@ -1,5 +1,5 @@ %% -%% Copyright 2019 Elsevier Ltd +%% Copyright 2019-2020 Elsevier Ltd %% %% This file is part of the 'CAS Bundle'. %% -------------------------------------- diff --git a/macros/latex/contrib/els-cas-templates/cas-dc.cls b/macros/latex/contrib/els-cas-templates/cas-dc.cls index 82352b5db6..719c0928be 100644 --- a/macros/latex/contrib/els-cas-templates/cas-dc.cls +++ b/macros/latex/contrib/els-cas-templates/cas-dc.cls @@ -15,11 +15,11 @@ %% given in the file `manifest.txt'. %% -%% $Id: cas-dc.cls 7 2019-02-13 12:02:17Z apu.v $ +%% $Id: cas-dc.cls 42 2020-02-25 09:50:39Z rishi $ \def\RCSfile{cas-dc}% - \def\RCSversion{1.0}% - \def\RCSdate{2019/02/11}% + \def\RCSversion{1.2}% + \def\RCSdate{2020/02/25}% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{\RCSfile}[\RCSdate, \RCSversion: Formatting class for CAS double column articles] diff --git a/macros/latex/contrib/els-cas-templates/cas-model2-names.bst b/macros/latex/contrib/els-cas-templates/cas-model2-names.bst index 95e0526096..420018de16 100644 --- a/macros/latex/contrib/els-cas-templates/cas-model2-names.bst +++ b/macros/latex/contrib/els-cas-templates/cas-model2-names.bst @@ -1,7 +1,7 @@ %% -%% This is file `model2-names.bst' (Version 2.0), +%% This is file `cas-model2-names.bst' (Version 2.0), %% -%% Copyright 2009-2013 Elsevier Ltd +%% Copyright 2009-2019 Elsevier Ltd %% %% This file is part of the 'Elsarticle Bundle'. %% --------------------------------------------- @@ -13,9 +13,9 @@ %% and version 1.2 or later is part of all distributions of LaTeX %% version 1999/12/01 or later. %% -%% $Id: model2-names.bst 217 2013-03-13 11:50:49Z rishi $ +%% $Id: cas-model2-names.bst 23 2019-04-05 10:17:39Z rishi $ %% -%% $URL: http://lenova.river-valley.com/svn/elsbst/trunk/New-Model-2/model2-names.bst $ +%% $URL: https://lenova.river-valley.com/svn/elscastemplates/trunk/cas-model2-names.bst $ %% ENTRY diff --git a/macros/latex/contrib/els-cas-templates/cas-sc-template.tex b/macros/latex/contrib/els-cas-templates/cas-sc-template.tex index 3e461592a8..15454c904c 100644 --- a/macros/latex/contrib/els-cas-templates/cas-sc-template.tex +++ b/macros/latex/contrib/els-cas-templates/cas-sc-template.tex @@ -1,5 +1,5 @@ %% -%% Copyright 2019 Elsevier Ltd +%% Copyright 2019-2020 Elsevier Ltd %% %% This file is part of the 'CAS Bundle'. %% -------------------------------------- diff --git a/macros/latex/contrib/els-cas-templates/cas-sc.cls b/macros/latex/contrib/els-cas-templates/cas-sc.cls index 3345e1c398..1cf68c20ed 100644 --- a/macros/latex/contrib/els-cas-templates/cas-sc.cls +++ b/macros/latex/contrib/els-cas-templates/cas-sc.cls @@ -15,11 +15,11 @@ %% given in the file `manifest.txt'. %% -%% $Id: cas-sc.cls 7 2019-02-13 12:02:17Z apu.v $ +%% $Id: cas-sc.cls 39 2020-02-25 09:13:49Z rishi $ \def\RCSfile{cas-sc}% - \def\RCSversion{1.0}% - \def\RCSdate{2018/09/22}% + \def\RCSversion{1.2}% + \def\RCSdate{2020/02/25}% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{\RCSfile}[\RCSdate, \RCSversion: Formatting class for CAS single column articles] diff --git a/macros/latex/contrib/els-cas-templates/doc/elsdoc-cas.tex b/macros/latex/contrib/els-cas-templates/doc/elsdoc-cas.tex index 3aeb8470ac..6195103d4f 100644 --- a/macros/latex/contrib/els-cas-templates/doc/elsdoc-cas.tex +++ b/macros/latex/contrib/els-cas-templates/doc/elsdoc-cas.tex @@ -1,5 +1,5 @@ %% -%% Copyright 2019 Elsevier Ltd +%% Copyright 2019-2020 Elsevier Ltd %% %% This file is part of the 'CAS Bundle'. %% --------------------------------------------- @@ -14,7 +14,7 @@ %% The list of all files belonging to the 'CAS Bundle' is %% given in the file `manifest.txt'. %% -%% $Id: elsdoc-cas.tex 4 2019-02-11 10:03:00Z rishi $ +%% $Id: elsdoc-cas.tex 35 2020-02-25 09:04:59Z rishi $ %% \documentclass[a4paper,12pt]{article} diff --git a/macros/latex/contrib/els-cas-templates/doc/makefile b/macros/latex/contrib/els-cas-templates/doc/makefile index 6a34191b71..0742fa1845 100644 --- a/macros/latex/contrib/els-cas-templates/doc/makefile +++ b/macros/latex/contrib/els-cas-templates/doc/makefile @@ -1,4 +1,4 @@ -# $Id: makefile 5 2019-02-11 10:03:21Z rishi $ +# $Id: makefile 37 2020-02-25 09:06:02Z rishi $ file=elsdoc-cas @@ -34,7 +34,3 @@ diff: copy: cp $(file).sty ../ - - - - diff --git a/macros/latex/contrib/els-cas-templates/doc/rvdtx.sty b/macros/latex/contrib/els-cas-templates/doc/rvdtx.sty index 3f16af7196..fa3de07930 100644 --- a/macros/latex/contrib/els-cas-templates/doc/rvdtx.sty +++ b/macros/latex/contrib/els-cas-templates/doc/rvdtx.sty @@ -4,7 +4,7 @@ % % Auxiliary package to format *.dtx documents. % -% Copyright (c) 2008-2019 CV Radhakrishnan <cvr@stmdocs.in>, +% Copyright (c) 2008-2020 CV Radhakrishnan <cvr@stmdocs.in>, % % This file may be distributed and/or modified under the conditions % of the LaTeX Project Public License, either version 1.2 of this diff --git a/macros/latex/contrib/els-cas-templates/manifest.txt b/macros/latex/contrib/els-cas-templates/manifest.txt index 8932a2f958..542099e0e6 100644 --- a/macros/latex/contrib/els-cas-templates/manifest.txt +++ b/macros/latex/contrib/els-cas-templates/manifest.txt @@ -1,4 +1,4 @@ -% Copyright 2019 Elsevier Ltd +% Copyright 2019-2020 Elsevier Ltd % % This file is part of the 'CAS Bundle'. % -------------------------------------- @@ -62,12 +62,12 @@ Directory thumbnails/ Contains thumbnail images which will be included in the typeset PDF. - email.jpeg - facebook.jpeg - gplus.jpeg - linkedin.jpeg - twitter.jpeg - url.jpeg + cas-email.jpeg + cas-facebook.jpeg + cas-gplus.jpeg + cas-linkedin.jpeg + cas-twitter.jpeg + cas-url.jpeg Directory figs/ diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md index bcfeffe33f..9ce3fed751 100644 --- a/macros/latex/contrib/l3kernel/CHANGELOG.md +++ b/macros/latex/contrib/l3kernel/CHANGELOG.md @@ -7,6 +7,11 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-02-25] + +### Changed +- Extend case-changing encoding support to Cyrillic and Greek + ## [2020-02-21] ### Added @@ -630,7 +635,8 @@ this project uses date-based 'snapshot' version identifiers. - Step functions have been added for dim variables, e.g. `\dim_step_inline:nnnn` -[Unreleased]: https://github.com/latex3/latex3/compare/2020-02-21...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2020-02-25...HEAD +[2020-02-25]: https://github.com/latex3/latex3/compare/2020-02-21...2020-02-25 [2020-02-21]: https://github.com/latex3/latex3/compare/2020-02-14...2020-02-21 [2020-02-14]: https://github.com/latex3/latex3/compare/2020-02-13...2020-02-14 [2020-02-13]: https://github.com/latex3/latex3/compare/2020-02-11...2020-02-13 diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md index c5a3b27c73..4337693ae2 100644 --- a/macros/latex/contrib/l3kernel/README.md +++ b/macros/latex/contrib/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2020-02-21 +Release 2020-02-25 Overview -------- diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx index c266a2c2da..3f2f1c78b4 100644 --- a/macros/latex/contrib/l3kernel/expl3.dtx +++ b/macros/latex/contrib/l3kernel/expl3.dtx @@ -24,7 +24,7 @@ % %<*driver|generic|package|2ekernel> %</driver|generic|package|2ekernel> -\def\ExplFileDate{2020-02-21}% +\def\ExplFileDate{2020-02-25}% %<*driver> \documentclass[full]{l3doc} \usepackage{graphicx} @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf Binary files differindex 665f6d5d05..10bc95f1d0 100644 --- a/macros/latex/contrib/l3kernel/expl3.pdf +++ b/macros/latex/contrib/l3kernel/expl3.pdf diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf Binary files differindex 7920813343..91aff8e85b 100644 --- a/macros/latex/contrib/l3kernel/interface3.pdf +++ b/macros/latex/contrib/l3kernel/interface3.pdf diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex index bb11c0f2a1..edac55de1e 100644 --- a/macros/latex/contrib/l3kernel/interface3.tex +++ b/macros/latex/contrib/l3kernel/interface3.tex @@ -54,7 +54,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2020-02-21} +\date{Released 2020-02-25} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3kernel/l3alloc.dtx b/macros/latex/contrib/l3kernel/l3alloc.dtx index 8796c5b8c7..41a3e7e26c 100644 --- a/macros/latex/contrib/l3kernel/l3alloc.dtx +++ b/macros/latex/contrib/l3kernel/l3alloc.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx index 5ecb409f51..b65f0feca4 100644 --- a/macros/latex/contrib/l3kernel/l3basics.dtx +++ b/macros/latex/contrib/l3kernel/l3basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx index 4b78f7addb..113fa59ab6 100644 --- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx +++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx index cc7fd1e691..efbbb2ca11 100644 --- a/macros/latex/contrib/l3kernel/l3box.dtx +++ b/macros/latex/contrib/l3kernel/l3box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3candidates.dtx b/macros/latex/contrib/l3kernel/l3candidates.dtx index 5fff939727..f36843ad33 100644 --- a/macros/latex/contrib/l3kernel/l3candidates.dtx +++ b/macros/latex/contrib/l3kernel/l3candidates.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx index 7b498b2acd..739764ad2b 100644 --- a/macros/latex/contrib/l3kernel/l3clist.dtx +++ b/macros/latex/contrib/l3kernel/l3clist.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx index 1b49492b34..f3a7ba081c 100644 --- a/macros/latex/contrib/l3kernel/l3coffins.dtx +++ b/macros/latex/contrib/l3kernel/l3coffins.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3color-base.dtx b/macros/latex/contrib/l3kernel/l3color-base.dtx index 6ee0980269..6ca023be82 100644 --- a/macros/latex/contrib/l3kernel/l3color-base.dtx +++ b/macros/latex/contrib/l3kernel/l3color-base.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx index fc5ef28497..bcdcb0cdd6 100644 --- a/macros/latex/contrib/l3kernel/l3debug.dtx +++ b/macros/latex/contrib/l3kernel/l3debug.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx index 8a3e8cce00..a52f33774f 100644 --- a/macros/latex/contrib/l3kernel/l3deprecation.dtx +++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx index 83c140a7ea..c4bd0f7751 100644 --- a/macros/latex/contrib/l3kernel/l3doc.dtx +++ b/macros/latex/contrib/l3kernel/l3doc.dtx @@ -79,7 +79,7 @@ and all files in that bundle must be distributed together. % % \title{The \cls{l3doc} class} % \author{\Team} -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % \maketitle % \tableofcontents % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx index 43ce8249f3..5cc079b2a0 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.dtx +++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf Binary files differindex 0600d6a4f6..ba9d9375ed 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.pdf +++ b/macros/latex/contrib/l3kernel/l3docstrip.pdf diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx index 272e1cc400..be01476521 100644 --- a/macros/latex/contrib/l3kernel/l3expan.dtx +++ b/macros/latex/contrib/l3kernel/l3expan.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx index 5eb3f68730..d474dba637 100644 --- a/macros/latex/contrib/l3kernel/l3file.dtx +++ b/macros/latex/contrib/l3kernel/l3file.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3final.dtx b/macros/latex/contrib/l3kernel/l3final.dtx index 5cd15dca48..4c573fc3a4 100644 --- a/macros/latex/contrib/l3kernel/l3final.dtx +++ b/macros/latex/contrib/l3kernel/l3final.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx index 23cd8127c0..15865ffa92 100644 --- a/macros/latex/contrib/l3kernel/l3flag.dtx +++ b/macros/latex/contrib/l3kernel/l3flag.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx index a3aff3c74b..34f8eea19b 100644 --- a/macros/latex/contrib/l3kernel/l3fp-assign.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-assign.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx index fe6932aaeb..6b8e4ae9de 100644 --- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx index 6c62694b26..ee77e00c6f 100644 --- a/macros/latex/contrib/l3kernel/l3fp-basics.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-basics.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx index 2be36397e0..404e2a5145 100644 --- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx index dd709983db..5a2214748d 100644 --- a/macros/latex/contrib/l3kernel/l3fp-expo.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-expo.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx index 0c8f1db628..263c82ff46 100644 --- a/macros/latex/contrib/l3kernel/l3fp-extended.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-extended.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx index 4b171ec613..66756acde0 100644 --- a/macros/latex/contrib/l3kernel/l3fp-logic.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-logic.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx index d370a148e0..4a06f89be8 100644 --- a/macros/latex/contrib/l3kernel/l3fp-parse.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-parse.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx index 4e1886893b..71127ebd03 100644 --- a/macros/latex/contrib/l3kernel/l3fp-random.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-random.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx index d73aa6de7c..951e5dec81 100644 --- a/macros/latex/contrib/l3kernel/l3fp-round.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx index 56c0d73349..9db9324a39 100644 --- a/macros/latex/contrib/l3kernel/l3fp-traps.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-traps.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx index f680dd9df1..e52aeffe54 100644 --- a/macros/latex/contrib/l3kernel/l3fp-trig.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-trig.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx index 6ad7be9b40..bc408b3a26 100644 --- a/macros/latex/contrib/l3kernel/l3fp.dtx +++ b/macros/latex/contrib/l3kernel/l3fp.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx index 91e6645f07..d4a0045e96 100644 --- a/macros/latex/contrib/l3kernel/l3fparray.dtx +++ b/macros/latex/contrib/l3kernel/l3fparray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx index 748d0c0f1c..ff70d60c54 100644 --- a/macros/latex/contrib/l3kernel/l3int.dtx +++ b/macros/latex/contrib/l3kernel/l3int.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx index 442c2d71d4..477a6b66ff 100644 --- a/macros/latex/contrib/l3kernel/l3intarray.dtx +++ b/macros/latex/contrib/l3kernel/l3intarray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx index 8b61579016..8bf6edca2e 100644 --- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx +++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx index aaccd9718d..dcf83e0d87 100644 --- a/macros/latex/contrib/l3kernel/l3keys.dtx +++ b/macros/latex/contrib/l3kernel/l3keys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx index 3ba72753cf..58984c8ba0 100644 --- a/macros/latex/contrib/l3kernel/l3legacy.dtx +++ b/macros/latex/contrib/l3kernel/l3legacy.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx index 7363dd07f6..e3d5f6d816 100644 --- a/macros/latex/contrib/l3kernel/l3luatex.dtx +++ b/macros/latex/contrib/l3kernel/l3luatex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx index b61d535545..4b2c06f526 100644 --- a/macros/latex/contrib/l3kernel/l3msg.dtx +++ b/macros/latex/contrib/l3kernel/l3msg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx index d04977a251..129e6ed6a2 100644 --- a/macros/latex/contrib/l3kernel/l3names.dtx +++ b/macros/latex/contrib/l3kernel/l3names.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3news.pdf b/macros/latex/contrib/l3kernel/l3news.pdf Binary files differindex 55ef5b2a98..a06982d228 100644 --- a/macros/latex/contrib/l3kernel/l3news.pdf +++ b/macros/latex/contrib/l3kernel/l3news.pdf diff --git a/macros/latex/contrib/l3kernel/l3news01.pdf b/macros/latex/contrib/l3kernel/l3news01.pdf Binary files differindex 9733838afd..0fa9132de6 100644 --- a/macros/latex/contrib/l3kernel/l3news01.pdf +++ b/macros/latex/contrib/l3kernel/l3news01.pdf diff --git a/macros/latex/contrib/l3kernel/l3news02.pdf b/macros/latex/contrib/l3kernel/l3news02.pdf Binary files differindex 8b77d167c7..0110d5cdc0 100644 --- a/macros/latex/contrib/l3kernel/l3news02.pdf +++ b/macros/latex/contrib/l3kernel/l3news02.pdf diff --git a/macros/latex/contrib/l3kernel/l3news03.pdf b/macros/latex/contrib/l3kernel/l3news03.pdf Binary files differindex 3c39f19d43..38f2707903 100644 --- a/macros/latex/contrib/l3kernel/l3news03.pdf +++ b/macros/latex/contrib/l3kernel/l3news03.pdf diff --git a/macros/latex/contrib/l3kernel/l3news04.pdf b/macros/latex/contrib/l3kernel/l3news04.pdf Binary files differindex cdf6227b24..7399a65d84 100644 --- a/macros/latex/contrib/l3kernel/l3news04.pdf +++ b/macros/latex/contrib/l3kernel/l3news04.pdf diff --git a/macros/latex/contrib/l3kernel/l3news05.pdf b/macros/latex/contrib/l3kernel/l3news05.pdf Binary files differindex bb57c0959b..d17c6e49dc 100644 --- a/macros/latex/contrib/l3kernel/l3news05.pdf +++ b/macros/latex/contrib/l3kernel/l3news05.pdf diff --git a/macros/latex/contrib/l3kernel/l3news06.pdf b/macros/latex/contrib/l3kernel/l3news06.pdf Binary files differindex a2fe951bf7..9cfe26ccde 100644 --- a/macros/latex/contrib/l3kernel/l3news06.pdf +++ b/macros/latex/contrib/l3kernel/l3news06.pdf diff --git a/macros/latex/contrib/l3kernel/l3news07.pdf b/macros/latex/contrib/l3kernel/l3news07.pdf Binary files differindex 8931c7737f..e0208fa696 100644 --- a/macros/latex/contrib/l3kernel/l3news07.pdf +++ b/macros/latex/contrib/l3kernel/l3news07.pdf diff --git a/macros/latex/contrib/l3kernel/l3news08.pdf b/macros/latex/contrib/l3kernel/l3news08.pdf Binary files differindex 7e67e421e5..ae306f8536 100644 --- a/macros/latex/contrib/l3kernel/l3news08.pdf +++ b/macros/latex/contrib/l3kernel/l3news08.pdf diff --git a/macros/latex/contrib/l3kernel/l3news09.pdf b/macros/latex/contrib/l3kernel/l3news09.pdf Binary files differindex 9ee5defb5a..0dd900517a 100644 --- a/macros/latex/contrib/l3kernel/l3news09.pdf +++ b/macros/latex/contrib/l3kernel/l3news09.pdf diff --git a/macros/latex/contrib/l3kernel/l3news10.pdf b/macros/latex/contrib/l3kernel/l3news10.pdf Binary files differindex 09f935dbc8..e96f6bb029 100644 --- a/macros/latex/contrib/l3kernel/l3news10.pdf +++ b/macros/latex/contrib/l3kernel/l3news10.pdf diff --git a/macros/latex/contrib/l3kernel/l3news11.pdf b/macros/latex/contrib/l3kernel/l3news11.pdf Binary files differindex 89cd55cfde..3a4e17fd16 100644 --- a/macros/latex/contrib/l3kernel/l3news11.pdf +++ b/macros/latex/contrib/l3kernel/l3news11.pdf diff --git a/macros/latex/contrib/l3kernel/l3news12.pdf b/macros/latex/contrib/l3kernel/l3news12.pdf Binary files differindex 3423a6bed6..0f7aaf6285 100644 --- a/macros/latex/contrib/l3kernel/l3news12.pdf +++ b/macros/latex/contrib/l3kernel/l3news12.pdf diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf Binary files differindex c24789d584..7ff0a83c23 100644 --- a/macros/latex/contrib/l3kernel/l3prefixes.pdf +++ b/macros/latex/contrib/l3kernel/l3prefixes.pdf diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx index d886d7c508..cbe1ea8bd4 100644 --- a/macros/latex/contrib/l3kernel/l3prg.dtx +++ b/macros/latex/contrib/l3kernel/l3prg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx index 7607e9eabc..7b06d4de6d 100644 --- a/macros/latex/contrib/l3kernel/l3prop.dtx +++ b/macros/latex/contrib/l3kernel/l3prop.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx index 7250f1663b..279747cfda 100644 --- a/macros/latex/contrib/l3kernel/l3quark.dtx +++ b/macros/latex/contrib/l3kernel/l3quark.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx index ffbbfae3ca..746ebde995 100644 --- a/macros/latex/contrib/l3kernel/l3regex.dtx +++ b/macros/latex/contrib/l3kernel/l3regex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx index 9aa2cf8eba..ccc96251db 100644 --- a/macros/latex/contrib/l3kernel/l3seq.dtx +++ b/macros/latex/contrib/l3kernel/l3seq.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx index 41622bf0b6..0669b3b172 100644 --- a/macros/latex/contrib/l3kernel/l3skip.dtx +++ b/macros/latex/contrib/l3kernel/l3skip.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx index 87f555b59c..e95a16e715 100644 --- a/macros/latex/contrib/l3kernel/l3sort.dtx +++ b/macros/latex/contrib/l3kernel/l3sort.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx index 374d33e7d9..3cf63e2768 100644 --- a/macros/latex/contrib/l3kernel/l3str-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx index 4be3042bcd..15a1378668 100644 --- a/macros/latex/contrib/l3kernel/l3str.dtx +++ b/macros/latex/contrib/l3kernel/l3str.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf Binary files differindex 3e7032e88f..e61ce63c9d 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.pdf +++ b/macros/latex/contrib/l3kernel/l3styleguide.pdf diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex index 697e9383eb..0a7686ae03 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.tex +++ b/macros/latex/contrib/l3kernel/l3styleguide.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2020-02-21} +\date{Released 2020-02-25} \begin{document} diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf Binary files differindex 3af7128843..9663dbfa35 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex index 87e0cdae78..f6b5382fe9 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.tex +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2020-02-21} +\date{Released 2020-02-25} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx index 0b8e487955..d5b28d2f2b 100644 --- a/macros/latex/contrib/l3kernel/l3sys.dtx +++ b/macros/latex/contrib/l3kernel/l3sys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf Binary files differindex 01dd5eb4dc..8d83bef487 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.pdf +++ b/macros/latex/contrib/l3kernel/l3term-glossary.pdf diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex index 0193b6f261..3504f898f5 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.tex +++ b/macros/latex/contrib/l3kernel/l3term-glossary.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2020-02-21} +\date{Released 2020-02-25} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3text-case.dtx b/macros/latex/contrib/l3kernel/l3text-case.dtx index 46c11330f1..9cf8bff4ce 100644 --- a/macros/latex/contrib/l3kernel/l3text-case.dtx +++ b/macros/latex/contrib/l3kernel/l3text-case.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % @@ -1388,6 +1388,91 @@ { 01F4 } { 01F5 } { 0218 } { 0219 } { 021A } { 021B } +% \end{macrocode} +% Add |T2| (Cyrillic) as this is doable using a classical \tn{MakeUppercase} +% approach. +% \begin{macrocode} + { 0400 } { 0450 } + { 0401 } { 0451 } + { 0402 } { 0452 } + { 0403 } { 0453 } + { 0404 } { 0454 } + { 0405 } { 0455 } + { 0406 } { 0456 } + { 0407 } { 0457 } + { 0408 } { 0458 } + { 0409 } { 0459 } + { 040A } { 045A } + { 040B } { 045B } + { 040C } { 045C } + { 040D } { 045D } + { 040E } { 045E } + { 040F } { 045F } + { 0410 } { 0430 } + { 0411 } { 0431 } + { 0412 } { 0432 } + { 0413 } { 0433 } + { 0414 } { 0434 } + { 0415 } { 0435 } + { 0416 } { 0436 } + { 0417 } { 0437 } + { 0418 } { 0438 } + { 0419 } { 0439 } + { 041A } { 043A } + { 041B } { 043B } + { 041C } { 043C } + { 041D } { 043D } + { 041E } { 043E } + { 041F } { 043F } + { 0420 } { 0440 } + { 0421 } { 0441 } + { 0422 } { 0442 } + { 0423 } { 0443 } + { 0424 } { 0444 } + { 0425 } { 0445 } + { 0426 } { 0446 } + { 0427 } { 0447 } + { 0428 } { 0448 } + { 0429 } { 0449 } + { 042A } { 044A } + { 042B } { 044B } + { 042C } { 044C } + { 042D } { 044D } + { 042E } { 044E } + { 042F } { 044F } +% \end{macrocode} +% Core Greek support: there may need to be a little more work here to +% deal completely with accents. +% \begin{macrocode} + { 0391 } { 03B1 } + { 0392 } { 03B2 } + { 0393 } { 03B3 } + { 0394 } { 03B4 } + { 0395 } { 03B5 } + { 0396 } { 03B6 } + { 0397 } { 03B7 } + { 0398 } { 03B8 } + { 0399 } { 03B9 } + { 039A } { 03BA } + { 039B } { 03BB } + { 039C } { 03BC } + { 039D } { 03BD } + { 039E } { 03BE } + { 039F } { 03BF } + { 03A0 } { 03C0 } + { 03A1 } { 03C1 } + { 03A3 } { 03C3 } + { 03A4 } { 03C4 } + { 03A5 } { 03C5 } + { 03A6 } { 03C6 } + { 03A7 } { 03C7 } + { 03A8 } { 03C8 } + { 03A9 } { 03C9 } + { 03D8 } { 03D9 } + { 03DA } { 03DB } + { 03DC } { 03DD } + { 03DE } { 03DF } + { 03E0 } { 03E1 } \q_recursion_tail ? \q_recursion_stop \cs_set_protected:Npn \@@_tmp:w #1#2#3 diff --git a/macros/latex/contrib/l3kernel/l3text.dtx b/macros/latex/contrib/l3kernel/l3text.dtx index 66279f7fff..837c1761d4 100644 --- a/macros/latex/contrib/l3kernel/l3text.dtx +++ b/macros/latex/contrib/l3kernel/l3text.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % @@ -91,7 +91,7 @@ % % \subsection{Case changing} % -% \begin{function}[EXP, added = 2019-11-20] +% \begin{function}[EXP, added = 2019-11-20, updated = 2020-02-24] % { % \text_lowercase:n, \text_uppercase:n, \text_titlecase:n, % \text_titlecase_first:n, @@ -142,7 +142,8 @@ % {Unicode Consortium} in \texttt{UnicodeData.txt} and % \texttt{SpecialCasing.txt}. In the case of $8$-bit engines, mappings % are provided for characters which can be represented in output typeset -% using the |T1| font encoding. Thus for example \texttt{ä} can be +% using the |T1|, |T2| and |LGR| font encodings. +% Thus for example \texttt{ä} can be % case-changed using \pdfTeX{}. For \pTeX{} only the ASCII range is % covered as the engine treats input outside of this range as east Asian. % diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx index 23017b37da..fe96c4ba2a 100644 --- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx +++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx index f9a85ab2a8..229d5f8196 100644 --- a/macros/latex/contrib/l3kernel/l3tl.dtx +++ b/macros/latex/contrib/l3kernel/l3tl.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % @@ -1086,7 +1086,7 @@ % Leaves in the input stream the items from the \meta{start index} to the % \meta{end index} inclusive. Spaces and braces are preserved between % the items returned (but never at either end of the list). -% Here \meta{start index} and \meta{end index} should be integer denotations. +% Here \meta{start index} and \meta{end index} should be \meta{integer expressions}. % For describing in detail the functions' behavior, let $m$ and $n$ be the start % and end index respectively. If either is $0$, the result is empty. A positive % index means `start counting from the left end', and a negative index means diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx index d3ce452a0e..1d07b79af4 100644 --- a/macros/latex/contrib/l3kernel/l3token.dtx +++ b/macros/latex/contrib/l3kernel/l3token.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx index 1578cbaf79..40c6775754 100644 --- a/macros/latex/contrib/l3kernel/l3unicode.dtx +++ b/macros/latex/contrib/l3kernel/l3unicode.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-02-25} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf Binary files differindex 46e61837a7..d3419a584b 100644 --- a/macros/latex/contrib/l3kernel/source3.pdf +++ b/macros/latex/contrib/l3kernel/source3.pdf diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex index c3b7c06411..b18a1fc90a 100644 --- a/macros/latex/contrib/l3kernel/source3.tex +++ b/macros/latex/contrib/l3kernel/source3.tex @@ -53,7 +53,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2020-02-21} +\date{Released 2020-02-25} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3packages/CHANGELOG.md b/macros/latex/contrib/l3packages/CHANGELOG.md index 363bbf7cdd..2a56ece1a1 100644 --- a/macros/latex/contrib/l3packages/CHANGELOG.md +++ b/macros/latex/contrib/l3packages/CHANGELOG.md @@ -7,6 +7,11 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-02-25] + +### Changed +- Issue warnings for unsupported delimiters in `xparse` + ## [2020-02-14] ### Fixed @@ -76,7 +81,8 @@ this project uses date-based 'snapshot' version identifiers. - Switch to ISO date format - Improve cross-module use of internal functions -[Unreleased]: https://github.com/latex3/latex3/compare/2020-02-14...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2020-02-25...HEAD +[2020-02-25]: https://github.com/latex3/latex3/compare/2020-02-14...2020-02-25 [2020-02-14]: https://github.com/latex3/latex3/compare/2020-02-08...2020-02-14 [2020-02-08]: https://github.com/latex3/latex3/compare/2020-02-03...2020-02-08 [2020-02-03]: https://github.com/latex3/latex3/compare/2020-01-12...2020-02-03 diff --git a/macros/latex/contrib/l3packages/README.md b/macros/latex/contrib/l3packages/README.md index 4aea7fed22..b7712552ba 100644 --- a/macros/latex/contrib/l3packages/README.md +++ b/macros/latex/contrib/l3packages/README.md @@ -1,7 +1,7 @@ LaTeX3 High-Level Concepts ========================== -Release 2020-02-14 +Release 2020-02-25 Overview -------- diff --git a/macros/latex/contrib/l3packages/l3keys2e.dtx b/macros/latex/contrib/l3packages/l3keys2e.dtx index 6d932b4126..2022b0ac00 100644 --- a/macros/latex/contrib/l3packages/l3keys2e.dtx +++ b/macros/latex/contrib/l3packages/l3keys2e.dtx @@ -62,7 +62,7 @@ % }^^A % } % -% \date{Released 2020-02-14} +% \date{Released 2020-02-25} % % \maketitle % @@ -139,7 +139,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3keys2e}{2020-02-14}{} +\ProvidesExplPackage{l3keys2e}{2020-02-25}{} {LaTeX2e option processing using LaTeX3 keys} % \end{macrocode} % diff --git a/macros/latex/contrib/l3packages/l3keys2e.pdf b/macros/latex/contrib/l3packages/l3keys2e.pdf Binary files differindex c40b0ca21e..ac7a187f8e 100644 --- a/macros/latex/contrib/l3packages/l3keys2e.pdf +++ b/macros/latex/contrib/l3packages/l3keys2e.pdf diff --git a/macros/latex/contrib/l3packages/xfp.dtx b/macros/latex/contrib/l3packages/xfp.dtx index c976197b91..6bd7eb53b2 100644 --- a/macros/latex/contrib/l3packages/xfp.dtx +++ b/macros/latex/contrib/l3packages/xfp.dtx @@ -64,7 +64,7 @@ % }^^A % } % -% \date{Released 2020-02-14} +% \date{Released 2020-02-25} % % \maketitle % @@ -167,7 +167,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xfp}{2020-02-14}{} +\ProvidesExplPackage{xfp}{2020-02-25}{} {L3 Floating point unit} % \end{macrocode} % diff --git a/macros/latex/contrib/l3packages/xfp.pdf b/macros/latex/contrib/l3packages/xfp.pdf Binary files differindex 9680389654..74dc6b73c3 100644 --- a/macros/latex/contrib/l3packages/xfp.pdf +++ b/macros/latex/contrib/l3packages/xfp.pdf diff --git a/macros/latex/contrib/l3packages/xfrac.dtx b/macros/latex/contrib/l3packages/xfrac.dtx index 3229465d5d..287c27a744 100644 --- a/macros/latex/contrib/l3packages/xfrac.dtx +++ b/macros/latex/contrib/l3packages/xfrac.dtx @@ -65,7 +65,7 @@ % }^^A % } % -% \date{Released 2020-02-14} +% \date{Released 2020-02-25} % % \maketitle % @@ -535,7 +535,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xfrac}{2020-02-14}{} +\ProvidesExplPackage{xfrac}{2020-02-25}{} {L3 Experimental split-level fractions} % \end{macrocode} % diff --git a/macros/latex/contrib/l3packages/xfrac.pdf b/macros/latex/contrib/l3packages/xfrac.pdf Binary files differindex 4696d0e129..4031e6c18e 100644 --- a/macros/latex/contrib/l3packages/xfrac.pdf +++ b/macros/latex/contrib/l3packages/xfrac.pdf diff --git a/macros/latex/contrib/l3packages/xparse.dtx b/macros/latex/contrib/l3packages/xparse.dtx index fa5e6e301d..fc0164a8cd 100644 --- a/macros/latex/contrib/l3packages/xparse.dtx +++ b/macros/latex/contrib/l3packages/xparse.dtx @@ -67,7 +67,7 @@ % }^^A % } % -% \date{Released 2020-02-14} +% \date{Released 2020-02-25} % % \maketitle % @@ -916,7 +916,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xparse}{2020-02-14}{} +\ProvidesExplPackage{xparse}{2020-02-25}{} {L3 Experimental document command parser} % \end{macrocode} % @@ -1793,7 +1793,7 @@ % with the default argument |-NoValue-|. To easily insert that marker % expanded in the definitions we call \cs{@@_tmp:w} with the argument % |-NoValue-|. For argument types that need additional data, check -% that that data is present (not \cs{q_recursion_tail}) before +% that the data is present (not \cs{q_recursion_tail}) before % proceeding. % \begin{macrocode} \cs_set_protected:Npn \@@_tmp:w #1 @@ -2992,7 +2992,7 @@ % same character with different category codes, but that really should not % happen in any sensible document-level syntax.) % \begin{macrocode} -\cs_set_protected_nopar:Npn \@@_grab_D_call:Nw #1 +\cs_new_protected_nopar:Npn \@@_grab_D_call:Nw #1 { \token_if_eq_catcode:NNTF + #1 { @@ -4894,10 +4894,7 @@ } \keys_set:nV { xparse } \l_@@_options_clist \bool_if:NF \l_@@_log_bool - { - \msg_redirect_module:nnn { LaTeX / xparse } { info } { none } - \msg_redirect_module:nnn { LaTeX / xparse } { warning } { none } - } + { \msg_redirect_module:nnn { LaTeX / xparse } { info } { none } } % \end{macrocode} % \end{variable} % \end{variable} diff --git a/macros/latex/contrib/l3packages/xparse.pdf b/macros/latex/contrib/l3packages/xparse.pdf Binary files differindex eb6a61e0b6..b9bf02a381 100644 --- a/macros/latex/contrib/l3packages/xparse.pdf +++ b/macros/latex/contrib/l3packages/xparse.pdf diff --git a/macros/latex/contrib/l3packages/xtemplate.dtx b/macros/latex/contrib/l3packages/xtemplate.dtx index 27ad45e22f..9a10fbca81 100644 --- a/macros/latex/contrib/l3packages/xtemplate.dtx +++ b/macros/latex/contrib/l3packages/xtemplate.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2020-02-14} +% \date{Released 2020-02-25} % % \maketitle % @@ -682,7 +682,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xtemplate}{2020-02-14}{} +\ProvidesExplPackage{xtemplate}{2020-02-25}{} {L3 Experimental prototype document functions} % \end{macrocode} % @@ -2292,7 +2292,7 @@ % \begin{macro}{\@@_assign_tokenlist:} % \begin{macro}{\@@_assign_tokenlist_aux:NN} % Life would be easy here if it were not for \cs{KeyValue}. To deal -% correctly with that, we need to allow for the recovery a a stored value +% correctly with that, we need to allow for the recovery a stored value % at point of use. % \begin{macrocode} \cs_new_protected:Npn \@@_assign_tokenlist: diff --git a/macros/latex/contrib/l3packages/xtemplate.pdf b/macros/latex/contrib/l3packages/xtemplate.pdf Binary files differindex 148db5798f..40f55ded1a 100644 --- a/macros/latex/contrib/l3packages/xtemplate.pdf +++ b/macros/latex/contrib/l3packages/xtemplate.pdf diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index bd9895a113..7609bf7877 100644 --- a/macros/latex/contrib/siunitx/siunitx.dtx +++ b/macros/latex/contrib/siunitx/siunitx.dtx @@ -699,6 +699,8 @@ This work consists of the file siunitx.dtx % bookmarks} % \changes{v2.8a}{2020/02/23}{Correct appearance of ohm when % \pkg{unicode-math} is loaded} +% \changes{v2.8b}{2020/02/25}{Correct appearance of ohm when +% \pkg{newtxmath} is loaded} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -5223,7 +5225,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2020/02/23} {2.8a} +\ProvidesExplPackage {siunitx} {2020/02/25} {2.8b} {A comprehensive (SI) units package} % \end{macrocode} % @@ -15389,7 +15391,14 @@ This work consists of the file siunitx.dtx { \text { \ensuremath { \Omega } } } { \text { \ensuremath { \Upomega } } } } - { } + { + \cs_if_exist:NT \upOmega + { + \@@_option_unchanged:Nnn \l_@@_ohm_math_tl + { \text { \ensuremath { \Omega } } } + { \text { \ensuremath { \upOmega } } } + } + } } } % \end{macrocode} diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf Binary files differindex e03e55beaf..fa11c665ec 100644 --- a/macros/latex/contrib/siunitx/siunitx.pdf +++ b/macros/latex/contrib/siunitx/siunitx.pdf |