summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/chemmacros/README13
-rw-r--r--Master/texmf-dist/doc/latex/chemmacros/chemmacros-codehelper.tex10
-rw-r--r--Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_de.pdfbin682466 -> 686813 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_de.tex36
-rw-r--r--Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_en.pdfbin671155 -> 675839 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_en.tex64
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/chemformula.sty6
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty197
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty8
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_english.def (renamed from Master/texmf-dist/doc/latex/chemmacros/language/ghsystem_english.def)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_german.def (renamed from Master/texmf-dist/doc/latex/chemmacros/language/ghsystem_german.def)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_langtemplate.def (renamed from Master/texmf-dist/doc/latex/chemmacros/language/ghsystem_langtemplate.def)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/acid-8.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/acid-8.jpg)bin42790 -> 42790 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/acid-8.png)bin9668 -> 9668 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/acid.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/acid.jpg)bin37848 -> 37848 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/acid.png)bin8687 -> 8687 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/aqpol.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/aqpol.jpg)bin36154 -> 36154 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/aqpol.png)bin8339 -> 8339 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-black.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-black.jpg)bin37718 -> 37718 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-black.png)bin5056 -> 5056 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-white.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-white.jpg)bin39232 -> 39232 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-white.png)bin5057 -> 5057 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/bottle.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/bottle.jpg)bin28215 -> 28215 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/bottle.png)bin5028 -> 5028 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/exclam.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/exclam.jpg)bin27186 -> 27186 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/exclam.png)bin5716 -> 5716 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-1.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-1.jpg)bin53511 -> 53511 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-1.png)bin10889 -> 10889 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-2.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-2.jpg)bin53802 -> 53802 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-2.png)bin10919 -> 10919 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-3.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-3.jpg)bin54910 -> 54910 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-3.png)bin11014 -> 11014 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-4.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-4.jpg)bin40172 -> 40172 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-4.png)bin5443 -> 5443 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-5.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-5.jpg)bin42072 -> 42072 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-5.png)bin6323 -> 6323 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-6.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-6.jpg)bin39304 -> 39304 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos-6.png)bin6486 -> 6486 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos.jpg)bin43610 -> 43610 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/explos.png)bin10980 -> 10980 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-black.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-black.jpg)bin43545 -> 43545 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-black.png)bin7277 -> 7277 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-white.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-white.jpg)bin44957 -> 44957 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-white.png)bin7347 -> 7347 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-black.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-black.jpg)bin43516 -> 43516 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-black.png)bin7327 -> 7327 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-white.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-white.jpg)bin45199 -> 45199 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-white.png)bin7429 -> 7429 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-1.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-1.jpg)bin55062 -> 55062 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-1.png)bin13487 -> 13487 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-2.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-2.jpg)bin47016 -> 47016 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-2.png)bin7876 -> 7876 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-black.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-black.jpg)bin45242 -> 45242 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-black.png)bin7143 -> 7143 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-white.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-white.jpg)bin47110 -> 47110 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-white.png)bin7159 -> 7159 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-black.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-black.jpg)bin45437 -> 45437 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-black.png)bin7973 -> 7973 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-white.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-white.jpg)bin47054 -> 47054 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-white.png)bin7956 -> 7956 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O-5-1.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O-5-1.jpg)bin45394 -> 45394 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O-5-1.png)bin7319 -> 7319 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O.jpg)bin34707 -> 34707 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O.png)bin8862 -> 8862 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame.jpg)bin33643 -> 33643 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/flame.png)bin8223 -> 8223 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/health.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/health.jpg)bin38998 -> 38998 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/health.png)bin9431 -> 9431 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/skull-2.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/skull-2.jpg)bin46125 -> 46125 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/skull-2.png)bin9631 -> 9631 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/skull-6.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/skull-6.jpg)bin46507 -> 46507 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/skull-6.png)bin9820 -> 9820 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.eps (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/skull.eps)0
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.jpg (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/skull.jpg)bin45843 -> 45843 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.png (renamed from Master/texmf-dist/doc/latex/chemmacros/pictures/skull.png)bin10514 -> 10514 bytes
105 files changed, 214 insertions, 120 deletions
diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README
index 086b1c9c414..5aeb58fcda7 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/README
+++ b/Master/texmf-dist/doc/latex/chemmacros/README
@@ -1,10 +1,10 @@
--------------------------------------------------------------------------
-the CHEMMACROS bundle v3.0a
+the CHEMMACROS bundle v3.0c
-> chemmacros package -> macros and commands for chemists
-> chemformula package -> typeset chemical compounds and reactions
-> ghsystem package -> typeset H & P statements and pictograms
from the globally harmonised system (GHS)
-2012/01/30
+2012/02/05
--------------------------------------------------------------------------
This bundle succeeds the chemmacros package which is now part of the
bundle
@@ -26,7 +26,14 @@ version 2005/12/01 or later.
This work has the LPPL maintenance status `maintained'.
The Current Maintainer of this work is Clemens Niederberger.
-
+--------------------------------------------------------------------------
+INSTALLATION NOTES:
+Please make sure you have the directories
+ language/
+ pictures/
+and the regarding files in it (*.def or *.eps,*.jpg,*png, respectively)
+in the _same_ directory as the style files.
+(probably something like $TEXMF/texmf/tex/latex/chemmacros/)
--------------------------------------------------------------------------
The chemmacros bundle consists of the files
- chemmacros.sty,
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros-codehelper.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros-codehelper.tex
index 51629183677..03e65615038 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros-codehelper.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros-codehelper.tex
@@ -5,7 +5,7 @@
% - macros and commands for chemists - %
% --------------------------------------------------------------------------- %
% - Clemens Niederberger - %
-% - 2012/01/27 - %
+% - 2012/02/05 - %
% --------------------------------------------------------------------------- %
% - http://www.mychemistry.eu/ - %
% - contact@mychemistry.eu - %
@@ -112,6 +112,7 @@
cstsetup,
DeclareInstance,
DeclareSIUnit,
+ DeclareParticle,
definecolor,
delm,
delp,
@@ -165,6 +166,7 @@
newreaction,
NMR,
Nu,
+ Nuc,
num,
ominus,
orbital,
@@ -181,6 +183,7 @@
pKa,
pKb,
pOH,
+ Pot,
prt,
R,
redox,
@@ -200,6 +203,7 @@
SI,
sisetup,
sld,
+ Sod,
State,
subsection,
textcolor,
@@ -353,6 +357,7 @@
cstsetup,
DeclareInstance,
DeclareSIUnit,
+ DeclareParticle,
definecolor,
delm,
delp,
@@ -406,6 +411,7 @@
newreaction,
NMR,
Nu,
+ Nuc,
num,
ominus,
orbital,
@@ -422,6 +428,7 @@
pKa,
pKb,
pOH,
+ Pot,
prt,
R,
redox,
@@ -441,6 +448,7 @@
SI,
sisetup,
sld,
+ Sod,
State,
subsection,
textcolor,
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_de.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_de.pdf
index efad4fd6a34..08d6149cb35 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_de.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_de.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_de.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_de.tex
index 9cab1dd5896..1927fa332a2 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_de.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_de.tex
@@ -5,7 +5,7 @@
% - macros and commands for chemists - %
% --------------------------------------------------------------------------- %
% - Clemens Niederberger - %
-% - 2012/01/30 - %
+% - 2012/02/03 - %
% --------------------------------------------------------------------------- %
% - http://www.mychemistry.eu/ - %
% - contact@mychemistry.eu - %
@@ -158,7 +158,9 @@ Ich nehme an, dass fast jeder Chemiker, der \LaTeX\ für seine Dokumente verwend
Als Chemiker wissen Sie vermutlich, dass die \textsc{United Nations} das „\textbf{G}lobally \textbf{H}armonized \textbf{S}ystem of Classification and Labelling of Chemicals“ (GHS) als weltweiten Ersatz für die zahlreichen ähnlichen aber doch verschiedenen Systeme der einzelnen Länder entwickelt haben. Obwohl es noch nicht in allen Ländern umgesetzt wurde\footnote{\url{http://www.unece.org/trans/danger/publi/ghs/implementation_e.html}}, ist das nur eine Frage der Zeit. Das Paket \ghsystem gibt Ihnen nun die Möglichkeit, alle „hazard and precautionary statements“ auf einfache Weise einzugeben und aufzurufen.
-\section{Laden des Bundles}\secidx{Laden des Bundles}
+\section{Installation und Laden des Bundles}\secidx{Laden des Bundles}\secidx{Installation}
+Das Bundle enthält drei Style-Dateien\footnote{Die mit der Endung \texttt{sty}.}, einem Ordner namens \texttt{language/}, der die Sprach-Definitions-Dateien für GHS enthält (Endung \texttt{def}) und einem Ordner \texttt{pictures/}, der \texttt{eps}-, \texttt{jpg}- und \texttt{png}-Dateien enthält (die GHS Piktogramme). Wenn Sie das Bundle von Hand installieren, \emph{bitte achten Sie darauf, die Ordner \texttt{language/} und \texttt{pictures/} in den \emph{gleichen} Ordner wie die Style-Dateien zu kopieren}.
+
Das Laden von \chemmacros via
\begin{beispiel}[code only]
\usepackage{chemmacros} % `chemmacros', `formula' and `ghs' are loaded
@@ -177,7 +179,7 @@ Das explizite Laden von \chemformula \bzw \ghsystem ist möglich und wird \chemm
\end{beispiel}
Es wird jedoch empfohlen, lediglich \lstinline=\usepackage{chemmacros}= zu verwenden und die gewünschten Optionen mit \lstinline=\chemsetup= vorzunehmen (siehe auch Abschnitt \ref{sec:setup}).
-\secidx*{Laden des Bundles}
+\secidx*{Installation}\secidx*{Laden des Bundles}
\section{Paketoptionen}\label{sec:optionen}\secidx{Paketoptionen}
\chemmacros hat einige Optionen. Sie alle folgen einen Schlüssel/Wert-Prinzip:
@@ -192,11 +194,12 @@ Sowohl \chemformula als auch \ghsystem haben keine eigenen Paketoptionen. Wenn S
\item \key[option]{circled}{\uline{formal}/all/none} \chemmacros unterscheidet zwischen zwei Typen von Ladungen\footnote{Vielen Dank an Christoph Schäfer, der mich darauf aufmerksam machte, dass v1.1 die Ladungen zu nachlässig behandelte!}: reale ($+/-$) und formale (\fplus/\fminus) Ladungen. Die Option \texttt{formal} unterscheidet zwischen ihnen, \texttt{none} stellt alle ohne Umkreisung dar, \texttt{all} umkreist alle. Default = \texttt{formal}
\item \key[option]{circletype}{\uline{chem}/math} Diese Option schaltet zwischen zwei Darstellungsmöglichkeiten für formale Ladungen hin und her: \cmd{fplus} \fplus\ und \lstinline+$\oplus$+ $\oplus$. Default = \texttt{chem}
\item \key[option]{detect-bold}{\uline{true}/false} Diese Option bestimmt, ob Makros wie \cmd{pKa} eine fette Schriftserie erkennen. \textbf{fetter \pKa Text} vs.\ {\chemsetup[option]{detect-bold}\textbf{fetter \pKa Text}}. Default = \texttt{false}
- \item \key[option]{EZ}{\uline{chemmacros}/cool} Der Befehl \cmd{E} wird durch das Paket \paket{cool} ebenfalls definiert. Mit dieser Option können Sie wählen, welche Definition verwendet wird, siehe Seite \pageref{EZ}. Default = \texttt{chemmacros}
+ \item \key[option]{EZ}{\uline{chemmacros}/cool} Der Befehl \cmd{E} wird durch das Paket \paket{cool} ebenfalls definiert. Mit dieser Option können Sie wählen, welche Definition verwendet wird, siehe Seite \pageref{EZ}. Default = \texttt{chemmacros}. Diese Option kann nur in der Präambel gesetzt werden.
\item \key[option]{german}{\uline{true}/false} Diese Option ändert die Befehle \cmd{pKa}, \cmd{sld} und \cmd{lqd}. Default = \texttt{false}. Diese Option hat den Alias \key[option]{ngerman}.
\item \key[option]{ghs}{\uline{true}/false} Das Paket \ghsystem abschalten. Die Einstellung \key{ghs}{false} wird das Laden von \ghsystem unterbinden. Default = \texttt{true}
\item \key[option]{method}{\uline{chemformula}/mhchem} Sie können wählen, ob \chemmacros \paket{mhchem} oder \chemformula für die Reaktionsumgebungen (siehe Abschnitt \ref{ssec:mhchem_reaktionen}) und die Teilchen (siehe Abschnitt \ref{sec:teilchen}) verwendet. Default = \texttt{chemformula}. Diese Option kann nur in der Präambel gesetzt werden.
- \item \key[option]{strict}{\uline{true}/false} Die Einstellung \key{strict}{true} wird alle Warnungen in Fehlermeldungen ändern. Default = \texttt{false}
+ \item \key[option]{Nu}{\uline{chemmacros}/mathspec} Das Paket \paket{mathspec} definiert ebenfalls ein Makro \cmd{Nu}. Diese Option entscheidet, welche Definition gilt, siehe Seite \pageref{Nu}. Default = \texttt{chemmacros}. Diese Option kann nur in der Präambel gesetzt werden.
+ \item \key[option]{strict}{\uline{true}/false} Die Einstellung \key{strict}{true} wird alle Warnungen in Fehlermeldungen ändern. Default = \texttt{false}
\item \key[option]{synchronize}{\uline{true}/false} Mit der Einstellung \texttt{true} wird \chemmacros die Schrifteinstellungen von \chemformula übernehmen, falls \chemformula als Methode gewählt wurde. Default = \texttt{false}. Um diese Option zu demonstrieren, wurde dieses Dokument mit \key{synchronize}{true} und der \chemformula Einstellung \lstinline+\chemsetup[chemformula]{font-spec={[Color=darkgray]Latin Modern Sans}}+ gesetzt.
\item \key[option]{version}{1/2/bundle} Diese Option stellt die Definition einiger Befehle wieder her, so dass Dokumente, die mit v1.* gesetzt wurden, Korrekt kompilieren. Default = \texttt{bundle}. Eigentlich sind \texttt{2} und \texttt{bundle} Aliase. Diese Option kann nur in der Präambel gesetzt werden.
\item \key[option]{xspace}{\uline{true}/false} Mit dieser Option werden die meisten Makros mit einem \lstinline+\xspace+ definiert. Default = \texttt{true}
@@ -227,6 +230,7 @@ Alle Optionen von \chemformula gehören dem Modul \textcolor{module}{\texttt{che
\part{\texorpdfstring{\Chemmacros}{chemmacros}}\secidx{CHEMMACROS}
\section{Teilchen, Ionen und Symbole}\label{sec:teilchen}\secidx{Teilchen, Ionen und Symbole}
+\subsection{Vordefiniert}\secidx[vordefiniert]{Teilchen, Ionen und Symbole}
Einige einfache Makros, um häufig verwendete Teilchen darzustellen. Außerdem ein Symbol. Bitte beachten Sie, dass sie unterschiedlich dargestellt werden, je nach dem, welche Paketoptionen Sie verwenden. Diese Befehle können auch im Mathematikmodus eingesetzt werden.
\begin{description}
\item \cmd{Hpl} \Hpl (Proton)
@@ -236,7 +240,7 @@ Einige einfache Makros, um häufig verwendete Teilchen darzustellen. Außerdem e
\item \cmd{el} \el (Elektron)
\item \cmd{prt} \prt (Proton)
\item \cmd{ntr} \ntr (Neutron)
- \item \cmd{Nu} \Nu (Nukleophil)
+ \item \cmd{Nu} \Nu (Nukleophil). Das Paket \paket{mathspec} definiert ebenfalls ein Makro \cmd{Nu}. Wenn Sie die Paketoption \key[option]{Nu}{mathspec} wählen, definiert \chemmacros stattdessen \cmd{Nuc}\label{Nu}.
\item \cmd{El} \El (Elektrophil)
\item \cmd{ba} \ba (Base)
\item \cmd{fplus} \fplus
@@ -265,6 +269,19 @@ Sie hat nur dann Auswirkungen, wenn das Paket \paket{chemfig} geladen wurde, da
\chemsetup[particle]{elpair}
\ba \Nu
\end{beispiel}
+
+\subsection{Eigene}\secidx[eigene]{Teilchen, Ionen und Symbole}
+Wenn Sie mögen, können Sie eigene Teilchen definieren.
+\begin{description}
+ \item \cmd{DeclareParticle}{<cmd>}\ma{<definition>}
+\end{description}
+Abhängig von der \key{method}, die Sie gewählt haben, ist \texttt{<definition>} entweder eine mit \paket{mhchem} oder mit \chemformula definierte Formel. Das so definierte Teilchen wird sich wie die schon vorgestellten verhalten mit einer Ausnahme: wenn Sie \key{method}{mhchem} gewählt haben, wird das Teilchen die Option \key{circled} \emph{nicht beachten}. Wenn Sie in diesem Fall formale Ladungen für das Teilchen wollen, müssen Sie es mit den von \chemmacros zur Verfügung gestellten Befehlen (siehe Abschnitt \ref{sec:ladungen}) definieren. Wenn Sie allerdings \key{method}{chemformula} gewählt haben, \emph{wird} das Teilchen die Option \key{circled} beachten.
+\begin{beispiel}
+ \DeclareParticle{\Sod}{Na+}
+ \DeclareParticle{\Pot}{K+}
+ \Sod \Pot \chemsetup[option]{circled=all} \Sod \Pot
+\end{beispiel}
+Die Teilchen werden nur definiert, wenn \texttt{<cmd>} nicht schon bereits für einen anderen Befehl vergeben ist. Ist er vergeben, wird \chemmacros entweder eine Warnung oder eine Fehlermeldung bringen, abhängig von der Option \key{strict}.
\secidx*{Teilchen, Ionen und Symbole}
\section{Nomenklatur, Stereodeskriptoren und lateinische Ausdrücke}\label{sec:stereo}
@@ -1104,7 +1121,8 @@ Manche Optionen können ohne Wert verwendet werden. Dann wird der \uline{unterst
EZ & option & \uline{chemmacros}/cool & chemmacros & Seite \pageref{key:option_EZ} \\
german & option & \uline{true}/false & false & Seite \pageref{key:option_german} \\
ghs & option & \uline{true}/false & true & Seite \pageref{key:option_ghs} \\
- method & option & \uline{chemformula}/formula & formula & Seite \pageref{key:option_method} \\
+ method & option & \uline{chemformula}/formula & formula & Seite \pageref{key:option_method} \\
+ Nu & option & \uline{chemmacros}/mathspec & chemmacros & Seite \pageref{key:option_Nu} \\
strict & option & \uline{true}/false & false & Seite \pageref{key:option_strict} \\
synchronize & option & \uline{true}/false & false & Seite \pageref{key:option_synchronize} \\
version & option & 1/2 & 2 & Seite \pageref{key:option_version} \\
@@ -1867,7 +1885,7 @@ Der Befehl
\begin{description}
\item\cmd{ghspic}[<options>]{<name>}
\end{description}
-lädt sie. \ref{tab:ghs_pictograms} zeigt alle Piktogramme und ihre Dateinamen.
+lädt sie. \ref{tab:ghs_pictograms} zeigt alle Piktogramme und ihre Dateinamen. Genauer: sie zeigt die Namen, die beim Befehl \cmd{ghspic} verwendet werden müssen. Tatsächlich heißen sie \lstinline=ghsystem_<name>.<filetype>=, wobei \texttt{<filetype>} entweder \texttt{eps}, \texttt{jpg} oder \texttt{png} ist, siehe auch Abschnitt \ref{ssec:picture_type}.
\begin{beispiel}
\ghspic{skull}
\end{beispiel}
@@ -1919,7 +1937,7 @@ Wenn Sie spezielle \lstinline=\includegraphics=-Optionen verwenden wollen, \zB d
aqpol & \ghspic{aqpol} & & \\
\end{longtable}
-\subsection{Der Bildtyp hängt von der Engine ab}
+\subsection{Der Bildtyp hängt von der Engine ab}\label{ssec:picture_type}
Sie wissen vermutlich, dass Sie nicht jeden Bildtyp mit jeder Compiler-engine verwenden können. \pdfTeX\ im \textsc{dvi}-Modus verlangt \texttt{eps}-Dateien, während \pdfTeX\ im \textsc{pdf}-Modus, \XeTeX\ und \LuaTeX\ \texttt{eps}-Dateien in \texttt{pdf}-Dateien konvertieren, vorausgesetzt, der Anwender hat Schreibrechte in dem Verzeichnis, in dem die Bilder gespeichert sind.
Die letztgenannte können jedoch \texttt{jpg}- und \texttt{png}-Dateien ohne Schwierigkeiten einbinden, während \pdfTeX\ im \textsc{dvi}-Modus das nicht kann.
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_en.pdf
index 99ca26f516c..0c8da7715d1 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_en.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_en.tex
index 6dbe65850f0..9efa1992357 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_en.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_doc_en.tex
@@ -5,7 +5,7 @@
% - macros and commands for chemists - %
% --------------------------------------------------------------------------- %
% - Clemens Niederberger - %
-% - 2012/02/01 - %
+% - 2012/02/03 - %
% --------------------------------------------------------------------------- %
% - http://www.mychemistry.eu/ - %
% - contact@mychemistry.eu - %
@@ -155,7 +155,9 @@ I would guess that nearly every chemist using \LaTeXe\ is aware of the great \pa
As a chemist you are probably aware of the fact that the \textsc{United Nations} have developed the “\textbf{G}lobally \textbf{H}armonized \textbf{S}ystem of Classification and Labelling of Chemicals” (GHS) as a global replacement for the various different systems in different countries. While it has not been implemented by all countries yet\footnote{\url{http://www.unece.org/trans/danger/publi/ghs/implementation_e.html}}, it as only a matter of time. The package \ghsystem now enables you to typeset all the hazard and precautionary statements and pictograms in a very easy way.
-\section{Loading the Bundle}\secidx{Loading the Bundle}
+\section{Installation, Loading the Bundle}\secidx{Loading the Bundle}\secidx{Installation}
+The bundle comes with three style files\footnote{Those ending \texttt{sty}.}, a directory called \texttt{language/} containing the language-definition files for GHS (ending \texttt{def}), and a directory \texttt{pictures/} containing \texttt{eps}, \texttt{jpg} and \texttt{png} files (the GHS pictogramms). If you install the bundle manually \emph{please make sure to place the directories \texttt{language/} and \texttt{pictures/} in the \emph{same} directory as the style files}.
+
Loading \chemmacros with
\begin{beispiel}[code only]
\usepackage{chemmacros} % `chemmacros', `formula' and `ghs' are loaded
@@ -173,7 +175,7 @@ Loading \chemformula or \ghsystem explicitly is possible and will also load \che
\end{beispiel}
However, it is recommended to simply use \lstinline=\usepackage{chemmacros}= and setup the required options with \lstinline=\chemsetup= (also see section \ref{sec:setup}).
-\secidx*{Loading the Bundle}
+\secidx*{Installation}\secidx*{Loading the Bundle}
\section{Package Options}\label{sec:optionen}\secidx{Package Options}
\chemmacros has several package options. They all are used as key/value pairs like
@@ -184,23 +186,24 @@ Some also can be used without value (\lstinline+\usepackage[option1]{chemmacros}
Both \chemformula and \ghsystem don't have package options of their own. If you load them explicitly you can give them \chemmacros' options instead and they will pass them on to \chemmacros.
\begin{description}
- \item \key[option]{bpchem}{\uline{true}/false} This option loads the package \paket{bpchem} and adjusts the layout of the \cmd{NMR} command to the \paket{bpchem} commands \lstinline+\HNMR+ and \lstinline+\CNMR+. (default: \texttt{false})
- \item \key[option]{circled}{\uline{formal}/all/none} \chemmacros uses two different kinds of charges\footnote{Thanks to Christoph Sch\"afer, who pointed out to me, that v1.1 handled the charges too sloppy!}, which indicate the usage of real ($+/-$) and formal (\fplus/\fminus) charges. The option \texttt{formal} distinguishes between them, option \texttt{none} displays them all without circle, option \texttt{all} circles all (default: \texttt{formal})
- \item \key[option]{circletype}{\uline{chem}/math} This option switches between two kinds of circled charge symbols: \cmd{fplus} \fplus\ and \lstinline+$\oplus$+ $\oplus$. (default: \texttt{chem})
- \item \key[option]{detect-bold}{\uline{true}/false} This option determines wether or not macros like \cmd{pKa} recognize a bold font series. \textbf{bold \pKa text} or {\chemsetup[option]{detect-bold}\textbf{bold \pKa text}}. (default: \texttt{false})
- \item \key[option]{EZ}{\uline{chemmacros}/cool} The command \cmd{E} is defined by the package \paket{cool} as well as by \chemmacros. With this option you can choose, which definition is used, see page \pageref{EZ}. (default: \texttt{chemmacros})
- \item \key[option]{german}{\uline{true}/false} This option changes the commands \cmd{pKa}, \cmd{sld} and \cmd{lqd} (default: \texttt{false}). This option has the alias \key[option]{ngerman}.
- \item \key[option]{ghs}{\uline{true}/false} Disable the use of the \ghsystem package. Setting \key{ghs}{false} will prevent \chemmacros from loading \ghsystem. (default: \texttt{true})
- \item \key[option]{method}{\uline{chemformula}/mhchem} You can choose the method which \chemmacros will use for the reaction environments (see section \ref{ssec:mhchem_reaktionen}) and the typesetting of the particles (see section \ref{sec:teilchen}). (default: \texttt{chemformula}). This option can only be chosen in the preamble.
- \item \key[option]{strict}{\uline{true}/false} Setting \key{strict}{true} will turn all warning messages into erros messages. (default: \texttt{false})
- \item \key[option]{synchronize}{\uline{true}/false} The setting \texttt{true} will tell \chemmacros the adapt the font settings of \chemformula if that method has been chosen (default: \texttt{false}). In order to demonstrate this feature this document is set with \key{synchronize}{true} and the \chemformula setting \lstinline+\chemsetup[chemformula]{font-spec={[Color=darkgray]Latin Modern Sans}}+.
- \item \key[option]{version}{1/2/bundle} This option restores the old definitions of some commands, so documents set with v1.* will still compile correctly. (default: \texttt{bundle}). Actually \texttt{2} and \texttt{bundle} are only aliases. This option can only be chosen in the preamble.
- \item \key[option]{xspace}{\uline{true}/false} With this option most commands are defined with a \lstinline+\xspace+. (default: \texttt{true})
+ \item \key[option]{bpchem}{\uline{true}/false} This option loads the package \paket{bpchem} and adjusts the layout of the \cmd{NMR} command to the \paket{bpchem} commands \lstinline+\HNMR+ and \lstinline+\CNMR+. (default = \texttt{false})
+ \item \key[option]{circled}{\uline{formal}/all/none} \chemmacros uses two different kinds of charges\footnote{Thanks to Christoph Sch\"afer, who pointed out to me, that v1.1 handled the charges too sloppy!}, which indicate the usage of real ($+/-$) and formal (\fplus/\fminus) charges. The option \texttt{formal} distinguishes between them, option \texttt{none} displays them all without circle, option \texttt{all} circles all (default = \texttt{formal})
+ \item \key[option]{circletype}{\uline{chem}/math} This option switches between two kinds of circled charge symbols: \cmd{fplus} \fplus\ and \lstinline+$\oplus$+ $\oplus$. (default = \texttt{chem})
+ \item \key[option]{detect-bold}{\uline{true}/false} This option determines wether or not macros like \cmd{pKa} recognize a bold font series. \textbf{bold \pKa text} or {\chemsetup[option]{detect-bold}\textbf{bold \pKa text}}. (default = \texttt{false})
+ \item \key[option]{EZ}{\uline{chemmacros}/cool} The command \cmd{E} is defined by the package \paket{cool} as well as by \chemmacros. With this option you can choose, which definition is used, see page \pageref{EZ}. (default = \texttt{chemmacros}). This option can only be chosen in the preamble.
+ \item \key[option]{german}{\uline{true}/false} This option changes the commands \cmd{pKa}, \cmd{sld} and \cmd{lqd} (default = \texttt{false}). This option has the alias \key[option]{ngerman}.
+ \item \key[option]{ghs}{\uline{true}/false} Disable the use of the \ghsystem package. Setting \key{ghs}{false} will prevent \chemmacros from loading \ghsystem. (default = \texttt{true})
+ \item \key[option]{method}{\uline{chemformula}/mhchem} You can choose the method which \chemmacros will use for the reaction environments (see section \ref{ssec:mhchem_reaktionen}) and the typesetting of the particles (see section \ref{sec:teilchen}). (default = \texttt{chemformula}). This option can only be chosen in the preamble.
+ \item \key[option]{Nu}{\uline{chemmacros}/mathspec} The package \paket{mathspec} also defines a macro \cmd{Nu}. This option chooses which definition holds, see page \pageref{Nu}. (default = \texttt{chemmacros}). This option can only be chosen in the preamble.
+ \item \key[option]{strict}{\uline{true}/false} Setting \key{strict}{true} will turn all warning messages into erros messages. (default = \texttt{false})
+ \item \key[option]{synchronize}{\uline{true}/false} The setting \texttt{true} will tell \chemmacros the adapt the font settings of \chemformula if that method has been chosen (default = \texttt{false}). In order to demonstrate this feature this document is set with \key{synchronize}{true} and the \chemformula setting \lstinline+\chemsetup[chemformula]{font-spec={[Color=darkgray]Latin Modern Sans}}+.
+ \item \key[option]{version}{1/2/bundle} This option restores the old definitions of some commands, so documents set with v1.* will still compile correctly. (default = \texttt{bundle}). Actually \texttt{2} and \texttt{bundle} are only aliases. This option can only be chosen in the preamble.
+ \item \key[option]{xspace}{\uline{true}/false} With this option most commands are defined with a \lstinline+\xspace+. (default = \texttt{true})
\end{description}
\secidx*{Package Options}
\section{Setup}\label{sec:setup}\secidx{Setup}
-Various of \chemmacros', \chemformula's and \ghsystem' commands have key/value pairs with which they can be customized. Most times they can be used as (optional) argument of the commands themselves. They also can most times be used with the \cmd{chemsetup} command.
+Various of \chemmacros', \chemformula's and \ghsystem's commands have key/value pairs with which they can be customized. Most times they can be used as (optional) argument of the commands themselves. They also can most times be used with the \cmd{chemsetup} command.
\begin{description}
\item \cmd{chemsetup}[<module>]{<key> = <value>} or
\item \cmd{chemsetup}{<module>/<key> = <value>}
@@ -217,12 +220,13 @@ The package options can also be seen as keys belonging to the module \textcolor{
\end{beispiel}
Keys \emph{not} belonging to a module \emph{cannot} be used with \cmd{chemsetup}!
-All options of \chemformula belong to the module \textcolor{module}{\texttt{chemformula}} and all of \ghsystem' options belong to the module \textcolor{module}{\texttt{ghs}}.
+All options of \chemformula belong to the module \textcolor{module}{\texttt{chemformula}} and all of \ghsystem's options belong to the module \textcolor{module}{\texttt{ghs}}.
\secidx*{Setup}
\secidx*{PRELIMINARIES}
\part{\texorpdfstring{\Chemmacros}{chemmacros}}\secidx{CHEMMACROS}
\section{Particles, Ions and Symbols}\label{sec:teilchen}\secidx{Particles, Ions and Symbols}
+\subsection{Predefined}\secidx[predefined]{Particles, Ions and Symbols}
Some simple macros for displaying often needed particles and a symbol. Please note, that they're displayed differently depending on the package options used, see section \ref{sec:optionen}. These commands can be used in text as well as in math mode.
\begin{description}
\item \cmd{Hpl} \Hpl (proton)
@@ -232,7 +236,7 @@ Some simple macros for displaying often needed particles and a symbol. Please no
\item \cmd{el} \el (electron)
\item \cmd{prt} \prt (proton)
\item \cmd{ntr} \ntr (neutron)
- \item \cmd{Nu} \Nu (nucleophile)
+ \item \cmd{Nu} \Nu (nucleophile). The package \paket{mathspec} also defines a macro \cmd{Nu}. If you chose package option \key[option]{Nu}{mathspec} \chemmacros defines \cmd{Nuc} instead\label{Nu}.
\item \cmd{El} \El (electrophile)
\item \cmd{ba} \ba (base)
\item \cmd{fplus} \fplus
@@ -260,11 +264,24 @@ It only has any effect, if the package \paket{chemfig} is loaded, since it uses
\chemsetup[particle]{elpair}
\ba \Nu
\end{beispiel}
+
+\subsection{Own Particles}\secidx[own]{Particles, Ions and Symbols}
+If you like you can define your own particles using
+\begin{description}
+ \item \cmd{DeclareParticle}{<cmd>}\ma{<definition>}
+\end{description}
+Depending on the \key{method} you chose as option the \texttt{<definition>} will either be formula defined with \paket{mhchem} or with \chemformula. The particle defined this way behaves like the predefined ones with one exception: if you chose \key{method}{mhchem} the particle \emph{will not} obey the option \key{circled}. If you want formal charges with this method you need to use \chemmacros' commands (see section \ref{sec:ladungen}) explicitly. If you chose \key{method}{chemformula} the partictle \emph{will} obey the \key{circled} option.
+\begin{beispiel}
+ \DeclareParticle{\Sod}{Na+}
+ \DeclareParticle{\Pot}{K+}
+ \Sod \Pot \chemsetup[option]{circled=all} \Sod \Pot
+\end{beispiel}
+The particles are only defined if the \texttt{<cmd>} you chose is not already used by any other command. If it is already used \chemmacros will either give a warning or an error, depending on the option \key{strict}.
\secidx*{Particles, Ions and Symbols}
\section{Stereo Descriptors, Nomenclature, Latin Phrases}\label{sec:stereo}
\subsection{IUPAC Names}\secidx{IUPAC Names}
-Similar to the \paket{bpchem} package \chemmacros provides a command\footnote{The idea and the implementation is borrowed from \paket*{bpchem} by Bjørn Pedersen.} to typeset IUPAC names. Why is that useful? IUPAC names can get very long. So long indeed that they span over more than two lines, especially in two-column documents. This means they must be allowed to be broken more than one time. This is what the following command does.
+Similar to the \paket{bpchem} package \chemmacros provides a command\footnote{The idea and the implementation is shamelessly borrowed from \paket*{bpchem} by Bjørn Pedersen.} to typeset IUPAC names. Why is that useful? IUPAC names can get very long. So long indeed that they span over more than two lines, especially in two-column documents. This means they must be allowed to be broken more than one time. This is what the following command does.
\begin{description}
\item\cmd{iupac}{<IUPAC name>} Inside this command use \cmd{\textbar} and \cmd{-} to indicate a breaking point or a breaking dash. Use \cmd{\textasciicircum} as a shortcut for \lstinline=\textsuperscript=\footnote{Actually \cmd{\textasciicircum} uses a \chemformula command instead.}.
\end{description}
@@ -1090,7 +1107,8 @@ Some keys can be set without value. Then the \uline{underlined} value is used.
EZ & option & \uline{chemmacros}/cool & chemmacros & page \pageref{key:option_EZ} \\
german & option & \uline{true}/false & false & page \pageref{key:option_german} \\
ghs & option & \uline{true}/false & true & page \pageref{key:option_ghs} \\
- method & option & \uline{chemformula}/formula & formula & page \pageref{key:option_method} \\
+ method & option & \uline{chemformula}/formula & formula & page \pageref{key:option_method} \\
+ Nu & option & \uline{chemmacros}/mathspec & chemmacros & page \pageref{key:option_Nu} \\
strict & option & \uline{true}/false & false & page \pageref{key:option_strict} \\
synchronize & option & \uline{true}/false & false & page \pageref{key:option_synchronize} \\
version & option & 1/2/bundle & bundle & page \pageref{key:option_version} \\
@@ -1718,7 +1736,7 @@ This section just presents some examples of a possible usage.
\part{\texorpdfstring{\Ghsystem}{ghsystem}}\secidx{GHSYSTEM}
\section{Setup}
-All of \ghsystem' options belong to the module \textcolor{module}{\texttt{ghsystem}}. This means they can be setup with
+All of \ghsystem's options belong to the module \textcolor{module}{\texttt{ghsystem}}. This means they can be setup with
\begin{beispiel}[code only]
\chemsetup[ghsystem]{<options>} or
\chemsetup{ghsystem/<option1>,ghsystem/<option2>}
@@ -1839,7 +1857,7 @@ The command
\begin{description}
\item\cmd{ghspic}[<options>]{<name>}
\end{description}
-loads them. \ref{tab:ghs_pictograms} shows all available pictograms and their names.
+loads them. \ref{tab:ghs_pictograms} shows all available pictograms and their names. To be more precise: it shows the names to use with the \cmd{ghspic} command. The file names are \lstinline=ghsystem_<name>.<filetype>= where \texttt{<filetype>} is \texttt{eps}, \texttt{jpg} or \texttt{png}, see also section \ref{ssec:picture_type}.
\begin{beispiel}
\ghspic{skull}
\end{beispiel}
@@ -1891,7 +1909,7 @@ If you want to use some specific \lstinline=\includegraphics= options, \eg if yo
aqpol & \ghspic{aqpol} & & \\
\end{longtable}
-\subsection{Picture Type Depending on Engine}
+\subsection{Picture Type Depending on Engine}\label{ssec:picture_type}
As you probably know you can't use every picture type with every compiler engine. \pdfTeX\ in \textsc{dvi} mode \emph{needs} \texttt{eps} pictures while \pdfTeX\ in \textsc{pdf} mode, \XeTeX\ and \LuaTeX\ convert \texttt{eps} pictures into \texttt{pdf} files, given they have the rights to write in the directory the pictures are saved in.
However, the latter can include \texttt{jpg} and \texttt{png} without any problems, while \pdfTeX\ in \textsc{dvi} mode can't.
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
index c6f338ecbd6..3ba0ba784ac 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/01/30 - %
+% - 2012/02/05 - %
% --------------------------------------------------------------------------- %
% - http://www.mychemistry.eu/ - %
% - contact@mychemistry.eu - %
@@ -28,7 +28,7 @@
% - The Current Maintainer of this work is Clemens Niederberger. - %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{ expl3 }
-\ProvidesExplPackage {chemformula} {2012/01/30} {3.0a} {typeset chemical compounds and reactions}
+\ProvidesExplPackage {chemformula} {2012/02/05} {3.0c} {typeset chemical compounds and reactions}
%-----------------------------------------------------------------------------%
% WARNING AND ERROR MESSAGES
@@ -1476,6 +1476,8 @@ VERSION HISTORY
2012/01/28 - version 3.0 - first published to CTAN with the chemmacros bundle
2012/01/30 - version 3.0a - bugfix: subscripts in escaped inputs failed,
renamed formula => chemformula
+2012/02/02 - version 3.0b - updated documentation
+2012/02/05 - version 3.0c - renamed pictogram files
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% TODO
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
index 3adb8505858..f53fbd5bbe8 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/02/01 - %
+% - 2012/02/05 - %
% --------------------------------------------------------------------------- %
% - http://www.mychemistry.eu/ - %
% - contact@mychemistry.eu - %
@@ -30,43 +30,30 @@
\RequirePackage{ expl3 , xparse , l3keys2e , xfrac , siunitx , tikz , mathtools , environ , scrlfile , etoolbox , bm }
\usetikzlibrary{calc,arrows}
-\ProvidesExplPackage {chemmacros} {2012/02/01} {3.0a} {macros and commands for chemists}
+\ProvidesExplPackage {chemmacros} {2012/02/05} {3.0c} {macros and commands for chemists}
\@ifpackageloaded { chemformula } {} { \RequirePackage { chemformula } }
\bool_new:N \l_chemmacros_version_one_bool
-\bool_set_false:N \l_chemmacros_version_one_bool
-
\bool_new:N \l_chemmacros_german_bool
-\bool_set_false:N \l_chemmacros_german_bool
-
\bool_new:N \l_chemmacros_xspace_bool
-\bool_set_true:N \l_chemmacros_xspace_bool
-
+ \bool_set_true:N \l_chemmacros_xspace_bool
\bool_new:N \l_chemmacros_bpchem_bool
-\bool_set_false:N \l_chemmacros_bpchem_bool
-
\bool_new:N \l_chemmacros_circled_bool
-\bool_set_true:N \l_chemmacros_circled_bool
-
+ \bool_set_true:N \l_chemmacros_circled_bool
\bool_new:N \l_chemmacros_circled_formal_bool
-\bool_set_true:N \l_chemmacros_circled_formal_bool
-
+ \bool_set_true:N \l_chemmacros_circled_formal_bool
\bool_new:N \l_chemmacros_circled_chem_bool
-\bool_set_true:N \l_chemmacros_circled_chem_bool
-
+ \bool_set_true:N \l_chemmacros_circled_chem_bool
\bool_new:N \l_chemmacros_EZ_cool_bool
-\bool_set_false:N \l_chemmacros_EZ_cool_bool
-
+\bool_new:N \l_chemmacros_Nu_mathspec_bool
\bool_new:N \l_chemmacros_use_mhchem_bool
-\bool_set_false:N \l_chemmacros_use_mhchem_bool
-
\bool_new:N \l_chemmacros_chemstyle_bool
\bool_new:N \l_chemmacros_hyperref_bool
\bool_new:N \l_chemmacros_varioref_bool
\bool_new:N \l_chemmacros_chemfig_bool
\bool_new:N \l_chemmacros_ghsystem_bool
-\bool_set_true:N \l_chemmacros_ghsystem_bool
+ \bool_set_true:N \l_chemmacros_ghsystem_bool
\AtBeginDocument
{
@@ -152,6 +139,12 @@
method / mhchem .code:n =
\bool_set_true:N \l_chemmacros_use_mhchem_bool ,
method .default:n = chemformula ,
+ Nu .choice: ,
+ Nu / mathspec .code:n =
+ \bool_set_true:N \l_chemmacros_Nu_mathspec_bool ,
+ Nu / chemmacros .code:n =
+ \bool_set_false:N \l_chemmacros_Nu_mathspec_bool ,
+ Nu .default:n = chemmacros ,
strict .bool_set:N = \l_chemmacros_strict_bool ,
strict .default:n = true ,
synchronize .choice: ,
@@ -209,6 +202,16 @@
See~the~documentation~for~more~information.
}
+\msg_set:nnnn { chemmacros } { particle }
+ {
+ The~command~sequence~ \token_to_str:N #1 \c_space_tl is~already~defined.
+ }
+ {
+ You've~tried~to~define~a~particle~with~\token_to_str:N \DeclareParticle ,~but
+ ~the~command~sequence~ \token_to_str:N #1 \c_space_tl already~exists.~Choose~
+ another~name.
+ }
+
\msg_set:nnn { chemmacros } { ox }
{
\token_to_str:N \ox \c_space_tl : ~ #1 ~ \msg_line_context: .
@@ -421,20 +424,44 @@
% --------------------------------------------------------------------------- %
% particles, charges
-% electron
\bool_new:N \l_chemmacros_charge_append_bool
\bool_set_false:N \l_chemmacros_charge_append_bool
\bool_if:NTF \l_chemmacros_use_mhchem_bool
{
+ \NewDocumentCommand \DeclareParticle { mm }
+ {
+ \cs_if_free:NTF #1
+ {
+ \cs_set_nopar:Npn #1
+ { \chemmacros_atom:n { #2 } \chemmacros_xspace: }
+ }
+ { \chemmacros_msg:nnxx { chemmacros } { particle } { #1 } {} }
+ }
+ }
+ {
+ \NewDocumentCommand \DeclareParticle { mm }
+ {
+ \cs_if_free:NTF #1
+ {
+ \cs_set_nopar:Npn #1
+ { \chemmacros_chemformula:n { #2 } \chemmacros_xspace: }
+ }
+ { \chemmacros_msg:nnxx { chemmacros } { particle } { #1 } {} }
+ }
+ }
+
+\bool_if:NTF \l_chemmacros_use_mhchem_bool
+ {
\cs_new_nopar:Npn \el { \chemmacros_atom:n { e } \mch \chemmacros_xspace: }
\cs_new_nopar:Npn \prt { \chemmacros_atom:n { p } \pch \chemmacros_xspace: }
}
{
- \cs_new_nopar:Npn \el { \chemmacros_chemformula:n { e- } \chemmacros_xspace: }
- \cs_new_nopar:Npn \prt { \chemmacros_chemformula:n { p+ } \chemmacros_xspace: }
+ \DeclareParticle \el { e- }
+ \DeclareParticle \prt { p+ }
}
-\cs_new_nopar:Npn \ntr { \chemmacros_chemformula:n { n^0 } \chemmacros_xspace: }
+
+\DeclareParticle \ntr { n^0 }
\cs_new_nopar:Npn \chemmacros_bm:n #1
{
@@ -543,16 +570,15 @@
\cs_new_nopar:Npn \El { \chemmacros_atom:n { E } \pch \chemmacros_xspace: }
}
{
- \cs_new_nopar:Npn \Hpl { \chemmacros_chemformula:n { H+ } \chemmacros_xspace: }
- \cs_new_nopar:Npn \Hyd { \chemmacros_chemformula:n { OH- } \chemmacros_xspace: }
- \cs_new_nopar:Npn \HtO { \chemmacros_chemformula:n { H3O+ } \chemmacros_xspace: }
- \cs_new_nopar:Npn \El { \chemmacros_chemformula:n { E+ } \chemmacros_xspace: }
+ \DeclareParticle \Hpl { H+ }
+ \DeclareParticle \Hyd { OH- }
+ \DeclareParticle \HtO { H3O+ }
+ \DeclareParticle \El { E+ }
}
-\cs_new_nopar:Npn \water
- { \chemmacros_chemformula:n { H2O } \chemmacros_xspace: }
-% TODO: \Nu konflikt mit `mathspec'
-\NewDocumentCommand \Nu { o }
+\DeclareParticle \water { H2O }
+
+\NewDocumentCommand \chemmacros_Nu:w { o }
{
\IfNoValueF { #1 } { \keys_set:nn { chemmacros / particle } { #1 } }
\bool_if:NTF \l_chemmacros_particle_elpair_bool
@@ -565,6 +591,13 @@
\chemmacros_xspace:
}
+\AtBeginDocument
+ {
+ \bool_if:NTF \l_chemmacros_Nu_mathspec_bool
+ { \cs_set_eq:NN \Nuc \chemmacros_Nu:w }
+ { \cs_set_eq:NN \Nu \chemmacros_Nu:w }
+ }
+
\NewDocumentCommand \ba { o }
{
\IfNoValueF { #1 } { \keys_set:nn { chemmacros / particle } { #1 } }
@@ -1646,7 +1679,6 @@
\tl_set:Nn \l_chemmacros_reaction_lorname_tl { #1 ~ }
}
-% TODO: define new reactions with optional Argument for lor-entry
% \newreaction[<keyval>]{<name>}{<type>}
\bool_if:NF \l_chemmacros_version_one_bool
{
@@ -2907,51 +2939,58 @@
% --------------------------------------------------------------------------- %
Version history
-2011/05/15 version 1.0 - CTAN release
-2011/06/22 version 1.1 - "LaTeXified" whole package for safer usage
- - less user work required (like loading package after
- another)
- - more particle macros
- - latin phrases
- - extra units
- - acid/base commands
- - \mech
- - \NMR
- - \mhName, \setmhName, \newreaction, phases
- - \renewstate, \setstatesubscript
- - improved orbitals
- - simpler package options, option german, bpchem
- - bug fixes
-2011/10/28 version 2.0 - rewritten in expl3
- - customization via \chemsetup
- - new commands \p, \fplus, \fminus, \fpch, \fmch, \fscrp,
- \fsrcm, \fdelp, \fdelm, \orbital, \chemsetup
- - various commands have a new syntax
- - removed: \setmhName, \setredoxdist, \setstatesubscript,
- \porb, \phorb, \pxorb, \pyorb, \pzorb, \setorbheight,
- \solid, \liquid
- - reaction environments work with hyperref and varioref
-2011/11/03 version 2.0a - minor bug fixes
- - new feature for \Nu
- - new command \ba
-2012/01/28 version 3.0 - bundled with packages `formula' and `ghs'
- - new commands \Ka, \Kb, \Kw
- - commands can detect if font series is bold
- - new package option "detect-bold"
- - new package option "method" => choose between `mhchem'
- and `formula' for internal uses.
- - new package option "ghs" => load `ghs' or don't
- - new package option "synchronize"
- - new package option "strict"
- - new command \iupac
- - new command \listofreactions, reaction environments
- with optional argument
- - \cis, \trans, \tert without \xspace
-2012/01/30 version 3.0a - bugfix in formula.sty
- - renamed formula => chemformula
- and ghs => ghsystem to make the names unique
- (following a request by Karl Berry)
+2011/05/15 - version 1.0 - CTAN release
+2011/06/22 - version 1.1 - "LaTeXified" whole package for safer usage
+ - less user work required (like loading package
+ after another)
+ - more particle macros
+ - latin phrases
+ - extra units
+ - acid/base commands
+ - \mech
+ - \NMR
+ - \mhName, \setmhName, \newreaction, phases
+ - \renewstate, \setstatesubscript
+ - improved orbitals
+ - simpler package options, option german, bpchem
+ - bug fixes
+2011/10/28 - version 2.0 - rewritten in expl3
+ - customization via \chemsetup
+ - new commands \p, \fplus, \fminus, \fpch, \fmch,
+ \fscrp, \fsrcm, \fdelp, \fdelm, \orbital, \chemsetup
+ - various commands have a new syntax
+ - removed: \setmhName, \setredoxdist, \setstatesubscript,
+ \porb, \phorb, \pxorb, \pyorb, \pzorb, \setorbheight,
+ \solid, \liquid
+ - reaction environments work with hyperref and varioref
+2011/11/03 - version 2.0a - minor bug fixes
+ - new feature for \Nu
+ - new command \ba
+2012/01/28 - version 3.0 - bundled with packages `formula' and `ghs'
+ - new commands \Ka, \Kb, \Kw
+ - commands can detect if font series is bold
+ - new package option "detect-bold"
+ - new package option "method" => choose between
+ `mhchem' and `formula' for internal uses.
+ - new package option "ghs" => load `ghs' or don't
+ - new package option "synchronize"
+ - new package option "strict"
+ - new command \iupac
+ - new command \listofreactions, reaction environments
+ with optional argument
+ - \cis, \trans, \tert without \xspace
+2012/01/30 - version 3.0a - bugfix in formula.sty
+ - renamed formula => chemformula
+ and ghs => ghsystem to make the names unique
+ (following a request by Karl Berry for TeXlive)
+2012/02/03 - version 3.0b - new command \DeclareParticle, updated documentation
+2012/02/05 - version 3.0c - renamed pictogram files (following a request by
+ Karl Berry for TeXlive)
+ - new package option "Nu"
+
% --------------------------------------------------------------------------- %
% TODO:
- ox-option xfrac vs math?
-- Option „side“ for Phasen-Befehle? \ No newline at end of file
+- Option „side“ for Phasen-Befehle?
+- \Nu konflikt mit `mathspec'
+- resolve conflict with \listofreactions and \setcounter{reaction}{<int>} \ 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 1f1be06e3cd..6b1c240d86e 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/01/30 - %
+% - 2012/02/05 - %
% --------------------------------------------------------------------------- %
% - http://www.mychemistry.eu/ - %
% - contact@mychemistry.eu - %
@@ -28,7 +28,7 @@
% - The Current Maintainer of this work is Clemens Niederberger. - %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{ expl3 }
-\ProvidesExplPackage {ghsystem} {2012/01/30} {3.0a} {globally harmonised system}
+\ProvidesExplPackage {ghsystem} {2012/02/05} {3.0c} {globally harmonised system}
% --------------------------------------------------------------------------- %
% error and warning messages:
@@ -417,7 +417,7 @@
\IfNoValueF { #1 } { \keys_set:nn { chemmacros / ghsystem } { #1 } }
\ghsystem_includegraphics:xn
{ scale=\fp_to_tl:N \l_ghsystem_picture_scale_fp \l_ghsystem_picture_includegraphics_tl }
- { pictures / #2 . \l_ghsystem_picture_type_tl }
+ { pictures / ghsystem_ #2 . \l_ghsystem_picture_type_tl }
\group_end:
}
@@ -430,6 +430,8 @@
VERSION HISTORY
2012/01/28 - version 3.0 - first published to CTAN with the chemmacros bundle
2012/01/30 - version 3.0a - bugfix in chemormula.sty, renamed ghs => ghsystem
+2012/02/03 - version 3.0b - updated documentation
+2012/02/05 - version 3.0c - renamed pictogram files
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% TODO:
diff --git a/Master/texmf-dist/doc/latex/chemmacros/language/ghsystem_english.def b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_english.def
index 1b63cd3ca98..1b63cd3ca98 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/language/ghsystem_english.def
+++ b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_english.def
diff --git a/Master/texmf-dist/doc/latex/chemmacros/language/ghsystem_german.def b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_german.def
index 7d6062e0204..7d6062e0204 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/language/ghsystem_german.def
+++ b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_german.def
diff --git a/Master/texmf-dist/doc/latex/chemmacros/language/ghsystem_langtemplate.def b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_langtemplate.def
index 357eccc33f9..357eccc33f9 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/language/ghsystem_langtemplate.def
+++ b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_langtemplate.def
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/acid-8.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.eps
index 156c90037c3..156c90037c3 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/acid-8.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/acid-8.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.jpg
index bbccf22cc90..bbccf22cc90 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/acid-8.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/acid-8.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.png
index 7c33182b18b..7c33182b18b 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/acid-8.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/acid.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.eps
index b5953fe62ca..b5953fe62ca 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/acid.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/acid.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.jpg
index d993c065391..d993c065391 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/acid.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/acid.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.png
index e94fe5fbddb..e94fe5fbddb 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/acid.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/aqpol.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.eps
index 105b198f8a5..105b198f8a5 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/aqpol.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/aqpol.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.jpg
index a195a7f9caf..a195a7f9caf 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/aqpol.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/aqpol.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.png
index 6a115d19c7a..6a115d19c7a 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/aqpol.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-black.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.eps
index 9fc0b5fb0a4..9fc0b5fb0a4 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-black.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-black.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.jpg
index 3bbeaddeefa..3bbeaddeefa 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-black.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-black.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.png
index 15151916a2d..15151916a2d 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-black.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-white.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.eps
index e1991e4ef2c..e1991e4ef2c 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-white.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-white.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.jpg
index 273dbd3ba8b..273dbd3ba8b 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-white.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-white.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.png
index 97409356ef3..97409356ef3 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle-2-white.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.eps
index 389b8a0f071..389b8a0f071 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.jpg
index 7b4b1273f64..7b4b1273f64 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.png
index 1f30d257773..1f30d257773 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/bottle.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/exclam.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.eps
index f9a1e66bdaa..f9a1e66bdaa 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/exclam.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/exclam.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.jpg
index 4c4cca9f2f8..4c4cca9f2f8 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/exclam.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/exclam.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.png
index b9c3127a0af..b9c3127a0af 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/exclam.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-1.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.eps
index 38b211bd483..38b211bd483 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-1.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-1.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.jpg
index 79822010b08..79822010b08 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-1.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-1.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.png
index 48ef0821c12..48ef0821c12 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-1.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-2.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.eps
index 7d05d64679a..7d05d64679a 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-2.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-2.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.jpg
index cc34c082097..cc34c082097 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-2.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-2.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.png
index 8bfd3cc70fe..8bfd3cc70fe 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-2.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-3.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.eps
index 16e24e72996..16e24e72996 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-3.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-3.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.jpg
index 0da14d3dd8b..0da14d3dd8b 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-3.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-3.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.png
index b6a4beef614..b6a4beef614 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-3.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-4.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.eps
index 33daeba5988..33daeba5988 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-4.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-4.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.jpg
index ae72a46fac8..ae72a46fac8 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-4.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-4.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.png
index d64077862f8..d64077862f8 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-4.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-5.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.eps
index 7f58eab956b..7f58eab956b 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-5.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-5.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.jpg
index b022f837186..b022f837186 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-5.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-5.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.png
index a1026d59391..a1026d59391 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-5.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-6.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.eps
index d2c82af3cf9..d2c82af3cf9 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-6.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-6.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.jpg
index 20d302193e1..20d302193e1 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-6.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-6.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.png
index 0ea95a1d9d6..0ea95a1d9d6 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos-6.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.eps
index 87fcdf91f27..87fcdf91f27 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.jpg
index 41bb9206cf2..41bb9206cf2 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.png
index 1ecee6542f5..1ecee6542f5 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/explos.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-black.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.eps
index 6e8763be5c6..6e8763be5c6 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-black.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-black.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.jpg
index 6fea101b646..6fea101b646 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-black.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-black.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.png
index 0e67914e5c6..0e67914e5c6 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-black.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-white.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.eps
index ddd21e5c5fd..ddd21e5c5fd 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-white.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-white.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.jpg
index 6579a7aebcd..6579a7aebcd 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-white.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-white.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.png
index 0941c7778e8..0941c7778e8 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-2-white.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-black.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.eps
index eba43ae2ea2..eba43ae2ea2 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-black.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-black.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.jpg
index 0fabb0d1277..0fabb0d1277 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-black.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-black.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.png
index eee78bd5e78..eee78bd5e78 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-black.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-white.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.eps
index f950b8df07b..f950b8df07b 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-white.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-white.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.jpg
index 04046497216..04046497216 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-white.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-white.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.png
index fae4106a311..fae4106a311 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-3-white.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-1.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.eps
index ac36d44e940..ac36d44e940 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-1.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-1.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.jpg
index fe003cce783..fe003cce783 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-1.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-1.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.png
index 01b3259cf08..01b3259cf08 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-1.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-2.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.eps
index 097500e2268..097500e2268 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-2.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-2.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.jpg
index 0b5048c28be..0b5048c28be 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-2.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-2.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.png
index 00b20967aa8..00b20967aa8 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-2.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-black.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.eps
index 23ff1024bd7..23ff1024bd7 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-black.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-black.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.jpg
index db851f38769..db851f38769 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-black.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-black.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.png
index 8a7b9920975..8a7b9920975 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-black.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-white.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.eps
index eabbec9b6bf..eabbec9b6bf 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-white.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-white.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.jpg
index 251d6be3aee..251d6be3aee 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-white.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-white.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.png
index 04e9b218256..04e9b218256 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-4-3-white.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-black.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.eps
index 50354d37398..50354d37398 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-black.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-black.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.jpg
index 7024532cc19..7024532cc19 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-black.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-black.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.png
index d311404a59c..d311404a59c 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-black.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-white.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.eps
index 5ace29e72c3..5ace29e72c3 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-white.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-white.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.jpg
index 2797decb0a6..2797decb0a6 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-white.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-white.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.png
index 802ccdcf0fe..802ccdcf0fe 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-5-2-white.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O-5-1.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.eps
index 9006dce3bd6..9006dce3bd6 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O-5-1.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O-5-1.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.jpg
index 663dc3a4a25..663dc3a4a25 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O-5-1.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O-5-1.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.png
index efbb5d92495..efbb5d92495 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O-5-1.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.eps
index 0e8d9358346..0e8d9358346 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.jpg
index 845c88f55a6..845c88f55a6 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.png
index 9c9408ebbff..9c9408ebbff 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame-O.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.eps
index a8d8c91998c..a8d8c91998c 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.jpg
index 8e07bed5158..8e07bed5158 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.png
index 1761b13b3ad..1761b13b3ad 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/flame.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/health.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.eps
index 498417e034b..498417e034b 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/health.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/health.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.jpg
index f3138243bd2..f3138243bd2 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/health.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/health.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.png
index 49d6b9a7dbc..49d6b9a7dbc 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/health.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull-2.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.eps
index faa1c65bcde..faa1c65bcde 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull-2.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull-2.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.jpg
index adcb62893ea..adcb62893ea 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull-2.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull-2.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.png
index 28456115787..28456115787 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull-2.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull-6.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.eps
index 33808166394..33808166394 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull-6.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull-6.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.jpg
index 70da06c610c..70da06c610c 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull-6.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull-6.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.png
index 4714bec1361..4714bec1361 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull-6.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull.eps b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.eps
index d8004fc8934..d8004fc8934 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull.eps
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.eps
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull.jpg b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.jpg
index bf3d3308dfd..bf3d3308dfd 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull.jpg
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.png
index e4d1bed16de..e4d1bed16de 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/pictures/skull.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.png
Binary files differ