summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-20 23:58:24 +0000
committerKarl Berry <karl@freefriends.org>2012-05-20 23:58:24 +0000
commitba135237e227af8d0a0cb28713636e65b95f7f2d (patch)
treeac35aa2bca31ce3acc235a6a85532daf4168be64 /Master
parentd66f3e2f4f5c746daae0c2368b939be05b451781 (diff)
chemmacros (18may12)
git-svn-id: svn://tug.org/texlive/trunk@26515 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/chemmacros/README4
-rw-r--r--Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdfbin792432 -> 792513 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex14
-rw-r--r--Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdfbin777496 -> 777566 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex8
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/chemformula.sty7
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty16
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty82
8 files changed, 86 insertions, 45 deletions
diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README
index 6bc54217db2..6d7810316e8 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.3a
+the CHEMMACROS bundle v3.3b
-> 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/05/13
+2012/05/18
--------------------------------------------------------------------------
This bundle succeeds the chemmacros package which is now part of the
bundle
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf
index 1997568c4b3..eb6a3688bff 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex
index 38d932a042e..9d914a17c17 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex
@@ -5,7 +5,7 @@
% - macros and commands for chemists
% -----------------------------------------------------------------------------
% - Clemens Niederberger
-% - 2012/05/13
+% - 2012/05/18
% -----------------------------------------------------------------------------
% - https://bitbucket.org/cgnieder/chemmacros/
% - contact@mychemistry.eu
@@ -139,8 +139,8 @@
electronvolt,ElPot,endo,Enthalpy,enthalpy,Entropy,footnotesize,fmch,fpch,fscrm,
fscrp,g,gas,ghs,ghslistall,ghspic,Gibbs,glqq,gram,grqq,H,hapto,HNMR,Helmholtz,
hertz,hspace,includegraphics,insitu,intertext,invacuo,iupac,IUPAC,J,joule,Ka,
- Kb,kilo,Kw,L,latin,lewis,Lewis,Lfi,listofreactions,lqd,mch,mega,meta,metre,
- mhName,midrule,milli,mmHg,mole,N,nano,nicefrac,newman,NMR,Nu,Nuc,num,O,ominus,
+ Kb,kilo,Kw,L,latin,lewis,Lewis,Lfi,listofreactions,lqd,ltn,mch,mega,meta,metre,
+ mhName,midrule,milli,mmHg,mole,N,nano,nicefrac,newman,NMR,Nu,Nuc,num,numrange,O,ominus,
orbital,ortho,oplus,ox,OX,p,P,para,pch,per,percent,pgfarrowsdeclarealias,
pgfarrowsrenewalias,pH,phase,photon,pKa,pKb,pOH,pos,positron,Pot,prt,R,Rad,
redox,RenewChemArrow,RenewChemIUPAC,RenewChemLatin,RenewChemNMR,
@@ -160,7 +160,7 @@
\section{Lizenz, Voraussetzungen und README}
Das \chemmacros-Bundle steht unter der \LaTeX\ Project Public License (LPPL) Version 1.3 oder später (\url{http://www.latex-project.org/lppl.txt}) und hat den Status „maintained“.
-Das \chemmacros-Bundle benötgt aktuelle Versionen der \paket{l3kernel}- und \paket{l3packages}-Bundles. Außerdem werden die Pakete \paket{siunitx}, \paket{mathtools}, \paket{bm}, \paket{nicefrac} und \paket{environ} sowie \paket*{tikz}\footnote{CTAN: \href{http://www.ctan.org/pkg/pgf/}{pgf}} und die \TikZ libraries \code{calc} und \code{arrows} benötigt.
+Das \chemmacros-Bundle benötigt aktuelle Versionen der \paket{l3kernel}- und \paket{l3packages}-Bundles. Außerdem werden die Pakete \paket{siunitx}, \paket{mathtools}, \paket{bm}, \paket{nicefrac} und \paket{environ} sowie \paket*{tikz}\footnote{CTAN: \href{http://www.ctan.org/pkg/pgf/}{pgf}} und die \TikZ libraries \code{calc} und \code{arrows} benötigt.
Die Paketoption \key{bpchem} (Abschnitt \ref{sec:optionen}) benötigt \paket{bpchem}, die Paketoption \key{xspace} benötigt \paket{xspace} und die Paketoption \key{method}{mhchem} benötigt \paket{mhchem}.
@@ -615,7 +615,7 @@ Wenn Sie \paket{chemstyle} \emph{nicht} geladen haben, können Sie das Erscheinu
\secidx*{Lateinische Ausdrücke}[Lateinische Ausdruecke]
\section{Einheiten für die Verwendung mit \textsf{siunitx}}\label{sec:einheiten}\secidx{Einheiten}
-In der Chemie sind einige nicht-SI-Einheiten sehr verbreitet. Das Paket \paket{siunitx} stellt den Befehl \lstinline+\DeclareSIUnit{<command>}{<unit>}+ zur Verfügung, um beliebige Einheiten zu definieren. \chemmacros verwendet diesen Befehl um die unten gelisteten Einheiten zu definieren. Wie alle \paket{siunitx}-Einheiten sind sie nur innerhalb von \lstinline+\SI{<num>}{<unit>}+ und \lstinline+\si{<unit>}+ gültig.
+In der Chemie sind einige nicht-SI-Einheiten sehr verbreitet. Das Paket \paket{siunitx} stellt den Befehl \lstinline+\DeclareSIUnit{<command>}{<unit>}+ zur Verfügung, um beliebige Einheiten zu definieren. \chemmacros verwendet diesen Befehl, um die unten gelisteten Einheiten zu definieren. Wie alle \paket{siunitx}-Einheiten sind sie nur innerhalb von \lstinline+\SI{<num>}{<unit>}+ und \lstinline+\si{<unit>}+ gültig.
\begin{beschreibung}
\befehl{atmosphere} \si{\atmosphere}
\befehl{atm} \si{\atm}
@@ -634,7 +634,7 @@ In der Chemie sind einige nicht-SI-Einheiten sehr verbreitet. Das Paket \paket{s
\secidx*{Einheiten}
\section{Säure/Base}\label{sec:saeure_base}\secidx{Säure/Base}[Saeure/Base]
-Einfache Darstellung von \pH, \pKa \ldots (der Befehl \cmd{pKa} hängt von der Paketoption \key{language} ab).
+Einfache Darstellung von \pH, \pKa \ldots\ (der Befehl \cmd{pKa} hängt von der Paketoption \key{language} ab).
\begin{beschreibung}
\befehl{pH} \pH
\befehl{pOH} \pOH
@@ -669,7 +669,7 @@ Es gibt eine Option, die den Stil, in dem das \p{} dargestellt wird, ändert:
\secidx*{Säure/Base}[Saeure/Base]
\section{Oxidationszahlen, reale und formale Ladungen}\label{sec:ladungen}
-\chemmacros unterscheidet zwischen realen ($+$/$-$) und formalen (\fplus/\fminus) Ladungssymbolen, siehe auch Abschnitt \ref{sec:optionen}. Alle Befehle, die formale Ladungen ausgeben, startem mit einem \code{f}.
+\chemmacros unterscheidet zwischen realen ($+$/$-$) und formalen (\fplus/\fminus) Ladungssymbolen, siehe auch Abschnitt \ref{sec:optionen}. Alle Befehle, die formale Ladungen ausgeben, starten mit einem \code{f}.
\subsection{Ionenladungen}\label{ssec:ionen}\secidx{Ionenladungen}
Einfache Verwendung von (realen) Ladungen:
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf
index b37f7f5dc05..3206d822ad0 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
index b32946b52e8..42513b3fc01 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
@@ -5,7 +5,7 @@
% - macros and commands for chemists
% -----------------------------------------------------------------------------
% - Clemens Niederberger
-% - 2012/05/13
+% - 2012/05/18
% -----------------------------------------------------------------------------
% - https://bitbucket.org/cgnieder/chemmacros/
% - contact@mychemistry.eu
@@ -138,8 +138,8 @@
electronvolt,ElPot,endo,Enthalpy,enthalpy,Entropy,footnotesize,fmch,fpch,fscrm,
fscrp,g,gas,ghs,ghslistall,ghspic,Gibbs,glqq,gram,grqq,H,hapto,HNMR,Helmholtz,
hertz,hspace,includegraphics,insitu,intertext,invacuo,iupac,IUPAC,J,joule,Ka,
- Kb,kilo,Kw,L,latin,lewis,Lewis,Lfi,listofreactions,lqd,mch,mega,meta,metre,
- mhName,midrule,milli,mmHg,mole,N,nano,nicefrac,newman,NMR,Nu,Nuc,num,O,ominus,
+ Kb,kilo,Kw,L,latin,lewis,Lewis,Lfi,listofreactions,lqd,ltn,mch,mega,meta,metre,
+ mhName,midrule,milli,mmHg,mole,N,nano,nicefrac,newman,NMR,Nu,Nuc,num,numrange,O,ominus,
orbital,ortho,oplus,ox,OX,p,P,para,pch,per,percent,pgfarrowsdeclarealias,
pgfarrowsrenewalias,pH,phase,photon,pKa,pKb,pOH,pos,positron,Pot,prt,R,Rad,
redox,RenewChemArrow,RenewChemIUPAC,RenewChemLatin,RenewChemNMR,
@@ -636,7 +636,7 @@ By the way: \lstinline+\mmHg+ \si{\mmHg} already is defined by \paket{siunitx} a
\secidx*{Units}
\section{Acid/Base}\label{sec:saeure_base}\secidx{Acid/Base}
-Easy representation of \pH, \pKa \ldots (the command \cmd{pKa} depends on the package option \key[option]{language}).
+Easy representation of \pH, \pKa \ldots\ (the command \cmd{pKa} depends on the package option \key[option]{language}).
\begin{beschreibung}
\befehl{pH} \pH
\befehl{pOH} \pOH
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
index 694a47ab3c9..14c5c4305ce 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
@@ -5,7 +5,7 @@
% - macros and commands for chemists - %
% --------------------------------------------------------------------------- %
% - Clemens Niederberger - %
-% - 2012/05/13 - %
+% - 2012/05/18 - %
% --------------------------------------------------------------------------- %
% - https://bitbucket.org/cgnieder/chemmacros/ - %
% - contact@mychemistry.eu - %
@@ -30,8 +30,8 @@
\RequirePackage{ expl3 }
\ProvidesExplPackage
{chemformula}
- {2012/05/13}
- {3.3a}
+ {2012/05/18}
+ {3.3b}
{typeset chemical compounds and reactions}
%-----------------------------------------------------------------------------%
@@ -1790,6 +1790,7 @@ VERSION HISTORY
2012/05/13 - version 3.3a - Italian translations of the H, EUH and P statements
- fix of unexpected behaviour in the compound naming
mechanism
+2012/05/18 - version 3.3b - compatibility with MiKTeX
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% TODO
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
index ef22313ddd7..806515e9b58 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
@@ -5,7 +5,7 @@
% - macros and commands for chemists - %
% --------------------------------------------------------------------------- %
% - Clemens Niederberger - %
-% - 2012/05/13 - %
+% - 2012/05/18 - %
% --------------------------------------------------------------------------- %
% - https://bitbucket.org/cgnieder/chemmacros/ - %
% - contact@mychemistry.eu - %
@@ -33,8 +33,8 @@
\ProvidesExplPackage
{chemmacros}
- {2012/05/13}
- {3.3a}
+ {2012/05/18}
+ {3.3b}
{macros and commands for chemists}
\@ifpackageloaded { chemformula } {} { \RequirePackage { chemformula } }
@@ -2261,7 +2261,11 @@
\cs_set_nopar:cpn { #1 }
{
\bool_if:NTF \l_chemmacros_phases_sub_bool
- { \ensuremath { \c_math_subscript_token { \text { (#2) } } } }
+ {
+ \bool_if:NTF \l_chemformula_inside_ch_bool
+ { \chemformula_subscript:n { ( #2 ) } }
+ { \ensuremath { \c_math_subscript_token { \text { (#2) } } } }
+ }
{
\ensuremath
{
@@ -3768,7 +3772,9 @@ Version history
- proper language support
2012/05/13 - version 3.3a - Italian translations of the H, EUH and P statements
- \hapto and \bridge
+2012/05/18 - version 3.3b - compatibility with MiKTeX
% --------------------------------------------------------------------------- %
% TODO:
-- ox-option xfrac vs math? \ No newline at end of file
+- ox-option xfrac vs math?
+- drop option `bpchem' \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty b/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty
index 7c85ca96765..8f761435690 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty
@@ -5,7 +5,7 @@
% - macros and commands for chemists - %
% --------------------------------------------------------------------------- %
% - Clemens Niederberger - %
-% - 2012/05/13 - %
+% - 2012/05/18 - %
% --------------------------------------------------------------------------- %
% - https://bitbucket.org/cgnieder/chemmacros/ - %
% - contact@mychemistry.eu - %
@@ -30,8 +30,8 @@
\RequirePackage{ expl3 }
\ProvidesExplPackage
{ghsystem}
- {2012/05/13}
- {3.3a}
+ {2012/05/18}
+ {3.3b}
{globally harmonised system}
% --------------------------------------------------------------------------- %
@@ -139,30 +139,47 @@
% language settings
\bool_new:N \l_ghsystem_language_file_loaded_bool
-\prop_map_inline:Nn \l_chemmacros_language_prop
+\bool_new:N \l_ghsystem_language_directory_bool
+\file_if_exist:nTF { language / ghsystem_english_def }
+ { \bool_set_true:N \l_ghsystem_language_directory_bool }
+ { \bool_set_false:N \l_ghsystem_language_directory_bool }
+
+\bool_if:NTF \l_ghsystem_language_directory_bool
+ {
+ \prop_map_inline:Nn \l_chemmacros_language_prop
+ {
+ \bool_if:cT { l_chemmacros_#1_bool }
+ {
+ \file_if_exist:nTF { language / ghsystem_#2.def }
+ {
+ \bool_set_true:N \l_ghsystem_language_file_loaded_bool
+ \input { language / ghsystem_#2.def } \ExplSyntaxOn
+ }
+ { \input { language / ghsystem_english.def } \ExplSyntaxOn }
+ }
+ }
+ }
{
- \bool_if:cT { l_chemmacros_#1_bool }
+ \prop_map_inline:Nn \l_chemmacros_language_prop
{
- \file_if_exist:nTF { language / ghsystem_#2.def }
+ \bool_if:cT { l_chemmacros_#1_bool }
{
- \bool_set_true:N \l_ghsystem_language_file_loaded_bool
- \input { language / ghsystem_#2.def } \ExplSyntaxOn
+ \file_if_exist:nTF { ghsystem_#2.def }
+ {
+ \bool_set_true:N \l_ghsystem_language_file_loaded_bool
+ \input { ghsystem_#2.def } \ExplSyntaxOn
+ }
+ { \input { ghsystem_english.def } \ExplSyntaxOn }
}
- { \input { language / ghsystem_english.def } \ExplSyntaxOn }
}
}
-% \bool_if:NT \l_chemmacros_german_bool
-% {
-% \bool_set_true:N \l_ghsystem_language_file_loaded_bool
-% \input { language / ghsystem_german.def } \ExplSyntaxOn
-% }
-% \bool_if:NT \l_chemmacros_italian_bool
-% {
-% \bool_set_true:N \l_ghsystem_language_file_loaded_bool
-% \input { language / ghsystem_italian.def } \ExplSyntaxOn
-% }
+
\bool_if:NF \l_ghsystem_language_file_loaded_bool
- { \input { language / ghsystem_english.def } \ExplSyntaxOn }
+ {
+ \bool_if:NTF \l_ghsystem_language_directory_bool
+ { \input { language / ghsystem_english.def } \ExplSyntaxOn }
+ { \input { ghsystem_english.def } \ExplSyntaxOn }
+ }
\cs_new_nopar:Nn \ghsystem_booktabs:n
{
@@ -438,6 +455,8 @@
\xetex_if_engine:T { \bool_set_true:N \l_ghsystem_engine_xetex_bool }
\luatex_if_engine:T { \bool_set_true:N \l_ghsystem_engine_luatex_bool }
+\bool_new:N \l_ghsystem_picture_directory_bool
+
\bool_if:NT \l_ghsystem_engine_pdftex_bool
{
\ifpdf
@@ -454,14 +473,28 @@
% the command:
\NewDocumentCommand \ghspic { om }
{
+ \file_if_exist:nTF { pictures / ghsystem_ #2 . \l_ghsystem_picture_type_tl }
+ { \bool_set_true:N \l_ghsystem_picture_directory_bool }
+ { \bool_set_false:N \l_ghsystem_picture_directory_bool }
\group_begin:
\IfNoValueF { #1 } { \keys_set:nn { chemmacros / ghsystem } { #1 } }
- \ghsystem_includegraphics:xn
+ \bool_if:NTF \l_ghsystem_picture_directory_bool
{
- scale = \fp_to_tl:N \l_ghsystem_picture_scale_fp
- \l_ghsystem_picture_includegraphics_tl
+ \ghsystem_includegraphics:xn
+ {
+ scale = \fp_to_tl:N \l_ghsystem_picture_scale_fp
+ \l_ghsystem_picture_includegraphics_tl
+ }
+ { pictures / ghsystem_ #2 . \l_ghsystem_picture_type_tl }
+ }
+ {
+ \ghsystem_includegraphics:xn
+ {
+ scale = \fp_to_tl:N \l_ghsystem_picture_scale_fp
+ \l_ghsystem_picture_includegraphics_tl
+ }
+ { ghsystem_ #2 . \l_ghsystem_picture_type_tl }
}
- { pictures / ghsystem_ #2 . \l_ghsystem_picture_type_tl }
\group_end:
}
@@ -490,6 +523,7 @@ VERSION HISTORY
2012/05/13 - version 3.3a - Italian translations of the H, EUH and P statements
- removed erroneous empty line at the end of the table
created by \ghslistall
+2012/05/18 - version 3.3b - compatibility with MiKTeX
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% TODO: