From 6538616b6c48d003babe30809efa10c70a6ead51 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 6 Jul 2014 23:17:09 +0000 Subject: chemmacros (6jul14) git-svn-id: svn://tug.org/texlive/trunk@34532 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/chemmacros/README | 8 ++-- .../doc/latex/chemmacros/chemformula_en.pdf | Bin 950231 -> 955535 bytes .../doc/latex/chemmacros/chemformula_en.tex | 48 +++++++++++++++++++-- .../doc/latex/chemmacros/chemgreek_en.pdf | Bin 554906 -> 553883 bytes .../doc/latex/chemmacros/chemgreek_en.tex | 4 +- .../doc/latex/chemmacros/chemmacros_en.pdf | Bin 906210 -> 906472 bytes .../doc/latex/chemmacros/chemmacros_en.tex | 5 ++- .../doc/latex/chemmacros/ghsystem_en.pdf | Bin 789523 -> 789175 bytes .../doc/latex/chemmacros/ghsystem_en.tex | 19 ++++---- 9 files changed, 65 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/doc/latex/chemmacros') diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README index 11ca389c3b7..ccfff0f53f5 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/README +++ b/Master/texmf-dist/doc/latex/chemmacros/README @@ -1,8 +1,8 @@ -------------------------------------------------------------------------- -the CHEMMACROS bundle 2014/04/08 - - chemmacros package v4.5 -> macros and commands for chemists - - chemformula package v4.5 -> typeset chemical compounds and reactions - - ghsystem package v4.5 -> typeset H & P statements and pictograms +the CHEMMACROS bundle 2014/05/30 + - chemmacros package v4.5a -> macros and commands for chemists + - chemformula package v4.6 -> typeset chemical compounds and reactions + - ghsystem package v4.5b -> typeset H & P statements and pictograms from the globally harmonised system (GHS) - chemgreek package v0.4 -> handle mapping of upright greek letters to the \chemalpha ... commands diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf index c1e6ba8075d..f286057ff45 100644 Binary files a/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf and b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.tex index 00ebc3d13d8..a00165db17a 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.tex +++ b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.tex @@ -613,6 +613,21 @@ gives the excited state. \ch{NO^*} \end{example} +Actually\changedversion{4.5a} a dot \code{.} is not always treated as +indicator for a radical: if the dot in the superscript is followed by a number +it is interpreted as a decimal sign. It is typeset according to the option +\option{decimal-marker}. This may be a good place to mention that a comma +\code{,} in a superscript is also typeset according to +\option{decimal-marker}. + +\begin{example}[side-by-side] + \ch{^{22,98}_{11}Na} + \ch{^{22.98}_{11}Na}\par + \setchemformula{decimal-marker={,}} + \ch{^{22,98}_{11}Na} + \ch{^{22.98}_{11}Na} +\end{example} + Ions and ion composites with more than one charge can be typeset quite as easy: \begin{example}[side-by-side] @@ -629,6 +644,25 @@ superscript alignment. The \chemmacros\ option \code{circled} is obeyed by \ch{H+ + OH- <=> H2O} \end{example} +\chemformula{} knows the options \option{circled} and \option{circletype} also +on its own: + +There are coupled with \chemmacros{} options, \ie, setting \chemmacros' +options will also set \chemformula's equivalents. The other way around the +options act independently: setting \chemformula's options will \emph{not} set +\chemmacros' options. +\begin{options} + \keychoice{circled}{formal,\default{all},none}\Default{formal} + \chemformula\ uses two different kinds of charges which indicate the usage + of real ($+/-$) and formal (\fplus/\fminus) charges. The choice + \code{formal} distinguishes between them, choice \code{none} displays them + all without circle, choice \code{all} circles all. + % circletype + \keychoice{circletype}{\default{chem},math}\Default{chem} + This option switches between two kinds of circled charge symbols: + \cs{fplus} \fplus\ and \verbcode+$\oplus$+ $\oplus$. +\end{options} + \paragraph{Behaviour} The supercripts behave differently depending on their position in a compound, if there are super- and subscripts following each other directly. @@ -773,6 +807,14 @@ These options allow you to customize the ouptut of the compounds: Extra vertical shift of the superscripts. \keychoice{charge-style}{text,math}\Default{text} Style that is used to typeset the superscripts. + \keychoice{circled}{formal,\default{all},none}\Default{formal} + \sinceversion{4.6}Like \chemmacros' package option but local to + \chemformula's \cs{ch}. That is: since \chemmacros' macros use + \chemformula's mechanism this is effectively an alias. + \keychoice{circletype}{\default{chem},math}\Default{chem} + \sinceversion{4.6}Like \chemmacros' package option but local to + \chemformula's \cs{ch}. That is: since \chemmacros' macros use + \chemformula's mechanism this is effectively an alias. \keyval{adduct-space}{dim}\Default{.1333em} Space to the left and the right of the adduct point. \keyval{bond-length}{dim}\Default{.5833em} @@ -1477,7 +1519,7 @@ a \code{*} produce a little filled circle. In the Kröger-Vink notation a prime denotes a negative relative charge, the circle a positive relative charge, and the cross denotes a neutral relative charge. -\begin{example}[side-by-side] +\begin{example}[side-by-side,add-sourcecode-options={literate=}] \setchemformula{kroeger-vink=true} \ch{Al_{Al}^'} \ch{Al_{Al}'}\par @@ -1486,8 +1528,8 @@ the cross denotes a neutral relative charge. \ch{V_{Cl}^*}\par \ch{Ca_i^{..}}\par \ch{e^'}\par - \ch{Cl_i^{''}} - \ch{Cl_i''}\par + \ch{Cl_i^'} + \ch{Cl_i'}\par \ch{O_i^{''}} \ch{O_i''} \end{example} diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf index 2bc8bcd89d8..d426bc38a8e 100644 Binary files a/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf and b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.tex index c26422e4167..6df2ffb9498 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.tex +++ b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.tex @@ -1,7 +1,7 @@ % arara: pdflatex: { shell: on } -% !arara: biber +% arara: biber +% arara: pdflatex % arara: pdflatex -% !arara: pdflatex % -------------------------------------------------------------------------- % the CHEMMACROS bundle % chemgreek_en.tex diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf index cb13c1ad0ea..e0c00723c65 100644 Binary files a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf and b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex index bc5bcc0d24e..0c49bb435cd 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex +++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex @@ -216,6 +216,8 @@ author = {R. Panico and W. H. Powell and J-C. Richer}, title = {``Nomenclature of Organic Chemistry, Sections A, B, C, D, E, F, and H'', \acs{iupac} Blue Book}, + sorttitle = {Nomenclature of Organic Chemistry} , + indexsorttitle = {Nomenclature of Organic Chemistry} , edition = {\mkbibacro{draft}}, date = {2004-10-07}, url = @@ -224,6 +226,7 @@ } @misc{eu:ghsystem_regulation, author = {{The European Parliament and The Council of the European Union}}, + sortname = {European Parliament and The Council of the European Union} , title = {Regulation (EC) No 1272/2008 of the European Parliament and of the Council} , subtitle = {on classification, labelling and packaging of substances and @@ -446,7 +449,7 @@ you load them explicitly any given option will silently fail. Options can then only be set using the setup command. \begin{options} % circled - \keychoice{circled}{\default{formal},all,none}\Module{option}\Default{formal} + \keychoice{circled}{formal,\default{all},none}\Module{option}\Default{formal} \chemmacros\ uses two different kinds of charges which indicate the usage of real ($+/-$) and formal (\fplus/\fminus) charges. The option \code{formal} distinguishes between them, option \code{none} displays them diff --git a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf index f52b8a18b42..695c1e0242d 100644 Binary files a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf and b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.tex b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.tex index aa0d6b971e4..b345dd08df1 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.tex +++ b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.tex @@ -1,6 +1,6 @@ % arara: pdflatex -% !arara: biber -% !arara: pdflatex +% arara: biber +% arara: pdflatex % arara: pdflatex % -------------------------------------------------------------------------- % the CHEMMACROS bundle @@ -517,16 +517,17 @@ pictograms. You are free to choose the picture type yourself with the option \end{options} \section{Available Languages}\label{sec:ghsystem_language} -Right now the H and P statements are only available in English, German or -Italian. The package adapts \chemmacros' option \option{language} or if the -option hasn't been used recognizes the language settings made with \pkg{babel} -or \pkg{polyglossia}. To be more precise: the language selected at begin -document is recognized. Later changes won't affect \ghsystem. If you want to -use different languages you have to use \ghsystem's language option then. +Right now the H and P statements are only available in English, German, +Italian and Spanish. The package adapts \chemmacros' option \option{language} +or if the option hasn't been used recognizes the language settings made with +\pkg{babel} or \pkg{polyglossia}. To be more precise: the language selected +at begin document is recognized. Later changes won't affect \ghsystem. If +you want to use different languages you have to use \ghsystem's language +option then. You can also choose the language explicitly. \begin{options} - \keychoice{language}{english,german,italian}\Default{english} + \keychoice{language}{english,german,italian,spanish}\Default{english} Selects and loads language file. Falls back to \code{english} if the chosen file doesn't exist. \end{options} -- cgit v1.2.3