From 703bb35b9a4b6c8e72bbcfc60a9ba4edf868b6bf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 17 Feb 2020 22:17:09 +0000 Subject: ghsystem (17feb20) git-svn-id: svn://tug.org/texlive/trunk@53822 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ghsystem/ghsystem.sty | 7 +++--- .../latex/ghsystem/language/ghsystem_english.def | 6 +++-- .../latex/ghsystem/language/ghsystem_french.def | 27 ++++++++++++++-------- .../latex/ghsystem/language/ghsystem_german.def | 6 +++-- .../latex/ghsystem/language/ghsystem_italian.def | 6 +++-- .../ghsystem/language/ghsystem_langtemplate.def | 6 +++-- .../latex/ghsystem/language/ghsystem_spanish.def | 6 +++-- 7 files changed, 42 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ghsystem') 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 @@ % \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 @@ % \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 @@ % \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 @@ % \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 @@ % ----------------------------------------------------------------------------- % % DEFINITIONS -\ghsystemlanguagefile{language}{date} +\ghsystemlanguagefile {language} {date} % table head: \tl_set:Nn \l_ghsystem_identifier_tl { ... } @@ -100,7 +100,9 @@ % \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 @@ % \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 -- cgit v1.2.3