summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/chemmacros
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-07-26 00:13:55 +0000
committerKarl Berry <karl@freefriends.org>2012-07-26 00:13:55 +0000
commit9e01bdb935ec7b0e2a43c548d9168c78e9b38bc0 (patch)
tree18e2ac08bf0eaee9424c4d13d085ba05117c5311 /Master/texmf-dist/tex/latex/chemmacros
parent40e66b62cf15c6041243e1bff5325feec4d2ac8d (diff)
chemmacros 3.3d (25jul12)
git-svn-id: svn://tug.org/texlive/trunk@27156 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/chemmacros')
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/chemformula.sty57
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty396
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty25
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.pdfbin0 -> 9729 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.pdfbin0 -> 8999 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.pngbin8687 -> 37706 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.pdfbin0 -> 8580 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.pdfbin0 -> 5227 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.pdfbin0 -> 5237 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.pdfbin0 -> 5285 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.pdfbin0 -> 5805 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.pdfbin0 -> 11035 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.pdfbin0 -> 11061 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.pdfbin0 -> 11175 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.pdfbin0 -> 5694 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.pdfbin0 -> 6468 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.pdfbin0 -> 6646 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.pdfbin0 -> 11156 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.pdfbin0 -> 7529 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.pdfbin0 -> 7558 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.pdfbin0 -> 7556 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.pdfbin0 -> 7638 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.pdfbin0 -> 13598 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.pdfbin0 -> 7998 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.pdfbin0 -> 7315 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.pdfbin0 -> 7317 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.pdfbin0 -> 8142 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.pdfbin0 -> 8133 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.pdfbin0 -> 7530 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.pdfbin0 -> 9051 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.pdfbin0 -> 8418 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.pdfbin0 -> 9541 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.pdfbin0 -> 9710 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.pdfbin0 -> 9869 bytes
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.pdfbin0 -> 10765 bytes
35 files changed, 276 insertions, 202 deletions
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
index 14c5c4305ce..5f525e1cebc 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
@@ -5,7 +5,6 @@
% - macros and commands for chemists - %
% --------------------------------------------------------------------------- %
% - Clemens Niederberger - %
-% - 2012/05/18 - %
% --------------------------------------------------------------------------- %
% - https://bitbucket.org/cgnieder/chemmacros/ - %
% - contact@mychemistry.eu - %
@@ -30,8 +29,8 @@
\RequirePackage{ expl3 }
\ProvidesExplPackage
{chemformula}
- {2012/05/18}
- {3.3b}
+ {2012/07/24}
+ {3.3d}
{typeset chemical compounds and reactions}
%-----------------------------------------------------------------------------%
@@ -726,6 +725,8 @@
\tl_set:Nn \l_chemformula_name_format_tl { \scriptsize\centering }
\tl_new:N \l_chemormula_sup_super_factor_tl
+\tl_new:N \l_chemformula_bond_style_tl
+
% dimensions:
\dim_new:N \l_chemformula_stoich_space_dim
\dim_set:Nn \l_chemformula_stoich_space_dim { .1667em }
@@ -756,9 +757,7 @@
\dim_new:N \l_chemformula_superscript_dim
\dim_zero:N \l_chemformula_superscript_dim
\dim_new:N \l_chemformula_bond_dim
- \hbox_set:Nn \l_tmpa_box { \textendash }
- \dim_set:Nn \l_chemformula_bond_dim { \box_wd:N \l_tmpa_box }
- \box_clear:N \l_tmpa_box
+ \dim_set:Nn \l_chemformula_bond_dim { 1.1667ex }
% integers:
\int_new:N \l_chemformula_count_tokens_int
@@ -845,7 +844,7 @@
%-----------------------------------------------------------------------------%
% bonds:
\dim_new:N \l_chemformula_bond_space_dim
-\dim_zero:N \l_chemformula_bond_space_dim
+\dim_set:Nn \l_chemformula_bond_space_dim { .07em }
\cs_new:Npn \chemformula_single_bond:
{
@@ -853,12 +852,19 @@
{ \chemformula_minus: }
{
\skip_horizontal:N \l_chemformula_bond_space_dim
- \chemformula_tikz:nn { inner~sep=0, outer~sep=0 }
+ \chemformula_tikz:nn
+ {
+ inner~sep = 0 ,
+ outer~sep = 0 ,
+ text~height = 1em ,
+ baseline = (chemformula-single-bond.base)
+ }
{
\draw node[draw=none,minimum~height=1em,minimum~width=0]
(chemformula-single-bond) at (0,0) {} ;
- \draw[butt~cap-butt~cap] (chemformula-single-bond) ++ (0,-.1716em)
- -- ++( \l_chemformula_bond_dim ,0) ;
+ \draw[butt~cap-butt~cap,\l_chemformula_bond_style_tl]
+ (chemformula-single-bond) ++ (0,-.1716em)
+ -- ++( \l_chemformula_bond_dim ,0);
}
\skip_horizontal:N \l_chemformula_bond_space_dim
}
@@ -867,7 +873,13 @@
\cs_new:Npn \chemformula_double_bond:
{
\skip_horizontal:N \l_chemformula_bond_space_dim
- \chemformula_tikz:nn { inner~sep=0, outer~sep=0 }
+ \chemformula_tikz:nn
+ {
+ inner~sep = 0 ,
+ outer~sep = 0 ,
+ text~height = 1em ,
+ baseline = (chemformula-double-bond.base)
+ }
{
\draw node[draw=none,minimum~height=1em,minimum~width=0]
(chemformula-double-bond) at (0,0) {} ;
@@ -884,7 +896,13 @@
\cs_new:Npn \chemformula_triple_bond:
{
\skip_horizontal:N \l_chemformula_bond_space_dim
- \chemformula_tikz:nn { inner~sep=0, outer~sep=0 }
+ \chemformula_tikz:nn
+ {
+ inner~sep = 0 ,
+ outer~sep = 0 ,
+ text~height = 1em ,
+ baseline = (chemformula-triple-bond.base)
+ }
{
\draw node[draw=none,minimum~height=1em,minimum~width=0]
(chemformula-triple-bond) at (0,0) {} ;
@@ -1723,6 +1741,7 @@
} ,
bond-length .dim_set:N = \l_chemformula_bond_dim ,
bond-offset .dim_set:N = \l_chemformula_bond_space_dim ,
+ bond-style .tl_set:N = \l_chemformula_bond_style_tl ,
font-family .code:n =
\bool_set_true:N \l_chemformula_fss_bool
\bool_set_false:N \l_chemformula_fontspec_bool
@@ -1791,11 +1810,19 @@ VERSION HISTORY
- fix of unexpected behaviour in the compound naming
mechanism
2012/05/18 - version 3.3b - compatibility with MiKTeX
+2012/05/18 - version 3.3c - fix in the `ghsystem/language' option
+2012/07/24 - version 3.3d - additional picture file type `pdf'
+ - default bond length set to 1.1667ex
+ - bug fix in the bonds
+ - added kerning to cip commands, new option
+ `iupac/cip-kern'
+ - bug fix: messages needed to be defined before the
+ options
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% TODO
-- Bug: \ch{ !(bla)( Fe(CO)6^3+ ) } ermöglichen
-- Hoch- und Tiefstellungen mit \box_move_up:nn et.al. umschreiben.
+- Option, die den Punkt . in \ch zum Radikal-Punkt macht, evtl \chemformula_radical:
+ an chemfigs \lewis anpassen
- Bindungen nach einem Mechanismus ähnlich der Pfeile konstruieren
=> Möglichkeit, eigene Bindungen hinzuzufügen, Bindungen leichter um weitere
Typen erweitern
@@ -1803,6 +1830,6 @@ VERSION HISTORY
=> Makro \bond{<type>}?
- Addukte: Zahlen nach * und . automatisch erkennen?
- allow fractions in subscripts: _{$\frac{1}{2}$} ?
-- optionale argumente von \\ nach außen weiterreichen?
+- optionale Argumente von \\ nach außen weiterreichen?
- vertikalen Shift der Hoch- und Tiefstellungen mit \mathchoice anpassen:
\( K = \frac{[\ch{Na+}]^2[\ch{SO4^2-}]}{[\ch{Na2SO4}]} \) \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
index 806515e9b58..306df5dfbb9 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
@@ -5,7 +5,6 @@
% - macros and commands for chemists - %
% --------------------------------------------------------------------------- %
% - Clemens Niederberger - %
-% - 2012/05/18 - %
% --------------------------------------------------------------------------- %
% - https://bitbucket.org/cgnieder/chemmacros/ - %
% - contact@mychemistry.eu - %
@@ -33,8 +32,8 @@
\ProvidesExplPackage
{chemmacros}
- {2012/05/18}
- {3.3b}
+ {2012/07/24}
+ {3.3d}
{macros and commands for chemists}
\@ifpackageloaded { chemformula } {} { \RequirePackage { chemformula } }
@@ -80,6 +79,189 @@
}
% --------------------------------------------------------------------------- %
+% warning / error messages
+\cs_new:Npn \chemmacros_msg:nnxx #1#2#3#4
+ {
+ \bool_if:NTF \l_chemmacros_strict_bool
+ { \msg_error:nnxx { #1 } { #2 } { #3 } { #4 } }
+ { \msg_warning:nnxx { #1 } { #2 } { #3 } { #4 } }
+ }
+
+\msg_set:nnnn { chemmacros } { language-not-defined }
+ {
+ The~language~#1~is~not~defined~by~chemmacros.
+ }
+ {
+ You~chose~the~language~`#1'~which~is~not~defined~by~chemmacros.~`english'~is
+ ~used~instead.~If~you~just~mistyped~try~again!~Otherwise~contact~the~author~
+ and~he'll~probably~add~your~language.
+ }
+
+\msg_set:nnnn { chemmacros } { already-defined }
+ {
+ The~command~#1~has~also~been~defined~by~another~package.
+ }
+ {
+ The~command~#1~has~also~been~defined~by~another~package.~
+ chemmacros~provides~an~alternative~definition.~
+ See~the~documentation~for~more~information.
+ }
+
+\msg_set:nnnn { chemmacros } { option-deprecated }
+ { The~option~#1~is~deprecated.~I~will~ignore~it. }
+ {
+ The~package~option~#1~is~deprecated~and~not~used~by~chemmacros~any~more.
+ ~It~will~therefore~simply~be~ignored.
+ }
+
+\msg_set:nnnn { chemmacros } { command-deprecated }
+ {
+ The~command~\token_to_str:N #1 \c_space_tl is~deprecated.~Use~
+ \token_to_str:N #2 \c_space_tl instead.
+ }
+ {
+ The~command~\token_to_str:N #1 \c_space_tl is~deprecated.~Use~
+ \token_to_str:N #2 \c_space_tl instead.
+ }
+
+\msg_set:nnnn { chemmacros } { command-dropped }
+ { The~command~\token_to_str:N #1 \c_space_tl has~been~dropped.~I'm~sorry. }
+ { The~command~\token_to_str:N #1 \c_space_tl has~been~dropped.~I'm~sorry. }
+
+\msg_set:nnnn { chemmacros } { declare-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 \DeclareChemParticle,
+ ~but~the~command~sequence~ \token_to_str:N #1 \c_space_tl already~exists.
+ ~Please~choose~another~name.
+ }
+
+\msg_set:nnnn { chemmacros } { renew-particle }
+ { The~particle~ \token_to_str:N #1 \c_space_tl is~not~defined. }
+ {
+ You've~tried~to~renew~the~particle~\token_to_str:N #1 ,~but~it~doesn't~
+ exist.
+ }
+
+\msg_set:nnnn { chemmacros } { declare-latin }
+ {
+ The~command~sequence~ \token_to_str:N #1 \c_space_tl is~already~defined.
+ }
+ {
+ You've~tried~to~define~a~latin~phrase~with~\token_to_str:N
+ \DeclareChemLatin,~but~the~command~sequence~ \token_to_str:N #1 \c_space_tl
+ already~exists.~Please~choose~another~name.
+ }
+
+\msg_set:nnnn { chemmacros } { renew-latin }
+ { The~latin~phrase \token_to_str:N #1 \c_space_tl is~not~defined. }
+ {
+ You've~tried~to~renew~the~latin~phrase~\token_to_str:N #1 ,~but~it~doesn't~
+ exist.
+ }
+
+\msg_set:nnnn { chemmacros } { declare-nmr }
+ {
+ The~command~sequence~ \token_to_str:N #1 \c_space_tl is~already~defined.
+ }
+ {
+ You've~tried~to~define~a~NMR~command~with~\token_to_str:N
+ \DeclareChemParticle, ~but~the~command~sequence~ \token_to_str:N #1
+ \c_space_tl already~exists.~Please~choose~another~name.
+ }
+
+\msg_set:nnnn { chemmacros } { renew-nmr }
+ { The~NMR~command~ \token_to_str:N #1 \c_space_tl is~not~defined. }
+ {
+ You've~tried~to~renew~the~NMR~command~\token_to_str:N #1 ,~but~it~doesn't~
+ exist.
+ }
+
+\msg_set:nnnn { chemmacros } { declare-phase }
+ {
+ 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 \DeclareChemPhase ,
+ ~but~the~command~sequence~ \token_to_str:N #1 \c_space_tl already~exists.
+ ~Please~choose~another~name.
+ }
+
+\msg_set:nnnn { chemmacros } { renew-phase }
+ { The~phase~ \token_to_str:N #1 \c_space_tl is~not~defined. }
+ {
+ You've~tried~to~renew~the~phase~\token_to_str:N #1 ,~but~it~doesn't~
+ exist.
+ }
+
+\msg_set:nnnn { chemmacros } { declare-iupac }
+ {
+ The~iupac~naming~command~ \token_to_str:N #1 \c_space_tl is~already~defined.
+ }
+ {
+ You've~tried~to~define~a~iupac~naming~command~with~\token_to_str:N
+ \DeclareChemIUPAC,~but~the~iupac~command~ \token_to_str:N #1 \c_space_tl
+ already~exists.~Choose~another~name~or~use~\token_to_str:N \RenewChemIUPAC .
+ }
+
+\msg_set:nnnn { chemmacros } { renew-iupac }
+ { The~iupac~naming~command~ \token_to_str:N #1 \c_space_tl is~not~defined. }
+ {
+ You've~tried~to~renew~the~iupac~command~\token_to_str:N #1 ,~but~it~doesn't~
+ exist.~Use~\token_to_str:N \DeclareChemIUPAC \c_space_tl instead .
+ }
+
+\msg_set:nnnn { chemmacros } { ox }
+ { \token_to_str:N \ox \c_space_tl : ~ #1 ~ \msg_line_context: . }
+ { \token_to_str:N \ox \c_space_tl : ~ #1 ~ \msg_line_context: . }
+
+\msg_set:nnnn { chemmacros } { OX }
+ { \token_to_str:N \OX \c_space_tl : ~ #1 ~ \msg_line_context: . }
+ { \token_to_str:N \OX \c_space_tl : ~ #1 ~ \msg_line_context: . }
+
+\msg_set:nnnn { chemmacros } { redox }
+ { \token_to_str:N \redox \c_space_tl : ~ #1 ~ \msg_line_context: . }
+ { \token_to_str:N \redox \c_space_tl : ~ #1 ~ \msg_line_context: . }
+
+\msg_set:nnnn { chemmacros } { chemfig }
+ {
+ You~need~to~load~the~chemfig~package~in~order~to~make~
+ \exp_after:wN \token_to_str:N \cs:w #1 \cs_end: \c_space_tl
+ work~properly~\msg_line_context: .
+ }
+ {
+ You~need~to~load~the~chemfig~package~in~order~to~make~
+ \exp_after:wN \token_to_str:N \cs:w #1 \cs_end: \c_space_tl
+ work~properly~\msg_line_context: .
+ }
+
+\msg_set:nnnn { chemmacros } { DeclareChemState }
+ {
+ The~state~ \exp_after:wN \token_to_str:N \cs:w #1 \cs_end:
+ \c_space_tl already~exists.~You~need~to~use~
+ \token_to_str:N \RenewChemState \c_space_tl to~alter~it.
+ }
+ {
+ The~state~ \exp_after:wN \token_to_str:N \cs:w #1 \cs_end:
+ \c_space_tl already~exists.~You~need~to~use~
+ \token_to_str:N \RenewChemState \c_space_tl to~alter~it.
+ }
+
+\msg_set:nnnn { chemmacros } { RenewChemState }
+ {
+ The~state~\exp_after:wN \token_to_str:N \cs:w #1 \cs_end:
+ \c_space_tl isn't~set~up~yet.~You~need~to~use~
+ \token_to_str:N \DeclareChemState \c_space_tl to~create~it.
+ }
+ {
+ The~state~\exp_after:wN \token_to_str:N \cs:w #1 \cs_end:
+ \c_space_tl isn't~set~up~yet.~You~need~to~use~
+ \token_to_str:N \DeclareChemState \c_space_tl to~create~it.
+ }
+
+% --------------------------------------------------------------------------- %
% package options
% bpchem => use \IUPAC inside for \NMR command
% circled => circle charges
@@ -143,11 +325,9 @@
EZ .code:n =
\chemmacros_msg:nnxx { chemmacros } { option-deprecated } { EZ } {} ,
german .code:n =
- \chemmacros_msg:nnxx { chemmacros } { option-deprecated }
- { german } {} ,
+ \tl_set:Nn \l_chemmacros_language_tl { german } ,
ngerman .code:n =
- \chemmacros_msg:nnxx { chemmacros } { option-deprecated }
- { ngerman } {} ,
+ \tl_set:Nn \l_chemmacros_language_tl { ngerman } ,
ghsystem .bool_set:N = \l_chemmacros_ghsystem_bool ,
ghsystem .default:n = true ,
iupac .choice: ,
@@ -216,13 +396,13 @@
% --------------------------------------------------------------------------- %
% language settings:
\prop_new:N \l_chemmacros_language_prop
-\prop_put:Nnn \l_chemmacros_language_prop { english } { english }
+\prop_put:Nnn \l_chemmacros_language_prop { english } { english }
\prop_put:Nnn \l_chemmacros_language_prop { american } { english }
-\prop_put:Nnn \l_chemmacros_language_prop { british } { english }
-\prop_put:Nnn \l_chemmacros_language_prop { german } { german }
-\prop_put:Nnn \l_chemmacros_language_prop { ngerman } { german }
-\prop_put:Nnn \l_chemmacros_language_prop { italian } { italian }
-\prop_put:Nnn \l_chemmacros_language_prop { french } { french }
+\prop_put:Nnn \l_chemmacros_language_prop { british } { english }
+\prop_put:Nnn \l_chemmacros_language_prop { german } { german }
+\prop_put:Nnn \l_chemmacros_language_prop { ngerman } { german }
+\prop_put:Nnn \l_chemmacros_language_prop { italian } { italian }
+\prop_put:Nnn \l_chemmacros_language_prop { french } { french }
\prop_map_inline:Nn \l_chemmacros_language_prop
{
@@ -342,168 +522,6 @@
}
% --------------------------------------------------------------------------- %
-% warning / error messages
-\cs_new:Npn \chemmacros_msg:nnxx #1#2#3#4
- {
- \bool_if:NTF \l_chemmacros_strict_bool
- { \msg_error:nnxx { #1 } { #2 } { #3 } { #4 } }
- { \msg_warning:nnxx { #1 } { #2 } { #3 } { #4 } }
- }
-
-\msg_set:nnnn { chemmacros } { language-not-defined }
- {
- The~language~#1~is~not~defined~by~chemmacros.
- }
- {
- You~chose~the~language~`#1'~which~is~not~defined~by~chemmacros.~`english'~is
- ~used~instead.~If~you~just~mistyped~try~again!~Otherwise~contact~the~author~
- and~he'll~probably~add~your~language.
- }
-
-\msg_set:nnnn { chemmacros } { already-defined }
- {
- The~command~#1~has~also~been~defined~by~another~package.
- }
- {
- The~command~#1~has~also~been~defined~by~another~package.~
- chemmacros~provides~an~alternative~definition.~
- See~the~documentation~for~more~information.
- }
-
-\msg_set:nnn { chemmacros } { option-deprecated }
- { The~option~#1~is~deprecated.~I~will~ignore~it. }
-
-\msg_set:nnn { chemmacros } { command-deprecated }
- {
- The~command~\token_to_str:N #1 \c_space_tl is~deprecated.~Use~
- \token_to_str:N #2 \c_space_tl instead.
- }
-
-\msg_set:nnn { chemmacros } { command-dropped }
- { The~command~\token_to_str:N #1 \c_space_tl has~been~dropped.~I'm~sorry. }
-
-\msg_set:nnnn { chemmacros } { declare-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 \DeclareChemParticle,
- ~but~the~command~sequence~ \token_to_str:N #1 \c_space_tl already~exists.
- ~Please~choose~another~name.
- }
-
-\msg_set:nnnn { chemmacros } { renew-particle }
- { The~particle~ \token_to_str:N #1 \c_space_tl is~not~defined. }
- {
- You've~tried~to~renew~the~particle~\token_to_str:N #1 ,~but~it~doesn't~
- exist.
- }
-
-\msg_set:nnnn { chemmacros } { declare-latin }
- {
- The~command~sequence~ \token_to_str:N #1 \c_space_tl is~already~defined.
- }
- {
- You've~tried~to~define~a~latin~phrase~with~\token_to_str:N
- \DeclareChemLatin,~but~the~command~sequence~ \token_to_str:N #1 \c_space_tl
- already~exists.~Please~choose~another~name.
- }
-
-\msg_set:nnnn { chemmacros } { renew-latin }
- { The~latin~phrase \token_to_str:N #1 \c_space_tl is~not~defined. }
- {
- You've~tried~to~renew~the~latin~phrase~\token_to_str:N #1 ,~but~it~doesn't~
- exist.
- }
-
-\msg_set:nnnn { chemmacros } { declare-nmr }
- {
- The~command~sequence~ \token_to_str:N #1 \c_space_tl is~already~defined.
- }
- {
- You've~tried~to~define~a~NMR~command~with~\token_to_str:N
- \DeclareChemParticle, ~but~the~command~sequence~ \token_to_str:N #1
- \c_space_tl already~exists.~Please~choose~another~name.
- }
-
-\msg_set:nnnn { chemmacros } { renew-nmr }
- { The~NMR~command~ \token_to_str:N #1 \c_space_tl is~not~defined. }
- {
- You've~tried~to~renew~the~NMR~command~\token_to_str:N #1 ,~but~it~doesn't~
- exist.
- }
-
-\msg_set:nnnn { chemmacros } { declare-phase }
- {
- 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 \DeclareChemPhase ,
- ~but~the~command~sequence~ \token_to_str:N #1 \c_space_tl already~exists.
- ~Please~choose~another~name.
- }
-
-\msg_set:nnnn { chemmacros } { renew-phase }
- { The~phase~ \token_to_str:N #1 \c_space_tl is~not~defined. }
- {
- You've~tried~to~renew~the~phase~\token_to_str:N #1 ,~but~it~doesn't~
- exist.
- }
-
-\msg_set:nnnn { chemmacros } { declare-iupac }
- {
- The~iupac~naming~command~ \token_to_str:N #1 \c_space_tl is~already~defined.
- }
- {
- You've~tried~to~define~a~iupac~naming~command~with~\token_to_str:N
- \DeclareChemIUPAC,~but~the~iupac~command~ \token_to_str:N #1 \c_space_tl
- already~exists.~Choose~another~name~or~use~\token_to_str:N \RenewChemIUPAC .
- }
-
-\msg_set:nnnn { chemmacros } { renew-iupac }
- { The~iupac~naming~command~ \token_to_str:N #1 \c_space_tl is~not~defined. }
- {
- You've~tried~to~renew~the~iupac~command~\token_to_str:N #1 ,~but~it~doesn't~
- exist.~Use~\token_to_str:N \DeclareChemIUPAC \c_space_tl instead .
- }
-
-\msg_set:nnn { chemmacros } { ox }
- {
- \token_to_str:N \ox \c_space_tl : ~ #1 ~ \msg_line_context: .
- }
-
-\msg_set:nnn { chemmacros } { OX }
- {
- \token_to_str:N \OX \c_space_tl : ~ #1 ~ \msg_line_context: .
- }
-
-\msg_set:nnn { chemmacros } { redox }
- {
- \token_to_str:N \redox \c_space_tl : ~ #1 ~ \msg_line_context: .
- }
-
-\msg_set:nnn { chemmacros } { chemfig }
- {
- You~need~to~load~the~chemfig~package~in~order~to~make~
- \exp_after:wN \token_to_str:N \cs:w #1 \cs_end: \c_space_tl
- work~properly~\msg_line_context: .
- }
-
-\msg_set:nnn { chemmacros } { DeclareChemState }
- {
- The~state~ \exp_after:wN \token_to_str:N \cs:w #1 \cs_end:
- \c_space_tl already~exists.~You~need~to~use~
- \token_to_str:N \RenewChemState \c_space_tl to~alter~it.
- }
-
-\msg_set:nnn { chemmacros } { RenewChemState }
- {
- The~state~\exp_after:wN \token_to_str:N \cs:w #1 \cs_end:
- \c_space_tl isn't~set~up~yet.~You~need~to~use~
- \token_to_str:N \DeclareChemState \c_space_tl to~create~it.
- }
-
-% --------------------------------------------------------------------------- %
% TikZ drawings
\cs_new_nopar:Npn \chemmacros_tikz_picture:nn #1#2
{ \tikzpicture[#1] #2 \endtikzpicture }
@@ -1006,7 +1024,18 @@
% stereo descriptors and other nomenclature commands
% Cahn-Ingold-Prelog
-\NewDocumentCommand \cip { m } { \textit { (#1) } }
+\dim_new:N \l_chemmacros_cip_kern_dim
+\dim_set:Nn \l_chemmacros_cip_kern_dim { .05ex }
+\keys_define:nn { chemmacros / iupac }
+ { cip-kern .dim_set:N = \l_chemmacros_cip_kern_dim }
+
+\NewDocumentCommand \cip { m }
+ {
+ \cs_if_exist:NTF \EmbracOff
+ { \textit* { (#1) } }
+ { \textit { (#1) } }
+ \tex_kern:D \l_chemmacros_cip_kern_dim
+ }
\cs_new_protected_nopar:Npn \Rcip
{
@@ -1045,8 +1074,8 @@
\ExplSyntaxOn
% E(ntgegen)/Z(usammen)
-\DeclareChemIUPAC \E { \textit { (E) } }
-\DeclareChemIUPAC \Z { \textit { (Z) } }
+\DeclareChemIUPAC \E { \cip { E } }
+\DeclareChemIUPAC \Z { \cip { Z } }
% cis/trans & tert
\DeclareChemIUPAC \cis { \textit{ cis } }
@@ -3773,8 +3802,17 @@ Version history
2012/05/13 - version 3.3a - Italian translations of the H, EUH and P statements
- \hapto and \bridge
2012/05/18 - version 3.3b - compatibility with MiKTeX
+2012/05/18 - version 3.3c - fix in the `ghsystem/language' option
+2012/07/24 - version 3.3d - additional picture file type `pdf'
+ - default bond length set to 1.1667ex
+ - bug fix in the bonds
+ - added kerning to cip commands, new option
+ `iupac/cip-kern'
+ - bug fix: messages needed to be defined before the
+ options
% --------------------------------------------------------------------------- %
% TODO:
- ox-option xfrac vs math?
-- drop option `bpchem' \ No newline at end of file
+- drop option `bpchem'
+- add d-orbitals \ 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 8f761435690..680b4b2da56 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty
@@ -5,7 +5,6 @@
% - macros and commands for chemists - %
% --------------------------------------------------------------------------- %
% - Clemens Niederberger - %
-% - 2012/05/18 - %
% --------------------------------------------------------------------------- %
% - https://bitbucket.org/cgnieder/chemmacros/ - %
% - contact@mychemistry.eu - %
@@ -30,8 +29,8 @@
\RequirePackage{ expl3 }
\ProvidesExplPackage
{ghsystem}
- {2012/05/18}
- {3.3b}
+ {2012/07/24}
+ {3.3d}
{globally harmonised system}
% --------------------------------------------------------------------------- %
@@ -194,7 +193,9 @@
% general options:
language .code:n =
\bool_set_true:c { l_ghsystem_#1_bool }
- \input { language / ghsystem_#1.def } \ExplSyntaxOn ,
+ \bool_if:NTF \l_ghsystem_language_directory_bool
+ { \input { language / ghsystem_#1.def } \ExplSyntaxOn }
+ { \input { ghsystem_#1.def } \ExplSyntaxOn } ,
% \ghs options:
hide .bool_set:N =
\l_ghsystem_hide_statement_bool ,
@@ -227,7 +228,7 @@
\fp_mul:Nn \l_ghsystem_picture_scale_fp { #1 } ,
includegraphics .code:n =
\tl_set:Nn \l_ghsystem_picture_includegraphics_tl { , #1 } ,
- pic-type .choices:nn = { eps , jpg , png }
+ pic-type .choices:nn = { eps , jpg , png , pdf }
{ \tl_set_eq:NN \l_ghsystem_picture_type_tl \l_keys_choice_tl } ,
% \ghslistall options:
table-head-number .tl_set:N = \l_ghsystem_identifier_tl ,
@@ -460,15 +461,15 @@
\bool_if:NT \l_ghsystem_engine_pdftex_bool
{
\ifpdf
- \tl_set:Nn \l_ghsystem_picture_type_tl { png }
+ \tl_set:Nn \l_ghsystem_picture_type_tl { pdf }
\else
\tl_set:Nn \l_ghsystem_picture_type_tl { eps }
\fi
}
\bool_if:NT \l_ghsystem_engine_xetex_bool
- { \tl_set:Nn \l_ghsystem_picture_type_tl { png } }
+ { \tl_set:Nn \l_ghsystem_picture_type_tl { pdf } }
\bool_if:NT \l_ghsystem_engine_luatex_bool
- { \tl_set:Nn \l_ghsystem_picture_type_tl { png } }
+ { \tl_set:Nn \l_ghsystem_picture_type_tl { pdf } }
% the command:
\NewDocumentCommand \ghspic { om }
@@ -524,6 +525,14 @@ VERSION HISTORY
- removed erroneous empty line at the end of the table
created by \ghslistall
2012/05/18 - version 3.3b - compatibility with MiKTeX
+2012/05/18 - version 3.3c - fix in the `ghsystem/language' option
+2012/07/24 - version 3.3d - additional picture file type `pdf'
+ - default bond length set to 1.1667ex
+ - bug fix in the bonds
+ - added kerning to cip commands, new option
+ `iupac/cip-kern'
+ - bug fix: messages needed to be defined before the
+ options
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% TODO:
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.pdf
new file mode 100644
index 00000000000..5ca4effd6f2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid-8.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.pdf
new file mode 100644
index 00000000000..7eb8489c952
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.png b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.png
index e94fe5fbddb..7a27249ca23 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.png
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_acid.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.pdf
new file mode 100644
index 00000000000..40e5d64e25a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_aqpol.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.pdf
new file mode 100644
index 00000000000..6667b224f3b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-black.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.pdf
new file mode 100644
index 00000000000..2556c4bcca1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle-2-white.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.pdf
new file mode 100644
index 00000000000..31fc21103ad
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_bottle.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.pdf
new file mode 100644
index 00000000000..884f741506e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_exclam.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.pdf
new file mode 100644
index 00000000000..c82e9d4633c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-1.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.pdf
new file mode 100644
index 00000000000..63013f23726
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-2.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.pdf
new file mode 100644
index 00000000000..f528677e245
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-3.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.pdf
new file mode 100644
index 00000000000..197c03ca1fc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-4.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.pdf
new file mode 100644
index 00000000000..4ddd9b2d7e4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-5.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.pdf
new file mode 100644
index 00000000000..f47125634c9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos-6.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.pdf
new file mode 100644
index 00000000000..657dc34e58f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_explos.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.pdf
new file mode 100644
index 00000000000..fbcd172554e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-black.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.pdf
new file mode 100644
index 00000000000..b63c284b18f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-2-white.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.pdf
new file mode 100644
index 00000000000..7551d69b937
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-black.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.pdf
new file mode 100644
index 00000000000..31d1cd82a86
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-3-white.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.pdf
new file mode 100644
index 00000000000..6950518c2c4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-1.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.pdf
new file mode 100644
index 00000000000..7fe6f32be88
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-2.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.pdf
new file mode 100644
index 00000000000..eac5a84f021
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-black.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.pdf
new file mode 100644
index 00000000000..a9d84a0f36d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-4-3-white.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.pdf
new file mode 100644
index 00000000000..21be517c0e2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-black.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.pdf
new file mode 100644
index 00000000000..b91f60acfa7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-5-2-white.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.pdf
new file mode 100644
index 00000000000..29ca127d4c0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O-5-1.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.pdf
new file mode 100644
index 00000000000..218fd767659
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame-O.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.pdf
new file mode 100644
index 00000000000..20e21ee5086
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_flame.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.pdf
new file mode 100644
index 00000000000..03c80179c6b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_health.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.pdf
new file mode 100644
index 00000000000..b905d8d08a8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-2.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.pdf
new file mode 100644
index 00000000000..060c8a7308e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull-6.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.pdf b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.pdf
new file mode 100644
index 00000000000..64ada217b35
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemmacros/pictures/ghsystem_skull.pdf
Binary files differ