diff options
Diffstat (limited to 'macros/latex')
57 files changed, 1136 insertions, 419 deletions
diff --git a/macros/latex/contrib/acro/acro-manual.pdf b/macros/latex/contrib/acro/acro-manual.pdf Binary files differindex 8d5fded23e..8a441d4a1f 100644 --- a/macros/latex/contrib/acro/acro-manual.pdf +++ b/macros/latex/contrib/acro/acro-manual.pdf diff --git a/macros/latex/contrib/acro/acro.history b/macros/latex/contrib/acro/acro.history index d6aa883d6d..21e61394dd 100644 --- a/macros/latex/contrib/acro/acro.history +++ b/macros/latex/contrib/acro/acro.history @@ -280,3 +280,4 @@ feel free to contact me. - rename the manual file and use a dedicated class for the manual - prefer lazy boolean evaluation when possible +2020/01/16 v2.11a - adapt to new l3text module diff --git a/macros/latex/contrib/acro/acro.sty b/macros/latex/contrib/acro/acro.sty index 98425268c1..0717259d27 100644 --- a/macros/latex/contrib/acro/acro.sty +++ b/macros/latex/contrib/acro/acro.sty @@ -35,10 +35,10 @@ \ExplSyntaxOn -\tl_const:Nn \c_acro_date_tl {2020/01/11} +\tl_const:Nn \c_acro_date_tl {2020/01/16} \tl_const:Nn \c_acro_version_major_number_tl {2} \tl_const:Nn \c_acro_version_minor_number_tl {11} -\tl_const:Nn \c_acro_version_subrelease_tl {} +\tl_const:Nn \c_acro_version_subrelease_tl {a} \tl_const:Nx \c_acro_version_number_tl { \c_acro_version_major_number_tl . @@ -487,9 +487,8 @@ \cs_new:Npn \acro_no_break: { \tex_penalty:D 10000 \scan_stop: } \cs_new_protected:Npn \__acro_first_upper_case:n #1 - { \tl_upper_case:n { \tl_head:n {#1} } \tl_tail:n {#1} } + { \text_titlecase_first:n {#1} } \cs_generate_variant:Nn \__acro_first_upper_case:n {x} -\cs_generate_variant:Nn \tl_mixed_case:n {x} \cs_new_eq:NN \acro_first_upper_case:n \__acro_first_upper_case:n @@ -702,7 +701,7 @@ } } \cs_generate_variant:Nn \acro_first_instance:nn {nV} - + % -------------------------------------------------------------------------- % hyperref support \cs_new_eq:NN \acro_hyper_target:nn \use_ii:nn @@ -1858,7 +1857,7 @@ { \bool_if:NTF \g__acro_case_sensitive_bool { \tl_to_str:n {#1} } - { \str_lower_case:n {#1} } + { \str_lowercase:n {#1} } } \cs_new_protected:Npn \acro_protected_case_insensitive:n #1 diff --git a/macros/latex/contrib/bearwear/README.md b/macros/latex/contrib/bearwear/README.md new file mode 100644 index 0000000000..fe6ffb7a6e --- /dev/null +++ b/macros/latex/contrib/bearwear/README.md @@ -0,0 +1,32 @@ +# bearwear --- A package for tikz bear fashion +Packageversion: 0.1 +Idea: Bär, Implementation: Ulrike Fischer 2020 +Packagedate: 2020-01-15 + +## LICENSE +LaTeX Project Public License + +## CONTENTS AND INSTALLATION + +- README.md (this file) +- bearwear.dtx +- bearwear.ins +- bearwear.pdf (documentation) +- tartan3.jpg,baer.png,montblanc.jpg,ulrike.pdf,flag.pdf,latex-project-logo.pdf + +The best is to install bearwear with the package manager of your texsystem. + +For manual installation compile the .ins file. This will create bearwear.sty and bearwear-doc.tex. +Move bearwear.sty in <texmf>/tex/latex/bearwear/ and update the filename +database. Compile bearwear.dtx to get the documentation + (it will need the extrated bearwear-doc.tex and all the graphics files). + + + +## DESCRIPTION + +This package offers commands to create shirts for a tikzbear. + +## REQUIREMENTS +It needs a recent version of pgf and tikzlings-bears. + diff --git a/macros/latex/contrib/bearwear/baer.png b/macros/latex/contrib/bearwear/baer.png Binary files differnew file mode 100644 index 0000000000..6263f06ef0 --- /dev/null +++ b/macros/latex/contrib/bearwear/baer.png diff --git a/macros/latex/contrib/bearwear/bearwear.dtx b/macros/latex/contrib/bearwear/bearwear.dtx new file mode 100644 index 0000000000..497cf44544 --- /dev/null +++ b/macros/latex/contrib/bearwear/bearwear.dtx @@ -0,0 +1,511 @@ +% \iffalse meta-comment +% +%% File: bearwear.dtx +% +% Copyright (C) 2020 Ulrike Fischer / Bär +% +% 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 +% +% https://www.latex-project.org/lppl.txt +% +% This file is part of the "bearwear bundle" (The Work in LPPL) +% and all files in that bundle must be distributed together. +% +% ----------------------------------------------------------------------- +% +% The development version of the bundle can be found at +% +% https://github.com/u-fischer/bearwear +% +% for those people who are interested. +% +%<*driver> +\documentclass{l3doc} +\OnlyDescription +\PassOptionsToPackage{svgnames}{xcolor} +\usepackage{tikzlings,tikzducks,bearwear} +\usetikzlibrary{patterns,patterns.meta} +\usepackage{csquotes,graphicx} +\usepackage{needspace} +\usepackage{AlegreyaSans} +\setmainfont{Heuristica} +\usepackage[most]{tcolorbox} + +\lstdefinestyle{bearwarestyle}{% stolen and adapted from tikzlings + language={[latex]TeX}, + tabsize=2, + breaklines, + basicstyle=\ttfamily, + commentstyle={\color{green!50!black}\slshape}, + columns=fullflexible, + alsodigit={-}, + alsoletter={3}, + emphstyle=\color{red!60!black}, + emph=[1]{ + v-neckline,muscle, shirt, t-shirt, long, sleeves, round, neckline, + leftarm, rightarm,arms,deco,body, pattern,beartummy, + bearheart,color}, + texcsstyle=*\color{SteelBlue!50!black}\bfseries, + keywordstyle=\color{red!60!black}\bfseries, + morekeywords={tikzpicture}, + moretexcs={bearwear, bearwearsetup}, + delim ={[s][\ttfamily\color{green!50!black}]{$}{$}}, + moredelim=[is][\footnotesize\ttfamily\color{orange!70!black}]{|}{|}, + index=[1][emph] +} +\tcbset{% + colframe=SteelBlue!50!black, + arc=0mm, + fonttitle=\bfseries, + sidebyside, + listing options={style=bearwarestyle}, + center lower, + righthand width=4cm, + bottom=0pt, + top=0pt, + %tikz lower, + height plus=3cm, + colback=SteelBlue!30!white, + enlarge top initially by=10pt +} +\lstset{style=bearwarestyle} +\tikzset{ + hippo/.pic = { + \begin{scope}[scale=0.2,transform shape] + \hippo; + \begin{scope}[yshift=0.15cm,xshift=-0.5cm,rotate=8] + \duck[invisible,bowtie] + \end{scope} + \end{scope}},} +\raggedbottom +\let\bearwearkey\lstinline +\newcommand{\TikZ}{Ti\emph{k}Z} + +\GetFileInfo{bearwear.sty} +\title{The \bearwearlogo{} Package% + \thanks{This file describes \fileversion, + last revised \filedate.}} +\author{Idea: Bär~~\includegraphics[trim=0pt 15pt 0pt 0pt,height=13pt]{baer} + \and Implementation: Ulrike Fischer% + \thanks{Issues should be reported at https://github.com/u-fischer/bearwear} + ~\includegraphics[trim=0pt 15pt 0pt 0pt,height=15pt]{ulrike}} +\date{\filedate} +\begin{document} + \DocInput{\jobname.dtx} +\end{document} +%</driver> +% \fi +% \maketitle +% {\catcode`\%=14 \input{bearwear-doc}} +% +% \StopEventually{} +% \begin{macrocode} +%<@@=bearwear> +%<*package> +\RequirePackage{xparse} +\RequirePackage{tikzlings-bears} +\ProvidesExplPackage {bearwear} {2020-01-15} {0.1} + {A package for tikz bear fashion} +\ProcessOptions\relax +% a tikzset style to reverse the clip: +\tikzset + {@@reverseclip/.style= + {insert~path= + { + (current~bounding~box.south~west) -- (current~bounding~box.north~west) + -- + (current~bounding~box.north~east) -- (current~bounding~box.south~east) + -- cycle + } + } + } + +\definecolor{@@europablue}{RGB}{00,33,99} + +\cs_new_protected:Npn \@@_rightarm_path:nn #1 #2 %#1 fill, clip, #2 user + { + \path[#1,#2,rotate~around={-50\char_generate:nn{58}{12}(0.525,0.9)}] + (0.525,0.9) ellipse (0.35~and~0.15); + } + +\cs_new_protected:Npn \@@_leftarm_path:nn #1 #2 %#1 fill, clip, #2 user + { + \path[#1,#2,rotate~around={50\char_generate:nn{58}{12}(-0.525,0.9)}] + (-0.525,0.9) ellipse (0.35~and~0.15); + } + +\cs_new_protected:Npn \@@_body_path:nn #1 #2 %#1 fill, clip, #2 user + { + \path[#1,#2] (0,0.75) ellipse (0.55~and~0.65); + } + +\cs_new_protected:Npn \@@_init_path: + { + \@@_rightarm_path:nn {}{} + \@@_leftarm_path:nn {}{} + \@@_body_path:nn {}{} + } + +\cs_new_protected:Npn \@@_set_coordinates: + { + \coordinate (beartummy) at (0,0.75); + \coordinate (bearheart) at (0.25,0.9); + } + +\cs_new_protected:Npn \@@_clipping_path: + { + \bool_if:NTF \l__bearwear_v_neckline_bool + { + \clip (0, 1.55) circle (0.5) [__bearwearreverseclip]; %head + \clip (-0.4, 1.55) -- (0.4, 1.55) -- (0,0.8) --cycle[__bearwearreverseclip]; + %v-neck + } + { + \clip (0, 1.55) circle (0.53) [__bearwearreverseclip]; %head + } + \clip (0.425, 0.3) circle (0.28) [@@reverseclip]; + \clip (-0.425, 0.3) circle (0.28) [@@reverseclip]; + \bool_if:NTF \l_@@_t_shirt_bool + { + \clip (-1,0.6) --++ (0.45,0)--++(-0.5,5) --cycle[@@reverseclip] ; + \clip ( 1,0.6) --++ (-0.45,0)--++(0.5,5) --cycle[@@reverseclip] ; + } + { + \clip (-1,0.6) --++ (0.45,0)--++(-0.5,1) --cycle[@@reverseclip] ; + \clip ( 1,0.6) --++ (-0.45,0)--++(0.5,1) --cycle[@@reverseclip] ; + } + \clip(-1,0.5) rectangle (1,1.2); + } + +\cs_new_protected:Npn \@@_shirt_color: + { + \bool_if:NF \l_@@_muscle_shirt_bool + { + \exp_args:Nno \@@_leftarm_path:nn {fill}{\l_@@_leftarm_color_tl} + \exp_args:Nno \@@_rightarm_path:nn {fill}{\l_@@_rightarm_color_tl} + } + \exp_args:Nno \@@_body_path:nn {fill}{\l_@@_body_color_tl} + } + +\cs_new_protected:Npn \@@_shirt_pattern: + { + \bool_if:NF \l_@@_muscle_shirt_bool + { + \exp_args:Nno \@@_leftarm_path:nn {}{\l_@@_leftarm_pattern_tl} + \exp_args:Nno \@@_rightarm_path:nn {}{\l_@@_rightarm_pattern_tl} + } + \exp_args:Nno \@@_body_path:nn {}{\l_@@_body_pattern_tl} + } + +\cs_new_protected:Npn \@@_shirt_deco: + { + \bool_if:NF \l_@@_muscle_shirt_bool + { + \exp_args:Nno \@@_leftarm_path:nn {}{\l_@@_leftarm_deco_tl} + \exp_args:Nno \@@_rightarm_path:nn {}{\l_@@_rightarm_deco_tl} + } + \exp_args:Nno \@@_body_path:nn {}{\l_@@_body_deco_tl} + } + +\bool_new:N \l_@@_t_shirt_bool +\bool_new:N \l_@@_muscle_shirt_bool +\bool_new:N \l__bearwear_round_neckline_bool + +\tl_new:N \l_@@_leftarm_color_tl +\tl_new:N \l_@@_rightarm_color_tl +\tl_new:N \l_@@_body_color_tl + +\tl_new:N \l_@@_leftarm_pattern_tl +\tl_new:N \l_@@_rightarm_pattern_tl +\tl_new:N \l_@@_body_pattern_tl +\tl_new:N \l_@@_leftarm_deco_tl +\tl_new:N \l_@@_rightarm_deco_tl +\tl_new:N \l_@@_body_deco_tl + +\keys_define:nn {@@} + { + ,leftarm .tl_set:N = \l_@@_leftarm_color_tl + ,leftarm .initial:n = {@@europablue} + ,leftarm~pattern .tl_set:N = \l_@@_leftarm_pattern_tl + ,leftarm~deco .code:n = + {\tl_set:Nn \l_@@_leftarm_deco_tl {path~picture = {#1}}} + ,rightarm .tl_set:N = \l_@@_rightarm_color_tl + ,rightarm .initial:n = {@@europablue} + ,rightarm~pattern .tl_set:N = \l_@@_rightarm_pattern_tl + ,rightarm~deco .code:n = + {\tl_set:Nn \l_@@_rightarm_deco_tl {path~picture = {#1}}} + ,body .tl_set:N = \l_@@_body_color_tl + ,body .initial:n = {@@europablue} + ,body~pattern .tl_set:N = \l_@@_body_pattern_tl + ,arms .meta:n = {leftarm={#1},rightarm={#1}} + ,arms~pattern .meta:n = {leftarm~pattern={#1},rightarm~pattern={#1}} + ,arms~deco .meta:n = {leftarm~deco={#1},rightarm~deco={#1}} + ,shirt .meta:n = {body={#1},leftarm={#1},rightarm={#1}} + ,shirt~pattern .meta:n = + {body~pattern={#1},leftarm~pattern={#1},rightarm~pattern={#1}} + ,shirt~deco .meta:n = + {body~deco={#1},leftarm~deco={#1},rightarm~deco={#1}} + ,long~sleeves .bool_set_inverse:N = \l_@@_t_shirt_bool + ,t-shirt .bool_set:N = \l_@@_t_shirt_bool + ,muscle~shirt .bool_set:N = \l_@@_muscle_shirt_bool + ,body~deco .code:n = + {\tl_set:Nn \l_@@_body_deco_tl {path~picture = {#1}}} + ,round~neckline .bool_set_inverse:N = \l__bearwear_v_neckline_bool + ,v-neckline .bool_set:N = \l__bearwear_v_neckline_bool + } + +\NewDocumentCommand\bearwearsetup { m } + { + \keys_set:nn { @@ } {#1} + } +\NewDocumentCommand\bearwear { O {} } + { + \begin{scope}[even~odd~rule] + % handle keys + \keys_set:nn { @@ } {#1} + \@@_init_path: + \@@_set_coordinates: + \@@_clipping_path: + \@@_shirt_color: + \@@_shirt_pattern: + \@@_shirt_deco: + \end{scope} + } + +\NewDocumentCommand\bearwearlogo {} {{ + \normalfont\fontencoding{T1}\fontfamily{AlegreyaSans-LF}\selectfont + BearWear + \raisebox{0.8ex}[0pt][0pt]{ + %\textcircled{ + \begin{tikzpicture}[baseline={(0,0.03)},scale=\fp_eval:n{\f@size/100}] + \bear; + \bearwear[body~deco={\node[text=white] at (beartummy) + {\fontsize{\fp_eval:n{\f@size/20}pt}{\fp_eval:n{\f@size/20}pt} + \sffamily + BearWear};}] + \end{tikzpicture}}}}%} +%</package> +% \end{macrocode} +%<*docu> +\section{Basic Usage} + + The package is based on \TikZ{} and the main command should be used in a \texttt{tikzpicture} or -- as shown in some of the examples -- with \verb+\tikz+. + + \subsection{The shirts} + The package provides a number of shirts for the bear, \bearwearkey{long sleeves} and \bearwearkey{round neckline} are the defaults: + \begin{tcblisting}{righthand width=6cm} + \tikz\bearwear % default + [long sleeves, + round neckline]; + \tikz\bearwear + [t-shirt]; + \tikz\bearwear + [muscle shirt]; + + \tikz\bearwear + [v-neckline]; + \tikz\bearwear + [t-shirt,v-neckline]; + \tikz\bearwear + [muscle shirt,v-neckline]; + \end{tcblisting} + + \subsection{Dressing the bear} + + To dress the bear with the shirt, simply add the \verb+\bear+ command from the \bearwearkey{tikzlings-bears} package. + + \begin{tcblisting}{before=\parindent0pt\nopagebreak} + \tikz{\bear;\bearwear[v-neckline];} + \tikz{\bear;\bearwear[muscle shirt];} + \end{tcblisting} + + \subsection{Coloring the shirts} + + The body and the arms of the shirts can be colored. They are three basic keys: \bearwearkey{leftarm}, \bearwearkey{rightarm} and \bearwearkey{body}, and two meta keys: \bearwearkey{arms} and \bearwearkey{shirt}. + Basically every option that would make sense in a \lstinline|\fill| is allowed here. + Patterns e.g. would work too. + \begin{tcblisting}{tikz lower} + \bear; + \bearwear + [v-neckline, + leftarm=red, + rightarm=green, + body=blue]; + \end{tcblisting} + \begin{tcblisting}{tikz lower} + \bear; + \bearwear[arms=green]; + \end{tcblisting} + \begin{tcblisting}{tikz lower} + \bear; + \bearwear + [shirt= + {shade, + top color=blue, + bottom color=red}]; + \end{tcblisting} + + + + \begin{tcblisting}{tikz lower,before=\parindent0pt\nopagebreak} + \bear; + \bearwear + [v-neckline, + shirt = + {pattern= + horizontal lines light blue}]; + \end{tcblisting} + + \subsection{Additional patterns} + + As seen in the last example patterns can be added instead of colors, but sometimes it makes sense to + add them on top to preserve a background color. For this the package provides special \texttt{pattern} keys:\\ + \bearwearkey{leftarm pattern}, \bearwearkey{rightarm pattern}, \bearwearkey{arms pattern}, + \bearwearkey{body pattern}, \bearwearkey{shirt pattern}, + + \begin{tcblisting}{tikz lower} + \bear; + \bearwear + [v-neckline, + shirt=red, + body pattern = + {pattern= + {Stars[points=6, + radius=0.5mm,distance=1.5mm]}, + pattern color=yellow}]; + \end{tcblisting} + + \subsection{Decorations} + + The \lstinline|deco| keys add their value to a \texttt{path picture} key. This can be used to place emblems or use graphics as pattern. To help with the placement two coordinates are + predefined: \bearwearkey{bearheart} and \bearwearkey{beartummy}. + + \begin{tcblisting}{tikz lower} + \bear; + \bearwear[shirt deco = + {\fill[red] (beartummy) circle (1pt); + \fill[red] (bearheart) circle (1pt);} + ] + \end{tcblisting} + + \begin{tcblisting}{tikz lower} + \bear; + \bearwear[shirt deco = + {\node at (beartummy) + {\includegraphics[width=5cm] + {tartan3}};}] + \end{tcblisting} + + \begin{tcblisting}{tikz lower} + \bear; + \bearwear[body deco= + {\node at ([yshift=-1mm]bearheart) + {\includegraphics[width=0.3cm] + {flag}};}]; + \end{tcblisting} + + \begin{tcblisting}{tikz lower} + \bear; + \bearwear[ + shirt=Beige!80!black, + body deco= + {\node at ([yshift=-1mm]bearheart) + {\includegraphics[width=0.5cm] + {latex-project-logo}};}]; + \end{tcblisting} + + \begin{tcblisting}{tikz lower} + \bear; + \bearwear[ + shirt=HotPink, + body deco= + {\path (bearheart)--++(0,-3mm) + pic{hippo};}]; + \end{tcblisting} + + \begin{tcblisting}{tikz lower} + \bear; + \bearwear[ + arms= DeepSkyBlue, + body deco = + {\node at ([yshift=-2mm]beartummy) + {\includegraphics[width=4cm] + {montblanc}}; + \node[text=white, + font=\tiny\sffamily] + at ([yshift=1.95mm]beartummy) + {{Mont Blanc}}; + }] + \end{tcblisting} + + \subsection{Scaling} + + Scaling works as expected, but don't forget that nodes in \TikZ{} normally don't scale if you don't use the \lstinline|transform shape| key: + + \begin{tcblisting}{tikz lower,before=\parindent0pt\nopagebreak,} + \begin{scope}[scale=1.5] + \bear; + \bearwear[ + arms= DeepSkyBlue, + body deco = + {\node at ([yshift=-2mm]beartummy) + {\includegraphics[width=4cm] + {montblanc}}; + \node[text=white, + font=\tiny\sffamily] + at ([yshift=2mm]beartummy) + {{Mont Blanc}}; + }] + \end{scope} + \end{tcblisting} + + \subsection{Setting up defaults} + + With \lstinline|\bearwearsetup| you can change the defaults: + + \begin{tcblisting}{} + \bearwearsetup + {body=green!50!black,arms=green} + \tikz{\bear;\bearwear;} + \tikz{\bear;\bearwear;} + \end{tcblisting} + \section{The brains behind \texorpdfstring{\bearwearlogo{}}{BearWear}} + \includegraphics[width=3cm]{baer} + \begin{description} + \item[Ulrike] + Bär, your decision to create \bearwearlogo{} has come as a surprise to many. Did you expect this? + \item[Bär] Quite true, Ulrike. I am better known as an outdoor type + and the fashionistas didn't reckon with me at all. + \item[Ulrike] So, why did you take this step? + \item[Bär] There were quite a few reasons -- most importantly + my deeply felt desire to bring more justice to the world. + Look at the wonderful world of \TikZ ducks fashion, and even Marmots have come + far in the area of refinement. Why should \TikZ bears be left behind? + \item[Ulrike] You are also concerned with the more momentous issues of our day. + \item[Bär] Correct! My fashion line is the first ever to have practically + no negative influence on our environment. Manufacture and transportation + are ecologically neutral. In fact it's the first time in the + history of world economy that goods are produced without + the use of raw materials. + \item[Ulrike] You claim that \bearwearlogo{} will have a global impact. + \item[Bär] Yes, the issue of globalization is one which has been interesting + me for a long time. \bearwearlogo{} caters for the needs of \TikZ bears all + over the world. There is the Longshirt Line for those who live near the poles, + t-shirts for those in temperate regions and even a Muscle Shirt Line for the + bears of Australia. + \item[Ulrike] How about individuality? + \item[Bär] I am particularly proud that \bearwearlogo{} enables every single + bear to create his own personal shirt -- free of the dictates of the modern + Brummells. He may use my suggestions but he need not do so. + \item[Ulrike] Will you be seen wearing your own creations? + \item[Bär] Well Ulrike, I am afraid this is not very likely. + I have got this most beautiful fur and I'd hate to cover it with artifical + patterns -- no matter how ravishing. + \item[Ulrike] One last question: what impulse got you moving towards + \bearwearlogo{}? + \item[Bär] The death of Karl Lagerfeld. Someone had to fill the void. + \end{description} + %</docu> diff --git a/macros/latex/contrib/bearwear/bearwear.ins b/macros/latex/contrib/bearwear/bearwear.ins new file mode 100644 index 0000000000..7e112c554d --- /dev/null +++ b/macros/latex/contrib/bearwear/bearwear.ins @@ -0,0 +1,70 @@ +\iffalse meta-comment + +File: bearwear.ins + +Copyright (C) 2020 Ulrike Fischer / Bär + +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 + + https://www.latex-project.org/lppl.txt + +This file is part of the "bearwear bundle" (The Work in LPPL) +and all files in that bundle must be distributed together. + +The released version of this bundle is available from CTAN. + +----------------------------------------------------------------------- + +The development version of the bundle can be found at + + https://github.com/u-fischer/bearwear + +for those people who are interested. + +----------------------------------------------------------------------- + +\fi + +\input l3docstrip.tex +\askforoverwritefalse + +\let\MetaPrefix\relax +\preamble + +Copyright (C) 2020 Ulrike Fischer / Bär + +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: + + https://www.latex-project.org/lppl.txt + +This file is part of the "bearwear bundle" (The Work in LPPL) +and all files in that bundle must be distributed together. + +\endpreamble +\let\MetaPrefix\DoubleperCent +% stop docstrip adding \endinput +\postamble +\endpostamble + +\keepsilent + +\generate + {% + \file{bearwear.sty} + {% + \from{bearwear.dtx}{package} + }% + \file{bearwear-doc.tex} + {% + \from{bearwear.dtx}{docu} + }% + } + + +\endbatchfile diff --git a/macros/latex/contrib/bearwear/bearwear.pdf b/macros/latex/contrib/bearwear/bearwear.pdf Binary files differnew file mode 100644 index 0000000000..6eb455f091 --- /dev/null +++ b/macros/latex/contrib/bearwear/bearwear.pdf diff --git a/macros/latex/contrib/bearwear/flag.pdf b/macros/latex/contrib/bearwear/flag.pdf Binary files differnew file mode 100644 index 0000000000..065d422ca3 --- /dev/null +++ b/macros/latex/contrib/bearwear/flag.pdf diff --git a/macros/latex/contrib/bearwear/latex-project-logo.pdf b/macros/latex/contrib/bearwear/latex-project-logo.pdf Binary files differnew file mode 100644 index 0000000000..bf32d25ef5 --- /dev/null +++ b/macros/latex/contrib/bearwear/latex-project-logo.pdf diff --git a/macros/latex/contrib/bearwear/montblanc.jpg b/macros/latex/contrib/bearwear/montblanc.jpg Binary files differnew file mode 100644 index 0000000000..f605535797 --- /dev/null +++ b/macros/latex/contrib/bearwear/montblanc.jpg diff --git a/macros/latex/contrib/bearwear/tartan3.jpg b/macros/latex/contrib/bearwear/tartan3.jpg Binary files differnew file mode 100644 index 0000000000..21cbbd68cb --- /dev/null +++ b/macros/latex/contrib/bearwear/tartan3.jpg diff --git a/macros/latex/contrib/bearwear/ulrike.pdf b/macros/latex/contrib/bearwear/ulrike.pdf Binary files differnew file mode 100644 index 0000000000..5cd08517f7 --- /dev/null +++ b/macros/latex/contrib/bearwear/ulrike.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bath/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-bath/README.md index 82ef9ef2a0..7caac7451c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bath/README.md +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bath/README.md @@ -96,7 +96,7 @@ documentation. ## Licence -Copyright 2016-2019 University of Bath. +Copyright 2016-2020 University of Bath. This work consists of the documented LaTeX file biblatex-bath.dtx and a Makefile. diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bath/biblatex-bath.dtx b/macros/latex/contrib/biblatex-contrib/biblatex-bath/biblatex-bath.dtx index bca43bc895..f5592d4c3b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bath/biblatex-bath.dtx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bath/biblatex-bath.dtx @@ -1,7 +1,33 @@ % \iffalse meta-comment +%<*internal|bbx|cbx|dbx|lbx|lbx-gb> +\def\Version{2020/01/16 v3.2} +%</internal|bbx|cbx|dbx|lbx|lbx-gb> %<*internal> \iffalse %</internal> +%<*bbx|cbx|dbx|lbx|lbx-gb> +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +%</bbx|cbx|dbx|lbx|lbx-gb> +%<*bbx> +\ProvidesFile{bath.bbx} + [\Version\space Biblography style as recommended by the University of Bath Library] +%</bbx> +%<*cbx> +\ProvidesFile{bath.cbx} + [\Version\space Citation style as recommended by the University of Bath Library] +%</cbx> +%<*dbx> +\ProvidesFile{bath.dbx} + [\Version\space Data model required by the biblatex-bath style] +%</dbx> +%<*lbx> +\ProvidesFile{english-bath.lbx} + [\Version\space Generic English conventions required by the biblatex-bath style] +%</lbx> +%<*lbx-gb> +\ProvidesFile{british-bath.lbx} + [\Version\space British English conventions required by the biblatex-bath style] +%</lbx-gb> %<*readme> # biblatex-bath: Harvard referencing style as recommended by the University of Bath Library %</readme> @@ -37,7 +63,7 @@ See: http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2019 by University of Bath +Copyright (C) 2020 by University of Bath \endpostamble \usedir{tex/latex/\jobname} @@ -63,7 +89,7 @@ Copyright (C) 2019 by University of Bath %</internal> %<*driver> \ProvidesFile{biblatex-bath.dtx} - [2019/08/29 v3.1 Harvard referencing style as recommended by the University of Bath Library] + [\Version\space Harvard referencing style as recommended by the University of Bath Library] \documentclass[10pt,a4paper]{article} \usepackage[british]{babel} @@ -397,7 +423,7 @@ documentation. \section{Using the style} -This style has been tested with \textsf{biblatex} versions 3.7 and 3.13. +This style has been tested with \textsf{biblatex} versions 3.12 and 3.14. To use the style, specify it when you load \textsf{biblatex}. To get the sorting order of your \emph{citations} right, specify the \texttt{ynt} sorting scheme. @@ -1414,13 +1440,13 @@ Use the \texttt{journal} field to specify the mailing list. If you omit the \begin{Verbatim} %</driver> %<*driver|bib> -@online{bvd2008bt, +@dataset{bvd2008bt, author = {{Bureau van Dijk}}, year = {2008}, title = {{BT} {Group} PLC Company Report}, library = {FAME}, address = {London}, - organization = {Bureau van Dijk}, + publisher = {Bureau van Dijk}, url = {http://www.portal.euromonitor.com}, urldate = {2014-11-06}} %</driver|bib> @@ -1442,13 +1468,13 @@ and the \texttt{library} field for the name of the database itself. \begin{Verbatim} %</driver> %<*driver|bib> -@online{wilson2013rgc, +@dataset{wilson2013rgc, author = {Wilson, D.}, year = {2013}, title = {Real Geometry and Connectedness via Triangular Description}, subtitle = {{CAD} Example Bank}, address = {Bath}, - organization = {University of Bath}, + publisher = {University of Bath}, doi = {10.15125/BATH-00069}, urldate = {2016-04-20}} %</driver|bib> @@ -1456,10 +1482,6 @@ and the \texttt{library} field for the name of the database itself. \end{Verbatim} \end{bibexbox} -\begin{tips}\item -You can also use \texttt{dataset} as an alias for \texttt{online}. -\end{tips} - \subsubsection*{Computer program} @@ -1997,7 +2019,7 @@ Commission case number, \texttt{number} for the formal decision number, and give %<readme>## Licence %<readme> %<*driver|readme> -Copyright 2016-2019 University of Bath. +Copyright 2016-2020 University of Bath. This work consists of the documented LaTeX file biblatex-bath.dtx and a Makefile. @@ -2054,7 +2076,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. % % \section{Implementation: bibliography style} % -% \setcounter{lstnumber}{16} +% \setcounter{lstnumber}{20} % % \subsection{Preliminaries} % @@ -2113,8 +2135,8 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. \renewcommand*{\bibfont}{\normalfont\normalsize} % \end{macrocode} % -% To maintain compatibility with \textsf{biblatex} 3.7 (used on Overleaf at the -% time of writing) we backport some newer features. +% To maintain compatibility with older versions of \textsf{biblatex}, +% we backport some newer features if necessary. % % \begin{macrocode} \ifcsdef{letbibmacro}{}{% @@ -2399,6 +2421,8 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. \newtoggle{bbx:onlineshown} \newbibmacro*{isonline}{% \ifboolexpr{( + test {\iffieldundef{doi}} + and test {\iffieldundef{url}} and not test {\ifentrytype{online}} @@ -2432,35 +2456,47 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. % % \begin{macrocode} \renewbibmacro*{title}{% - \printtext{% + \ifboolexpr{ + test {\iffieldundef{title}} + and + test {\iffieldundef{subtitle}} + }{}{% + \printtext[title]{% + \printfield[sentencecase]{title}% + \setunit{\subtitlepunct}% + \printfield[midsentencecase]{subtitle}% + \setunit{\addspace}% + }% + \printfield{version}% + \clearfield{version}% + \setunit*{\addspace}% + \printfield{titleaddon}% \ifboolexpr{ - test {\iffieldundef{title}} + test {\iffieldundef{journaltitle}} and - test {\iffieldundef{subtitle}} - }{}{% - \printtext[title]{% - \printfield[sentencecase]{title}% - \setunit{\subtitlepunct}% - \printfield[midsentencecase]{subtitle}% - \setunit{\addspace}% - }% - \printfield{version}% - \clearfield{version}% + test {\iffieldundef{booktitle}} + and + test {\iffieldundef{library}} + and + not test {\ifentrytype{software}} + and ( + test {\iffieldundef{type}} + or + test {\nottoggle{bbx:labelistitle}} + or + not ( + test {\ifentrytype{audio}} + or + test {\ifentrytype{video}} + or + test {\ifentrytype{music}} + or + test {\ifentrytype{movie}} + )) + }{% \setunit*{\addspace}% - \printfield{titleaddon}% - \ifboolexpr{ - test {\iffieldundef{journaltitle}} - and - test {\iffieldundef{booktitle}} - and - test {\iffieldundef{library}} - and - not test {\ifentrytype{software}} - }{% - \setunit*{\addspace}% - \usebibmacro{isonline}% - }{}% - }% + \usebibmacro{isonline}% + }{}% }% } @@ -2555,6 +2591,18 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. test {\ifentrytype{image}} ) and not test {\ifentrytype{software}} + and ( + test {\iffieldundef{type}} + or + not ( + test {\ifentrytype{audio}} + or + test {\ifentrytype{video}} + or + test {\ifentrytype{music}} + or + test {\ifentrytype{movie}} + )) }{% \setunit*{\addspace}% \usebibmacro{isonline}% @@ -2620,7 +2668,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. % % \begin{macrocode} \DeclareDelimFormat{nameyeardelim}{\addcomma\space} -\DeclareDelimFormat*[parencite,bib,biblist]{nameyeardelim}{\addcomma\space} +\DeclareDelimFormat[parencite,bib,biblist]{nameyeardelim}{\addcomma\space} \newcommand{\dononameyeardelim}{% \ifentrytype{legislation}{% \addspace @@ -2671,7 +2719,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. ) and togl {bbx:labelistitle} }{\addspace}{\addcomma\space}} -\DeclareDelimFormat*[bib,biblist]{nametitledelim}{% +\DeclareDelimFormat[bib,biblist]{nametitledelim}{% \ifboolexpr{ ( test {\ifentrytype{jurisdiction}} @@ -2807,7 +2855,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. }{}{\wlog{WARNING: biblatex-bath failed to patch bbx@opt@mergedate@false}} % \end{macrocode} % -% If biblatex 3.7 is used, we update the logic for +% If an older version of biblatex is used, we update the logic for % |\bbx@opt@mergedate@maximum|, which is used by the |letter| driver. % % \begin{macrocode} @@ -3009,7 +3057,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. % Versions are printed with `v.\@' in parentheses. % % \begin{macrocode} -\DeclareFieldFormat{version}{\mkbibparens{\bibstring{version}#1}} +\DeclareFieldFormat{version}{\mkbibparens{\biblcsstring{version}#1}} % \end{macrocode} % % \subsection{Types} @@ -3106,6 +3154,12 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. \iftoggle{bbx:url} {\usebibmacro{url+urldate}} {}} +\xpatchbibdriver{online}{% + \iftoggle{bbx:doi} + {\printfield{doi}} + {}% +}{}{}{\wlog{WARNING: biblatex-bath failed to remove extra DOI from online driver}} + \renewbibmacro*{url}{% \iffieldundef{doi}% {\printfield{url}}% @@ -3273,6 +3327,24 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. % \end{macrocode} % +% \subsection{Datasets} +% +% We patch the new datasets driver from biblatex v3.13 so it can emulate what +% we had previously done with the online driver. +% +% \begin{macrocode} +\xpatchbibdriver{dataset}{% + \printlist{organization}% + \newunit + \usebibmacro{publisher+location+date}% +}{% + \usebibmacro{library}% + \newunit\newblock + \usebibmacro{organization+location+date}% +}{}{\wlog{WARNING: biblatex-bath failed to patch dataset driver}} + +% \end{macrocode} +% % \subsection{Online works} % % Compared with the standard styles, the main difference is that the @@ -3281,6 +3353,8 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. % \begin{macrocode} \xpatchbibdriver{online}{% \printlist{organization}% + \newunit\newblock + \usebibmacro{date}% }{% \usebibmacro{library}% \newunit\newblock @@ -3440,6 +3514,15 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. % The \texttt{audio} and \texttt{video} drivers are based on \texttt{misc}. % % \begin{macrocode} +\newbibmacro*{type+online}{% + \printfield{type}% + \ifboolexpr{ + test {\iffieldundef{type}} + or + test {\nottoggle{bbx:labelistitle}} + }{}{% + \setunit{\addspace}% + \usebibmacro{isonline}}} \DeclareBibliographyDriver{audio}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -3449,7 +3532,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. \newunit \printlist{language}% \newunit\newblock - \printfield{type}% + \usebibmacro{type+online}% \newunit\newblock \usebibmacro{byauthor}[given-family:full]% \newunit\newblock @@ -4022,7 +4105,6 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. % % \begin{macrocode} \DeclareBibliographyAlias{standard}{manual} -\DeclareBibliographyAlias{dataset}{online} % \end{macrocode} % % \iffalse @@ -4032,7 +4114,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. % % \section{Implementation: data model} % -% \setcounter{lstnumber}{16} +% \setcounter{lstnumber}{20} % % \begin{macrocode} \DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,cjk} @@ -4044,7 +4126,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. % % \section{Implementation: General English language localization} % -% \setcounter{lstnumber}{16} +% \setcounter{lstnumber}{20} % % The strings are mostly the same except for the following changes. Note that % month names are never abbreviated. @@ -4107,7 +4189,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. % % \section{Implementation: British English language localization} % -% \setcounter{lstnumber}{16} +% \setcounter{lstnumber}{20} % % We use the standard version with a few changes. We display the day as a % cardinal number instead of an ordinal. The date is separated from the time @@ -4144,7 +4226,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me]. % % \section{Implementation: citation style} % -% \setcounter{lstnumber}{16} +% \setcounter{lstnumber}{20} % % The standard |authoryear-comp| style is a close match for what we need. % diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bath/biblatex-bath.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-bath/biblatex-bath.pdf Binary files differindex 1a4d4254ee..a61f4a509f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bath/biblatex-bath.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bath/biblatex-bath.pdf diff --git a/macros/latex/contrib/chemgreek/README b/macros/latex/contrib/chemgreek/README index 060b465f2d..8143e8020c 100644 --- a/macros/latex/contrib/chemgreek/README +++ b/macros/latex/contrib/chemgreek/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the CHEMGREEK package v1.1 2016/12/20 +the CHEMGREEK package v1.1a 2020/01/16 typeset chemical compounds and reactions @@ -8,7 +8,7 @@ Clemens Niederberger Web: http://www.mychemistry.eu/forums/forum/chemgreek/ E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2011-2016 Clemens Niederberger +Copyright 2015--2020 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/chemgreek/chemgreek.sty b/macros/latex/contrib/chemgreek/chemgreek.sty index 3d1d8601b2..29db1a5faf 100644 --- a/macros/latex/contrib/chemgreek/chemgreek.sty +++ b/macros/latex/contrib/chemgreek/chemgreek.sty @@ -6,13 +6,13 @@ % -------------------------------------------------------------------------- % Clemens Niederberger % -------------------------------------------------------------------------- -% https://github.org/cgnieder/chemgreek/ +% https://github.com/cgnieder/chemgreek/ % contact@mychemistry.eu % -------------------------------------------------------------------------- % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2016 Clemens Niederberger +% Copyright 2015--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -28,9 +28,10 @@ % -------------------------------------------------------------------------- \RequirePackage{expl3,xparse,amstext} \ExplSyntaxOn -\tl_const:Nn \c_chemgreek_date_tl {2016/12/20} -\tl_const:Nn \c_chemgreek_version_tl {1.1} -\tl_const:Nn \c_chemgreek_info_tl {interface for upright greek letters for use in chemistry} +\tl_const:Nn \c_chemgreek_date_tl {2020/01/16} +\tl_const:Nn \c_chemgreek_version_tl {1.1a} +\tl_const:Nn \c_chemgreek_info_tl + {interface~ for~ upright~ Greek~ letters~ for~ use~ in~ chemistry} \ProvidesExplPackage{chemgreek} {\c_chemgreek_date_tl} @@ -186,13 +187,16 @@ \cs_generate_variant:Nn \msg_warning:nnnn { nnnV } \cs_generate_variant:Nn \quark_if_no_value:nTF { V } +\tl_new:N \l__chemgreek_lower_tl +\tl_new:N \l__chemgreek_upper_tl + % ---------------------------------------------------------------------------- % helper function to retrieve upper- and lowercase entries while the mapping % happens: -\cs_new_protected:Npn \__chemgreek_get_upper_lower:w #1 / #2 \q_stop +\cs_new_protected:Npn \__chemgreek_get_upper_lower:ww #1 / #2 \q_stop { - \tl_set:Nn \l__chemgreek_tmpa_tl {#1} - \tl_set:Nn \l__chemgreek_tmpb_tl {#2} + \tl_set:Nn \l__chemgreek_lower_tl {#1} + \tl_set:Nn \l__chemgreek_upper_tl {#2} } % ---------------------------------------------------------------------------- @@ -270,13 +274,13 @@ \clist_map_inline:nn {#2} { \int_incr:N \l__chemgreek_tmpa_int - \__chemgreek_get_upper_lower:w ##1 \q_stop + \__chemgreek_get_upper_lower:ww ##1 \q_stop \prop_put:cxV { l__chemgreek_lowercase_mapping_#1_prop } { \tl_item:Nn \c__chemgreek_alphabet_tl { \l__chemgreek_tmpa_int } } - \l__chemgreek_tmpa_tl + \l__chemgreek_lower_tl \prop_put:cxV { l__chemgreek_uppercase_mapping_#1_prop } { \tl_item:Nn \c__chemgreek_alphabet_tl { \l__chemgreek_tmpa_int } } - \l__chemgreek_tmpb_tl + \l__chemgreek_upper_tl } } @@ -429,27 +433,27 @@ \cs_set_protected:cpx { chem - \str_upper_case:f { \tl_head:n {##1} } - \str_lower_case:f { \tl_tail:n {##1} } + \str_uppercase:f { \tl_head:n {##1} } + \str_lowercase:f { \tl_tail:n {##1} } } { \prop_item:cn { l__chemgreek_uppercase_mapping_#1_prop } {##1} } \cs_set_eq:cc { chemgreek_ - \str_upper_case:f { \tl_head:n {##1} } - \str_lower_case:f { \tl_tail:n {##1} } + \str_uppercase:f { \tl_head:n {##1} } + \str_lowercase:f { \tl_tail:n {##1} } : } { chem - \str_upper_case:f { \tl_head:n {##1} } - \str_lower_case:f { \tl_tail:n {##1} } + \str_uppercase:f { \tl_head:n {##1} } + \str_lowercase:f { \tl_tail:n {##1} } } - \cs_set_protected:cpx { chem \str_lower_case:f {##1} } + \cs_set_protected:cpx { chem \str_lowercase:f {##1} } { \prop_item:cn { l__chemgreek_lowercase_mapping_#1_prop } {##1} } \cs_set_eq:cc - { chemgreek_ \str_lower_case:f {##1} : } - { chem \str_lower_case:f {##1} } + { chemgreek_ \str_lowercase:f {##1} : } + { chem \str_lowercase:f {##1} } } \msg_info:nnn {chemgreek} {mapping-activated} {#1} } @@ -460,12 +464,12 @@ { \tl_set:Nx \l__chemgreek_tmpa_tl { - \str_upper_case:f { \tl_head:n {#2} } - \str_lower_case:f { \tl_tail:n {#2} } + \str_uppercase:f { \tl_head:n {#2} } + \str_lowercase:f { \tl_tail:n {#2} } } \str_if_eq:nVTF {#2} \l__chemgreek_tmpa_tl { - \tl_set:Nx \l__chemgreek_tmpa_tl { \str_lower_case:f {#2} } + \tl_set:Nx \l__chemgreek_tmpa_tl { \str_lowercase:f {#2} } \prop_item:cV { l__chemgreek_uppercase_mapping_#1_prop } \l__chemgreek_tmpa_tl @@ -523,14 +527,14 @@ \iow_log:x { . \c_space_tl \c_space_tl \c_space_tl \c_space_tl \c_space_tl - \str_lower_case:f {##1} ~ => ~ + \str_lowercase:f {##1} ~ => ~ \prop_item:cn { l__chemgreek_lowercase_mapping_#1_prop } {##1} } \iow_log:x { . \c_space_tl \c_space_tl \c_space_tl \c_space_tl \c_space_tl - \str_upper_case:f { \tl_head:n {##1} } - \str_lower_case:f { \tl_tail:n {##1} } + \str_uppercase:f { \tl_head:n {##1} } + \str_lowercase:f { \tl_tail:n {##1} } \c_space_tl => ~ \prop_item:cn { l__chemgreek_uppercase_mapping_#1_prop } {##1} } @@ -544,12 +548,12 @@ { \tl_map_inline:Nn \c__chemgreek_alphabet_tl { - \use:c { chem \str_lower_case:f {##1} } + \use:c { chem \str_lowercase:f {##1} } \use:c { chem - \str_upper_case:f { \tl_head:n {##1} } - \str_lower_case:f { \tl_tail:n {##1} } + \str_uppercase:f { \tl_head:n {##1} } + \str_lowercase:f { \tl_tail:n {##1} } } \c_space_tl } @@ -571,8 +575,8 @@ \chemgreek_drop_symbol:n {##1} \chemgreek_drop_symbol:n { - \str_upper_case:f { \tl_head:n {##1} } - \str_lower_case:f { \tl_tail:n {##1} } + \str_uppercase:f { \tl_head:n {##1} } + \str_lowercase:f { \tl_tail:n {##1} } } } } @@ -586,30 +590,30 @@ { \int_to_symbols:nnn {#1} {24} { - { 1 } { \chemalpha } - { 2 } { \chembeta } - { 3 } { \chemgamma } - { 4 } { \chemdelta } - { 5 } { \chemepsilon } - { 6 } { \chemzeta } - { 7 } { \chemeta } - { 8 } { \chemiota } - { 9 } { \chemtheta } - { 10 } { \chemkappa } - { 11 } { \chemlambda } - { 12 } { \chemmu } - { 13 } { \chemnu } - { 14 } { \chemxi } - { 15 } { \chemomikron } - { 16 } { \chempi } - { 17 } { \chemrho } - { 18 } { \chemsigma } - { 19 } { \chemtau } - { 20 } { \chemupsilon } - { 21 } { \chemphi } - { 22 } { \chemchi } - { 23 } { \chempsi } - { 24 } { \chemomega } + { 1 } { \chemgreek_alpha: } + { 2 } { \chemgreek_beta: } + { 3 } { \chemgreek_gamma: } + { 4 } { \chemgreek_delta: } + { 5 } { \chemgreek_epsilon: } + { 6 } { \chemgreek_zeta: } + { 7 } { \chemgreek_eta: } + { 8 } { \chemgreek_iota: } + { 9 } { \chemgreek_theta: } + { 10 } { \chemgreek_kappa: } + { 11 } { \chemgreek_lambda: } + { 12 } { \chemgreek_mu: } + { 13 } { \chemgreek_nu: } + { 14 } { \chemgreek_xi: } + { 15 } { \chemgreek_omikron: } + { 16 } { \chemgreek_pi: } + { 17 } { \chemgreek_rho: } + { 18 } { \chemgreek_sigma: } + { 19 } { \chemgreek_tau: } + { 20 } { \chemgreek_upsilon: } + { 21 } { \chemgreek_phi: } + { 22 } { \chemgreek_chi: } + { 23 } { \chemgreek_psi: } + { 24 } { \chemgreek_omega: } } } @@ -617,30 +621,30 @@ { \int_to_symbols:nnn {#1} {24} { - { 1 } { \chemAlpha } - { 2 } { \chemBeta } - { 3 } { \chemGamma } - { 4 } { \chemDelta } - { 5 } { \chemEpsilon } - { 6 } { \chemZeta } - { 7 } { \chemEta } - { 8 } { \chemIota } - { 9 } { \chemTheta } - { 10 } { \chemKappa } - { 11 } { \chemLambda } - { 12 } { \chemMu } - { 13 } { \chemNu } - { 14 } { \chemXi } - { 15 } { \chemOmikron } - { 16 } { \chemPi } - { 17 } { \chemRho } - { 18 } { \chemSigma } - { 19 } { \chemTau } - { 20 } { \chemUpsilon } - { 21 } { \chemPhi } - { 22 } { \chemChi } - { 23 } { \chemPsi } - { 24 } { \chemOmega } + { 1 } { \chemgreek_Alpha: } + { 2 } { \chemgreek_Beta: } + { 3 } { \chemgreek_Gamma: } + { 4 } { \chemgreek_Delta: } + { 5 } { \chemgreek_Epsilon: } + { 6 } { \chemgreek_Zeta: } + { 7 } { \chemgreek_Eta: } + { 8 } { \chemgreek_Iota: } + { 9 } { \chemgreek_Theta: } + { 10 } { \chemgreek_Kappa: } + { 11 } { \chemgreek_Lambda: } + { 12 } { \chemgreek_Mu: } + { 13 } { \chemgreek_Nu: } + { 14 } { \chemgreek_Xi: } + { 15 } { \chemgreek_Omikron: } + { 16 } { \chemgreek_Pi: } + { 17 } { \chemgreek_Rho: } + { 18 } { \chemgreek_Sigma: } + { 19 } { \chemgreek_Tau: } + { 20 } { \chemgreek_Upsilon: } + { 21 } { \chemgreek_Phi: } + { 22 } { \chemgreek_Chi: } + { 23 } { \chemgreek_Psi: } + { 24 } { \chemgreek_Omega: } } } @@ -649,88 +653,88 @@ % default: \chemgreek_new_mapping:nnn {default} { } { - \ensuremath{\alpha} / \ensuremath{\mathrm{A}} , % 1 - \ensuremath{\beta} / \ensuremath{\mathrm{B}} , % 2 - \ensuremath{\gamma} / \ensuremath{\Gamma} , % 3 - \ensuremath{\delta} / \ensuremath{\Delta} , % 4 - \ensuremath{\epsilon} / \ensuremath{\mathrm{E}} , % 5 - \ensuremath{\zeta} / \ensuremath{\mathrm{Z}} , % 6 - \ensuremath{\eta} / \ensuremath{\mathrm{H}} , % 7 - \ensuremath{\theta} / \ensuremath{\Theta} , % 8 - \ensuremath{\iota} / \ensuremath{\mathrm{I}} , % 9 - \ensuremath{\kappa} / \ensuremath{\mathrm{K}} , % 10 - \ensuremath{\lambda} / \ensuremath{\Lambda} , % 11 - \ensuremath{\mu} / \ensuremath{\mathrm{M}} , % 12 - \ensuremath{\nu} / \ensuremath{\mathrm{N}} , % 13 - \ensuremath{\xi} / \ensuremath{\Xi} , % 14 - \ensuremath{o} / \ensuremath{\mathrm{O}} , % 15 - \ensuremath{\pi} / \ensuremath{\Pi} , % 16 - \ensuremath{\rho} / \ensuremath{\mathrm{P}} , % 17 - \ensuremath{\sigma} / \ensuremath{\Sigma} , % 18 - \ensuremath{\tau} / \ensuremath{\mathrm{T}} , % 19 - \ensuremath{\upsilon} / \ensuremath{\Upsilon} , % 20 - \ensuremath{\phi} / \ensuremath{\Phi} , % 21 - \ensuremath{\chi} / \ensuremath{\mathrm{X}} , % 22 - \ensuremath{\psi} / \ensuremath{\Psi}, % 23 - \ensuremath{\omega} / \ensuremath{\Omega} % 24 + \ensuremath {\alpha} / \ensuremath {\mathrm{A}} , % 1 + \ensuremath {\beta} / \ensuremath {\mathrm{B}} , % 2 + \ensuremath {\gamma} / \ensuremath {\Gamma} , % 3 + \ensuremath {\delta} / \ensuremath {\Delta} , % 4 + \ensuremath {\epsilon} / \ensuremath {\mathrm{E}} , % 5 + \ensuremath {\zeta} / \ensuremath {\mathrm{Z}} , % 6 + \ensuremath {\eta} / \ensuremath {\mathrm{H}} , % 7 + \ensuremath {\theta} / \ensuremath {\Theta} , % 8 + \ensuremath {\iota} / \ensuremath {\mathrm{I}} , % 9 + \ensuremath {\kappa} / \ensuremath {\mathrm{K}} , % 10 + \ensuremath {\lambda} / \ensuremath {\Lambda} , % 11 + \ensuremath {\mu} / \ensuremath {\mathrm{M}} , % 12 + \ensuremath {\nu} / \ensuremath {\mathrm{N}} , % 13 + \ensuremath {\xi} / \ensuremath {\Xi} , % 14 + \ensuremath {o} / \ensuremath {\mathrm{O}} , % 15 + \ensuremath {\pi} / \ensuremath {\Pi} , % 16 + \ensuremath {\rho} / \ensuremath {\mathrm{P}} , % 17 + \ensuremath {\sigma} / \ensuremath {\Sigma} , % 18 + \ensuremath {\tau} / \ensuremath {\mathrm{T}} , % 19 + \ensuremath {\upsilon} / \ensuremath {\Upsilon} , % 20 + \ensuremath {\phi} / \ensuremath {\Phi} , % 21 + \ensuremath {\chi} / \ensuremath {\mathrm{X}} , % 22 + \ensuremath {\psi} / \ensuremath {\Psi}, % 23 + \ensuremath {\omega} / \ensuremath {\Omega} % 24 } % default-variant: \chemgreek_new_mapping:nnn {var-default} { } { - \ensuremath{\alpha} / \ensuremath{\mathrm{A}} , % 1 - \ensuremath{\beta} / \ensuremath{\mathrm{B}} , % 2 - \ensuremath{\gamma} / \ensuremath{\Gamma} , % 3 - \ensuremath{\delta} / \ensuremath{\Delta} , % 4 - \ensuremath{\varepsilon} / \ensuremath{\mathrm{E}} , % 5 - \ensuremath{\zeta} / \ensuremath{\mathrm{Z}} , % 6 - \ensuremath{\eta} / \ensuremath{\mathrm{H}} , % 7 - \ensuremath{\vartheta} / \ensuremath{\Theta} , % 8 - \ensuremath{\iota} / \ensuremath{\mathrm{I}} , % 9 - \ensuremath{\kappa} / \ensuremath{\mathrm{K}} , % 10 - \ensuremath{\lambda} / \ensuremath{\Lambda} , % 11 - \ensuremath{\mu} / \ensuremath{\mathrm{M}} , % 12 - \ensuremath{\nu} / \ensuremath{\mathrm{N}} , % 13 - \ensuremath{\xi} / \ensuremath{\Xi} , % 14 - \ensuremath{o} / \ensuremath{\mathrm{O}} , % 15 - \ensuremath{\varpi} / \ensuremath{\Pi} , % 16 - \ensuremath{\varrho} / \ensuremath{\mathrm{P}} , % 17 - \ensuremath{\varsigma} / \ensuremath{\Sigma} , % 18 - \ensuremath{\tau} / \ensuremath{\mathrm{T}} , % 19 - \ensuremath{\upsilon} / \ensuremath{\Upsilon} , % 20 - \ensuremath{\varphi} / \ensuremath{\Phi} , % 21 - \ensuremath{\chi} / \ensuremath{\mathrm{X}} , % 22 - \ensuremath{\psi} / \ensuremath{\Psi} , % 23 - \ensuremath{\omega} / \ensuremath{\Omega} % 24 + \ensuremath {\alpha} / \ensuremath {\mathrm{A}} , % 1 + \ensuremath {\beta} / \ensuremath {\mathrm{B}} , % 2 + \ensuremath {\gamma} / \ensuremath {\Gamma} , % 3 + \ensuremath {\delta} / \ensuremath {\Delta} , % 4 + \ensuremath {\varepsilon} / \ensuremath {\mathrm{E}} , % 5 + \ensuremath {\zeta} / \ensuremath {\mathrm{Z}} , % 6 + \ensuremath {\eta} / \ensuremath {\mathrm{H}} , % 7 + \ensuremath {\vartheta} / \ensuremath {\Theta} , % 8 + \ensuremath {\iota} / \ensuremath {\mathrm{I}} , % 9 + \ensuremath {\kappa} / \ensuremath {\mathrm{K}} , % 10 + \ensuremath {\lambda} / \ensuremath {\Lambda} , % 11 + \ensuremath {\mu} / \ensuremath {\mathrm{M}} , % 12 + \ensuremath {\nu} / \ensuremath {\mathrm{N}} , % 13 + \ensuremath {\xi} / \ensuremath {\Xi} , % 14 + \ensuremath {o} / \ensuremath {\mathrm{O}} , % 15 + \ensuremath {\varpi} / \ensuremath {\Pi} , % 16 + \ensuremath {\varrho} / \ensuremath {\mathrm{P}} , % 17 + \ensuremath {\varsigma} / \ensuremath {\Sigma} , % 18 + \ensuremath {\tau} / \ensuremath {\mathrm{T}} , % 19 + \ensuremath {\upsilon} / \ensuremath {\Upsilon} , % 20 + \ensuremath {\varphi} / \ensuremath {\Phi} , % 21 + \ensuremath {\chi} / \ensuremath {\mathrm{X}} , % 22 + \ensuremath {\psi} / \ensuremath {\Psi} , % 23 + \ensuremath {\omega} / \ensuremath {\Omega} % 24 } % mathdesign: \chemgreek_new_mapping:nnn {mathdesign} {mathdesign} { - \ensuremath{\alphaup} / \ensuremath{\mathrm{A}} , % 1 - \ensuremath{\betaup} / \ensuremath{\mathrm{B}} , % 2 - \ensuremath{\gammaup} / \ensuremath{\Gammaup} , % 3 - \ensuremath{\deltaup} / \ensuremath{\Deltaup} , % 4 - \ensuremath{\epsilonup} / \ensuremath{\mathrm{E}} , % 5 - \ensuremath{\zetaup} / \ensuremath{\mathrm{Z}} , % 6 - \ensuremath{\etaup} / \ensuremath{\mathrm{H}} , % 7 - \ensuremath{\thetaup} / \ensuremath{\Thetaup} , % 8 - \ensuremath{\iotaup} / \ensuremath{\mathrm{I}} , % 9 - \ensuremath{\kappaup} / \ensuremath{\mathrm{K}} , % 10 - \ensuremath{\lambdaup} / \ensuremath{\Lambdaup} , % 11 - \ensuremath{\muup} / \ensuremath{\mathrm{M}} , % 12 - \ensuremath{\nuup} / \ensuremath{\mathrm{N}} , % 13 - \ensuremath{\xiup} / \ensuremath{\Xiup} , % 14 - \ensuremath{\mathrm{o}} / \ensuremath{\mathrm{O}} , % 15 - \ensuremath{\piup} / \ensuremath{\Piup} , % 16 - \ensuremath{\rhoup} / \ensuremath{\mathrm{R}} , % 17 - \ensuremath{\sigmaup} / \ensuremath{\Sigmaup} , % 18 - \ensuremath{\tauup} / \ensuremath{\mathrm{T}} , % 19 - \ensuremath{\upsilonup} / \ensuremath{\Upsilonup} , % 20 - \ensuremath{\phiup} / \ensuremath{\Phiup} , % 21 - \ensuremath{\chiup} / \ensuremath{\mathrm{X}} , % 22 - \ensuremath{\psiup} / \ensuremath{\Psiup} , % 23 - \ensuremath{\omegaup} / \ensuremath{\Omegaup} % 24 + \ensuremath {\alphaup} / \ensuremath {\mathrm{A}} , % 1 + \ensuremath {\betaup} / \ensuremath {\mathrm{B}} , % 2 + \ensuremath {\gammaup} / \ensuremath {\Gammaup} , % 3 + \ensuremath {\deltaup} / \ensuremath {\Deltaup} , % 4 + \ensuremath {\epsilonup} / \ensuremath {\mathrm{E}} , % 5 + \ensuremath {\zetaup} / \ensuremath {\mathrm{Z}} , % 6 + \ensuremath {\etaup} / \ensuremath {\mathrm{H}} , % 7 + \ensuremath {\thetaup} / \ensuremath {\Thetaup} , % 8 + \ensuremath {\iotaup} / \ensuremath {\mathrm{I}} , % 9 + \ensuremath {\kappaup} / \ensuremath {\mathrm{K}} , % 10 + \ensuremath {\lambdaup} / \ensuremath {\Lambdaup} , % 11 + \ensuremath {\muup} / \ensuremath {\mathrm{M}} , % 12 + \ensuremath {\nuup} / \ensuremath {\mathrm{N}} , % 13 + \ensuremath {\xiup} / \ensuremath {\Xiup} , % 14 + \ensuremath {\mathrm{o}} / \ensuremath {\mathrm{O}} , % 15 + \ensuremath {\piup} / \ensuremath {\Piup} , % 16 + \ensuremath {\rhoup} / \ensuremath {\mathrm{R}} , % 17 + \ensuremath {\sigmaup} / \ensuremath {\Sigmaup} , % 18 + \ensuremath {\tauup} / \ensuremath {\mathrm{T}} , % 19 + \ensuremath {\upsilonup} / \ensuremath {\Upsilonup} , % 20 + \ensuremath {\phiup} / \ensuremath {\Phiup} , % 21 + \ensuremath {\chiup} / \ensuremath {\mathrm{X}} , % 22 + \ensuremath {\psiup} / \ensuremath {\Psiup} , % 23 + \ensuremath {\omegaup} / \ensuremath {\Omegaup} % 24 } % textgreek: @@ -765,88 +769,88 @@ % upgreek: \chemgreek_new_mapping:nnn {upgreek} {upgreek} { - \ensuremath{\upalpha} / \ensuremath{\mathrm{A}} , % 1 - \ensuremath{\upbeta} / \ensuremath{\mathrm{B}} , % 2 - \ensuremath{\upgamma} / \ensuremath{\Upgamma} , % 3 - \ensuremath{\updelta} / \ensuremath{\Updelta} , % 4 - \ensuremath{\upepsilon} / \ensuremath{\mathrm{E}} , % 5 - \ensuremath{\upzeta} / \ensuremath{\mathrm{Z}} , % 6 - \ensuremath{\upeta} / \ensuremath{\mathrm{H}} , % 7 - \ensuremath{\uptheta} / \ensuremath{\Uptheta} , % 8 - \ensuremath{\upiota} / \ensuremath{\mathrm{I}} , % 9 - \ensuremath{\upkappa} / \ensuremath{\mathrm{K}} , % 10 - \ensuremath{\uplambda} / \ensuremath{\Uplambda} , % 11 - \ensuremath{\upmu} / \ensuremath{\mathrm{M}} , % 12 - \ensuremath{\upnu} / \ensuremath{\mathrm{N}} , % 13 - \ensuremath{\upxi} / \ensuremath{\Upxi} , % 14 - \ensuremath{\mathrm{o}} / \ensuremath{\mathrm{O}} , % 15 - \ensuremath{\uppi} / \ensuremath{\Uppi} , % 16 - \ensuremath{\uprho} / \ensuremath{\mathrm{R}} , % 17 - \ensuremath{\upsigma} / \ensuremath{\Upsigma} , % 18 - \ensuremath{\uptau} / \ensuremath{\mathrm{T}} , % 19 - \ensuremath{\upupsilon} / \ensuremath{\Upupsilon} , % 20 - \ensuremath{\upphi} / \ensuremath{\Upphi} , % 21 - \ensuremath{\upchi} / \ensuremath{\mathrm{X}} , % 22 - \ensuremath{\uppsi} / \ensuremath{\Uppsi} , % 23 - \ensuremath{\upomega} / \ensuremath{\Upomega} % 24 + \ensuremath {\upalpha} / \ensuremath {\mathrm{A}} , % 1 + \ensuremath {\upbeta} / \ensuremath {\mathrm{B}} , % 2 + \ensuremath {\upgamma} / \ensuremath {\Upgamma} , % 3 + \ensuremath {\updelta} / \ensuremath {\Updelta} , % 4 + \ensuremath {\upepsilon} / \ensuremath {\mathrm{E}} , % 5 + \ensuremath {\upzeta} / \ensuremath {\mathrm{Z}} , % 6 + \ensuremath {\upeta} / \ensuremath {\mathrm{H}} , % 7 + \ensuremath {\uptheta} / \ensuremath {\Uptheta} , % 8 + \ensuremath {\upiota} / \ensuremath {\mathrm{I}} , % 9 + \ensuremath {\upkappa} / \ensuremath {\mathrm{K}} , % 10 + \ensuremath {\uplambda} / \ensuremath {\Uplambda} , % 11 + \ensuremath {\upmu} / \ensuremath {\mathrm{M}} , % 12 + \ensuremath {\upnu} / \ensuremath {\mathrm{N}} , % 13 + \ensuremath {\upxi} / \ensuremath {\Upxi} , % 14 + \ensuremath {\mathrm{o}} / \ensuremath {\mathrm{O}} , % 15 + \ensuremath {\uppi} / \ensuremath {\Uppi} , % 16 + \ensuremath {\uprho} / \ensuremath {\mathrm{R}} , % 17 + \ensuremath {\upsigma} / \ensuremath {\Upsigma} , % 18 + \ensuremath {\uptau} / \ensuremath {\mathrm{T}} , % 19 + \ensuremath {\upupsilon} / \ensuremath {\Upupsilon} , % 20 + \ensuremath {\upphi} / \ensuremath {\Upphi} , % 21 + \ensuremath {\upchi} / \ensuremath {\mathrm{X}} , % 22 + \ensuremath {\uppsi} / \ensuremath {\Uppsi} , % 23 + \ensuremath {\upomega} / \ensuremath {\Upomega} % 24 } % kpfonts: \chemgreek_new_mapping:nnn {kpfonts} {kpfonts} { - \ensuremath{\alphaup} / \ensuremath{\mathrm{A}} , % 1 - \ensuremath{\betaup} / \ensuremath{\mathrm{B}} , % 2 - \ensuremath{\gammaup} / \ensuremath{\Gammaup} , % 3 - \ensuremath{\deltaup} / \ensuremath{\Deltaup} , % 4 - \ensuremath{\epsilonup} / \ensuremath{\mathrm{E}} , % 5 - \ensuremath{\zetaup} / \ensuremath{\mathrm{Z}} , % 6 - \ensuremath{\etaup} / \ensuremath{\mathrm{H}} , % 7 - \ensuremath{\thetaup} / \ensuremath{\Thetaup} , % 8 - \ensuremath{\iotaup} / \ensuremath{\mathrm{I}} , % 9 - \ensuremath{\kappaup} / \ensuremath{\mathrm{K}} , % 10 - \ensuremath{\lambdaup} / \ensuremath{\Lambdaup} , % 11 - \ensuremath{\muup} / \ensuremath{\mathrm{M}} , % 12 - \ensuremath{\nuup} / \ensuremath{\mathrm{N}} , % 13 - \ensuremath{\xiup} / \ensuremath{\Xiup} , % 14 - \ensuremath{\mathrm{o}} / \ensuremath{\mathrm{O}} , % 15 - \ensuremath{\piup} / \ensuremath{\Piup} , % 16 - \ensuremath{\rhoup} / \ensuremath{\mathrm{R}} , % 17 - \ensuremath{\sigmaup} / \ensuremath{\Sigmaup} , % 18 - \ensuremath{\tauup} / \ensuremath{\mathrm{T}} , % 19 - \ensuremath{\upsilonup} / \ensuremath{\Upsilonup} , % 20 - \ensuremath{\phiup} / \ensuremath{\Phiup} , % 21 - \ensuremath{\chiup} / \ensuremath{\mathrm{X}} , % 22 - \ensuremath{\psiup} / \ensuremath{\Psiup} , % 23 - \ensuremath{\omegaup} / \ensuremath{\Omegaup} % 24 + \ensuremath {\alphaup} / \ensuremath {\mathrm{A}} , % 1 + \ensuremath {\betaup} / \ensuremath {\mathrm{B}} , % 2 + \ensuremath {\gammaup} / \ensuremath {\Gammaup} , % 3 + \ensuremath {\deltaup} / \ensuremath {\Deltaup} , % 4 + \ensuremath {\epsilonup} / \ensuremath {\mathrm{E}} , % 5 + \ensuremath {\zetaup} / \ensuremath {\mathrm{Z}} , % 6 + \ensuremath {\etaup} / \ensuremath {\mathrm{H}} , % 7 + \ensuremath {\thetaup} / \ensuremath {\Thetaup} , % 8 + \ensuremath {\iotaup} / \ensuremath {\mathrm{I}} , % 9 + \ensuremath {\kappaup} / \ensuremath {\mathrm{K}} , % 10 + \ensuremath {\lambdaup} / \ensuremath {\Lambdaup} , % 11 + \ensuremath {\muup} / \ensuremath {\mathrm{M}} , % 12 + \ensuremath {\nuup} / \ensuremath {\mathrm{N}} , % 13 + \ensuremath {\xiup} / \ensuremath {\Xiup} , % 14 + \ensuremath {\mathrm{o}} / \ensuremath {\mathrm{O}} , % 15 + \ensuremath {\piup} / \ensuremath {\Piup} , % 16 + \ensuremath {\rhoup} / \ensuremath {\mathrm{R}} , % 17 + \ensuremath {\sigmaup} / \ensuremath {\Sigmaup} , % 18 + \ensuremath {\tauup} / \ensuremath {\mathrm{T}} , % 19 + \ensuremath {\upsilonup} / \ensuremath {\Upsilonup} , % 20 + \ensuremath {\phiup} / \ensuremath {\Phiup} , % 21 + \ensuremath {\chiup} / \ensuremath {\mathrm{X}} , % 22 + \ensuremath {\psiup} / \ensuremath {\Psiup} , % 23 + \ensuremath {\omegaup} / \ensuremath {\Omegaup} % 24 } % newtx: \chemgreek_new_mapping:nnn {newtx} {newtxmath} { - \ensuremath{\upalpha} / \ensuremath{\mathrm{A}} , % 1 - \ensuremath{\upbeta} / \ensuremath{\mathrm{B}} , % 2 - \ensuremath{\upgamma} / \ensuremath{\upGamma} , % 3 - \ensuremath{\updelta} / \ensuremath{\upDelta} , % 4 - \ensuremath{\upepsilon} / \ensuremath{\mathrm{E}} , % 5 - \ensuremath{\upzeta} / \ensuremath{\mathrm{Z}} , % 6 - \ensuremath{\upeta} / \ensuremath{\mathrm{H}} , % 7 - \ensuremath{\uptheta} / \ensuremath{\upTheta} , % 8 - \ensuremath{\upiota} / \ensuremath{\mathrm{I}} , % 9 - \ensuremath{\upkappa} / \ensuremath{\mathrm{K}} , % 10 - \ensuremath{\uplambda} / \ensuremath{\upLambda} , % 11 - \ensuremath{\upmu} / \ensuremath{\mathrm{M}} , % 12 - \ensuremath{\upnu} / \ensuremath{\mathrm{N}} , % 13 - \ensuremath{\upxi} / \ensuremath{\upXi} , % 14 - \ensuremath{\mathrm{o}} / \ensuremath{\mathrm{O}} , % 15 - \ensuremath{\uppi} / \ensuremath{\upPi} , % 16 - \ensuremath{\uprho} / \ensuremath{\mathrm{R}} , % 17 - \ensuremath{\upsigma} / \ensuremath{\upSigma} , % 18 - \ensuremath{\uptau} / \ensuremath{\mathrm{T}} , % 19 - \ensuremath{\upupsilon} / \ensuremath{\upUpsilon} , % 20 - \ensuremath{\upphi} / \ensuremath{\upPhi} , % 21 - \ensuremath{\upchi} / \ensuremath{\mathrm{X}} , % 22 - \ensuremath{\uppsi} / \ensuremath{\upPsi} , % 23 - \ensuremath{\upomega} / \ensuremath{\upOmega} % 24 + \ensuremath {\upalpha} / \ensuremath {\mathrm{A}} , % 1 + \ensuremath {\upbeta} / \ensuremath {\mathrm{B}} , % 2 + \ensuremath {\upgamma} / \ensuremath {\upGamma} , % 3 + \ensuremath {\updelta} / \ensuremath {\upDelta} , % 4 + \ensuremath {\upepsilon} / \ensuremath {\mathrm{E}} , % 5 + \ensuremath {\upzeta} / \ensuremath {\mathrm{Z}} , % 6 + \ensuremath {\upeta} / \ensuremath {\mathrm{H}} , % 7 + \ensuremath {\uptheta} / \ensuremath {\upTheta} , % 8 + \ensuremath {\upiota} / \ensuremath {\mathrm{I}} , % 9 + \ensuremath {\upkappa} / \ensuremath {\mathrm{K}} , % 10 + \ensuremath {\uplambda} / \ensuremath {\upLambda} , % 11 + \ensuremath {\upmu} / \ensuremath {\mathrm{M}} , % 12 + \ensuremath {\upnu} / \ensuremath {\mathrm{N}} , % 13 + \ensuremath {\upxi} / \ensuremath {\upXi} , % 14 + \ensuremath {\mathrm{o}} / \ensuremath {\mathrm{O}} , % 15 + \ensuremath {\uppi} / \ensuremath {\upPi} , % 16 + \ensuremath {\uprho} / \ensuremath {\mathrm{R}} , % 17 + \ensuremath {\upsigma} / \ensuremath {\upSigma} , % 18 + \ensuremath {\uptau} / \ensuremath {\mathrm{T}} , % 19 + \ensuremath {\upupsilon} / \ensuremath {\upUpsilon} , % 20 + \ensuremath {\upphi} / \ensuremath {\upPhi} , % 21 + \ensuremath {\upchi} / \ensuremath {\mathrm{X}} , % 22 + \ensuremath {\uppsi} / \ensuremath {\upPsi} , % 23 + \ensuremath {\upomega} / \ensuremath {\upOmega} % 24 } % fourier: @@ -866,28 +870,28 @@ \chemgreek_new_mapping:nnn {fourier} {fourier} { - \__chemgreek_lfourier:n {alpha} / \ensuremath{\mathrm{A}} , % 1 - \__chemgreek_lfourier:n {beta} / \ensuremath{\mathrm{B}} , % 2 + \__chemgreek_lfourier:n {alpha} / \ensuremath {\mathrm{A}} , % 1 + \__chemgreek_lfourier:n {beta} / \ensuremath {\mathrm{B}} , % 2 \__chemgreek_lfourier:n {gamma} / \__chemgreek_ufourier:n {Gamma} , % 3 \__chemgreek_lfourier:n {delta} / \__chemgreek_ufourier:n {Delta} , % 4 - \__chemgreek_lfourier:n {epsilon} / \ensuremath{\mathrm{E}} , % 5 - \__chemgreek_lfourier:n {zeta} / \ensuremath{\mathrm{Z}} , % 6 - \__chemgreek_lfourier:n {eta} / \ensuremath{\mathrm{H}} , % 7 + \__chemgreek_lfourier:n {epsilon} / \ensuremath {\mathrm{E}} , % 5 + \__chemgreek_lfourier:n {zeta} / \ensuremath {\mathrm{Z}} , % 6 + \__chemgreek_lfourier:n {eta} / \ensuremath {\mathrm{H}} , % 7 \__chemgreek_lfourier:n {theta} / \__chemgreek_ufourier:n {Theta} , % 8 - \__chemgreek_lfourier:n {iota} / \ensuremath{\mathrm{I}} , % 9 - \__chemgreek_lfourier:n {kappa} / \ensuremath{\mathrm{K}} , % 10 + \__chemgreek_lfourier:n {iota} / \ensuremath {\mathrm{I}} , % 9 + \__chemgreek_lfourier:n {kappa} / \ensuremath {\mathrm{K}} , % 10 \__chemgreek_lfourier:n {lambda} / \__chemgreek_ufourier:n {Lambda} , % 11 - \__chemgreek_lfourier:n {mu} / \ensuremath{\mathrm{M}} , % 12 - \__chemgreek_lfourier:n {nu} / \ensuremath{\mathrm{N}} , % 13 + \__chemgreek_lfourier:n {mu} / \ensuremath {\mathrm{M}} , % 12 + \__chemgreek_lfourier:n {nu} / \ensuremath {\mathrm{N}} , % 13 \__chemgreek_lfourier:n {xi} / \__chemgreek_ufourier:n {Xi} , % 14 - \ensuremath {\mathrm{o}} / \ensuremath{\mathrm{O}} , % 15 + \ensuremath {\mathrm{o}} / \ensuremath {\mathrm{O}} , % 15 \__chemgreek_lfourier:n {pi} / \__chemgreek_ufourier:n {Pi} , % 16 - \__chemgreek_lfourier:n {rho} / \ensuremath{\mathrm{R}} , % 17 + \__chemgreek_lfourier:n {rho} / \ensuremath {\mathrm{R}} , % 17 \__chemgreek_lfourier:n {sigma} / \__chemgreek_ufourier:n {Sigma} , % 18 - \__chemgreek_lfourier:n {tau} / \ensuremath{\mathrm{T}} , % 19 + \__chemgreek_lfourier:n {tau} / \ensuremath {\mathrm{T}} , % 19 \__chemgreek_lfourier:n {upsilon} / \__chemgreek_ufourier:n {Upsilon} , % 20 \__chemgreek_lfourier:n {phi} / \__chemgreek_ufourier:n {Phi} , % 21 - \__chemgreek_lfourier:n {chi} / \ensuremath{\mathrm{X}} , % 22 + \__chemgreek_lfourier:n {chi} / \ensuremath {\mathrm{X}} , % 22 \__chemgreek_lfourier:n {psi} / \__chemgreek_ufourier:n {Psi} , % 23 \__chemgreek_lfourier:n {omega} / \__chemgreek_ufourier:n {Omega} % 24 } @@ -960,30 +964,30 @@ \chemgreek_new_mapping:nnn {pxgreeks} {pxgreeks} { - \ensuremath{\alphaup} / \ensuremath{\mathrm{A}} , % 1 - \ensuremath{\betaup} / \ensuremath{\mathrm{B}} , % 2 - \ensuremath{\gammaup} / \__chemgreek_upxgreeks:n {Gamma} , % 3 - \ensuremath{\deltaup} / \__chemgreek_upxgreeks:n {Delta} , % 4 - \ensuremath{\epsilonup} / \ensuremath{\mathrm{E}} , % 5 - \ensuremath{\zetaup} / \ensuremath{\mathrm{Z}} , % 6 - \ensuremath{\etaup} / \ensuremath{\mathrm{H}} , % 7 - \ensuremath{\thetaup} / \__chemgreek_upxgreeks:n {Theta} , % 8 - \ensuremath{\iotaup} / \ensuremath{\mathrm{I}} , % 9 - \ensuremath{\kappaup} / \ensuremath{\mathrm{K}} , % 10 - \ensuremath{\lambdaup} / \__chemgreek_upxgreeks:n {Lambda} , % 11 - \ensuremath{\muup} / \ensuremath{\mathrm{M}} , % 12 - \ensuremath{\nuup} / \ensuremath{\mathrm{N}} , % 13 - \ensuremath{\xiup} / \__chemgreek_upxgreeks:n {Xi} , % 14 - \ensuremath{\omicronup} / \ensuremath{\mathrm{O}} , % 15 - \ensuremath{\piup} / \__chemgreek_upxgreeks:n {Pi} , % 16 - \ensuremath{\rhoup} / \ensuremath{\mathrm{R}} , % 17 - \ensuremath{\sigmaup} / \__chemgreek_upxgreeks:n {Sigma} , % 18 - \ensuremath{\tauup} / \ensuremath{\mathrm{T}} , % 19 - \ensuremath{\upsilonup} / \__chemgreek_upxgreeks:n {Upsilon} , % 20 - \ensuremath{\phiup} / \__chemgreek_upxgreeks:n {Phi} , % 21 - \ensuremath{\chiup} / \ensuremath{\mathrm{X}} , % 22 - \ensuremath{\psiup} / \__chemgreek_upxgreeks:n {Psi} , % 23 - \ensuremath{\omegaup} / \__chemgreek_upxgreeks:n {Omega} % 24 + \ensuremath {\alphaup} / \ensuremath {\mathrm{A}} , % 1 + \ensuremath {\betaup} / \ensuremath {\mathrm{B}} , % 2 + \ensuremath {\gammaup} / \__chemgreek_upxgreeks:n {Gamma} , % 3 + \ensuremath {\deltaup} / \__chemgreek_upxgreeks:n {Delta} , % 4 + \ensuremath {\epsilonup} / \ensuremath {\mathrm{E}} , % 5 + \ensuremath {\zetaup} / \ensuremath {\mathrm{Z}} , % 6 + \ensuremath {\etaup} / \ensuremath {\mathrm{H}} , % 7 + \ensuremath {\thetaup} / \__chemgreek_upxgreeks:n {Theta} , % 8 + \ensuremath {\iotaup} / \ensuremath {\mathrm{I}} , % 9 + \ensuremath {\kappaup} / \ensuremath {\mathrm{K}} , % 10 + \ensuremath {\lambdaup} / \__chemgreek_upxgreeks:n {Lambda} , % 11 + \ensuremath {\muup} / \ensuremath {\mathrm{M}} , % 12 + \ensuremath {\nuup} / \ensuremath {\mathrm{N}} , % 13 + \ensuremath {\xiup} / \__chemgreek_upxgreeks:n {Xi} , % 14 + \ensuremath {\omicronup} / \ensuremath {\mathrm{O}} , % 15 + \ensuremath {\piup} / \__chemgreek_upxgreeks:n {Pi} , % 16 + \ensuremath {\rhoup} / \ensuremath {\mathrm{R}} , % 17 + \ensuremath {\sigmaup} / \__chemgreek_upxgreeks:n {Sigma} , % 18 + \ensuremath {\tauup} / \ensuremath {\mathrm{T}} , % 19 + \ensuremath {\upsilonup} / \__chemgreek_upxgreeks:n {Upsilon} , % 20 + \ensuremath {\phiup} / \__chemgreek_upxgreeks:n {Phi} , % 21 + \ensuremath {\chiup} / \ensuremath {\mathrm{X}} , % 22 + \ensuremath {\psiup} / \__chemgreek_upxgreeks:n {Psi} , % 23 + \ensuremath {\omegaup} / \__chemgreek_upxgreeks:n {Omega} % 24 } % ---------------------------------------------------------------------------- @@ -1025,25 +1029,25 @@ \cs_set_eq:cc { chem - \str_upper_case:f { \tl_head:n {#1} } - \str_lower_case:f { \tl_tail:n {#1} } + \str_uppercase:f { \tl_head:n {#1} } + \str_lowercase:f { \tl_tail:n {#1} } } { text - \str_upper_case:f { \tl_head:n {#1} } - \str_lower_case:f { \tl_tail:n {#1} } + \str_uppercase:f { \tl_head:n {#1} } + \str_lowercase:f { \tl_tail:n {#1} } } \cs_set_eq:cc { chemgreek_ - \str_upper_case:f { \tl_head:n {#1} } - \str_lower_case:f { \tl_tail:n {#1} } + \str_uppercase:f { \tl_head:n {#1} } + \str_lowercase:f { \tl_tail:n {#1} } : } { text - \str_upper_case:f { \tl_head:n {#1} } - \str_lower_case:f { \tl_tail:n {#1} } + \str_uppercase:f { \tl_head:n {#1} } + \str_lowercase:f { \tl_tail:n {#1} } } \cs_set_eq:cc {chem#1} {text#1} \cs_set_eq:cc { chemgreek_ #1 : } {text#1} @@ -1103,6 +1107,5 @@ HISTORY: 2016/02/10 - v1.0e - one missed \prop_get:Nn 2016/20/12 - v1.1 - fix wrong alphabet order (issue #5) - fix errors in fontspec mapping (issue #4) - -TODO: +2020/01/16 - v1.1a - adapt to renaming of string case changing functions diff --git a/macros/latex/contrib/chemgreek/chemgreek_en.pdf b/macros/latex/contrib/chemgreek/chemgreek_en.pdf Binary files differindex d3169050cd..2ea798e7f1 100644 --- a/macros/latex/contrib/chemgreek/chemgreek_en.pdf +++ b/macros/latex/contrib/chemgreek/chemgreek_en.pdf diff --git a/macros/latex/contrib/chemgreek/chemgreek_en.tex b/macros/latex/contrib/chemgreek/chemgreek_en.tex index d9f40da0a8..8308e9aef3 100644 --- a/macros/latex/contrib/chemgreek/chemgreek_en.tex +++ b/macros/latex/contrib/chemgreek/chemgreek_en.tex @@ -1,4 +1,4 @@ -% arara: pdflatex: { shell: on } +% arara: pdflatex: { shell: on , interaction: nonstopmode } % !arara: biber % !arara: pdflatex % !arara: pdflatex @@ -16,7 +16,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2015--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/ghsystem/README b/macros/latex/contrib/ghsystem/README index 6d486c5d99..6117fa22c4 100644 --- a/macros/latex/contrib/ghsystem/README +++ b/macros/latex/contrib/ghsystem/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the GHSYSTEM package v4.8a 2019/09/30 +the GHSYSTEM package v4.8b 2020/01/16 globally harmonized system @@ -8,7 +8,7 @@ Clemens Niederberger Web: https://github.com/cgnieder/ghsystem/ E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2011--2019 Clemens Niederberger +Copyright 2011--2020 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/ghsystem/ghsystem.sty b/macros/latex/contrib/ghsystem/ghsystem.sty index 3ff663d7c0..dfc4d1eacd 100644 --- a/macros/latex/contrib/ghsystem/ghsystem.sty +++ b/macros/latex/contrib/ghsystem/ghsystem.sty @@ -12,7 +12,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011--2019 Clemens Niederberger +% Copyright 2011--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -29,8 +29,8 @@ \RequirePackage{ expl3, xparse, chemmacros } \ExplSyntaxOn -\tl_const:Nn \c_ghsystem_version_tl {4.8a} -\tl_const:Nn \c_ghsystem_date_tl {2019/09/30} +\tl_const:Nn \c_ghsystem_version_tl {4.8b} +\tl_const:Nn \c_ghsystem_date_tl {2020/01/16} \tl_const:Nn \c_ghsystem_info_tl {globally~ harmonised~ system} \ProvidesExplPackage @@ -203,7 +203,7 @@ % statement \cs_new_protected:Npn \ghsystem_add_statement:nnn #1#2#3 { - \prop_put:cxn {l__ghsystem_ \str_lower_case:n {#1} _prop} + \prop_put:cxn {l__ghsystem_ \str_lowercase:n {#1} _prop} {\l_ghsystem_current_language_file_tl-#2} {#3} } @@ -437,7 +437,7 @@ \cs_new_protected:Nn \__ghsystem_get_type:nN { - \tl_set:Nx #2 { \str_lower_case:n {#1} } + \tl_set:Nx #2 { \str_lowercase:n {#1} } \str_case:VnF #2 { {h} {} {p} {} {euh} {} } { \msg_error:nnn {ghsystem} {unknown-type} {#2} } @@ -454,13 +454,13 @@ { \bool_if:NT \l__ghsystem_show_number_bool { - \tl_upper_case:n {#1} + \text_uppercase:n {#1} \tl_use:N \l__ghsystem_number_space_tl #2 ~ + ~ \tl_if_in:nnTF {#3} { + } { \__ghsystem_is_combination_aux_iii:w #1,#3 \q_stop } { - \tl_upper_case:n {#1} + \text_uppercase:n {#1} \tl_use:N \l__ghsystem_number_space_tl #3 \bool_if:NF \l__ghsystem_hide_statement_bool { : ~ } } @@ -471,7 +471,7 @@ { \bool_if:NT \l__ghsystem_show_number_bool { - \tl_upper_case:n {#1} + \text_uppercase:n {#1} \tl_use:N \l__ghsystem_number_space_tl #2 \bool_if:NF \l__ghsystem_hide_statement_bool { : ~ } } @@ -481,10 +481,10 @@ { \bool_if:NT \l__ghsystem_show_number_bool { - \tl_upper_case:n {#1} + \text_uppercase:n {#1} \tl_use:N \l__ghsystem_number_space_tl #2 ~ + ~ - \tl_upper_case:n {#1} + \text_uppercase:n {#1} \tl_use:N \l__ghsystem_number_space_tl #3 \bool_if:NF \l__ghsystem_hide_statement_bool { : ~ } } @@ -713,4 +713,4 @@ VERSION HISTORY Beaude Aurélien 2019/09/30 - version 4.8a - add \l_ghsystem_table_next_page_tl to the template and the French translations - +2020/01/16 - version 4.8b - adapt to renaming of case changing functions diff --git a/macros/latex/contrib/ghsystem/ghsystem_en.pdf b/macros/latex/contrib/ghsystem/ghsystem_en.pdf Binary files differindex a18645c640..dccf33b05d 100644 --- a/macros/latex/contrib/ghsystem/ghsystem_en.pdf +++ b/macros/latex/contrib/ghsystem/ghsystem_en.pdf diff --git a/macros/latex/contrib/ghsystem/ghsystem_en.tex b/macros/latex/contrib/ghsystem/ghsystem_en.tex index 24b9749e91..1267fb29e3 100644 --- a/macros/latex/contrib/ghsystem/ghsystem_en.tex +++ b/macros/latex/contrib/ghsystem/ghsystem_en.tex @@ -16,7 +16,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011--2019 Clemens Niederberger +% Copyright 2011--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/ghsystem/language/ghsystem_english.def b/macros/latex/contrib/ghsystem/language/ghsystem_english.def index e5b2c92f3c..67b579371c 100644 --- a/macros/latex/contrib/ghsystem/language/ghsystem_english.def +++ b/macros/latex/contrib/ghsystem/language/ghsystem_english.def @@ -11,7 +11,7 @@ % - If you have any ideas, questions, suggestions or bugs to report, please % - feel free to contact me. % -------------------------------------------------------------------------- -% - Copyright 2011--2019 Clemens Niederberger +% - Copyright 2011--2020 Clemens Niederberger % - % - This work may be distributed and/or modified under the % - conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/ghsystem/language/ghsystem_french.def b/macros/latex/contrib/ghsystem/language/ghsystem_french.def index 14a7264e38..417df28349 100644 --- a/macros/latex/contrib/ghsystem/language/ghsystem_french.def +++ b/macros/latex/contrib/ghsystem/language/ghsystem_french.def @@ -11,7 +11,7 @@ % - If you have any ideas, questions, suggestions or bugs to report, please % - feel free to contact me. % -------------------------------------------------------------------------- -% - Copyright 2011--2019 Clemens Niederberger +% - Copyright 2011--2020 Clemens Niederberger % - % - This work may be distributed and/or modified under the % - conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/ghsystem/language/ghsystem_german.def b/macros/latex/contrib/ghsystem/language/ghsystem_german.def index 82fbe3619c..f7f706996d 100644 --- a/macros/latex/contrib/ghsystem/language/ghsystem_german.def +++ b/macros/latex/contrib/ghsystem/language/ghsystem_german.def @@ -11,7 +11,7 @@ % - If you have any ideas, questions, suggestions or bugs to report, please % - feel free to contact me. % -------------------------------------------------------------------------- -% - Copyright 2011--2019 Clemens Niederberger +% - Copyright 2011--2020 Clemens Niederberger % - % - This work may be distributed and/or modified under the % - conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/ghsystem/language/ghsystem_italian.def b/macros/latex/contrib/ghsystem/language/ghsystem_italian.def index 9159279f26..9d97ca043c 100644 --- a/macros/latex/contrib/ghsystem/language/ghsystem_italian.def +++ b/macros/latex/contrib/ghsystem/language/ghsystem_italian.def @@ -11,7 +11,7 @@ % - If you have any ideas, questions, suggestions or bugs to report, please % - feel free to contact me. % -------------------------------------------------------------------------- -% - Copyright 2011--2019 Clemens Niederberger +% - Copyright 2011--2020 Clemens Niederberger % - % - This work may be distributed and/or modified under the % - conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/ghsystem/language/ghsystem_langtemplate.def b/macros/latex/contrib/ghsystem/language/ghsystem_langtemplate.def index 0652875739..52a6a21011 100644 --- a/macros/latex/contrib/ghsystem/language/ghsystem_langtemplate.def +++ b/macros/latex/contrib/ghsystem/language/ghsystem_langtemplate.def @@ -11,7 +11,7 @@ % - If you have any ideas, questions, suggestions or bugs to report, please % - feel free to contact me. % -------------------------------------------------------------------------- -% - Copyright 2011--2019 Clemens Niederberger +% - Copyright 2011--2020 Clemens Niederberger % - % - This work may be distributed and/or modified under the % - conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/ghsystem/language/ghsystem_spanish.def b/macros/latex/contrib/ghsystem/language/ghsystem_spanish.def index 431bc02d1f..ecbf46fa17 100644 --- a/macros/latex/contrib/ghsystem/language/ghsystem_spanish.def +++ b/macros/latex/contrib/ghsystem/language/ghsystem_spanish.def @@ -11,7 +11,7 @@ % - If you have any ideas, questions, suggestions or bugs to report, please % - feel free to contact me. % -------------------------------------------------------------------------- -% - Copyright 2011--2019 Clemens Niederberger +% - Copyright 2011--2020 Clemens Niederberger % - % - This work may be distributed and/or modified under the % - conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/README b/macros/latex/contrib/xsim/README index 0aa35c006f..c96de8d2a3 100644 --- a/macros/latex/contrib/xsim/README +++ b/macros/latex/contrib/xsim/README @@ -1,5 +1,6 @@ -------------------------------------------------------------------------- -XSIM 2019/11/10 v0.16 +XSIM 2020/01/16 v0.16a +XSIMVERB 2019/12/29 v0.1a eXercise Sheets IMproved diff --git a/macros/latex/contrib/xsim/code/xsim.auxfile.code.tex b/macros/latex/contrib/xsim/code/xsim.auxfile.code.tex index d308a9ccc3..69e5a9a618 100644 --- a/macros/latex/contrib/xsim/code/xsim.auxfile.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.auxfile.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.base.code.tex b/macros/latex/contrib/xsim/code/xsim.base.code.tex index b1fa20bff7..3eb336e3a3 100644 --- a/macros/latex/contrib/xsim/code/xsim.base.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.base.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -143,6 +143,13 @@ { \prg_return_false: } } +\prg_new_conditional:Npnn \xsim_if_write_to_files: {p,T,F,TF} + { + \bool_if:NTF \g__xsim_write_to_file_bool + { \prg_return_true: } + { \prg_return_false: } + } + \prg_new_conditional:Npnn \xsim_if_clear_aux: {p,T,F,TF} { \xsim_if_final:TF diff --git a/macros/latex/contrib/xsim/code/xsim.blanks.code.tex b/macros/latex/contrib/xsim/code/xsim.blanks.code.tex index 18af3f404d..70c4440537 100644 --- a/macros/latex/contrib/xsim/code/xsim.blanks.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.blanks.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.collections.code.tex b/macros/latex/contrib/xsim/code/xsim.collections.code.tex index 3097981b74..eba9940e23 100644 --- a/macros/latex/contrib/xsim/code/xsim.collections.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.collections.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.definitions.code.tex b/macros/latex/contrib/xsim/code/xsim.definitions.code.tex index 2a7add33de..c6fa9bd011 100644 --- a/macros/latex/contrib/xsim/code/xsim.definitions.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.definitions.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.environments.code.tex b/macros/latex/contrib/xsim/code/xsim.environments.code.tex index 2f9c870b71..9c0c30111a 100644 --- a/macros/latex/contrib/xsim/code/xsim.environments.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.environments.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.exercises.code.tex b/macros/latex/contrib/xsim/code/xsim.exercises.code.tex index f9cb706410..6f1503dbc4 100644 --- a/macros/latex/contrib/xsim/code/xsim.exercises.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.exercises.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.goals.code.tex b/macros/latex/contrib/xsim/code/xsim.goals.code.tex index 6e482737b5..cf7975c4bd 100644 --- a/macros/latex/contrib/xsim/code/xsim.goals.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.goals.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.grades.code.tex b/macros/latex/contrib/xsim/code/xsim.grades.code.tex index bfcecf92b2..678011c610 100644 --- a/macros/latex/contrib/xsim/code/xsim.grades.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.grades.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.interface.code.tex b/macros/latex/contrib/xsim/code/xsim.interface.code.tex index ba409d9758..0eb8535e3f 100644 --- a/macros/latex/contrib/xsim/code/xsim.interface.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.interface.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.modules.code.tex b/macros/latex/contrib/xsim/code/xsim.modules.code.tex index 3b874dbad0..bc82dcbafc 100644 --- a/macros/latex/contrib/xsim/code/xsim.modules.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.modules.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.properties.code.tex b/macros/latex/contrib/xsim/code/xsim.properties.code.tex index 5dd0d1baee..add2431018 100644 --- a/macros/latex/contrib/xsim/code/xsim.properties.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.properties.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -182,7 +182,7 @@ \cs_new_protected:Npn \__xsim_set_boolean_property:nnnn #1#2#3#4 { - \str_case_e:nnTF { \str_lower_case:n {#4} } + \str_case_e:nnTF { \str_lowercase:n {#4} } { {} {} {true} {} diff --git a/macros/latex/contrib/xsim/code/xsim.random.code.tex b/macros/latex/contrib/xsim/code/xsim.random.code.tex index 7a0eeb297d..2444ef1745 100644 --- a/macros/latex/contrib/xsim/code/xsim.random.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.random.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.solutions.code.tex b/macros/latex/contrib/xsim/code/xsim.solutions.code.tex index edb954e838..eddeaa911f 100644 --- a/macros/latex/contrib/xsim/code/xsim.solutions.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.solutions.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.sty b/macros/latex/contrib/xsim/code/xsim.sty index f5efe12408..a6a5538c67 100644 --- a/macros/latex/contrib/xsim/code/xsim.sty +++ b/macros/latex/contrib/xsim/code/xsim.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -29,9 +29,9 @@ \ExplSyntaxOn -\tl_const:Nn \c_xsim_date_tl {2019/11/10} +\tl_const:Nn \c_xsim_date_tl {2020/01/16} \tl_const:Nn \c_xsim_version_major_number_tl {0} -\tl_const:Nn \c_xsim_version_minor_number_tl {16} +\tl_const:Nn \c_xsim_version_minor_number_tl {16a} \tl_const:Nn \c_xsim_version_subrelease_tl {} \tl_const:Nx \c_xsim_version_number_tl { @@ -75,13 +75,6 @@ \ProcessKeysPackageOptions {xsim/package} -\prg_new_conditional:Npnn \xsim_if_write_to_files: {p,T,F,TF} - { - \bool_if:NTF \g__xsim_write_to_file_bool - { \prg_return_true: } - { \prg_return_false: } - } - % -------------------------------------------------------------------------- % messages: diff --git a/macros/latex/contrib/xsim/code/xsim.style.layouts.code.tex b/macros/latex/contrib/xsim/code/xsim.style.layouts.code.tex index 756a61e838..11ab475b2a 100644 --- a/macros/latex/contrib/xsim/code/xsim.style.layouts.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.style.layouts.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.tags.code.tex b/macros/latex/contrib/xsim/code/xsim.tags.code.tex index e63174a0cc..f97c1af889 100644 --- a/macros/latex/contrib/xsim/code/xsim.tags.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.tags.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.templates.code.tex b/macros/latex/contrib/xsim/code/xsim.templates.code.tex index c5c08b8d9b..7644074be7 100644 --- a/macros/latex/contrib/xsim/code/xsim.templates.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.templates.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.translations.code.tex b/macros/latex/contrib/xsim/code/xsim.translations.code.tex index f818c8d5ff..b9f0712b4b 100644 --- a/macros/latex/contrib/xsim/code/xsim.translations.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.translations.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsim.verbwrite.code.tex b/macros/latex/contrib/xsim/code/xsim.verbwrite.code.tex index bc9b2ce096..5d87f7c750 100644 --- a/macros/latex/contrib/xsim/code/xsim.verbwrite.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.verbwrite.code.tex @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/code/xsimverb.sty b/macros/latex/contrib/xsim/code/xsimverb.sty index 4046415277..a7cbd0706b 100644 --- a/macros/latex/contrib/xsim/code/xsimverb.sty +++ b/macros/latex/contrib/xsim/code/xsimverb.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -26,14 +26,13 @@ % feel free to contact me. % ---------------------------------------------------------------------------- -\@ifpackageloaded{xsim}{\endinput}{} -\RequirePackage {expl3,xparse} +\RequirePackage {expl3} \ExplSyntaxOn -\tl_const:Nn \c_xsimverb_date_tl {2017/03/19} +\tl_const:Nn \c_xsimverb_date_tl {2019/12/29} \tl_const:Nn \c_xsimverb_version_major_number_tl {0} \tl_const:Nn \c_xsimverb_version_minor_number_tl {1} -\tl_const:Nn \c_xsimverb_version_subrelease_tl {} +\tl_const:Nn \c_xsimverb_version_subrelease_tl {a} \tl_const:Nx \c_xsimverb_version_number_tl { \c_xsimverb_version_major_number_tl . @@ -44,7 +43,7 @@ \c_xsimverb_version_number_tl \c_xsimverb_version_subrelease_tl } -\tl_const:Nn \c_xsimverb_info_tl {write environments verbatim to files} +\tl_const:Nn \c_xsimverb_info_tl {write~ environments~ verbatim~ to~ files} \ProvidesExplPackage {xsimverb} @@ -52,29 +51,33 @@ {\c_xsimverb_version_tl} {\c_xsimverb_info_tl} -% options, information +\@ifpackageloaded {xsim} { \file_input_stop: } {} +\RequirePackage {xparse,l3keys2e} -\bool_new:N \g_xsim_final_bool -\bool_new:N \g_xsim_verbose_bool -\bool_new:N \g_xsim_clear_aux_bool +% options, information -\keys_define:nn {xsim} +\cs_new_protected:Npn \xsimverb_bool_provide:N #1 + { \bool_if_exist:NF #1 { \bool_new:N #1 } } + +\xsimverb_bool_provide:N \g_xsim_final_bool +\xsimverb_bool_provide:N \g_xsim_verbose_bool +\xsimverb_bool_provide:N \g_xsim_clear_aux_bool +\xsimverb_bool_provide:N \g__xsim_write_to_file_bool +\xsimverb_bool_provide:N \g_xsim_use_aux_bool +\xsimverb_bool_provide:N \g__xsim_rerun_bool + +\keys_define:nn {xsimverb} { - final .bool_gset:N = \g_xsim_final_bool , - verbose .bool_gset:N = \g_xsim_verbose_bool , - clear-aux .bool_gset:N = \g_xsim_clear_aux_bool + final .bool_gset:N = \g_xsim_final_bool , + verbose .bool_gset:N = \g_xsim_verbose_bool , + clear-aux .bool_gset:N = \g_xsim_clear_aux_bool , + no-files .bool_gset_inverse:N = \g__xsim_write_to_file_bool , + no-files .initial:n = false , + use-aux .bool_gset:N = \g_xsim_use_aux_bool , + use-aux .initial:n = false } -\DeclareOption {final} - { \bool_gset_true:N \g_xsim_final_bool } - -\DeclareOption {verbose} - { \bool_gset_true:N \g_xsim_verbose_bool } - -\DeclareOption {clear-aux} - { \bool_gset_true:N \g_xsim_clear_aux_bool } - -\ProcessOptions \scan_stop: +\ProcessKeysPackageOptions {xsimverb} % -------------------------------------------------------------------------- @@ -91,3 +94,4 @@ 2018/01/31 - define xsim's options as dummy options to prevent possible errors caused by undefined booleans +2019/12/29 - adapt to update of xsim diff --git a/macros/latex/contrib/xsim/doc/xsim-manual.cls b/macros/latex/contrib/xsim/doc/xsim-manual.cls index 3667dd11c6..6e1359c0b1 100644 --- a/macros/latex/contrib/xsim/doc/xsim-manual.cls +++ b/macros/latex/contrib/xsim/doc/xsim-manual.cls @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -29,12 +29,12 @@ % please ignore the contents of this file -- it is not a good example for % coding... % -\ProvidesClass{xsim-manual}[2019/11/10] +\ProvidesClass{xsim-manual}[2019/12/29] \LoadClass[load-preamble,add-index]{cnltx-doc} \RequirePackage{imakeidx} \RequirePackage[utf8]{inputenc} -\RequirePackage{xsim} +\RequirePackage{xsim,xsimverb} \RequirePackage{geometry} \geometry{ @@ -259,6 +259,17 @@ \newnote*\sincechanged[2]{\GetTranslation{cnltx-introduced}~#1 (\csuse{xsimversion#1}), changed with version~#2 (\csuse{xsimversion#2})} +\RequirePackage{xsimverb} +\ExplSyntaxOn +\tl_replace_all:Nnn \c_xsimverb_date_tl {/} {-} +\ExplSyntaxOff + +\newnote*\xsimverbversion{% + \pkg{xsimverb} version~\csname c_xsimverb_version_tl\endcsname\ + (\expandafter\expandafter\expandafter\DTMdate + \expandafter\expandafter\expandafter{\csname c_xsimverb_date_tl\endcsname})% +} + \renewcommand*\versionnoteformat{\scriptsize\sffamily\RaggedRight} \renewcommand*\cnltx@module@text[2]{% diff --git a/macros/latex/contrib/xsim/doc/xsim.history b/macros/latex/contrib/xsim/doc/xsim.history index c3214cf573..b2bf16e4c0 100644 --- a/macros/latex/contrib/xsim/doc/xsim.history +++ b/macros/latex/contrib/xsim/doc/xsim.history @@ -7,7 +7,7 @@ Clemens Niederberger Web: https://github.com/cgnieder/xsim E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2017--2019 Clemens Niederberger +Copyright 2017--2020 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -133,4 +133,6 @@ HISTORY: `use-aux' v0.16 2019/11/10 - fix issue due to usage of own auxiliary file - \XSIMatbegindocument and \XSIMatenddocument - - \xprintexercise, \xprintsolution, \xsimprint, \xsimxprint + - \xprintexercise, \xprintsolution, \xsimprint, \xsimxprint + 2019/12/29 - bugfix in `xsimverb' + v0.16a 2020/01/16 - adapt to renaming of string case changing functions diff --git a/macros/latex/contrib/xsim/doc/xsim.ideas b/macros/latex/contrib/xsim/doc/xsim.ideas index cdc4b7d2ba..0882c70535 100644 --- a/macros/latex/contrib/xsim/doc/xsim.ideas +++ b/macros/latex/contrib/xsim/doc/xsim.ideas @@ -7,7 +7,7 @@ Clemens Niederberger Web: https://github.com/cgnieder/xsim E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2017--2019 Clemens Niederberger +Copyright 2017--2020 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/xsim/doc/xsim_manual.pdf b/macros/latex/contrib/xsim/doc/xsim_manual.pdf Binary files differindex 72711292c5..9c3f546204 100644 --- a/macros/latex/contrib/xsim/doc/xsim_manual.pdf +++ b/macros/latex/contrib/xsim/doc/xsim_manual.pdf diff --git a/macros/latex/contrib/xsim/doc/xsim_manual.tex b/macros/latex/contrib/xsim/doc/xsim_manual.tex index 5156221b0e..46706662a1 100644 --- a/macros/latex/contrib/xsim/doc/xsim_manual.tex +++ b/macros/latex/contrib/xsim/doc/xsim_manual.tex @@ -13,7 +13,7 @@ % Web: https://github.com/cgnieder/xsim % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2017--2019 Clemens Niederberger +% Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -2274,10 +2274,11 @@ For this manual we then get the following list\footnote{Taking care of the } \section{The \pkg*{xsimverb} package}\label{sec:xsimverb-package} -\xsim\ comes bundled with another package called \pkg{xsimverb}. This package -loads a very small subset of \xsim\ which allows to create environments which -write their contents verbatim to external files. It provides the following -commands (which of course are also available in \xsim, too): +\xsim\ comes bundled with another package called +\pkg{xsimverb}\xsimverbversion. This package loads a very small subset of +\xsim\ which allows to create environments that write their contents verbatim +to external files. It provides the following commands (which of course are +also available in \xsim, too): \begin{commands} \command{XSIMfilewritestart}[\sarg\marg{file name}] @@ -2309,7 +2310,7 @@ commands (which of course are also available in \xsim, too): value is~$0$. \end{commands} -An example of how to use those commands: +The following code shows an example of how to use those commands: \begin{sourcecode} \documentclass{article} \usepackage{xsimverb,listings} |
