summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-11 23:11:55 +0000
committerKarl Berry <karl@freefriends.org>2015-11-11 23:11:55 +0000
commit68684ca13f8f038010d042e35f61531772bbe206 (patch)
treea7ac7215d3a71efe62d79eba6348700b8d01108a
parent1d9414683ac75b19a10ac34fce703ebe7706e459 (diff)
chemgreek (11nov15)
git-svn-id: svn://tug.org/texlive/trunk@38822 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/chemgreek/README2
-rw-r--r--Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.pdfbin716351 -> 738318 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.tex10
-rw-r--r--Master/texmf-dist/tex/latex/chemgreek/chemgreek.sty41
4 files changed, 47 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/latex/chemgreek/README b/Master/texmf-dist/doc/latex/chemgreek/README
index 6461fa5de57..6119c78e229 100644
--- a/Master/texmf-dist/doc/latex/chemgreek/README
+++ b/Master/texmf-dist/doc/latex/chemgreek/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the CHEMGREEK package v1.0a 2015/07/01
+the CHEMGREEK package v1.0b 2015/11/10
typeset chemical compounds and reactions
diff --git a/Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.pdf b/Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.pdf
index 69305654fc4..205a6d27fc8 100644
--- a/Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.pdf
+++ b/Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.tex b/Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.tex
index 2c2a28b827b..71841b183fd 100644
--- a/Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.tex
+++ b/Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.tex
@@ -30,7 +30,8 @@
%
% The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
-\documentclass[load-preamble+,scrartcl={listof=totoc}]{cnltx-doc}
+\documentclass[load-preamble+]{cnltx-doc}
+\KOMAoption{listof}{totoc}
\usepackage[utf8]{inputenc}
\usepackage{chemgreek}
\setcnltx{
@@ -58,7 +59,7 @@
index-setup = { level = \section , headers={\indexname}{\indexname} }
}
-\usepackage{booktabs}
+\usepackage{array,booktabs}
\expandafter\def\csname libertine@figurestyle\endcsname{LF}
\usepackage[libertine]{newtxmath}
@@ -115,7 +116,7 @@ in base \LaTeX.
\chemgreek{} offers a possibility to map those different interfaces to a
unified set of macros for usage in a chemistry package. This is useful as
-then for example names like \iupac{\b\-\D\-gluco|pyranose} can be typeset
+then for example names like \iupac{\b-\D-gluco|pyranose} can be typeset
with a semantic interface and still have matching greek letters while the user
is not limited to a certain package or font. Consequently this package is
used by the \pkg{chemmacros} package~\cite{pkg:chemmacros} and its \acs{iupac}
@@ -301,6 +302,7 @@ use a font that has the Greek glyphs.
upgreek & \pkg{upgreek} \cite{pkg:upgreek} \\
newtx & \pkg*{newtxmath} \cite{pkg:newtx} \\
kpfonts & \pkg{kpfonts} \cite{pkg:kpfonts} \\
+ pxgreeks & \pkg{pxgreeks} \cite{pkg:pxgreeks} \\
mathdesign & \pkg{mathdesign} \cite{pkg:mathdesign} \\
fourier & \pkg{fourier} \cite{pkg:fourier} \\
textalpha & \pkg{textalpha} \cite{bnd:greek-fontenc} \\
@@ -438,10 +440,12 @@ following commands:
\demonstratemapping{upgreek}
\demonstratemapping{newtx}
\demonstratemapping{kpfonts}
+\demonstratemapping{pxgreeks}
\demonstratemapping[utopia]{mathdesign}
\demonstratemapping[charter]{mathdesign}
\demonstratemapping{fourier}
\demonstratemapping{textalpha}
+
\subsection{Mapping `\texttt{fontspec}' with Font `Linux Libertine'}
\includegraphics{chemgreek-fontspec.pdf}
diff --git a/Master/texmf-dist/tex/latex/chemgreek/chemgreek.sty b/Master/texmf-dist/tex/latex/chemgreek/chemgreek.sty
index 6b8a14674c6..570e1f24fda 100644
--- a/Master/texmf-dist/tex/latex/chemgreek/chemgreek.sty
+++ b/Master/texmf-dist/tex/latex/chemgreek/chemgreek.sty
@@ -28,8 +28,8 @@
% --------------------------------------------------------------------------
\RequirePackage{expl3,xparse}
\ExplSyntaxOn
-\tl_const:Nn \c_chemgreek_date_tl {2015/07/01}
-\tl_const:Nn \c_chemgreek_version_tl {1.0a}
+\tl_const:Nn \c_chemgreek_date_tl {2015/11/10}
+\tl_const:Nn \c_chemgreek_version_tl {1.0b}
\tl_const:Nn \c_chemgreek_info_tl {interface for upright greek letters for use in chemistry}
\ProvidesExplPackage{chemgreek}
@@ -554,6 +554,7 @@
% ----------------------------------------------------------------------------
% drop old macro names that started with an uppercase C:
+% remove this in March 2016
\cs_new_protected:Npn \chemgreek_drop_symbol:n #1
{ \chemgreek_define_dropped:cc { Chem#1 } { chem#1 } }
@@ -943,6 +944,41 @@
\mbox{\textomega} / \mbox{\textOmega} % 24
}
+% pxgreeks: \iftgs@itupper
+\cs_new:Npn \__chemgreek_upxgreeks:n #1
+ {
+ \chemgreek_latex_if:nTF { tgs@itupper }
+ { \ensuremath { \use:c { other #1 } } }
+ { \ensuremath { \use:c { #1 } } }
+ }
+\chemgreek_new_mapping:nnn {pxgreeks} {pxgreeks}
+ {
+ \ensuremath{\alphaup} / \ensuremath{\mathrm{A}} , % 1
+ \ensuremath{\betaup} / \ensuremath{\mathrm{B}} , % 2
+ \ensuremath{\gammaup} / \__chemgreek_upxgreeks:n {Gamma} , % 3
+ \ensuremath{\deltaup} / \__chemgreek_upxgreeks:n {Delta} , % 4
+ \ensuremath{\epsilonup} / \ensuremath{\mathrm{E}} , % 5
+ \ensuremath{\zetaup} / \ensuremath{\mathrm{Z}} , % 6
+ \ensuremath{\etaup} / \ensuremath{\mathrm{H}} , % 7
+ \ensuremath{\thetaup} / \__chemgreek_upxgreeks:n {Theta} , % 8
+ \ensuremath{\iotaup} / \ensuremath{\mathrm{I}} , % 9
+ \ensuremath{\kappaup} / \ensuremath{\mathrm{K}} , % 10
+ \ensuremath{\lambdaup} / \__chemgreek_upxgreeks:n {Lambda} , % 11
+ \ensuremath{\muup} / \ensuremath{\mathrm{M}} , % 12
+ \ensuremath{\nuup} / \ensuremath{\mathrm{N}} , % 13
+ \ensuremath{\xiup} / \__chemgreek_upxgreeks:n {Xi} , % 14
+ \ensuremath{\omicronup} / \ensuremath{\mathrm{O}} , % 15
+ \ensuremath{\piup} / \__chemgreek_upxgreeks:n {Pi} , % 16
+ \ensuremath{\rhoup} / \ensuremath{\mathrm{R}} , % 17
+ \ensuremath{\sigmaup} / \__chemgreek_upxgreeks:n {Sigma} , % 18
+ \ensuremath{\tauup} / \ensuremath{\mathrm{T}} , % 19
+ \ensuremath{\upsilonup} / \__chemgreek_upxgreeks:n {Upsilon} , % 20
+ \ensuremath{\phiup} / \__chemgreek_upxgreeks:n {Phi} , % 21
+ \ensuremath{\psiup} / \__chemgreek_upxgreeks:n {Psi} , % 22
+ \ensuremath{\chiup} / \ensuremath{\mathrm{X}} , % 23
+ \ensuremath{\omegaup} / \__chemgreek_upxgreeks:n {Omega} % 24
+ }
+
% ----------------------------------------------------------------------------
% default activating of a mapping if a corresponding package has been loaded.
@@ -1054,6 +1090,7 @@ HISTORY:
\chemgreek_new_mapping_alias:nn ,
\chemgreek_renew_mapping_alias:nn
2015/07/01 - v1.0a - corrected `var-default' mapping
+2015/11/10 - v1.0b - new mapping `pxgreeks'
TODO: