From e71ffee2103e3f137bbc9ee526858bc277e95908 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 17 Jan 2020 03:01:22 +0000 Subject: CTAN sync 202001170301 --- macros/latex/contrib/ghsystem/ghsystem.sty | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'macros/latex/contrib/ghsystem/ghsystem.sty') 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 -- cgit v1.2.3