summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-20 23:58:24 +0000
committerKarl Berry <karl@freefriends.org>2012-05-20 23:58:24 +0000
commitba135237e227af8d0a0cb28713636e65b95f7f2d (patch)
treeac35aa2bca31ce3acc235a6a85532daf4168be64 /Master/texmf-dist/tex
parentd66f3e2f4f5c746daae0c2368b939be05b451781 (diff)
chemmacros (18may12)
git-svn-id: svn://tug.org/texlive/trunk@26515 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/chemformula.sty7
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty16
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty82
3 files changed, 73 insertions, 32 deletions
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
index 694a47ab3c9..14c5c4305ce 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
@@ -5,7 +5,7 @@
% - macros and commands for chemists - %
% --------------------------------------------------------------------------- %
% - Clemens Niederberger - %
-% - 2012/05/13 - %
+% - 2012/05/18 - %
% --------------------------------------------------------------------------- %
% - https://bitbucket.org/cgnieder/chemmacros/ - %
% - contact@mychemistry.eu - %
@@ -30,8 +30,8 @@
\RequirePackage{ expl3 }
\ProvidesExplPackage
{chemformula}
- {2012/05/13}
- {3.3a}
+ {2012/05/18}
+ {3.3b}
{typeset chemical compounds and reactions}
%-----------------------------------------------------------------------------%
@@ -1790,6 +1790,7 @@ VERSION HISTORY
2012/05/13 - version 3.3a - Italian translations of the H, EUH and P statements
- fix of unexpected behaviour in the compound naming
mechanism
+2012/05/18 - version 3.3b - compatibility with MiKTeX
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% TODO
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
index ef22313ddd7..806515e9b58 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
@@ -5,7 +5,7 @@
% - macros and commands for chemists - %
% --------------------------------------------------------------------------- %
% - Clemens Niederberger - %
-% - 2012/05/13 - %
+% - 2012/05/18 - %
% --------------------------------------------------------------------------- %
% - https://bitbucket.org/cgnieder/chemmacros/ - %
% - contact@mychemistry.eu - %
@@ -33,8 +33,8 @@
\ProvidesExplPackage
{chemmacros}
- {2012/05/13}
- {3.3a}
+ {2012/05/18}
+ {3.3b}
{macros and commands for chemists}
\@ifpackageloaded { chemformula } {} { \RequirePackage { chemformula } }
@@ -2261,7 +2261,11 @@
\cs_set_nopar:cpn { #1 }
{
\bool_if:NTF \l_chemmacros_phases_sub_bool
- { \ensuremath { \c_math_subscript_token { \text { (#2) } } } }
+ {
+ \bool_if:NTF \l_chemformula_inside_ch_bool
+ { \chemformula_subscript:n { ( #2 ) } }
+ { \ensuremath { \c_math_subscript_token { \text { (#2) } } } }
+ }
{
\ensuremath
{
@@ -3768,7 +3772,9 @@ Version history
- proper language support
2012/05/13 - version 3.3a - Italian translations of the H, EUH and P statements
- \hapto and \bridge
+2012/05/18 - version 3.3b - compatibility with MiKTeX
% --------------------------------------------------------------------------- %
% TODO:
-- ox-option xfrac vs math? \ No newline at end of file
+- ox-option xfrac vs math?
+- drop option `bpchem' \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty b/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty
index 7c85ca96765..8f761435690 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty
@@ -5,7 +5,7 @@
% - macros and commands for chemists - %
% --------------------------------------------------------------------------- %
% - Clemens Niederberger - %
-% - 2012/05/13 - %
+% - 2012/05/18 - %
% --------------------------------------------------------------------------- %
% - https://bitbucket.org/cgnieder/chemmacros/ - %
% - contact@mychemistry.eu - %
@@ -30,8 +30,8 @@
\RequirePackage{ expl3 }
\ProvidesExplPackage
{ghsystem}
- {2012/05/13}
- {3.3a}
+ {2012/05/18}
+ {3.3b}
{globally harmonised system}
% --------------------------------------------------------------------------- %
@@ -139,30 +139,47 @@
% language settings
\bool_new:N \l_ghsystem_language_file_loaded_bool
-\prop_map_inline:Nn \l_chemmacros_language_prop
+\bool_new:N \l_ghsystem_language_directory_bool
+\file_if_exist:nTF { language / ghsystem_english_def }
+ { \bool_set_true:N \l_ghsystem_language_directory_bool }
+ { \bool_set_false:N \l_ghsystem_language_directory_bool }
+
+\bool_if:NTF \l_ghsystem_language_directory_bool
+ {
+ \prop_map_inline:Nn \l_chemmacros_language_prop
+ {
+ \bool_if:cT { l_chemmacros_#1_bool }
+ {
+ \file_if_exist:nTF { language / ghsystem_#2.def }
+ {
+ \bool_set_true:N \l_ghsystem_language_file_loaded_bool
+ \input { language / ghsystem_#2.def } \ExplSyntaxOn
+ }
+ { \input { language / ghsystem_english.def } \ExplSyntaxOn }
+ }
+ }
+ }
{
- \bool_if:cT { l_chemmacros_#1_bool }
+ \prop_map_inline:Nn \l_chemmacros_language_prop
{
- \file_if_exist:nTF { language / ghsystem_#2.def }
+ \bool_if:cT { l_chemmacros_#1_bool }
{
- \bool_set_true:N \l_ghsystem_language_file_loaded_bool
- \input { language / ghsystem_#2.def } \ExplSyntaxOn
+ \file_if_exist:nTF { ghsystem_#2.def }
+ {
+ \bool_set_true:N \l_ghsystem_language_file_loaded_bool
+ \input { ghsystem_#2.def } \ExplSyntaxOn
+ }
+ { \input { ghsystem_english.def } \ExplSyntaxOn }
}
- { \input { language / ghsystem_english.def } \ExplSyntaxOn }
}
}
-% \bool_if:NT \l_chemmacros_german_bool
-% {
-% \bool_set_true:N \l_ghsystem_language_file_loaded_bool
-% \input { language / ghsystem_german.def } \ExplSyntaxOn
-% }
-% \bool_if:NT \l_chemmacros_italian_bool
-% {
-% \bool_set_true:N \l_ghsystem_language_file_loaded_bool
-% \input { language / ghsystem_italian.def } \ExplSyntaxOn
-% }
+
\bool_if:NF \l_ghsystem_language_file_loaded_bool
- { \input { language / ghsystem_english.def } \ExplSyntaxOn }
+ {
+ \bool_if:NTF \l_ghsystem_language_directory_bool
+ { \input { language / ghsystem_english.def } \ExplSyntaxOn }
+ { \input { ghsystem_english.def } \ExplSyntaxOn }
+ }
\cs_new_nopar:Nn \ghsystem_booktabs:n
{
@@ -438,6 +455,8 @@
\xetex_if_engine:T { \bool_set_true:N \l_ghsystem_engine_xetex_bool }
\luatex_if_engine:T { \bool_set_true:N \l_ghsystem_engine_luatex_bool }
+\bool_new:N \l_ghsystem_picture_directory_bool
+
\bool_if:NT \l_ghsystem_engine_pdftex_bool
{
\ifpdf
@@ -454,14 +473,28 @@
% the command:
\NewDocumentCommand \ghspic { om }
{
+ \file_if_exist:nTF { pictures / ghsystem_ #2 . \l_ghsystem_picture_type_tl }
+ { \bool_set_true:N \l_ghsystem_picture_directory_bool }
+ { \bool_set_false:N \l_ghsystem_picture_directory_bool }
\group_begin:
\IfNoValueF { #1 } { \keys_set:nn { chemmacros / ghsystem } { #1 } }
- \ghsystem_includegraphics:xn
+ \bool_if:NTF \l_ghsystem_picture_directory_bool
{
- scale = \fp_to_tl:N \l_ghsystem_picture_scale_fp
- \l_ghsystem_picture_includegraphics_tl
+ \ghsystem_includegraphics:xn
+ {
+ scale = \fp_to_tl:N \l_ghsystem_picture_scale_fp
+ \l_ghsystem_picture_includegraphics_tl
+ }
+ { pictures / ghsystem_ #2 . \l_ghsystem_picture_type_tl }
+ }
+ {
+ \ghsystem_includegraphics:xn
+ {
+ scale = \fp_to_tl:N \l_ghsystem_picture_scale_fp
+ \l_ghsystem_picture_includegraphics_tl
+ }
+ { ghsystem_ #2 . \l_ghsystem_picture_type_tl }
}
- { pictures / ghsystem_ #2 . \l_ghsystem_picture_type_tl }
\group_end:
}
@@ -490,6 +523,7 @@ VERSION HISTORY
2012/05/13 - version 3.3a - Italian translations of the H, EUH and P statements
- removed erroneous empty line at the end of the table
created by \ghslistall
+2012/05/18 - version 3.3b - compatibility with MiKTeX
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% TODO: