diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/doc/latex/ghsystem/README | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/ghsystem/ghsystem-manual.cls | 272 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/ghsystem/ghsystem-manual.pdf (renamed from Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.pdf) | bin | 780361 -> 782510 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/ghsystem/ghsystem-manual.tex (renamed from Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.tex) | 59 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/ghsystem/ghsystem.sty | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_english.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_french.def | 27 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_german.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_italian.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_langtemplate.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_spanish.def | 6 |
11 files changed, 321 insertions, 78 deletions
diff --git a/Master/texmf-dist/doc/latex/ghsystem/README b/Master/texmf-dist/doc/latex/ghsystem/README index 6117fa22c4a..d1dcf7617b4 100644 --- a/Master/texmf-dist/doc/latex/ghsystem/README +++ b/Master/texmf-dist/doc/latex/ghsystem/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the GHSYSTEM package v4.8b 2020/01/16 +the GHSYSTEM package v4.8c 2020/02/17 globally harmonized system @@ -34,7 +34,7 @@ language-definition files: - ghsystem_italian.def - ghsystem_langtemplate.def documentation and README: - - ghsystem_en.tex, ghsystem_en.pdf, + - ghsystem-manual.tex, ghsystem-manual.cls, ghsystem-manual.pdf, - README -------------------------------------------------------------------------- If you have any ideas, questions, suggestions or bugs to report, please diff --git a/Master/texmf-dist/doc/latex/ghsystem/ghsystem-manual.cls b/Master/texmf-dist/doc/latex/ghsystem/ghsystem-manual.cls new file mode 100644 index 00000000000..1a47c50a134 --- /dev/null +++ b/Master/texmf-dist/doc/latex/ghsystem/ghsystem-manual.cls @@ -0,0 +1,272 @@ +% -------------------------------------------------------------------------- +% the GHSYSTEM package +% +% globally harmonised system +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% -------------------------------------------------------------------------- +% https://github.org/cgnieder/ghsystem/ +% contact@mychemistry.eu +% -------------------------------------------------------------------------- +% If you have any ideas, questions, suggestions or bugs to report, please +% feel free to contact me. +% -------------------------------------------------------------------------- +% 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 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- +\ProvidesClass{ghsystem-manual}[2020/02/17] + +\LoadClass[load-preamble,add-index]{cnltx-doc} +\RequirePackage{imakeidx} +\RequirePackage[utf8]{inputenc} + +\RequirePackage{ghsystem,chemmacros} + +\setcnltx{ + package = {ghsystem}, + info = \acl*{ghs} , + url = https://github.com/cgnieder/ghsystem/ , + authors = Clemens Niederberger , + email = contact@mychemistry.eu , + abstract = {% + \centering + \includegraphics{chemmacros-logo.pdf} + \par + } , + add-cmds = { + chemsetup, + ghs, ghslistall, ghspic, ghssetup + } , + index-setup = { noclearpage , level = \addsec } +} + +\RequirePackage{booktabs} + +\def\libertine@figurestyle{LF} +\RequirePackage{amsmath} +\undef\lvert \undef\lVert +\undef\rvert \undef\rVert +\RequirePackage[libertine]{newtxmath} +\def\libertine@figurestyle{OsF} + +\RequirePackage[biblatex]{embrac} +\ChangeEmph{[}[,.02em]{]}[.055em,-.08em] +\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] + +\RequirePackage[accsupp]{acro} +\acsetup{ + long-format = \scshape , + short-format = \scshape +} + +\chemsetup{ + greek = newtx , + formula = chemformula , + chemformula/format = \libertineLF +} + +\ghssetup{ + language = {german,english} +} + +\sisetup{ + detect-mode=false, + mode=text, + text-rm=\libertineLF +} + +\RequirePackage{fontawesome} +\RequirePackage{datetime2} +\DTMsetup{useregional=numeric,datesep=/} +\newrobustcmd*\ghsystem@add@version[2]{% + \csdef{ghsystem@ver@#2}{% + \DTMdate{#1}% + \csgdef{ghsystem@ver@#2used}{}% + \csdef{ghsystem@ver@#2}{\DTMdate{#1}}% + }% +} + +\newrobustcmd*\ghsystem@date[1]{% + \ifcsdef{ghsystem@ver@#1used}{}{ (\csuse{ghsystem@ver@#1})}} +\newrobustcmd*\ghsystem@ifnew[1]{\ifcsstring{c_ghsystem_version_tl}{#1}} +\newrobustcmd*\ghsystem@NEW{\faStarO\ New} + +\renewrobustcmd*\sinceversion[1]{% + \ghsystem@ifnew{#1}% + {\cnltx@version@note{\textcolor{red}{\ghsystem@NEW}}}% + {\cnltx@version@note{\GetTranslation{cnltx-introduced}~#1\ghsystem@date{#1}}}% +} +\renewrobustcmd*\changedversion[1]{% + \cnltx@version@note{\GetTranslation{cnltx-changed}~#1\ghsystem@date{#1}}% +} + +\newnote*\sincechanged[2]{% + \GetTranslation{cnltx-introduced}~#1\ghsystem@date{#1}, + changed with version~#2\ghsystem@date{#2}\ghsystem@ifnew{#2}{ \ghsystem@NEW}{}% +} + +\RenewDocumentEnvironment{commands}{} + {% + \cnltx@set@catcode_{12}% + \let\command\cnltx@command + \cnltxlist + } + {\endcnltxlist} + +\RequirePackage{tcolorbox,xsimverb} +\tcbuselibrary{skins,breakable} +\tcbset{enhanced,enhanced jigsaw} + +\newtcolorbox{bewareofthedog}{ + colback = white , + colframe = red , + underlay={% + \path[draw=none] + (interior.south west) + rectangle node[red]{\Huge\bfseries !} + ([xshift=-4mm]interior.north west); + }% +} + +\newtcolorbox{cnltxcode}[1][]{ + boxrule = 1pt , + colback = cnltxbg , + colframe = cnltx , + arc = 5pt , + beforeafter skip = .5\baselineskip ,% + #1% +} + +\newcommand*\ghsystem@readoptions[1]{% + \catcode`\^^M=13 + \ghsystem@read@options{#1}% +} + +\begingroup +\catcode`\^^M=13 +\gdef\ghsystem@read@options#1#2^^M{% + \endgroup + \ifblank{#2}{}{\ghsystem@read@options@#2}% + #1% + \XSIMfilewritestart*{\jobname.tmp}% +}% +\endgroup +\def\ghsystem@read@options@[#1]{\pgfqkeys{/cnltx}{#1}} + +\RenewDocumentEnvironment{sourcecode}{} + {% + \begingroup + \ghsystem@readoptions{% + \setlength\cnltx@sidebysidewidth + {\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}% + \expanded{% + \noexpand\lstset{ + style=cnltx, + \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} } + {linewidth=\cnltx@sidebysidewidth,}{}% + \expandonce\cnltx@local@listings@options + }% + }% + \XSIMgobblechars{2}% + }% + } + {% + \XSIMfilewritestop + \cnltxcode[breakable]% + \lstinputlisting[style=cnltx]{\jobname.tmp}% + \endcnltxcode + } + +\RenewDocumentEnvironment{example}{} + {% + \begingroup + \ghsystem@readoptions{% + \setlength\cnltx@sidebysidewidth + {\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}% + \expanded{% + \noexpand\lstset{ + style=cnltx, + \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} } + {linewidth=\cnltx@sidebysidewidth,}{}% + \expandonce\cnltx@local@listings@options + }% + }% + \XSIMgobblechars{2}% + }% + } + {% + \XSIMfilewritestop + \ifbool{cnltx@sidebyside} + {% + \cnltxcode + \noindent + \minipage[c]{\cnltx@sidebysidewidth}% + \cnltx@pre@source@hook + \lstinputlisting[style=cnltx] {\jobname.tmp}% + \cnltx@after@source@hook + \endminipage\hfill + \minipage[c]{\cnltx@sidebysidewidth}% + \cnltx@pre@example@hook + \input {\jobname.tmp}% + \cnltx@after@example@hook + \endminipage + } + {% + \cnltxcode[breakable]% + \cnltx@pre@source@hook + \lstinputlisting{\jobname.tmp}% + \cnltx@after@source@hook + \tcblower + \cnltx@pre@example@hook + \input {\jobname.tmp}% + \cnltx@after@example@hook + }% + \endcnltxcode + } + +\RequirePackage[ + backend=biber, + style=cnltx, + sortlocale=en_US, + indexing=cite]{biblatex} +\RequirePackage{csquotes,varioref} +\defbibheading{bibliography}{\section{References}} + +\RequirePackage[biblatex]{embrac}[2012/06/29] +\ChangeEmph{[}[,.02em]{]}[.055em,-.08em] +\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] + +\ghsystem@add@version{2012-01-28}{3.0} +\ghsystem@add@version{2012/01/30}{3.0a} +\ghsystem@add@version{2012/02/05}{3.0c} +\ghsystem@add@version{2012/05/13}{3.3a} +\ghsystem@add@version{2012/05/18}{3.3b} +\ghsystem@add@version{2012/05/18}{3.3c} +\ghsystem@add@version{2012/07/24}{3.3d} +\ghsystem@add@version{2013/02/19}{3.5a} +\ghsystem@add@version{2013/07/06}{4.0} +\ghsystem@add@version{2013/12/13}{4.0a} +\ghsystem@add@version{2014/01/09}{4.2e} +\ghsystem@add@version{2014/04/08}{4.5} +\ghsystem@add@version{2014/04/13}{4.5a} +\ghsystem@add@version{2014/06/30}{4.5b} +\ghsystem@add@version{2014/08/08}{4.6} +\ghsystem@add@version{2016/01/15}{4.7} +\ghsystem@add@version{2016/07/16}{4.8} +\ghsystem@add@version{2019/09/30}{4.8a} +\ghsystem@add@version{2020/01/16}{4.8b} +\ghsystem@add@version{2020/02/17}{4.8c} + +\endinput diff --git a/Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.pdf b/Master/texmf-dist/doc/latex/ghsystem/ghsystem-manual.pdf Binary files differindex dccf33b05d4..c6d566d6c9a 100644 --- a/Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.pdf +++ b/Master/texmf-dist/doc/latex/ghsystem/ghsystem-manual.pdf diff --git a/Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.tex b/Master/texmf-dist/doc/latex/ghsystem/ghsystem-manual.tex index 1267fb29e36..230deda95b4 100644 --- a/Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.tex +++ b/Master/texmf-dist/doc/latex/ghsystem/ghsystem-manual.tex @@ -30,43 +30,8 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\documentclass[load-preamble+]{cnltx-doc} -\usepackage[utf8]{inputenc} -% \usepackage[greek=newtx]{chemmacros} -\usepackage{ghsystem} -\setcnltx{ - package = {ghsystem}, - info = \acl*{ghs} , - url = https://github.com/cgnieder/ghsystem/ , - authors = Clemens Niederberger , - email = contact@mychemistry.eu , - abstract = {% - \centering - \includegraphics{chemmacros-logo.pdf} - \par - } , - add-cmds = { - chemsetup, - ghs, ghslistall, ghspic, ghssetup - } , - index-setup = noclearpage -} - -\usepackage{booktabs} - -\expandafter\def\csname libertine@figurestyle\endcsname{LF} -\usepackage[libertine]{newtxmath} -\expandafter\def\csname libertine@figurestyle\endcsname{OsF} +\documentclass{ghsystem-manual} -\usepackage[biblatex]{embrac} -\ChangeEmph{[}[,.02em]{]}[.055em,-.08em] -\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] - -\usepackage[accsupp]{acro} -\acsetup{ - long-format = \scshape , - short-format = \scshape -} \DeclareAcronym{ghs}{ short = ghs , long = Globally Harmonized System of Classification and Labelling of @@ -99,27 +64,11 @@ accsupp = PDF } -\chemsetup{ - greek = newtx , - formula = chemformula , - chemformula/format = \libertineLF -} - -\ghssetup{ - language = {german,english} -} - -\sisetup{ - detect-mode=false, - mode=text, - text-rm=\libertineLF -} - -\usepackage{filecontents} \defbibheading{bibliography}{\addsec{References}} +\addbibresource{cnltx.bib} \addbibresource{\jobname.bib} -\begin{filecontents*}{\jobname.bib} +\begin{filecontents*}[overwrite]{\jobname.bib} @misc{eu:ghsystem_regulation, author = {{The European Parliament and The Council of the European Union}}, title = {Regulation (EC) No 1272/2008 of the European Parliament and of @@ -491,4 +440,6 @@ The code below shows how table~\ref{tab:ghs-hp-statements} was created: \ghslistall[fill-in,table-rules=booktabs] +\printbibliography + \end{document} diff --git a/Master/texmf-dist/tex/latex/ghsystem/ghsystem.sty b/Master/texmf-dist/tex/latex/ghsystem/ghsystem.sty index dfc4d1eacd8..62f97b82826 100644 --- a/Master/texmf-dist/tex/latex/ghsystem/ghsystem.sty +++ b/Master/texmf-dist/tex/latex/ghsystem/ghsystem.sty @@ -29,8 +29,8 @@ \RequirePackage{ expl3, xparse, chemmacros } \ExplSyntaxOn -\tl_const:Nn \c_ghsystem_version_tl {4.8b} -\tl_const:Nn \c_ghsystem_date_tl {2020/01/16} +\tl_const:Nn \c_ghsystem_version_tl {4.8c} +\tl_const:Nn \c_ghsystem_date_tl {2020/02/17} \tl_const:Nn \c_ghsystem_info_tl {globally~ harmonised~ system} \ProvidesExplPackage @@ -525,7 +525,7 @@ \caption [ \l_ghsystem_table_caption_short_tl ] { \l_ghsystem_table_caption_tl - \exp_args:No \label { \l__ghsystem_table_label_tl } + \exp_args:NV \label \l__ghsystem_table_label_tl } \\ \l__ghsystem_table_top_head_rule_tl \textbf { \l_ghsystem_identifier_tl } & @@ -714,3 +714,4 @@ VERSION HISTORY 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 +2020/02/17 - version 4.8c - resolve bug with French and Lua- or XeLaTeX diff --git a/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_english.def b/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_english.def index 67b579371c0..1d6e18d7d06 100644 --- a/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_english.def +++ b/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_english.def @@ -26,7 +26,7 @@ % - The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- % ENGLISH DEFINITIONS -\ghsystemlanguagefile{english}{2016/01/16} +\ghsystemlanguagefile {english} {2020/02/17} % table head and foot: \tl_set:Nn \l_ghsystem_identifier_tl { Identifier } @@ -61,7 +61,9 @@ % <or state all organs affected, if known> \cs_set:Npn \ghsystem_organs: { - \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool } + \bool_lazy_and:nnT + { \l_ghsystem_fill_in_bool } + { !\l_ghsystem_organs_bool } { \c_space_tl \ghsystem_filler:n { or~ state~ all~ organs~ affected,~ if~ known } diff --git a/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_french.def b/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_french.def index 417df283491..0901369fd3e 100644 --- a/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_french.def +++ b/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_french.def @@ -29,7 +29,7 @@ % - Aurélien. Many thanks! % FRENCH DEFINITIONS -\ghsystemlanguagefile{french}{2019/09/30} +\ghsystemlanguagefile {french} {2020/02/17} % table head: \tl_set:Nn \l_ghsystem_identifier_tl { num\'ero } @@ -37,13 +37,20 @@ \tl_set:Nn \l_ghsystem_table_caption_tl { Toutes~ les~ phrases~ H,~ EUH~ et~ P } \tl_set:Nn \l_ghsystem_table_next_page_tl { suite~ sur~ la~ prochaine~ page } -\group_begin: -\char_set_catcode_active:N \^^@ -\char_set_lccode:nn { `^^@ } { `: } -\tex_lowercase:D - { - \group_end: - \tl_const:Nn \c_ghsystem_french_colon_tl { ^^@ } +% with pdflatex babel sets the colon active: +\bool_lazy_or:nnTF + { \sys_if_engine_luatex_p: } + { \sys_if_engine_xetex_p: } + { \tl_const:Nn \c_ghsystem_french_colon_tl { \c_colon_str } } + { + \group_begin: + \char_set_catcode_active:N \^^~ + \char_set_lccode:nn { `^^~ } { `: } + \tex_lowercase:D + { + \group_end: + \tl_const:Nn \c_ghsystem_french_colon_tl { ^^~ } + } } % fill-in functions: @@ -76,7 +83,9 @@ % <or state all organs affected, if known> \cs_set:Npn \ghsystem_organs: { - \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool } + \bool_lazy_and:nnT + { \l_ghsystem_fill_in_bool } + { !\l_ghsystem_organs_bool } { \c_space_tl \ghsystem_filler:n diff --git a/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_german.def b/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_german.def index f7f706996d9..481830eab4c 100644 --- a/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_german.def +++ b/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_german.def @@ -26,7 +26,7 @@ % - The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- % GERMAN DEFINITIONS -\ghsystemlanguagefile{german}{2016/01/16} +\ghsystemlanguagefile {german} {2016/01/16} % table head and foot: \tl_set:Nn \l_ghsystem_identifier_tl { Nummer } @@ -62,7 +62,9 @@ % <or state all organs affected, if known> \cs_set:Npn \ghsystem_organs: { - \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool } + \bool_lazy_and:nnT + { \l_ghsystem_fill_in_bool } + { !\l_ghsystem_organs_bool } { \c_space_tl \ghsystem_filler:n diff --git a/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_italian.def b/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_italian.def index 9d97ca043ca..6e89094ff3d 100644 --- a/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_italian.def +++ b/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_italian.def @@ -28,7 +28,7 @@ % - the Italian translation was kindly provided by Jonas Rivetti. Many thanks! % ITALIAN DEFINITIONS -\ghsystemlanguagefile{italian}{2016/01/16} +\ghsystemlanguagefile {italian} {2020/02/17} % table head and foot: \tl_set:Nn \l_ghsystem_identifier_tl { Numero } @@ -66,7 +66,9 @@ % <or state all organs affected, if known> \cs_set:Npn \ghsystem_organs: { - \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool } + \bool_lazy_and:nnT + { \l_ghsystem_fill_in_bool } + { !\l_ghsystem_organs_bool } { \c_space_tl \ghsystem_filler:n diff --git a/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_langtemplate.def b/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_langtemplate.def index 52a6a210111..75f19cae5cc 100644 --- a/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_langtemplate.def +++ b/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_langtemplate.def @@ -70,7 +70,7 @@ % ----------------------------------------------------------------------------- % % <LANGUAGE> DEFINITIONS -\ghsystemlanguagefile{language}{date} +\ghsystemlanguagefile {language} {date} % table head: \tl_set:Nn \l_ghsystem_identifier_tl { ... } @@ -100,7 +100,9 @@ % <or state all organs affected, if known> \cs_set:Npn \ghsystem_organs: { - \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool } + \bool_lazy_and:nnT + { \l_ghsystem_fill_in_bool } + { !\l_ghsystem_organs_bool } { \c_space_tl \ghsystem_filler:n { ... } } diff --git a/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_spanish.def b/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_spanish.def index ecbf46fa177..5b6a2038849 100644 --- a/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_spanish.def +++ b/Master/texmf-dist/tex/latex/ghsystem/language/ghsystem_spanish.def @@ -29,7 +29,7 @@ % - Galván. Many thanks! % SPANISH DEFINITIONS -\ghsystemlanguagefile{spanish}{2016/01/16} +\ghsystemlanguagefile {spanish} {2020/02/17} % table head: \tl_set:Nn \l_ghsystem_identifier_tl { Identificador } @@ -67,7 +67,9 @@ % <or state all organs affected, if known> \cs_set:Npn \ghsystem_organs: { - \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool } + \bool_lazy_and:nnT + { \l_ghsystem_fill_in_bool } + { !\l_ghsystem_organs_bool } { \c_space_tl \ghsystem_filler:n |