summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-14 22:51:51 +0000
committerKarl Berry <karl@freefriends.org>2014-04-14 22:51:51 +0000
commit4f954575ea54e72fedc6cb767697c1c90e33bdbe (patch)
tree0411a23e9b1c7b333c86335c11eb4d0f9ea571bb /Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
parentb9d9e9d13ed7c7d0faf0733995d28567756be4f6 (diff)
chemmacros (10apr14)
git-svn-id: svn://tug.org/texlive/trunk@33447 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty')
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty70
1 files changed, 54 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
index 5c95c03bf23..846a9d86fcd 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
@@ -26,8 +26,8 @@
% - The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
\RequirePackage{ expl3 , xparse , l3keys2e }
-\def\chemmacros@version{4.4}
-\def\chemmacros@date{2014/01/29}
+\def\chemmacros@version{4.5}
+\def\chemmacros@date{2014/04/08}
\ProvidesExplPackage
{chemmacros}
@@ -57,6 +57,7 @@
\cs_generate_variant:Nn \tl_set_rescan:Nnn { NnV }
\cs_generate_variant:Nn \tl_if_eq:nnTF { V }
\cs_generate_variant:Nn \tl_const:cn { cV }
+\cs_generate_variant:Nn \tl_to_lowercase:n { f }
% --------------------------------------------------------------------------
% load required packages
@@ -1393,21 +1394,49 @@
% --------------------------------------------------------------------------- %
% acid / base
\tl_new:N \l__chemmacros_k_acid_tl
-\tl_set:Nn \l__chemmacros_k_acid_tl { \chemmacros_translate:n { K-acid } }
\tl_new:N \l__chemmacros_k_base_tl
-\tl_set:Nn \l__chemmacros_k_base_tl { \chemmacros_translate:n { K-base } }
\tl_new:N \l__chemmacros_k_water_tl
-\tl_set:Nn \l__chemmacros_k_water_tl { \chemmacros_translate:n { K-water } }
+
+\bool_new:N \l__chemmacros_subscript_lowercase_bool
+
+\tl_set:Nn \l__chemmacros_k_acid_tl
+ {
+ \bool_if:NTF \l__chemmacros_subscript_lowercase_bool
+ { \tl_to_lowercase:f }
+ { \use:n }
+ { \chemmacros_translate:n { K-acid } }
+ }
+
+\tl_set:Nn \l__chemmacros_k_base_tl
+ {
+ \bool_if:NTF \l__chemmacros_subscript_lowercase_bool
+ { \tl_to_lowercase:f }
+ { \use:n }
+ { \chemmacros_translate:n { K-base } }
+ }
+
+\tl_set:Nn \l__chemmacros_k_water_tl
+ {
+ \bool_if:NTF \l__chemmacros_subscript_lowercase_bool
+ { \tl_to_lowercase:f }
+ { \use:n }
+ { \chemmacros_translate:n { K-water } }
+ }
\keys_define:nn { chemmacros / acid-base }
{
- p-style .choice: ,
- p-style / slanted .code:n = \cs_set_eq:NN \chemmacros_p_style:n \textsl ,
- p-style / italics .code:n = \cs_set_eq:NN \chemmacros_p_style:n \textit ,
- p-style / upright .code:n = \cs_set_eq:NN \chemmacros_p_style:n \textup ,
- K-acid .tl_set:N = \l__chemmacros_k_acid_tl ,
- K-base .tl_set:N = \l__chemmacros_k_base_tl ,
- K-water .tl_set:N = \l__chemmacros_k_water_tl
+ p-style .choice: ,
+ p-style / slanted .code:n = \cs_set_eq:NN \chemmacros_p_style:n \textsl ,
+ p-style / italics .code:n = \cs_set_eq:NN \chemmacros_p_style:n \textit ,
+ p-style / upright .code:n = \cs_set_eq:NN \chemmacros_p_style:n \textup ,
+ K-acid .tl_set:N = \l__chemmacros_k_acid_tl ,
+ K-base .tl_set:N = \l__chemmacros_k_base_tl ,
+ K-water .tl_set:N = \l__chemmacros_k_water_tl ,
+ subscript .choice: ,
+ subscript / lowercase .code:n =
+ \bool_set_true:N \l__chemmacros_subscript_lowercase_bool ,
+ subscript / uppercase .code:n =
+ \bool_set_false:N \l__chemmacros_subscript_lowercase_bool
}
\cs_new_eq:NN \chemmacros_p_style:n \textup
@@ -4015,10 +4044,15 @@
% --------------------------------------------------------------------------
% language support -- provided through `translations'
% equilibrium constants:
-\DeclareTranslationFallback{K-acid}{A}
-\DeclareTranslationFallback{K-base}{B}
-\DeclareTranslationFallback{K-water}{W}
-\DeclareTranslation{German}{K-acid}{S}
+\DeclareTranslationFallback {K-acid} {A}
+\DeclareTranslation{German} {K-acid} {S}
+\DeclareTranslation{Dutch} {K-acid} {Z}
+
+\DeclareTranslationFallback {K-base} {B}
+% \DeclareTranslation{Dutch} {K-base} {B}
+
+\DeclareTranslationFallback {K-water} {W}
+% \DeclareTranslation{Dutch} {K-water} {W}
% phases:
\DeclareTranslation{German}{phase-sld}{ f }
\DeclareTranslation{German}{phase-lqd}{ f{}l }
@@ -4028,12 +4062,14 @@
\DeclareTranslation{German} {list-of-reactions} { Reaktionsverzeichnis }
\DeclareTranslation{Italian} {list-of-reactions} { Elenco~ delle~ reazioni }
\DeclareTranslation{French} {list-of-reactions} { Table~ des~ r\'eactions }
+\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\'eaction }
+\DeclareTranslation{Dutch} {reaction} { Reactie }
\tl_set:Nn \l__chemmacros_reaction_lorname_tl
{ \chemmacros_translate:n {reaction} }
@@ -4291,6 +4327,8 @@ Version history
changes in `translations'
- new option `nmr/atom-number-cs'
- new option `nmr/coupling-pos-cs'
+2014/04/08 - version 4.5 - new option `acid-base/subscript'
+ - added Dutch translations
% --------------------------------------------------------------------------- %
% TODO: