From 36af474fe0145570149f984a67e6255a6a869cf1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 Jan 2014 23:21:37 +0000 Subject: chemmacros (11jan14) git-svn-id: svn://tug.org/texlive/trunk@32638 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/chemmacros/README | 8 +-- .../doc/latex/chemmacros/chemmacros_en.pdf | Bin 896070 -> 897435 bytes .../doc/latex/chemmacros/chemmacros_en.tex | 2 +- .../doc/latex/chemmacros/ghsystem_en.pdf | Bin 787983 -> 788320 bytes .../tex/latex/chemmacros/chemformula.sty | 4 +- .../texmf-dist/tex/latex/chemmacros/chemgreek.sty | 2 +- .../texmf-dist/tex/latex/chemmacros/chemmacros.sty | 7 ++- .../texmf-dist/tex/latex/chemmacros/ghsystem.sty | 62 +++++++++++++-------- 8 files changed, 52 insertions(+), 33 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README index bac46d36bbc..239ccb17fc5 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/README +++ b/Master/texmf-dist/doc/latex/chemmacros/README @@ -1,8 +1,8 @@ -------------------------------------------------------------------------- -the CHEMMACROS bundle 2013/12/15 - - chemmacros package v4.2d -> macros and commands for chemists +the CHEMMACROS bundle 2014/01/09 + - chemmacros package v4.2e -> macros and commands for chemists - chemformula package v4.2a -> typeset chemical compounds and reactions - - ghsystem package v4.0a -> typeset H & P statements and pictograms + - ghsystem package v4.2e -> typeset H & P statements and pictograms from the globally harmonised system (GHS) - chemgreek package v0.2a -> handle mapping of upright greek letters to the \chemalpha ... commands @@ -14,7 +14,7 @@ Clemens Niederberger Web: https://bitbucket.org/cgnieder/chemmacros/ E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2011-2013 Clemens Niederberger +Copyright 2011-2014 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/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf index b05e91e2971..08ff636b1d7 100644 Binary files a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf and b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex index 5efeebbfd6f..68720c0a1ec 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex +++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex @@ -1228,7 +1228,7 @@ These macros for example can be used with the \cs{ox} command or with the option/circled = all, ox/parse = false } - \ce{\ox{\delp,H}-\ox{\delm,Cl}} \hspace*{1cm} + \ch{"\ox{\delp,H}" -{} "\ox{\delm,Cl}"} \hspace*{1cm} \chemfig{\chemabove[3pt]{\lewis{246,Br}}{\delm}-\chemabove[3pt]{H}{\delp}} \end{example} diff --git a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf index 36799e44576..45ec00a0839 100644 Binary files a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf and b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf differ diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty index 5a284390463..05e7dbce85e 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2013 Clemens Niederberger +% Copyright 2011-2014 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -2731,7 +2731,6 @@ VERSION HISTORY 2013/11/04 - version 4.2a - bug fix in \chcpd, - change sanitizing/restoring of category codes - % -------------------------------------------------------------------------- % TODO - https://bitbucket.org/cgnieder/chemmacros/issue/23/ @@ -2739,3 +2738,4 @@ VERSION HISTORY - optionale Argumente von \\ nach außen - make escaped text/math /truely/ escaped, i.e., behave as if it's been input /outside/ of \ch +- add possibility to use `siunitx' \num for stoichiometric factors diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemgreek.sty b/Master/texmf-dist/tex/latex/chemmacros/chemgreek.sty index fda3886a67f..0a90ba4809f 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemgreek.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemgreek.sty @@ -11,7 +11,7 @@ % - If you have any ideas, questions, suggestions or bugs to report, please % - feel free to contact me. % --------------------------------------------------------------------------- -% - Copyright 2011-2013 Clemens Niederberger +% - Copyright 2011-2014 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/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty index b5af1fa8903..4f393c2b2a1 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty @@ -11,7 +11,7 @@ % - If you have any ideas, questions, suggestions or bugs to report, please % - feel free to contact me. % -------------------------------------------------------------------------- -% - Copyright 2011-2013 Clemens Niederberger +% - Copyright 2011-2014 Clemens Niederberger % - % - This work may be distributed and/or modified under the % - conditions of the LaTeX Project Public License, either version 1.3 @@ -26,8 +26,8 @@ % - The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- \RequirePackage{ expl3 , xparse , l3keys2e } -\def\chemmacros@version{4.2d} -\def\chemmacros@date{2013/12/15} +\def\chemmacros@version{4.2e} +\def\chemmacros@date{2014/01/09} \ProvidesExplPackage {chemmacros} @@ -4068,6 +4068,7 @@ Version history - new options `acid-base/K-acid', `acid-base/K-base' and `acid-base/K-water' - adapt \ox to updates in `l3fp' +2014/01/09 - version 4.2e - step bundle version due to changes in `ghsystem' % --------------------------------------------------------------------------- % % TODO: diff --git a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty b/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty index 8c4f9d37708..8f0cea54cda 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/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-2013 Clemens Niederberger - % +% - Copyright 2011-2014 Clemens Niederberger - % % - - % % - This work may be distributed and/or modified under the - % % - conditions of the LaTeX Project Public License, either version 1.3 - % @@ -27,8 +27,8 @@ % - The Current Maintainer of this work is Clemens Niederberger. - % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{ expl3, xparse, l3keys2e } -\def\ghsystem@version{4.0a} -\def\ghsystem@date{2013/12/13} +\def\ghsystem@version{4.2e} +\def\ghsystem@date{2014/01/09} \ProvidesExplPackage {ghsystem} {\ghsystem@date} @@ -209,34 +209,50 @@ \bool_new:N \l__ghsystem_language_directory_bool % load the language file -- it needs expl3 namespace but shouldn't care about -% what catcode regime was before and simply restore it +% what catcode regime was before and simply restore it... +% so we basically copy the definitions of \ExplSyntaxOn and \ExplSyntaxOff -\cs_new:Npn \__ghsystem_namespace_restore: {} +\cs_new_protected:Npn \__ghsystem_namespace_restore: {} +\bool_new:N \l__ghsystem_expl_namespace_bool \cs_new_protected:Npn \__ghsystem_expl_namespace: { - \group_begin: - \cs_gset_protected:Npx \__ghsystem_namespace_restore: - { - \char_set_catcode:nn { 9 } { \char_value_catcode:n { 9 } } - \char_set_catcode:nn { 32 } { \char_value_catcode:n { 32 } } - \char_set_catcode:nn { 34 } { \char_value_catcode:n { 34 } } - \char_set_catcode:nn { 38 } { \char_value_catcode:n { 38 } } - \char_set_catcode:nn { 58 } { \char_value_catcode:n { 58 } } - \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } } - \char_set_catcode:nn { 95 } { \char_value_catcode:n { 95 } } - \char_set_catcode:nn { 124 } { \char_value_catcode:n { 124 } } - \char_set_catcode:nn { 126 } { \char_value_catcode:n { 126 } } - \tex_endlinechar:D = \tex_the:D \tex_endlinechar:D \scan_stop: - } - \group_end: - \ExplSyntaxOn + \bool_if:NF \l__ghsystem_expl_namespace_bool + { + \cs_set_protected:Npx \__ghsystem_namespace_restore: + { + \char_set_catcode:nn { 9 } { \char_value_catcode:n { 9 } } + \char_set_catcode:nn { 32 } { \char_value_catcode:n { 32 } } + \char_set_catcode:nn { 34 } { \char_value_catcode:n { 34 } } + \char_set_catcode:nn { 38 } { \char_value_catcode:n { 38 } } + \char_set_catcode:nn { 58 } { \char_value_catcode:n { 58 } } + \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } } + \char_set_catcode:nn { 95 } { \char_value_catcode:n { 95 } } + \char_set_catcode:nn { 124 } { \char_value_catcode:n { 124 } } + \char_set_catcode:nn { 126 } { \char_value_catcode:n { 126 } } + \tex_endlinechar:D = \tex_the:D \tex_endlinechar:D \scan_stop: + \bool_set_false:N \l__ghsystem_expl_namespace_bool + \cs_set_protected:Npn \__ghsystem_namespace_restore: {} + } + } + \char_set_catcode_ignore:n { 9 } + \char_set_catcode_ignore:n { 32 } + \char_set_catcode_other:n { 34 } + \char_set_catcode_math_toggle:n { 36 } + \char_set_catcode_alignment:n { 38 } + \char_set_catcode_letter:n { 58 } + \char_set_catcode_math_superscript:n { 94 } + \char_set_catcode_letter:n { 95 } + \char_set_catcode_other:n { 124 } + \char_set_catcode_space:n { 126 } + \tex_endlinechar:D = 32 \scan_stop: + \bool_set_true:N \l__ghsystem_expl_namespace_bool } \cs_new:Npn \ghsystem_load_language_file:n #1 { \__ghsystem_expl_namespace: - \input ghsystem_#1.def \scan_stop: + \file_input:n { ghsystem_#1.def } \__ghsystem_namespace_restore: } @@ -623,6 +639,8 @@ VERSION HISTORY `chemmacros' 2013/12/13 - version 4.0a - small changes to `ghsystem_german.def' - added \ghsystem_dash: and \ghsystem_slash: +2014/01/09 - version 4.2e - bug fix: namespace after language file loading + properly restored %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % TODO: -- cgit v1.2.3