summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-20 22:56:46 +0000
committerKarl Berry <karl@freefriends.org>2016-12-20 22:56:46 +0000
commit7928d564344411b723438938a4d4fae7b352cfd1 (patch)
treedd574cd9cb504cd9ba76272c504a4b2c5678b6b7
parent7db88bf8a9b681417a440914e376013b13457d13 (diff)
chemgreek (20dec16)
git-svn-id: svn://tug.org/texlive/trunk@42758 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.pdfbin738445 -> 737766 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.tex8
-rw-r--r--Master/texmf-dist/tex/latex/chemgreek/chemgreek.sty106
4 files changed, 59 insertions, 57 deletions
diff --git a/Master/texmf-dist/doc/latex/chemgreek/README b/Master/texmf-dist/doc/latex/chemgreek/README
index 616a66a11d6..060b465f2d0 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.0e 2016/02/10
+the CHEMGREEK package v1.1 2016/12/20
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 eeed26f975f..d3169050cd4 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 8ea34f6f771..d9f40da0a80 100644
--- a/Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.tex
+++ b/Master/texmf-dist/doc/latex/chemgreek/chemgreek_en.tex
@@ -56,7 +56,7 @@
renewchemgreekmapping,
selectchemgreekmapping
} ,
- index-setup = { level = \section , headers={\indexname}{\indexname} }
+ index-setup = { level = \section , headers={\indexname}{\indexname} , noclearpage }
}
\usepackage{array,booktabs}
@@ -271,7 +271,7 @@ uppercase name of the Greek letter.
The default mapping is -- as you can probably see -- \emph{not an upright
one}. This is because \chemgreek{} will not make any choice for a specific
-package but let's the user (or another package) choose. \chemgreek\ however
+package but lets the user (or another package) choose. \chemgreek\ however
recognizes if \emph{an unambiguous choice} for one of the upright mappings is
possible and if it is will select the appropriate mapping at begin document.
@@ -355,10 +355,10 @@ Since the \code{fontspec} mapping is a little bit different than the others
I'd like to show a little example for it. The difference is subtle: you need
to choose a font containing the needed glyphs.
-\begin{example}[compile,program=lualatex,runs=1,add-frame=false]
+\begin{example}[compile,program=xelatex,runs=1,add-frame=false]
\documentclass[margin=3pt]{standalone}
\usepackage{fontspec}
- \setmainfont{Linux Libertine O}% need a font that has the glyphs!
+ \setmainfont{LinLibertine_R.otf}% need a font that has the glyphs!
\usepackage{chemgreek}
\selectchemgreekmapping{fontspec}
\begin{document}
diff --git a/Master/texmf-dist/tex/latex/chemgreek/chemgreek.sty b/Master/texmf-dist/tex/latex/chemgreek/chemgreek.sty
index 02d017cea7e..3d1d8601b25 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,amstext}
\ExplSyntaxOn
-\tl_const:Nn \c_chemgreek_date_tl {2016/02/10}
-\tl_const:Nn \c_chemgreek_version_tl {1.0e}
+\tl_const:Nn \c_chemgreek_date_tl {2016/12/20}
+\tl_const:Nn \c_chemgreek_version_tl {1.1}
\tl_const:Nn \c_chemgreek_info_tl {interface for upright greek letters for use in chemistry}
\ProvidesExplPackage{chemgreek}
@@ -173,8 +173,8 @@
{ tau } % 19
{ upsilon } % 20
{ phi } % 21
- { psi } % 22
- { chi } % 23
+ { chi } % 22
+ { psi } % 23
{ omega } % 24
}
@@ -607,8 +607,8 @@
{ 19 } { \chemtau }
{ 20 } { \chemupsilon }
{ 21 } { \chemphi }
- { 22 } { \chempsi }
- { 23 } { \chemchi }
+ { 22 } { \chemchi }
+ { 23 } { \chempsi }
{ 24 } { \chemomega }
}
}
@@ -638,8 +638,8 @@
{ 19 } { \chemTau }
{ 20 } { \chemUpsilon }
{ 21 } { \chemPhi }
- { 22 } { \chemPsi }
- { 23 } { \chemChi }
+ { 22 } { \chemChi }
+ { 23 } { \chemPsi }
{ 24 } { \chemOmega }
}
}
@@ -670,8 +670,8 @@
\ensuremath{\tau} / \ensuremath{\mathrm{T}} , % 19
\ensuremath{\upsilon} / \ensuremath{\Upsilon} , % 20
\ensuremath{\phi} / \ensuremath{\Phi} , % 21
- \ensuremath{\psi} / \ensuremath{\Psi} , % 22
- \ensuremath{\chi} / \ensuremath{\mathrm{X}} , % 23
+ \ensuremath{\chi} / \ensuremath{\mathrm{X}} , % 22
+ \ensuremath{\psi} / \ensuremath{\Psi}, % 23
\ensuremath{\omega} / \ensuremath{\Omega} % 24
}
@@ -699,8 +699,8 @@
\ensuremath{\tau} / \ensuremath{\mathrm{T}} , % 19
\ensuremath{\upsilon} / \ensuremath{\Upsilon} , % 20
\ensuremath{\varphi} / \ensuremath{\Phi} , % 21
- \ensuremath{\psi} / \ensuremath{\Psi} , % 22
- \ensuremath{\chi} / \ensuremath{\mathrm{X}} , % 23
+ \ensuremath{\chi} / \ensuremath{\mathrm{X}} , % 22
+ \ensuremath{\psi} / \ensuremath{\Psi} , % 23
\ensuremath{\omega} / \ensuremath{\Omega} % 24
}
@@ -728,8 +728,8 @@
\ensuremath{\tauup} / \ensuremath{\mathrm{T}} , % 19
\ensuremath{\upsilonup} / \ensuremath{\Upsilonup} , % 20
\ensuremath{\phiup} / \ensuremath{\Phiup} , % 21
- \ensuremath{\psiup} / \ensuremath{\Psiup} , % 22
- \ensuremath{\chiup} / \ensuremath{\mathrm{X}} , % 23
+ \ensuremath{\chiup} / \ensuremath{\mathrm{X}} , % 22
+ \ensuremath{\psiup} / \ensuremath{\Psiup} , % 23
\ensuremath{\omegaup} / \ensuremath{\Omegaup} % 24
}
@@ -757,8 +757,8 @@
\chemgreek_text:n {\texttau} / \chemgreek_text:n {\textTau} , % 19
\chemgreek_text:n {\textupsilon} / \chemgreek_text:n {\textUpsilon} , % 20
\chemgreek_text:n {\textphi} / \chemgreek_text:n {\textPhi} , % 21
- \chemgreek_text:n {\textpsi} / \chemgreek_text:n {\textPsi} , % 22
- \chemgreek_text:n {\textchi} / \chemgreek_text:n {\textChi} , % 23
+ \chemgreek_text:n {\textchi} / \chemgreek_text:n {\textChi} , % 22
+ \chemgreek_text:n {\textpsi} / \chemgreek_text:n {\textPsi} , % 23
\chemgreek_text:n {\textomega} / \chemgreek_text:n {\textOmega} % 24
}
@@ -786,8 +786,8 @@
\ensuremath{\uptau} / \ensuremath{\mathrm{T}} , % 19
\ensuremath{\upupsilon} / \ensuremath{\Upupsilon} , % 20
\ensuremath{\upphi} / \ensuremath{\Upphi} , % 21
- \ensuremath{\uppsi} / \ensuremath{\Uppsi} , % 22
- \ensuremath{\upchi} / \ensuremath{\mathrm{X}} , % 23
+ \ensuremath{\upchi} / \ensuremath{\mathrm{X}} , % 22
+ \ensuremath{\uppsi} / \ensuremath{\Uppsi} , % 23
\ensuremath{\upomega} / \ensuremath{\Upomega} % 24
}
@@ -815,8 +815,8 @@
\ensuremath{\tauup} / \ensuremath{\mathrm{T}} , % 19
\ensuremath{\upsilonup} / \ensuremath{\Upsilonup} , % 20
\ensuremath{\phiup} / \ensuremath{\Phiup} , % 21
- \ensuremath{\psiup} / \ensuremath{\Psiup} , % 22
- \ensuremath{\chiup} / \ensuremath{\mathrm{X}} , % 23
+ \ensuremath{\chiup} / \ensuremath{\mathrm{X}} , % 22
+ \ensuremath{\psiup} / \ensuremath{\Psiup} , % 23
\ensuremath{\omegaup} / \ensuremath{\Omegaup} % 24
}
@@ -844,8 +844,8 @@
\ensuremath{\uptau} / \ensuremath{\mathrm{T}} , % 19
\ensuremath{\upupsilon} / \ensuremath{\upUpsilon} , % 20
\ensuremath{\upphi} / \ensuremath{\upPhi} , % 21
- \ensuremath{\uppsi} / \ensuremath{\upPsi} , % 22
- \ensuremath{\upchi} / \ensuremath{\mathrm{X}} , % 23
+ \ensuremath{\upchi} / \ensuremath{\mathrm{X}} , % 22
+ \ensuremath{\uppsi} / \ensuremath{\upPsi} , % 23
\ensuremath{\upomega} / \ensuremath{\upOmega} % 24
}
@@ -887,8 +887,8 @@
\__chemgreek_lfourier:n {tau} / \ensuremath{\mathrm{T}} , % 19
\__chemgreek_lfourier:n {upsilon} / \__chemgreek_ufourier:n {Upsilon} , % 20
\__chemgreek_lfourier:n {phi} / \__chemgreek_ufourier:n {Phi} , % 21
- \__chemgreek_lfourier:n {psi} / \__chemgreek_ufourier:n {Psi} , % 22
- \__chemgreek_lfourier:n {chi} / \ensuremath{\mathrm{X}} , % 23
+ \__chemgreek_lfourier:n {chi} / \ensuremath{\mathrm{X}} , % 22
+ \__chemgreek_lfourier:n {psi} / \__chemgreek_ufourier:n {Psi} , % 23
\__chemgreek_lfourier:n {omega} / \__chemgreek_ufourier:n {Omega} % 24
}
@@ -916,38 +916,38 @@
\chemgreek_text:n {\texttau} / \chemgreek_text:n {\textTau} , % 19
\chemgreek_text:n {\textupsilon} / \chemgreek_text:n {\textUpsilon} , % 20
\chemgreek_text:n {\textphi} / \chemgreek_text:n {\textPhi} , % 21
- \chemgreek_text:n {\textpsi} / \chemgreek_text:n {\textPsi} , % 22
- \chemgreek_text:n {\textchi} / \chemgreek_text:n {\textChi} , % 23
+ \chemgreek_text:n {\textchi} / \chemgreek_text:n {\textChi} , % 22
+ \chemgreek_text:n {\textpsi} / \chemgreek_text:n {\textPsi} , % 23
\chemgreek_text:n {\textomega} / \chemgreek_text:n {\textOmega} % 24
}
% textgreek:
\chemgreek_new_mapping:nnn {fontspec} {fontspec}
{
- \chemgreek_text:n {\textalpha} / \chemgreek_text:n {\textAlpha} , % 1
- \chemgreek_text:n {\textbeta} / \chemgreek_text:n {\textBeta} , % 2
- \chemgreek_text:n {\textgamma} / \chemgreek_text:n {\textGamma} , % 3
- \chemgreek_text:n {\textdelta} / \chemgreek_text:n {\textDelta} , % 4
- \chemgreek_text:n {\textepsilon} / \chemgreek_text:n {\textEpsilon} , % 5
- \chemgreek_text:n {\textzeta} / \chemgreek_text:n {\textZeta} , % 6
- \chemgreek_text:n {\texteta} / \chemgreek_text:n {\textEta} , % 7
- \chemgreek_text:n {\texttheta} / \chemgreek_text:n {\textTheta} , % 8
- \chemgreek_text:n {\textiota} / \chemgreek_text:n {\textIota} , % 9
- \chemgreek_text:n {\textkappa} / \chemgreek_text:n {\textKappa} , % 10
- \chemgreek_text:n {\textlambda} / \chemgreek_text:n {\textLambda} , % 11
- \chemgreek_text:n {\textmu} / \chemgreek_text:n {\textMu} , % 12
- \chemgreek_text:n {\textnu} / \chemgreek_text:n {\textNu} , % 13
- \chemgreek_text:n {\textxi} / \chemgreek_text:n {\textXi} , % 14
- \chemgreek_text:n {o} / \chemgreek_text:n {O} , % 15
- \chemgreek_text:n {\textpi} / \chemgreek_text:n {\textPi} , % 16
- \chemgreek_text:n {\textrho} / \chemgreek_text:n {\textRho} , % 17
- \chemgreek_text:n {\textsigma} / \chemgreek_text:n {\textSigma} , % 18
- \chemgreek_text:n {\texttau} / \chemgreek_text:n {\textTau} , % 19
- \chemgreek_text:n {\textupsilon} / \chemgreek_text:n {\textUpsilon} , % 20
- \chemgreek_text:n {\textphi} / \chemgreek_text:n {\textPhi} , % 21
- \chemgreek_text:n {\textpsi} / \chemgreek_text:n {\textPsi} , % 22
- \chemgreek_text:n {\textchi} / \chemgreek_text:n {\textChi} , % 23
- \chemgreek_text:n {\textomega} / \chemgreek_text:n {\textOmega} % 24
+ \chemgreek_text:n {\symbol{"03B1}} / \chemgreek_text:n {\symbol{"0391}} , % 1
+ \chemgreek_text:n {\symbol{"03B2}} / \chemgreek_text:n {\symbol{"0392}} , % 2
+ \chemgreek_text:n {\symbol{"03B3}} / \chemgreek_text:n {\symbol{"0393}} , % 3
+ \chemgreek_text:n {\symbol{"03B4}} / \chemgreek_text:n {\symbol{"0394}} , % 4
+ \chemgreek_text:n {\symbol{"03B5}} / \chemgreek_text:n {\symbol{"0395}} , % 5
+ \chemgreek_text:n {\symbol{"03B6}} / \chemgreek_text:n {\symbol{"0396}} , % 6
+ \chemgreek_text:n {\symbol{"03B7}} / \chemgreek_text:n {\symbol{"0397}} , % 7
+ \chemgreek_text:n {\symbol{"03B8}} / \chemgreek_text:n {\symbol{"0398}} , % 8
+ \chemgreek_text:n {\symbol{"03B9}} / \chemgreek_text:n {\symbol{"0399}} , % 9
+ \chemgreek_text:n {\symbol{"03BA}} / \chemgreek_text:n {\symbol{"039A}} , % 10
+ \chemgreek_text:n {\symbol{"03BB}} / \chemgreek_text:n {\symbol{"039B}} , % 11
+ \chemgreek_text:n {\symbol{"03BC}} / \chemgreek_text:n {\symbol{"039C}} , % 12
+ \chemgreek_text:n {\symbol{"03BD}} / \chemgreek_text:n {\symbol{"039D}} , % 13
+ \chemgreek_text:n {\symbol{"03BE}} / \chemgreek_text:n {\symbol{"039E}} , % 14
+ \chemgreek_text:n {\symbol{"03BF}} / \chemgreek_text:n {\symbol{"039F}} , % 15
+ \chemgreek_text:n {\symbol{"03C0}} / \chemgreek_text:n {\symbol{"03A0}} , % 16
+ \chemgreek_text:n {\symbol{"03C1}} / \chemgreek_text:n {\symbol{"03A1}} , % 17
+ \chemgreek_text:n {\symbol{"03C3}} / \chemgreek_text:n {\symbol{"03A3}} , % 18
+ \chemgreek_text:n {\symbol{"03C4}} / \chemgreek_text:n {\symbol{"03A4}} , % 19
+ \chemgreek_text:n {\symbol{"03C5}} / \chemgreek_text:n {\symbol{"03A5}} , % 20
+ \chemgreek_text:n {\symbol{"03C6}} / \chemgreek_text:n {\symbol{"03A6}} , % 21
+ \chemgreek_text:n {\symbol{"03C7}} / \chemgreek_text:n {\symbol{"03A7}} , % 22
+ \chemgreek_text:n {\symbol{"03C8}} / \chemgreek_text:n {\symbol{"03A8}} , % 23
+ \chemgreek_text:n {\symbol{"03C9}} / \chemgreek_text:n {\symbol{"03A9}} % 24
}
% pxgreeks: \iftgs@itupper
@@ -981,8 +981,8 @@
\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{\chiup} / \ensuremath{\mathrm{X}} , % 22
+ \ensuremath{\psiup} / \__chemgreek_upxgreeks:n {Psi} , % 23
\ensuremath{\omegaup} / \__chemgreek_upxgreeks:n {Omega} % 24
}
@@ -1101,6 +1101,8 @@ HISTORY:
2016/01/05 - v1.0c - fix issue #1 https://github.com/cgnieder/chemgreek/issues/1
2016/01/07 - v1.0d - \prop_get:Nn => \prop_item:Nn
2016/02/10 - v1.0e - one missed \prop_get:Nn
+2016/20/12 - v1.1 - fix wrong alphabet order (issue #5)
+ - fix errors in fontspec mapping (issue #4)
TODO: