diff options
author | Karl Berry <karl@freefriends.org> | 2019-11-17 22:32:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-11-17 22:32:31 +0000 |
commit | 3a29da9222c9516099c75309557dbb2904b7cb79 (patch) | |
tree | 06d5211aca8e1760f2345fdfe35d05bdef06df2a /Master/texmf-dist | |
parent | fecc550a4f745ccbfe977365d6644a32ca6afcd8 (diff) |
chemmacros (17nov19)
git-svn-id: svn://tug.org/texlive/trunk@52839 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/chemmacros.history | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf | bin | 973195 -> 947092 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex | 25 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex | 21 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty | 6 |
7 files changed, 36 insertions, 30 deletions
diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README index 2661b9f4271..d97f1818e4c 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/README +++ b/Master/texmf-dist/doc/latex/chemmacros/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the CHEMMACROS package v5.8e 2019/09/27 +the CHEMMACROS package v5.9 2019/11/17 comprehensive support for typesetting chemistry documents diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros.history b/Master/texmf-dist/doc/latex/chemmacros/chemmacros.history index 2b2429f9f8b..ac061221f78 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros.history +++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros.history @@ -381,3 +381,7 @@ Version history 2019/09/23 - version 5.8d - add some Norwegian translations (reactions, scheme) 2019/09/27 - version 5.8e - change `O{}' argument of reactions into `!O{}' (reactions) +2019/09/30 - version 5.8f - fix bug introduced in the last version +2019/11/17 - version 5.9 - correction: torr -> Torr (units) + - define latin phrases on the go instead of at begin + document diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf Binary files differindex b62e8b0501f..ee2ecb6eee3 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf +++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex index feb89102c4d..3fccfe76345 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex +++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex @@ -139,9 +139,14 @@ ]{geometry} -\expandafter\def\csname libertine@figurestyle\endcsname{LF} +\makeatletter +\def\libertine@figurestyle{LF} +\usepackage{amsmath} +\undef\lvert \undef\lVert +\undef\rvert \undef\rVert \usepackage[libertine]{newtxmath} -\expandafter\def\csname libertine@figurestyle\endcsname{OsF} +\def\libertine@figurestyle{OsF} +\makeatother \usepackage[biblatex]{embrac} \ChangeEmph{[}[,.02em]{]}[.055em,-.08em] @@ -1374,20 +1379,6 @@ existing ones: If you additionally load \pkg{chemstyle}~\cite{pkg:chemstyle} said package will \emph{not} define its own \cs{latin}. -% The package \pkg{chemstyle}~\cite{pkg:chemstyle} provides the command -% \cs{latin} to typeset common latin phrases in a consistent way. \chemmacros\ -% defines a similar \cs{latin} only if \pkg{chemstyle} has \emph{not} been -% loaded and additionally provides these commands: -% \begin{center} -% \cs{insitu} \insitu \quad -% \cs{abinitio} \abinitio \quad -% \cs{invacuo} \invacuo -% \end{center} - -% \emph{If the package \pkg{chemstyle} has been loaded they are defined using -% \pkg{chemstyle}'s \cs{latin} command. This means that then the appearance -% depends on \pkg{chemstyle}'s option \code{abbremph}.} - The last three commands mentioned above are defined through \begin{commands} \command{NewChemLatin}[\marg{cs}\marg{phrase}] @@ -3461,7 +3452,7 @@ units. Like all \pkg{siunitx} units they're only valid inside \command{Molar} \si{\Molar} \command{MolMass} \si{\MolMass} \command{normal} \si{\normal} - \command{torr} \si{\torr} + \command{Torr} \si{\Torr} \end{commands} By the way: \cs*{mmHg} \si{\mmHg} already is defined by \pkg{siunitx}. diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex index 596d36f65a1..9cb5969ed29 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex @@ -862,7 +862,9 @@ \chemmacros_latin:n {#2} \group_end: } +\EndChemCompatibility +\ChemCompatibilityBetween{5.7}{5.9} \AtBeginDocument { \AfterPackage* {chemstyle} { \cs_undefine:N \invacuo } @@ -870,7 +872,13 @@ \NewChemLatin \abinitio {ab~initio} \NewChemLatin \invacuo {in~vacuo} } +\EndChemCompatibility +\ChemCompatibilityFrom{5.9} +\cs_undefine:N \invacuo +\NewChemLatin \invacuo {in~vacuo} +\NewChemLatin \abinitio {ab~initio} +\NewChemLatin \insitu {in~situ} \EndChemCompatibility % -------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex index 18bf0e5b9ee..4584c8a631d 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex @@ -25,19 +25,21 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\ChemModule{units}{2015/09/28 chemical units} +\ChemModule{units}{2019/11/07 chemical units} \RequirePackage{siunitx} % -------------------------------------------------------------------------- -\DeclareSIUnit {\atm } {atm} -\DeclareSIUnit {\atmosphere} {atm} -\DeclareSIUnit {\calory } {cal} -\DeclareSIUnit {\cal } {cal} -\DeclareSIUnit {\moLar } {\mole\per\liter} -\DeclareSIUnit {\MolMass } {\gram\per\mole} -\DeclareSIUnit {\normal } {\textsc{n}} -\DeclareSIUnit {\torr } {torr} +\DeclareSIUnit \atm {atm} +\DeclareSIUnit \atmosphere {atm} +\DeclareSIUnit \calory {cal} +\DeclareSIUnit \cal {cal} +\DeclareSIUnit \moLar {\mole\per\liter} +\DeclareSIUnit \MolMass {\gram\per\mole} +\DeclareSIUnit \normal {\textsc{n}} +\chemmacros_if_compatibility:nnTF {<} {5.8g} + { \DeclareSIUnit \torr {torr} } + { \DeclareSIUnit \Torr {Torr} } \AtEndPreamble { @@ -53,4 +55,5 @@ \file_input_stop: 2015/09/28 - change \AtBeginDocument into \AtEndPreamble +2019/11/07 - correction torr -> Torr diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty index bb1e94bd3f9..3865e1a8608 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty @@ -31,10 +31,10 @@ % -------------------------------------------------------------------------- % package information: -\tl_const:Nn \c_chemmacros_date_tl {2019/09/30} +\tl_const:Nn \c_chemmacros_date_tl {2019/11/17} \tl_const:Nn \c_chemmacros_version_major_number_tl {5} -\tl_const:Nn \c_chemmacros_version_minor_number_tl {8} -\tl_const:Nn \c_chemmacros_version_subrelease_tl {f} +\tl_const:Nn \c_chemmacros_version_minor_number_tl {9} +\tl_const:Nn \c_chemmacros_version_subrelease_tl {} \tl_const:Nx \c_chemmacros_version_number_tl { \c_chemmacros_version_major_number_tl . |