diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
28 files changed, 219 insertions, 123 deletions
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.acid-base.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.acid-base.code.tex index fb998832c9a..1024cd4face 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.acid-base.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.acid-base.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -25,7 +25,7 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\ChemModule{acid-base}{2016/05/31 acid/base} +\ChemModule{acid-base}{2018/02/22 acid/base} \chemmacros_load_modules:n {charges} @@ -108,7 +108,9 @@ \cs_new_protected:Npn \chemmacros_p:n #1 { \group_begin: - \mbox + \chemmacros_if_compatibility:nnTF {<=} {5.8b} + { \mbox } + { \chemmacros_text:n } { \chemmacros_p_style:n {p} \ensuremath {#1} @@ -157,8 +159,9 @@ } \EndChemCompatibility % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2016/02/04 - \NewChemEqConstant and family, new option `eq-constant' 2016/04/27 - moved translations from lang module to acid-base module 2016/05/31 - adapt to changes in `lang' module +2018/02/22 - fix bug in \chemmacros_p:n (https://tex.stackexchange.com/q/416227/) diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.all.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.all.code.tex index 599b6598194..fa14ed3fdbd 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.all.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.all.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -68,7 +68,7 @@ \msg_info:nn {chemmacros} {all-modules} % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2015/10/14 - add info message discouraging the usage of this module - add `errorcheck' module diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.base.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.base.code.tex index 6e6b98094ad..5d2e66611d3 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.base.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.base.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -272,7 +272,9 @@ { \cs_if_exist:cF {cref@#1@name} { - \crefname {#1} {#2} {#3} + \chemmacros_tex_if:nnTF {@cref@capitalise} {} + { \crefname {#1} {#4} {#5} } + { \crefname {#1} {#2} {#3} } \Crefname {#1} {#4} {#5} } } @@ -471,7 +473,7 @@ { \bool_set_true:N \l__chemmacros_hyperref_bool } } -\tex_endinput:D +\file_input_stop: 2015/09/23 - new conditionals \chemmacros_if_preamble:TF and \chemmacros_if_document:TF diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.charges.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.charges.code.tex index 3429727aa23..981d9d272e7 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.charges.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.charges.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 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.module.chemformula.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex index 9f54d9317f7..6a6c45d1f23 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -230,7 +230,7 @@ } % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2015/09/22 - new general option `method' which allows a choice between `chemformula' and `mhchem' diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.errorcheck.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.errorcheck.code.tex index d7c70b5e9c8..07499ef5f2c 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.errorcheck.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.errorcheck.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -122,7 +122,7 @@ % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2015/10/14 - first version 2016/03/08 - add `polymers' module diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.greek.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.greek.code.tex index a9f96d7485a..d3c9ee87aeb 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.greek.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.greek.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 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.module.isotopes.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.isotopes.code.tex index 0931c1579f4..1d7ec5466c6 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.isotopes.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.isotopes.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 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.module.lang.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.lang.code.tex index b9dea089d24..7ae37a2f9fa 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.lang.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.lang.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -162,7 +162,7 @@ \EndChemCompatibility % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2015/11/17 - remove options `german' and `ngerman', starting with v5.3 2016/02/03 - adapt to changes in `acid-base' module diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.mechanisms.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.mechanisms.code.tex index 662d93fbb3a..22624538b6c 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.mechanisms.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.mechanisms.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 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.module.newman.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.newman.code.tex index 79d5c16ff13..7c8caa10a5e 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.newman.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.newman.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -207,6 +207,6 @@ \cs_generate_variant:Nn \chemmacros_newman_front_node:nn { nf } % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2016/04/23 - some changes on how \newman is processed internally diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex index 5a347b66e9d..596d36f65a1 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -456,7 +456,7 @@ } \EndChemCompatibility -\ChemCompatibilityFrom{5.8a} +\ChemCompatibility{5.8a} \cs_new_protected:Npn \__chemmacros_break_point_insert:nnn #1#2#3 { \mode_if_math:TF @@ -473,6 +473,49 @@ } \EndChemCompatibility +\ChemCompatibilityFrom{5.8b} +\cs_new_protected:Npn \__chemmacros_peek_if_dash:TF #1#2 + { + \peek_charcode:NTF - + {#1} + {#2} + } + +\cs_new_protected:Npn \__chemmacros_peek_if_paren:TF #1#2 + { % ( + \peek_charcode:NTF ) + {#1} + { % [ + \peek_charcode:NTF ] + {#1} + {#2} + } + } + +\cs_new_protected:Npn \__chemmacros_break_point_insert:nnn #1#2#3 + { + \mode_if_math:TF + {#3} + { + \peek_meaning:NTF \group_end: + {#3} + { + \__chemmacros_peek_if_dash:TF + {#3} + { + \__chemmacros_peek_if_paren:TF + {#3} + { + \chemmacros_nobreak: + \tex_discretionary:D {#1} {#2} {#3} + \chemmacros_allow_hyphens: + } + } + } + } + } +\EndChemCompatibility + \dim_new:N \l__chemmacros_iupac_hyphen_pre_dim \dim_set:Nn \l__chemmacros_iupac_hyphen_pre_dim { .01em } \dim_new:N \l__chemmacros_iupac_hyphen_post_dim @@ -528,7 +571,7 @@ { \tex_kern:D \l__chemmacros_iupac_break_dim } } } - + \cs_new_protected:Npn \chemmacros_break_point_opening_paren: { \__chemmacros_break_point_insert:nnn { - } { ( } { ( } } @@ -642,6 +685,11 @@ \NewChemIUPACShorthand ' \chemprime \EndChemCompatibility +\ChemCompatibilityFrom{5.8c} +\NewChemIUPAC \nonbreakinghyphen { \mbox{-} \nobreak \hspace{0pt} } +\NewChemIUPACShorthand = \nonbreakinghyphen +\EndChemCompatibility + \cs_new_protected:Npn \chemmacros_iupac:nn #1#2 { \group_begin: @@ -873,7 +921,7 @@ } % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2015/10/01 - use new function \chemmacros_if_document:TF for \chemmacros_make_iupac: diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.orbital.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.orbital.code.tex index d3f3a5a16f2..79153b0d11c 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.orbital.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.orbital.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 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.module.particles.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.particles.code.tex index 44cde878408..9d68712f81a 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.particles.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.particles.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -136,6 +136,6 @@ \EndChemCompatibility % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2016/01/13 - new option particles/space 2016/04/02 - adapt to formula methods `chemist' and `chemfig' diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.phases.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.phases.code.tex index 5f2bcc1dcda..da3365c0387 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.phases.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.phases.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -133,7 +133,7 @@ \EndChemCompatibility % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2015/06/09 - first version 2016/04/27 - moved translations from lang module to phases module diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.polymers.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.polymers.code.tex index 8c93ff002cc..f7d71c85652 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.polymers.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.polymers.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -25,7 +25,7 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\ChemModule{polymers}{2016/03/08 polymers} +\ChemModule{polymers}{2018/03/02 polymers} \chemmacros_load_modules:n {nomenclature,tikz} @@ -123,8 +123,24 @@ depth \l__chemmacros_polymer_delimiter_height_dim width \c_zero_dim \tex_right:D \l__chemmacros_polymer_delimiter_right_tl - \c_math_subscript_token { \hbox_overlap_right:n {#5} } - \c_math_superscript_token { \hbox_overlap_right:n {#6} } + \c_math_subscript_token + { + \hbox_overlap_right:n + { + \chemmacros_if_compatibility:nnTF {>} {5.8b} + { \smash {#5} } + {#5} + } + } + \c_math_superscript_token + { + \hbox_overlap_right:n + { + \chemmacros_if_compatibility:nnTF {>} {5.8b} + { \smash {#6} } + {#6} + } + } \c_math_toggle_token } ; } @@ -159,8 +175,8 @@ } % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2016/03/07 - first version 2016/03/08 - \makepolymerdelims - +2018/03/02 - smash sub- and superscripts of polymer delimiters diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.reactions.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.reactions.code.tex index 35be8b3e905..65121238975 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.reactions.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.reactions.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -25,7 +25,7 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\ChemModule{reactions}{2016/05/04 reaction environments} +\ChemModule{reactions}{2019/09/23 reaction environments} \chemmacros_load_module:n {chemformula} @@ -349,60 +349,68 @@ % -------------------------------------------------------------------------- \ChemCompatibilityTo{5.6} -\DeclareTranslationFallback {list-of-reactions} {List~ of~ Reactions} -\DeclareTranslation {English} {list-of-reactions} {List~ of~ Reactions} -\DeclareTranslation {German} {list-of-reactions} {Reaktionsverzeichnis} -\DeclareTranslation {Italian} {list-of-reactions} {Elenco~ delle~ reazioni} -\DeclareTranslation {French} {list-of-reactions} {Table~ des~ r\'{e}actions} -\DeclareTranslation {Dutch} {list-of-reactions} {Lijst~ van~ reacties} - -\DeclareTranslationFallback {reaction} {Reaction} -\DeclareTranslation {English} {reaction} {Reaction} -\DeclareTranslation {German} {reaction} {Reaktion} -\DeclareTranslation {Italian} {reaction} {Reazione} -\DeclareTranslation {French} {reaction} {R\'{e}action} -\DeclareTranslation {Dutch} {reaction} {Reactie} +\DeclareTranslationFallback {list-of-reactions} {List~ of~ Reactions} +\DeclareTranslation {English} {list-of-reactions} {List~ of~ Reactions} +\DeclareTranslation {German} {list-of-reactions} {Reaktionsverzeichnis} +\DeclareTranslation {Italian} {list-of-reactions} {Elenco~ delle~ reazioni} +\DeclareTranslation {French} {list-of-reactions} {Table~ des~ r\'{e}actions} +\DeclareTranslation {Dutch} {list-of-reactions} {Lijst~ van~ reacties} + +\DeclareTranslationFallback {reaction} {Reaction} +\DeclareTranslation {English} {reaction} {Reaction} +\DeclareTranslation {German} {reaction} {Reaktion} +\DeclareTranslation {Italian} {reaction} {Reazione} +\DeclareTranslation {French} {reaction} {R\'{e}action} +\DeclareTranslation {Dutch} {reaction} {Reactie} \EndChemCompatibility \ChemCompatibilityFrom{5.6} \chemmacros_declare_translations:nn {list-of-reactions} { - fallback = List~ of~ Reactions , - English = List~ of~ Reactions , - German = Reaktionsverzeichnis , - Italian = Elenco~ delle~ reazioni , - French = Table~ des~ r\'{e}actions , - Dutch = Lijst~ van~ reacties + fallback = List~ of~ Reactions , + English = List~ of~ Reactions , + German = Reaktionsverzeichnis , + Italian = Elenco~ delle~ reazioni , + French = Table~ des~ r\'{e}actions , + Dutch = Lijst~ van~ reacties , + Norwegian = Reaksjonsliste , + Nynorsk = Reaksjonsliste } \chemmacros_declare_translations:nn {reaction} { - fallback = reaction , - English = reaction , - German = Reaktion , - Italian = reazione , - French = r\'{e}action , - Dutch = reactie + fallback = reaction , + English = reaction , + German = Reaktion , + Italian = reazione , + French = r\'{e}action , + Dutch = reactie , + Norwegian = reaksjon , + Nynorsk = reaksjon } \chemmacros_declare_translations:nn {reactions} { - fallback = reactions , - English = reactions , - German = Reaktionen , - Italian = reazioni , - French = r\'{e}actions , - Dutch = reacties + fallback = reactions , + English = reactions , + German = Reaktionen , + Italian = reazioni , + French = r\'{e}actions , + Dutch = reacties , + Norwegian = reaksjoner , + Nynorsk = reaksjonar } \chemmacros_declare_translations:nn {Reaction} { - fallback = Reaction , - English = Reaction , - German = Reaktion , - Italian = Reazione , - French = R\'{e}action , - Dutch = Reactie + fallback = Reaction , + English = Reaction , + German = Reaktion , + Italian = Reazione , + French = R\'{e}action , + Dutch = Reactie , + Norwegian = Reaksjon , + Nynorsk = Reaksjon } \chemmacros_declare_translations:nn {Reactions} @@ -412,11 +420,13 @@ German = Reaktionen , Italian = Reazioni , French = R\'{e}actions , - Dutch = Reacties + Dutch = Reacties , + Norwegian = Reaksjoner , + Nynorsk = Reaksjonar } \EndChemCompatibility % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2015/09/15 - adapt to `method' option => do not use chemformula's macros directly @@ -431,3 +441,4 @@ - add fancyref support - moved translations from lang module to reactions module 2016/05/04 - options `tag-open', `tag-close' and `before-tag' +2019/09/23 - added Norwegian translations diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.redox.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.redox.code.tex index 9e95b9b076a..01e629028f9 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.redox.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.redox.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -435,6 +435,6 @@ } % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2015/09/30 - new option `explicit-zero-sign' diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.scheme.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.scheme.code.tex index 1a07bd1c500..059741fe0c4 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.scheme.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.scheme.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -25,7 +25,7 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\ChemModule{scheme}{2016/04/25 a scheme floating environment} +\ChemModule{scheme}{2019/09/23 a scheme floating environment} \RequirePackage {chemnum} @@ -102,7 +102,7 @@ \DeclareFloatingEnvironment[{ fileext = #2 , listname = {\exp_not:N \chemmacros_translate:n {#1-list}} , - name = #2 + name = \chemmacros_translate:n {#1-name} }]{#1} } @@ -248,13 +248,13 @@ % -------------------------------------------------------------------------- \ChemCompatibilityTo{5.6} -\DeclareTranslationFallback {scheme-name} {Scheme} -\DeclareTranslation {English} {scheme-name} {Scheme} -\DeclareTranslation {German} {scheme-name} {Schema} +\DeclareTranslationFallback {scheme-name} {Scheme} +\DeclareTranslation {English} {scheme-name} {Scheme} +\DeclareTranslation {German} {scheme-name} {Schema} -\DeclareTranslationFallback {scheme-list} {List~ of~ Schemes} -\DeclareTranslation {English} {scheme-list} {List~ of~ Schemes} -\DeclareTranslation {German} {scheme-list} {Verzeichnis~ der~ Schemata} +\DeclareTranslationFallback {scheme-list} {List~ of~ Schemes} +\DeclareTranslation {English} {scheme-list} {List~ of~ Schemes} +\DeclareTranslation {German} {scheme-list} {Verzeichnis~ der~ Schemata} \EndChemCompatibility \ChemCompatibilityFrom{5.6} @@ -262,49 +262,62 @@ { fallback = Scheme , English = Scheme , - German = Schema + German = Schema , + Norwegian = Skjema , + Nynorsk = Skjema } \chemmacros_declare_translations:nn {scheme-list} { - fallback = List~ of~ Schemes , - English = List~ of~ Schemes , - German = Verzeichnis~ der~ Schemata + fallback = List~ of~ Schemes , + English = List~ of~ Schemes , + German = Verzeichnis~ der~ Schemata, + Norwegian = Skjemaliste, + Nynorsk = Skjemaliste } \chemmacros_declare_translations:nn {scheme} { - fallback = scheme , - English = scheme , - German = Schema + fallback = scheme , + English = scheme , + German = Schema , + Norwegian = skjema , + Nynorsk = skjema } \chemmacros_declare_translations:nn {Scheme} { - fallback = Scheme , - English = Scheme , - German = Schema + fallback = Scheme , + English = Scheme , + German = Schema , + Norwegian = Skjema , + Nynorsk = Skjema } \chemmacros_declare_translations:nn {schemes} { fallback = schemes , English = schemes , - German = Schemata + German = Schemata , + Norwegian = skjema , + Nynorsk = skjema } \chemmacros_declare_translations:nn {Schemes} { fallback = Schemes , English = Schemes , - German = Schemata + German = Schemata , + Norwegian = Skjema , + Nynorsk = Skjema } \EndChemCompatibility -\tex_endinput:D +\file_input_stop: % -------------------------------------------------------------------------- 2015/09/19 - make the module compatible with floatrow 2015/10/23 - add info message to float method detection 2016/01/23 - make the module compatible with chemscheme 2016/04/25 - cleveref and fancyref support 2016/12/28 - bug fix: typo in \chemmacros_tex_if:nnTF usage +2019/03/23 - added Norwegian translations diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex index 30223fc583f..87d53dd3ce7 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -131,8 +131,8 @@ \tl_put_left:Nn \g__chemmacros_nmr_element_coupled_tl {#2} \chemmacros_chemformula:n { ^{#1} } \bool_if:NTF \l__chemmacros_nmr_parse_bool - { \chemformula_ch:nV {} \g__chemmacros_nmr_element_coupled_tl } { \chemmacros_chemformula:V \g__chemmacros_nmr_element_coupled_tl } + { \g__chemmacros_nmr_element_coupled_tl } \tl_use:N \l__chemmacros_nmr_element_method_connector_tl \tl_use:N \l__chemmacros_nmr_method_tl } @@ -157,8 +157,8 @@ \tl_if_blank:VF \g__chemmacros_nmr_element_coupled_tl { \bool_if:NTF \l__chemmacros_nmr_parse_bool - { \chemformula_ch:nV {} \g__chemmacros_nmr_element_coupled_tl } { \chemmacros_chemformula:V \g__chemmacros_nmr_element_coupled_tl } + { \g__chemmacros_nmr_element_coupled_tl } } \tl_use:N \l__chemmacros_nmr_element_method_connector_tl \tl_use:N \l__chemmacros_nmr_method_tl @@ -339,7 +339,7 @@ \bool_if:NT \l__chemmacros_nmr_solvent_bool { \bool_if:NTF \l__chemmacros_nmr_parse_bool - { \chemformula_ch:nn { } {#4} } + { \chemmacros_chemformula:n {#4} } {#4} } \bool_if:NT \l__chemmacros_nmr_delimiters_bool @@ -404,7 +404,10 @@ \cs_new_protected:Npn \chemmacros_nmr_number:n #1 { \__chemmacros_nmr_number:n {#1} - \skip_horizontal:N \l__chemmacros_nmr_space_skip + \chemmacros_if_compatibility:nnTF {>=} {5.8c} + { \chemmacros_skip_nobreak:N } + { \skip_horizontal:N } + \l__chemmacros_nmr_space_skip \chemmacros_chemformula:V \g__chemmacros_nmr_element_tl } @@ -509,6 +512,6 @@ } % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2015/12/31 - new option `atom-number-space' 2017/01/27 - new option `nmr-base-format' diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.symbols.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.symbols.code.tex index dfbc812d6ff..314eeda81a6 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.symbols.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.symbols.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 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.module.thermodynamics.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.thermodynamics.code.tex index cf49fd0695b..82306cc0ead 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.thermodynamics.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.thermodynamics.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 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.module.tikz.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.tikz.code.tex index 2e8dfd243cd..a656e70e5eb 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.tikz.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.tikz.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -182,6 +182,6 @@ \EndChemCompatibility % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2015/10/26 - add decoration `wave' (complete sines) diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex index ce7142e3dd4..18bf0e5b9ee 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -50,7 +50,7 @@ } % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2015/09/28 - change \AtBeginDocument into \AtEndPreamble diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.xfrac.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.xfrac.code.tex index 6ad2fd7771a..735632beb40 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.xfrac.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.xfrac.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 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 fb25545aad6..badf8ddb9ac 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty @@ -12,7 +12,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -31,10 +31,10 @@ % -------------------------------------------------------------------------- % package information: -\tl_const:Nn \c_chemmacros_date_tl {2017/08/28} +\tl_const:Nn \c_chemmacros_date_tl {2019/09/24} \tl_const:Nn \c_chemmacros_version_major_number_tl {5} \tl_const:Nn \c_chemmacros_version_minor_number_tl {8} -\tl_const:Nn \c_chemmacros_version_subrelease_tl {b} +\tl_const:Nn \c_chemmacros_version_subrelease_tl {d} \tl_const:Nx \c_chemmacros_version_number_tl { \c_chemmacros_version_major_number_tl . @@ -268,5 +268,5 @@ { \RequirePackage{chemmacros5} } % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros4.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros4.sty index c47106a14b9..ae86ebc47d1 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros4.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros4.sty @@ -12,7 +12,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -4083,7 +4083,7 @@ \tl_set:Nn \reactionlistname { \chemmacros_translate:n {list-of-reactions} } -\tex_endinput:D +\file_input_stop: % -------------------------------------------------------------------------- Version history diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros5.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros5.sty index 6c267fe42c1..c9578f737bc 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros5.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros5.sty @@ -12,7 +12,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -231,7 +231,7 @@ \chemmacros_if_compatibility:nnF {>=} {#4} { \msg_warning:nnnn {chemmacros} {module-not-available} {#2} {#4} - \tex_endinput:D + \file_input_stop: } \seq_gput_right:Nn \g__chemmacros_loaded_modules_seq {#2} \prop_gput:Nnn \g__chemmacros_loaded_modules_prop {#2} {#3} @@ -280,7 +280,7 @@ } % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: % -------------------------------------------------------------------------- Modules: (* = preloaded) |