textgreek (4oct11)

git-svn-id: svn://tug.org/texlive/trunk@24202 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 309 insertions, 396 deletions

diff --git a/Master/texmf-dist/doc/latex/textgreek/textgreek.hd b/Master/texmf-dist/doc/latex/textgreek/textgreek.hd
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textgreek/textgreek.hd
diff --git a/Master/texmf-dist/doc/latex/textgreek/textgreek.pdf b/Master/texmf-dist/doc/latex/textgreek/textgreek.pdf
index 9bd4e9b6b19..2fed1ead9a7 100644
--- a/Master/texmf-dist/doc/latex/textgreek/textgreek.pdf
+++ b/Master/texmf-dist/doc/latex/textgreek/textgreek.pdf
diff --git a/Master/texmf-dist/source/latex/textgreek/textgreek.dtx b/Master/texmf-dist/source/latex/textgreek/textgreek.dtx
index 5a8f559b0d3..8856de28854 100644
--- a/Master/texmf-dist/source/latex/textgreek/textgreek.dtx
+++ b/Master/texmf-dist/source/latex/textgreek/textgreek.dtx
@@ -20,7 +20,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[2009/09/24]
 %<package>\ProvidesPackage{textgreek}
-%<package>   [2011/04/08 v0.5 greek symbols in text]
+%<package>   [2011/09/24 v0.6 Greek symbols in text]
 %
 %<*batchfile>
 \begingroup
@@ -56,6 +56,7 @@ and the derived files textgreek.sty and textgreek.pdf
 %</batchfile>
 %<*driver>
 \documentclass[a4paper]{ltxdoc}
+\usepackage{textcomp}
 \usepackage{textgreek}[2011/04/08]
 \usepackage[american]{babel}
 \usepackage{upgreek}
@@ -75,7 +76,7 @@ and the derived files textgreek.sty and textgreek.pdf
 % \fi
 %
 % \iffalse\OnlyDescription\fi
-% \CheckSum{0}
+% \CheckSum{479}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -116,7 +117,7 @@ and the derived files textgreek.sty and textgreek.pdf
 % \DoNotIndex{\vbox,\vfil,\voffset,\vsize,\vskip}
 % \DoNotIndex{\ce,\char,\curr@fontshape,\DeclareFontEncoding}
 % \DoNotIndex{\DeclareRobustCommand,\temp,\tempa,\tempb,\tempc}
-% \DoNotIndex{\tempd,\tempe}
+% \DoNotIndex{\tempd,\tempe,\2,\3,\8}
 % \DoNotIndex{\fontseries,\providecommand,\renewcommand}
 % \DoNotIndex{\RequirePackage,\romannumeral,\usefont}
 % \DoNotIndex{\DeclareTextCommandDefault,\@@end}
@@ -130,9 +131,9 @@ and the derived files textgreek.sty and textgreek.pdf
 %
 % \begin{abstract}
 %   The \LaTeX{} package \textsf{textgreek} provides NFSS text symbols
-%   for greek letters. This way the author can use greek letters in
+%   for Greek letters. This way the author can use Greek letters in
 %   text without changing to math mode. The usual font selection
-%   commands---e.g. |\textbf|---apply to these greek letters as to
+%   commands---e.g.\  |\textbf|---apply to these Greek letters as to
 %   usual text and the font is upright in an upright
 %   environment. Further, \textsf{hyperref} can use these symbols in
 %   PDF-strings such as PDF-bookmarks.
@@ -142,27 +143,27 @@ and the derived files textgreek.sty and textgreek.pdf
 %
 % \section{Introduction}
 %
-% The usual way to print greek letters in \LaTeX{} uses the math
-% mode. E.g. |$\beta$| produces $\beta$. With the default math
-% fonts, the greek letters produced this way are
+% The usual way to print Greek letters in \LaTeX{} uses the math
+% mode. E.g.\ |$\beta$| produces $\beta$. With the default math
+% fonts, the Greek letters produced this way are
 % \textit{italic}. Generally, this is ok, since they represent
 % variables and variables are typeset italic with the default math
-% font settings. In some circumstances, however, greek letters don't
-% represent variables and should be typeset upright. E.g. in
+% font settings. In some circumstances, however, Greek letters don't
+% represent variables and should be typeset upright. E.g.\ in
 % ``\textbeta-decay'' or ``\textmugreek A''.
 % 
-% The package \textsf{upgreek} provides commands to set upright greek
+% The package \textsf{upgreek} provides commands to set upright Greek
 % letters in math mode, but it does not provide text symbols. You
 % could use them in text with |$\upbeta$-decay|, for example,
 % which gives $\upbeta$-decay, but the font will always be the
 % same and will not be adapted to the surrounding font.
 %
-% The package \textsf{textgreek} provides text commands for greek
+% The package \textsf{textgreek} provides text commands for Greek
 % letters in text that adapt to the surrounding font. For example in
-% bold text, {\bf the command \verb|\textbeta| gives \textbeta{} while
-%   \verb|$\upbeta$| gives $\upbeta$}.
+% {\bf bold text, the command \verb|\textbeta| gives \textbeta{} while
+% \verb|$\upbeta$| gives $\upbeta$}.
 %
-% As textsymbols, greek letters can also be used in unicode
+% As textsymbols, Greek letters can also be used in unicode
 % PDF-strings, for example in PDF-bookmarks provided by the
 % \textsf{hyperref} package. See section \ref{hyperref}.
 %
@@ -183,7 +184,7 @@ and the derived files textgreek.sty and textgreek.pdf
 % |\textiota|\>\textiota\\
 % |\textkappa|\>\textkappa\\
 % |\textlambda|\>\textlambda\\
-% |\textmu|\>\textmu\\
+% |\textmu|\>\textmugreek\\
 % |\textmugreek|\>\textmugreek\\
 % |\textnu|\>\textnu\\
 % |\textxi|\>\textxi\\
@@ -229,9 +230,13 @@ and the derived files textgreek.sty and textgreek.pdf
 % |\straightepsilon|\>\straightepsilon\\
 % \end{tabbing}
 % \end{multicols}
-%
+% The \textsf{textcomp} package also defines
+% \cmd{\textmu}. \textsf{textgreek} will not replace a prior
+% definition of \cmd{\textmu} if recognized. Therefore it is often
+% better to use \cmd{\textmugreek} instead to avoid unexpected
+% results.
 % \subsection{Package Options}
-% You can choose the greek fonts used.
+% You can choose the Greek fonts used.
 % \newcommand{\textsample}{\textalpha \textbeta \textgamma \textdelta
 %   \textepsilon{} \textzeta\texteta\texttheta\textiota\textkappa{}
 %   \textlambda\textmugreek\textnu\textxi\textomikron{}
@@ -267,7 +272,8 @@ and the derived files textgreek.sty and textgreek.pdf
 %   {phv/*/*}{U/psy/*/*}
 %   {*/bx/n}{U/eur/b/n}
 %   {*/b/n}{U/eur/b/n}
-%   {*/*/n}{U/eur/m/n}}}
+%   {*/*/n}{U/eur/m/n}
+%   {*/*/it}{OML/*/*/*}}
 % \end{verbatim}
 % The list contains pairs of options: the font spec (without the
 % encoding) of the font to be replaced and the font spec (with
@@ -280,12 +286,16 @@ and the derived files textgreek.sty and textgreek.pdf
 %
 % \section{Examples}
 %
-% Most users will use this package to get upright greek letters, but
+% Most users will use this package to get upright Greek letters, but
 % you can use it for italic letters too: for example
 % |\textit{\textdelta}| \textit{\textdelta}.
 %
 % {\usefont{T1}{phv}{m}{n} When you are using Helvetica, the font
-%   ``Symbol'' is used for greek letters:  \textsample}
+% ``Symbol'' is used for Greek letters: \textsample}
+%
+% Remember that \TeX{} skips over whitespace directly following a
+% command. Add |{}| to get an interword space after a
+% command. E.g.\ \textsigma{} is genereted by |\textsigma{}|.
 %
 % \subsection{Use \textquotedblleft\textbeta-decay\textquotedblright {}
 %   in a heading}
@@ -307,7 +317,7 @@ and the derived files textgreek.sty and textgreek.pdf
 % document. If you want to use a textgreek letter inside a math
 % environment, you can place it into an |\mbox| or |\textnormal|, or
 % use |\text| from the package \textsf{amstext},
-% e.g. |$\lambda||_{\text| |{\textbeta}}$|: $\lambda _{\text {\textbeta}}$.
+% e.g.\ |$\lambda||_{\text| |{\textbeta}}$|: $\lambda _{\text {\textbeta}}$.
 %
 % \section{Limitations}
 %
@@ -325,20 +335,21 @@ and the derived files textgreek.sty and textgreek.pdf
 %
 % \section{Copyright}
 % Copyright 2010,2011 Leonard Michlmayr
+% \smallskip
 %
-% This work may be distributed and/or modified under the
+% \noindent This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %   http://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
+% version 2005/12/01 or later. \smallskip
 % 
-% This work has the LPPL maintenance status `author-maintained'.
+% \noindent This work has the LPPL maintenance status `author-maintained'. \smallskip
 %  
-% The Current Maintainer of this work is Leonard Michlmayr.
+% \noindent The Current Maintainer of this work is Leonard Michlmayr. \smallskip
 % 
-% This work consists of the file textgreek.dtx
+% \noindent This work consists of the file textgreek.dtx
 % and the derived files textgreek.sty and textgreek.pdf
 % \StopEventually{}
 % \section{Implementation}
@@ -355,17 +366,18 @@ and the derived files textgreek.sty and textgreek.pdf
 %    \begin{macrocode}
 \DeclareOption{cbgreek}{%
 \renewcommand*{\textgreekfontmap}{%
-{eur/*/*}{U/eur/*/*}
-{phv/*/*}{U/psy/*/*}}}%
+  {eur/*/*}{U/eur/*/*}
+  {phv/*/*}{U/psy/*/*}}}%
 %    \end{macrocode}
 % \changes{v0.5}{2011/04/04}{use wildcards in the fontmap.}
 %    \begin{macrocode}
 \DeclareOption{euler}{%
 \renewcommand*{\textgreekfontmap}{%
-{phv/*/*}{U/psy/*/*}
-{*/bx/n}{U/eur/b/n}
-{*/b/n}{U/eur/b/n}
-{*/*/n}{U/eur/m/n}}}%
+  {phv/*/*}{U/psy/*/*}
+  {*/bx/n}{U/eur/b/n}
+  {*/b/n}{U/eur/b/n}
+  {*/*/n}{U/eur/m/n}
+  {*/*/it}{OML/*/*/*}}}%
 %    \end{macrocode}
 %    \begin{macrocode}
 \DeclareOption{artemisia}{%
@@ -442,7 +454,7 @@ and the derived files textgreek.sty and textgreek.pdf
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\textgreekfont}
-%   Select the greek font encoding and apply font replacements.
+%   Select the Greek font encoding and apply font replacements.
 %   \changes{v0.2}{2010/10/20}{apply font replacements before
 %     \textbackslash selectfont}
 %    \begin{macrocode}
@@ -454,139 +466,13 @@ and the derived files textgreek.sty and textgreek.pdf
 }%
 %    \end{macrocode}
 % \end{macro}
-% \begin{macro}{\lgrtoeuler}
-%   Convert LGR encoded characters to Euler's U encoding.
-%    \begin{macrocode}
-\newcommand*{\lgrtoeuler}[1]{%
-\if G#1\textgreek@return{\char0}\fi%
-\if D#1\textgreek@return{\char1}\fi%
-\if J#1\textgreek@return{\char2}\fi%
-\if L#1\textgreek@return{\char3}\fi%
-\if X#1\textgreek@return{\char4}\fi%
-\if P#1\textgreek@return{\char5}\fi%
-\if S#1\textgreek@return{\char6}\fi%
-\if U#1\textgreek@return{\char7}\fi%
-\if F#1\textgreek@return{\char8}\fi%
-\if Y#1\textgreek@return{\char9}\fi%
-\if W#1\textgreek@return{\char10}\fi%
-\if a#1\textgreek@return{\char11}\fi%
-\if b#1\textgreek@return{\char12}\fi%
-\if g#1\textgreek@return{\char13}\fi%
-\if d#1\textgreek@return{\char14}\fi%
-\if 3#1\textgreek@return{\char15}\fi% element-of style epsilon
-\if z#1\textgreek@return{\char16}\fi%
-\if h#1\textgreek@return{\char17}\fi%
-%    \end{macrocode}
+% \changes{v0.6}{2011/09/24}{remove obsolote conversion tables
+% \cs{lgrtoeuler} and \cs{lgrtosymbol}}
 % \changes{v0.5}{2011/04/08}{Change the default variant for theta to
-%   \straighttheta} Euler provides two variants of theta:
-% {\usefont{U}{eur}{m}{n}\char18} and
-% {\usefont{U}{eur}{m}{n}\char35}. Use
-% {\usefont{U}{eur}{m}{n}\texttheta} by default.
-%    \begin{macrocode}
-\if j#1\textgreek@return{\char18}\fi% temperature style theta
-\if i#1\textgreek@return{\char19}\fi%
-\if k#1\textgreek@return{\char20}\fi%
-\if l#1\textgreek@return{\char21}\fi%
-\if m#1\textgreek@return{\char22}\fi%
-\if n#1\textgreek@return{\char23}\fi%
-\if x#1\textgreek@return{\char24}\fi%
-\if p#1\textgreek@return{\char25}\fi%
-\if r#1\textgreek@return{\char26}\fi%
-\if s#1\textgreek@return{\char27}\fi%
-\if t#1\textgreek@return{\char28}\fi%
-\if u#1\textgreek@return{\char29}\fi%
-\if v#1\textgreek@return{\char30}\fi% o-slash style phi
-\if q#1\textgreek@return{\char31}\fi%
-\if y#1\textgreek@return{\char32}\fi%
-\if w#1\textgreek@return{\char33}\fi%
-%    \end{macrocode}
-% Euler provides two variants of epsilon:
-% {\usefont{U}{eur}{m}{n}\char15} and
-% {\usefont{U}{eur}{m}{n}\char34}. Use {\usefont{U}{eur}{m}{n}\char34} by default.
-%    \begin{macrocode}
-\if e#1\textgreek@return{\char34}\fi%
-\if 0#1\textgreek@return{\char35}\fi%
-%    \end{macrocode}
-% Euler provides two variants of phi:
-% {\usefont{U}{eur}{m}{n}\char30} and
-% {\usefont{U}{eur}{m}{n}\char39}. Use {\usefont{U}{eur}{m}{n}\char39} by default.
-%    \begin{macrocode}
-\if f#1\textgreek@return{\char39}\fi%
-%    \end{macrocode}
-% Use the default font for the LGR encoding, if the character does not
-% exist in Euler.
-%    \begin{macrocode}
-\fontencoding{LGR}\selectfont #1%
-\textgreek@eof}%
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\lgrtosymbol}
-%   \changes{v0.5}{2011/04/04}{recognize that the U-font-encoding of
-%     Symbol differs from LGR in some points} Convert LGR encoded
-%   characters to Symbol's U encoding.
-%    \begin{macrocode}
-\newcommand*{\lgrtosymbol}[1]{%
-\if A#1\textgreek@return{A}\fi%
-\if B#1\textgreek@return{B}\fi%
-\if Q#1\textgreek@return{C}\fi%
-\if D#1\textgreek@return{D}\fi%
-\if E#1\textgreek@return{E}\fi%
-\if F#1\textgreek@return{F}\fi%
-\if G#1\textgreek@return{G}\fi%
-\if H#1\textgreek@return{H}\fi%
-\if I#1\textgreek@return{I}\fi%
-\if 0#1\textgreek@return{J}\fi%
-\if K#1\textgreek@return{K}\fi%
-\if L#1\textgreek@return{L}\fi%
-\if M#1\textgreek@return{M}\fi%
-\if N#1\textgreek@return{N}\fi%
-\if O#1\textgreek@return{O}\fi%
-\if P#1\textgreek@return{P}\fi%
-\if J#1\textgreek@return{Q}\fi%
-\if R#1\textgreek@return{R}\fi%
-\if S#1\textgreek@return{S}\fi%
-\if T#1\textgreek@return{T}\fi%
-\if U#1\textgreek@return{U}\fi%
-\if c#1\textgreek@return{V}\fi%
-\if W#1\textgreek@return{W}\fi%
-\if X#1\textgreek@return{X}\fi%
-\if Y#1\textgreek@return{Y}\fi%
-\if Z#1\textgreek@return{Z}\fi%
-\if a#1\textgreek@return{a}\fi%
-\if b#1\textgreek@return{b}\fi%
-\if q#1\textgreek@return{c}\fi%
-\if d#1\textgreek@return{d}\fi%
-\if e#1\textgreek@return{e}\fi%
-\if v#1\textgreek@return{f}\fi%
-\if g#1\textgreek@return{g}\fi%
-\if h#1\textgreek@return{h}\fi%
-\if i#1\textgreek@return{i}\fi%
-\if f#1\textgreek@return{j}\fi%
-\if k#1\textgreek@return{k}\fi%
-\if l#1\textgreek@return{l}\fi%
-\if m#1\textgreek@return{m}\fi%
-\if n#1\textgreek@return{n}\fi%
-\if o#1\textgreek@return{o}\fi%
-\if p#1\textgreek@return{p}\fi%
-\if j#1\textgreek@return{q}\fi%
-\if r#1\textgreek@return{r}\fi%
-\if s#1\textgreek@return{s}\fi%
-\if t#1\textgreek@return{t}\fi%
-\if u#1\textgreek@return{u}\fi%
-\if w#1\textgreek@return{w}\fi%
-\if x#1\textgreek@return{x}\fi%
-\if y#1\textgreek@return{y}\fi%
-\if z#1\textgreek@return{z}\fi%
-%    \end{macrocode}
-% Use the default font for the LGR encoding, if the character does not
-% exist in Symbol.
-%    \begin{macrocode}
-\fontencoding{LGR}\selectfont #1%
-\textgreek@eof}%
-%    \end{macrocode}
-% \end{macro}
+% \straighttheta} \changes{v0.5}{2011/04/04}{Recognize that the
+% font-encoding of Symbol differs from LGR in some points}
 % \begin{macro}{\TextGreek}
-%   Produce a greek letter using the correct font. If the font is
+%   Produce a Greek letter using the correct font. If the font is
 %   Euler or Symbol, convert to the appropriate font encoding.
 %   \changes{v0.4}{2011/03/30}{Avoid the ligature that changes sigma
 %     to a word-final sigma with the help of \texttt{\textbackslash
@@ -596,7 +482,10 @@ and the derived files textgreek.sty and textgreek.pdf
 \begingroup%
 \textgreekfont%
 \edef\tempa{\f@family}%
+\let\tempd\f@encoding%
 \def\tempb{eur}\def\tempc{psy}%
+\def\tempe{OML}%
+\ifx\tempd\tempe\textgreek@return{\lgrtoeuler#1}\fi%
 \ifx\tempa\tempb\textgreek@return{\lgrtoeuler#1}\fi%
 \ifx\tempa\tempc\textgreek@return{\lgrtosymbol#1}\fi%
 #1%
@@ -604,96 +493,182 @@ and the derived files textgreek.sty and textgreek.pdf
 \endgroup}%
 %    \end{macrocode}
 % \end{macro}
-% \subsection{List of greek letters}
+% \begin{macro}{\TextGreek@Select}
+%   The macro |\TextGreek@Select|\marg{LGR}\marg{OML}\marg{symbol}
+%   will produce a Greek letter using the font set by |\textgreekfont|
+%   and selcting the character from the three arguments corresponding
+%   to the font encoding.
+%    \begin{macrocode}
+\DeclareRobustCommand*{\TextGreek@Select}[3]{%
+\begingroup%
+\textgreekfont%
+\edef\tempa{\f@family}%
+\let\tempd\f@encoding%
+\def\tempb{eur}\def\tempc{psy}%
+\def\tempe{OML}%
+\ifx\tempd\tempe\textgreek@return{#2}\fi%
+\ifx\tempa\tempb\textgreek@return{#2}\fi%
+\ifx\tempa\tempc\textgreek@return{#3}\fi%
+#1%
+\textgreek@eof%
+\endgroup}%
+%    \end{macrocode}
+% \end{macro}
+% \subsection{Greek letter definitions}
+% \subsubsection{Utility macro}
 % \begin{macro}{\DeclareTextGreekSymbol}
-% Define the symbol name with |\DeclareTextCommandDefault|.
+%   \cmd{\DeclareTextGreekSymbol}\marg{letter}\marg{LGR}\oarg{OML}\oarg{U}\hskip
+%   0pt plus 20pt will define |\text|\textit{letter} using the
+%   character code \textlangle\textit{LGR\/}\textrangle{} for
+%   LGR-encoded fonts, \textlangle\textit{OML\/}\textrangle{} for math
+%   fonts including Euler, and \textlangle\textit{U\/}\textrangle{}
+%   for the Symbol font. If \textlangle\textit{OML\/}\textrangle{} is
+%   not provided, an LGR font will be used instead, if
+%   \textlangle\textit{U\/}\textrangle{} is missing
+%   \textlangle\textit{LGR\/}\textrangle{} will be used
+%   instead. \changes{v0.6}{2011/09/24}{In order to improve
+%   performance, do not run through the conversion tables
+%   (e.g.\ \texttt{\textbackslash lgrtoeuler}) but save all the
+%   encodings for each letter in the macro itself.}
+%    \begin{macrocode}
+\def\DeclareTextGreekSymbol#1#2{%
+  \@ifnextchar[%
+  {\DeclareTextGreekSymbol@{#1}{#2}}%
+  {\@DeclareTextGreekSymbol{#1}{#2}%
+    {\fontencoding{LGR}\fontfamily{cmr}\selectfont#2}{#2}}%
+}%
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\@DeclareTextGreekSymbol#1#2#3#4{%
+  \expandafter\DeclareTextCommandDefault\csname text#1\endcsname%
+  {\TextGreek@Select{#2}{#3}{#4}}%
+}%
+%    \end{macrocode}
 %    \begin{macrocode}
-\newcommand*{\DeclareTextGreekSymbol}[2]{%
-\expandafter\DeclareTextCommandDefault\csname text#1\endcsname%
-{\TextGreek{#2}}}%
+\def\DeclareTextGreekSymbol@#1#2[#3]{%
+  \ifx\textgreek@eof#3\textgreek@return{%
+    \DeclareTextGreekSymbol@@{#1}{#2}%
+    {\fontencoding{LGR}\fontfamily{cmr}\selectfont#2}}%
+  \else\textgreek@return{%
+    \DeclareTextGreekSymbol@@{#1}{#2}{#3}}\fi%
+  \textgreek@eof}%
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\DeclareTextGreekSymbol@@#1#2#3{%
+  \@ifnextchar[%
+  {\DeclareTextGreekSymbol@@@{#1}{#2}{#3}}%
+  {\@DeclareTextGreekSymbol{#1}{#2}{#3}{#2}}%
+}%
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\DeclareTextGreekSymbol@@@#1#2#3[#4]{%
+  \ifx\textgreek@eof#4\textgreek@return{%
+    \@DeclareTextGreekSymbol{#1}{#2}{#3}{#2}}%
+  \else\textgreek@return{%
+    \@DeclareTextGreekSymbol{#1}{#2}{#3}{#4}}\fi%
+  \textgreek@eof}%
 %    \end{macrocode}
 % \end{macro}
+% \subsubsection{List of Greek letters}
 %    \begin{macrocode}
-\DeclareTextGreekSymbol{alpha}{a}
-\DeclareTextGreekSymbol{beta}{b}
-\DeclareTextGreekSymbol{gamma}{g}
-\DeclareTextGreekSymbol{delta}{d}
-\DeclareTextGreekSymbol{epsilon}{e}
-\DeclareTextGreekSymbol{zeta}{z}
-\DeclareTextGreekSymbol{eta}{h}
-\DeclareTextGreekSymbol{theta}{j}
-\DeclareTextGreekSymbol{iota}{i}
-\DeclareTextGreekSymbol{kappa}{k}
-\DeclareTextGreekSymbol{lambda}{l}
+\DeclareTextGreekSymbol{alpha}{a}[\char11]
+\DeclareTextGreekSymbol{beta}{b}[\char12]
+\DeclareTextGreekSymbol{gamma}{g}[\char13]
+\DeclareTextGreekSymbol{delta}{d}[\char14]
+%    \end{macrocode}
+% Euler provides two variants of epsilon:
+% {\usefont{U}{eur}{m}{n}\char15} and
+% {\usefont{U}{eur}{m}{n}\char34}. Use {\usefont{U}{eur}{m}{n}\char34}
+% with \cmd{\textepsilon}.
+%    \begin{macrocode}
+\DeclareTextGreekSymbol{epsilon}{e}[\char34]
+\DeclareTextGreekSymbol{zeta}{z}[\char16]
+\DeclareTextGreekSymbol{eta}{h}[\char17]
+%    \end{macrocode}
+%  Euler provides two variants of theta:
+% {\usefont{U}{eur}{m}{n}\char18} and
+% {\usefont{U}{eur}{m}{n}\char35}. Use
+% {\usefont{U}{eur}{m}{n}\texttheta} for \cmd{\texttheta}.
+%    \begin{macrocode}
+\DeclareTextGreekSymbol{theta}{j}[\char18][q]
+\DeclareTextGreekSymbol{iota}{i}[\char19]
+\DeclareTextGreekSymbol{kappa}{k}[\char20]
+\DeclareTextGreekSymbol{lambda}{l}[\char21]
 %    \end{macrocode}
 % \begin{macro}{\textmu}
 %   \changes{v0.4}{2010/11/07}{Don't override \textsf{textcomp}'s
 %     \texttt{\textbackslash textmu}} \changes{v0.4}{2010/11/07}{Don't
 %     provide \texttt{\textbackslash textmicro} anymore.}
 % \begin{macro}{\textmugreek}
-% Don't redefine |\textmu| if it is also provided by another
-% package. Use |\textmugreek| if you mean the greek letter rather than
-% the micro symbol of the \textsf{textcomp} package.
+%   I don't redefine |\textmu| if it is already provided by another
+%   package. Use |\textmugreek| if you mean the Greek letter rather
+%   than the micro symbol of the \textsf{textcomp} package.
 %    \begin{macrocode}
 \expandafter\ifx\csname?\string\textmu\endcsname\relax%
-\DeclareTextGreekSymbol{mu}{m}\fi
-\DeclareTextGreekSymbol{mugreek}{m}
+\DeclareTextGreekSymbol{mu}{m}[\char22]
+\fi
+\DeclareTextGreekSymbol{mugreek}{m}[\char22]
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %    \begin{macrocode}
-\DeclareTextGreekSymbol{nu}{n}
-\DeclareTextGreekSymbol{xi}{x}
+\DeclareTextGreekSymbol{nu}{n}[\char23]
+\DeclareTextGreekSymbol{xi}{x}[\char24]
 \DeclareTextGreekSymbol{omikron}{o}
-\DeclareTextGreekSymbol{pi}{p}
-\DeclareTextGreekSymbol{rho}{r}
+\DeclareTextGreekSymbol{pi}{p}[\char25]
+\DeclareTextGreekSymbol{rho}{r}[\char26]
 %    \end{macrocode}
-% \begin{macro}{\textsigma}
-%   \changes{v0.5}{2011/04/07}{\texttt{\textbackslash noboundary} is
-%     needed only for sigma}
+% \changes{v0.5}{2011/04/07}{\texttt{\textbackslash noboundary} is
+% needed only for sigma} Since the word-end sigma \textvarsigma{} is
+% implemented as a ligature in LGR encoded fonts, we have to add
+% \cmd{\noboundary} to get a \textsigma.
 %    \begin{macrocode}
-\DeclareTextGreekSymbol{sigma}{s\noboundary}
+\DeclareTextGreekSymbol{sigma}{s\noboundary}[\char27][s]
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\textvarsigma}
+% \begin{macro}{\textvarsigma} Provide \textvarsigma{} as \cmd{\textvarsigma}.
 % \changes{v0.5}{2011/04/04}{New symbol \textvarsigma.}
 %    \begin{macrocode}
-\DeclareTextGreekSymbol{varsigma}{c}
+\DeclareTextGreekSymbol{varsigma}{c}[][V]
 %    \end{macrocode}
 % \end{macro}
 %    \begin{macrocode}
-\DeclareTextGreekSymbol{tau}{t}
-\DeclareTextGreekSymbol{upsilon}{u}
-\DeclareTextGreekSymbol{phi}{f}
-\DeclareTextGreekSymbol{chi}{q}
-\DeclareTextGreekSymbol{psi}{y}
-\DeclareTextGreekSymbol{omega}{w}
+\DeclareTextGreekSymbol{tau}{t}[\char28]
+\DeclareTextGreekSymbol{upsilon}{u}[\char29]
+%    \end{macrocode}
+% Euler provides two variants of phi: {\usefont{U}{eur}{m}{n}\char30}
+% and {\usefont{U}{eur}{m}{n}\char39}. Use
+% {\usefont{U}{eur}{m}{n}\char39} for \cmd{\textphi}.
+%    \begin{macrocode}
+\DeclareTextGreekSymbol{phi}{f}[\char39][j]
+\DeclareTextGreekSymbol{chi}{q}[\char31][c]
+\DeclareTextGreekSymbol{psi}{y}[\char32]
+\DeclareTextGreekSymbol{omega}{w}[\char33]
 \DeclareTextGreekSymbol{Alpha}{A}
 \DeclareTextGreekSymbol{Beta}{B}
-\DeclareTextGreekSymbol{Gamma}{G}
-\DeclareTextGreekSymbol{Delta}{D}
+\DeclareTextGreekSymbol{Gamma}{G}[\char0]
+\DeclareTextGreekSymbol{Delta}{D}[\char1]
 \DeclareTextGreekSymbol{Epsilon}{E}
 \DeclareTextGreekSymbol{Zeta}{Z}
 \DeclareTextGreekSymbol{Eta}{H}
-\DeclareTextGreekSymbol{Theta}{J}
+\DeclareTextGreekSymbol{Theta}{J}[\char2][Q]
 \DeclareTextGreekSymbol{Iota}{I}
 \DeclareTextGreekSymbol{Kappa}{K}
-\DeclareTextGreekSymbol{Lambda}{L}
+\DeclareTextGreekSymbol{Lambda}{L}[\char3]
 \DeclareTextGreekSymbol{Mu}{M}
 \DeclareTextGreekSymbol{Nu}{N}
-\DeclareTextGreekSymbol{Xi}{X}
+\DeclareTextGreekSymbol{Xi}{X}[\char4]
 \DeclareTextGreekSymbol{Omikron}{O}
-\DeclareTextGreekSymbol{Pi}{P}
+\DeclareTextGreekSymbol{Pi}{P}[\char5]
 \DeclareTextGreekSymbol{Rho}{R}
-\DeclareTextGreekSymbol{Sigma}{S}
+\DeclareTextGreekSymbol{Sigma}{S}[\char6]
 \DeclareTextGreekSymbol{Tau}{T}
-\DeclareTextGreekSymbol{Upsilon}{U}
-\DeclareTextGreekSymbol{Phi}{F}
-\DeclareTextGreekSymbol{Chi}{Q}
-\DeclareTextGreekSymbol{Psi}{Y}
-\DeclareTextGreekSymbol{Omega}{W}
+\DeclareTextGreekSymbol{Upsilon}{U}[\char7]
+\DeclareTextGreekSymbol{Phi}{F}[\char8]
+\DeclareTextGreekSymbol{Chi}{Q}[][C]
+\DeclareTextGreekSymbol{Psi}{Y}[\char9]
+\DeclareTextGreekSymbol{Omega}{W}[\char10]
 %    \end{macrocode}
-% \subsection{Variants}
+% \subsubsection{Variants}
 % \begin{macro}{\straightphi}
 %   \changes{v0.5}{2011/04/03}{New symbol \straightphi} The phi symbol
 %   \straightphi{} is a variant of phi \textphi. Sometimes this variant
@@ -703,7 +678,7 @@ and the derived files textgreek.sty and textgreek.pdf
 \DeclareTextCommand{\straightphi}{PU}%
   {\83\325} % U+03D5 GREEK PHI SYMBOL
 %    \end{macrocode}
-% The greek fonts aim at greek text therefore the phi symbol is not
+% The Greek fonts aim at Greek text. Therefore the phi symbol is not
 % included. I use the math symbol for italic fonts and euler else.
 %    \begin{macrocode}
 \DeclareTextCommandDefault{\straightphi}{%
@@ -712,11 +687,12 @@ and the derived files textgreek.sty and textgreek.pdf
 \edef\tempb{\f@shape}%
 \def\tempc{eur}\def\tempd{psy}%
 \def\tempe{it}%
-\ifx\tempa\tempc\textgreek@return{\lgrtoeuler{v}}\fi%
-\ifx\tempa\tempd\textgreek@return{\lgrtosymbol{v}}\fi%
+\ifx\tempa\tempc\textgreek@return{\char30}\fi%
+\ifx\tempa\tempd\textgreek@return{f}\fi%
 \ifx\tempb\tempe\textgreek@return{%
   \fontencoding{OML}\selectfont\char30}\fi%
-\fontencoding{U}\fontfamily{eur}\selectfont\lgrtoeuler{v}%
+\textgreek@ematch{\f@series}{bx}{\fontseries{b}}{}%
+\fontencoding{U}\fontfamily{eur}\selectfont\char30%
 \textgreek@eof%
 \endgroup}%
 %    \end{macrocode}
@@ -731,16 +707,7 @@ and the derived files textgreek.sty and textgreek.pdf
 %    \end{macrocode}
 %    \begin{macrocode}
 \DeclareTextCommandDefault{\scripttheta}{%
-\begingroup\textgreekfont%
-\edef\tempa{\f@family}%
-\edef\tempb{\f@shape}%
-\def\tempc{eur}\def\tempd{psy}%
-\def\tempe{it}%
-\ifx\tempa\tempc\textgreek@return{\lgrtoeuler{0}}\fi%
-\ifx\tempa\tempd\textgreek@return{\lgrtosymbol{0}}\fi%
-j% default theta in cbgreek and artemisia
-\textgreek@eof%
-\endgroup}%
+  \TextGreek@Select{j}{\char35}{J}}%
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\straighttheta}
@@ -759,11 +726,12 @@ j% default theta in cbgreek and artemisia
 \edef\tempb{\f@shape}%
 \def\tempc{eur}\def\tempd{psy}%
 \def\tempe{it}%
-\ifx\tempa\tempc\textgreek@return{\lgrtoeuler{j}}\fi%
-\ifx\tempa\tempd\textgreek@return{\lgrtosymbol{j}}\fi%
+\ifx\tempa\tempc\textgreek@return{\char18}\fi%
+\ifx\tempa\tempd\textgreek@return{q}\fi%
 \ifx\tempb\tempe\textgreek@return{%
   \fontencoding{OML}\selectfont\char18}\fi%
-\fontencoding{U}\fontfamily{eur}\selectfont\lgrtoeuler{j}%
+\textgreek@ematch{\f@series}{bx}{\fontseries{b}}{}%
+\fontencoding{U}\fontfamily{eur}\selectfont\char18%
 \textgreek@eof%
 \endgroup}%
 %    \end{macrocode}
@@ -783,12 +751,13 @@ j% default theta in cbgreek and artemisia
 \edef\tempb{\f@shape}%
 \def\tempc{eur}\def\tempd{psy}%
 \def\tempe{it}%
-\ifx\tempa\tempc\textgreek@return{\lgrtoeuler{3}}\fi%
+\ifx\tempa\tempc\textgreek@return{\char15}\fi%
 \ifx\tempa\tempd\textgreek@return{%
-  \fontfamily{eur}\fontseries{b}\selectfont\lgrtoeuler{3}}\fi%
+  \fontfamily{eur}\fontseries{b}\selectfont\char15}\fi%
 \ifx\tempb\tempe\textgreek@return{%
   \fontencoding{OML}\selectfont\char15}\fi%
-\fontencoding{U}\fontfamily{eur}\selectfont\lgrtoeuler{3}%
+\textgreek@ematch{\f@series}{bx}{\fontseries{b}}{}%
+\fontencoding{U}\fontfamily{eur}\selectfont\char15%
 \textgreek@eof%
 \endgroup}%
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/textgreek/textgreek.sty b/Master/texmf-dist/tex/latex/textgreek/textgreek.sty
index 4099af10042..48c39145283 100644
--- a/Master/texmf-dist/tex/latex/textgreek/textgreek.sty
+++ b/Master/texmf-dist/tex/latex/textgreek/textgreek.sty
@@ -28,7 +28,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2009/09/24]
 \ProvidesPackage{textgreek}
-   [2011/04/08 v0.5 greek symbols in text]
+   [2011/09/24 v0.6 Greek symbols in text]
 \InputIfFileExists{lgrenc.def}{%
   \PackageInfo{textgreek}{Loading the definitions for the Greek font%
     encoding.}}{%
@@ -37,14 +37,15 @@
     font encoding LGR. Maybe it comes with the babel package.}}
 \DeclareOption{cbgreek}{%
 \renewcommand*{\textgreekfontmap}{%
-{eur/*/*}{U/eur/*/*}
-{phv/*/*}{U/psy/*/*}}}%
+  {eur/*/*}{U/eur/*/*}
+  {phv/*/*}{U/psy/*/*}}}%
 \DeclareOption{euler}{%
 \renewcommand*{\textgreekfontmap}{%
-{phv/*/*}{U/psy/*/*}
-{*/bx/n}{U/eur/b/n}
-{*/b/n}{U/eur/b/n}
-{*/*/n}{U/eur/m/n}}}%
+  {phv/*/*}{U/psy/*/*}
+  {*/bx/n}{U/eur/b/n}
+  {*/b/n}{U/eur/b/n}
+  {*/*/n}{U/eur/m/n}
+  {*/*/it}{OML/*/*/*}}}%
 \DeclareOption{artemisia}{%
 \renewcommand*{\textgreekfontmap}{%
   {eur/*/*}{U/eur/*/*}
@@ -104,164 +105,112 @@
   \expandafter\textgreek@findfont\textgreek@fontmap\textgreek@eof%
   \selectfont%
 }%
-\newcommand*{\lgrtoeuler}[1]{%
-\if G#1\textgreek@return{\char0}\fi%
-\if D#1\textgreek@return{\char1}\fi%
-\if J#1\textgreek@return{\char2}\fi%
-\if L#1\textgreek@return{\char3}\fi%
-\if X#1\textgreek@return{\char4}\fi%
-\if P#1\textgreek@return{\char5}\fi%
-\if S#1\textgreek@return{\char6}\fi%
-\if U#1\textgreek@return{\char7}\fi%
-\if F#1\textgreek@return{\char8}\fi%
-\if Y#1\textgreek@return{\char9}\fi%
-\if W#1\textgreek@return{\char10}\fi%
-\if a#1\textgreek@return{\char11}\fi%
-\if b#1\textgreek@return{\char12}\fi%
-\if g#1\textgreek@return{\char13}\fi%
-\if d#1\textgreek@return{\char14}\fi%
-\if 3#1\textgreek@return{\char15}\fi% element-of style epsilon
-\if z#1\textgreek@return{\char16}\fi%
-\if h#1\textgreek@return{\char17}\fi%
-\if j#1\textgreek@return{\char18}\fi% temperature style theta
-\if i#1\textgreek@return{\char19}\fi%
-\if k#1\textgreek@return{\char20}\fi%
-\if l#1\textgreek@return{\char21}\fi%
-\if m#1\textgreek@return{\char22}\fi%
-\if n#1\textgreek@return{\char23}\fi%
-\if x#1\textgreek@return{\char24}\fi%
-\if p#1\textgreek@return{\char25}\fi%
-\if r#1\textgreek@return{\char26}\fi%
-\if s#1\textgreek@return{\char27}\fi%
-\if t#1\textgreek@return{\char28}\fi%
-\if u#1\textgreek@return{\char29}\fi%
-\if v#1\textgreek@return{\char30}\fi% o-slash style phi
-\if q#1\textgreek@return{\char31}\fi%
-\if y#1\textgreek@return{\char32}\fi%
-\if w#1\textgreek@return{\char33}\fi%
-\if e#1\textgreek@return{\char34}\fi%
-\if 0#1\textgreek@return{\char35}\fi%
-\if f#1\textgreek@return{\char39}\fi%
-\fontencoding{LGR}\selectfont #1%
-\textgreek@eof}%
-\newcommand*{\lgrtosymbol}[1]{%
-\if A#1\textgreek@return{A}\fi%
-\if B#1\textgreek@return{B}\fi%
-\if Q#1\textgreek@return{C}\fi%
-\if D#1\textgreek@return{D}\fi%
-\if E#1\textgreek@return{E}\fi%
-\if F#1\textgreek@return{F}\fi%
-\if G#1\textgreek@return{G}\fi%
-\if H#1\textgreek@return{H}\fi%
-\if I#1\textgreek@return{I}\fi%
-\if 0#1\textgreek@return{J}\fi%
-\if K#1\textgreek@return{K}\fi%
-\if L#1\textgreek@return{L}\fi%
-\if M#1\textgreek@return{M}\fi%
-\if N#1\textgreek@return{N}\fi%
-\if O#1\textgreek@return{O}\fi%
-\if P#1\textgreek@return{P}\fi%
-\if J#1\textgreek@return{Q}\fi%
-\if R#1\textgreek@return{R}\fi%
-\if S#1\textgreek@return{S}\fi%
-\if T#1\textgreek@return{T}\fi%
-\if U#1\textgreek@return{U}\fi%
-\if c#1\textgreek@return{V}\fi%
-\if W#1\textgreek@return{W}\fi%
-\if X#1\textgreek@return{X}\fi%
-\if Y#1\textgreek@return{Y}\fi%
-\if Z#1\textgreek@return{Z}\fi%
-\if a#1\textgreek@return{a}\fi%
-\if b#1\textgreek@return{b}\fi%
-\if q#1\textgreek@return{c}\fi%
-\if d#1\textgreek@return{d}\fi%
-\if e#1\textgreek@return{e}\fi%
-\if v#1\textgreek@return{f}\fi%
-\if g#1\textgreek@return{g}\fi%
-\if h#1\textgreek@return{h}\fi%
-\if i#1\textgreek@return{i}\fi%
-\if f#1\textgreek@return{j}\fi%
-\if k#1\textgreek@return{k}\fi%
-\if l#1\textgreek@return{l}\fi%
-\if m#1\textgreek@return{m}\fi%
-\if n#1\textgreek@return{n}\fi%
-\if o#1\textgreek@return{o}\fi%
-\if p#1\textgreek@return{p}\fi%
-\if j#1\textgreek@return{q}\fi%
-\if r#1\textgreek@return{r}\fi%
-\if s#1\textgreek@return{s}\fi%
-\if t#1\textgreek@return{t}\fi%
-\if u#1\textgreek@return{u}\fi%
-\if w#1\textgreek@return{w}\fi%
-\if x#1\textgreek@return{x}\fi%
-\if y#1\textgreek@return{y}\fi%
-\if z#1\textgreek@return{z}\fi%
-\fontencoding{LGR}\selectfont #1%
-\textgreek@eof}%
 \DeclareRobustCommand*{\TextGreek}[1]{%
 \begingroup%
 \textgreekfont%
 \edef\tempa{\f@family}%
+\let\tempd\f@encoding%
 \def\tempb{eur}\def\tempc{psy}%
+\def\tempe{OML}%
+\ifx\tempd\tempe\textgreek@return{\lgrtoeuler#1}\fi%
 \ifx\tempa\tempb\textgreek@return{\lgrtoeuler#1}\fi%
 \ifx\tempa\tempc\textgreek@return{\lgrtosymbol#1}\fi%
 #1%
 \textgreek@eof%
 \endgroup}%
-\newcommand*{\DeclareTextGreekSymbol}[2]{%
-\expandafter\DeclareTextCommandDefault\csname text#1\endcsname%
-{\TextGreek{#2}}}%
-\DeclareTextGreekSymbol{alpha}{a}
-\DeclareTextGreekSymbol{beta}{b}
-\DeclareTextGreekSymbol{gamma}{g}
-\DeclareTextGreekSymbol{delta}{d}
-\DeclareTextGreekSymbol{epsilon}{e}
-\DeclareTextGreekSymbol{zeta}{z}
-\DeclareTextGreekSymbol{eta}{h}
-\DeclareTextGreekSymbol{theta}{j}
-\DeclareTextGreekSymbol{iota}{i}
-\DeclareTextGreekSymbol{kappa}{k}
-\DeclareTextGreekSymbol{lambda}{l}
+\DeclareRobustCommand*{\TextGreek@Select}[3]{%
+\begingroup%
+\textgreekfont%
+\edef\tempa{\f@family}%
+\let\tempd\f@encoding%
+\def\tempb{eur}\def\tempc{psy}%
+\def\tempe{OML}%
+\ifx\tempd\tempe\textgreek@return{#2}\fi%
+\ifx\tempa\tempb\textgreek@return{#2}\fi%
+\ifx\tempa\tempc\textgreek@return{#3}\fi%
+#1%
+\textgreek@eof%
+\endgroup}%
+\def\DeclareTextGreekSymbol#1#2{%
+  \@ifnextchar[%
+  {\DeclareTextGreekSymbol@{#1}{#2}}%
+  {\@DeclareTextGreekSymbol{#1}{#2}%
+    {\fontencoding{LGR}\fontfamily{cmr}\selectfont#2}{#2}}%
+}%
+\def\@DeclareTextGreekSymbol#1#2#3#4{%
+  \expandafter\DeclareTextCommandDefault\csname text#1\endcsname%
+  {\TextGreek@Select{#2}{#3}{#4}}%
+}%
+\def\DeclareTextGreekSymbol@#1#2[#3]{%
+  \ifx\textgreek@eof#3\textgreek@return{%
+    \DeclareTextGreekSymbol@@{#1}{#2}%
+    {\fontencoding{LGR}\fontfamily{cmr}\selectfont#2}}%
+  \else\textgreek@return{%
+    \DeclareTextGreekSymbol@@{#1}{#2}{#3}}\fi%
+  \textgreek@eof}%
+\def\DeclareTextGreekSymbol@@#1#2#3{%
+  \@ifnextchar[%
+  {\DeclareTextGreekSymbol@@@{#1}{#2}{#3}}%
+  {\@DeclareTextGreekSymbol{#1}{#2}{#3}{#2}}%
+}%
+\def\DeclareTextGreekSymbol@@@#1#2#3[#4]{%
+  \ifx\textgreek@eof#4\textgreek@return{%
+    \@DeclareTextGreekSymbol{#1}{#2}{#3}{#2}}%
+  \else\textgreek@return{%
+    \@DeclareTextGreekSymbol{#1}{#2}{#3}{#4}}\fi%
+  \textgreek@eof}%
+\DeclareTextGreekSymbol{alpha}{a}[\char11]
+\DeclareTextGreekSymbol{beta}{b}[\char12]
+\DeclareTextGreekSymbol{gamma}{g}[\char13]
+\DeclareTextGreekSymbol{delta}{d}[\char14]
+\DeclareTextGreekSymbol{epsilon}{e}[\char34]
+\DeclareTextGreekSymbol{zeta}{z}[\char16]
+\DeclareTextGreekSymbol{eta}{h}[\char17]
+\DeclareTextGreekSymbol{theta}{j}[\char18][q]
+\DeclareTextGreekSymbol{iota}{i}[\char19]
+\DeclareTextGreekSymbol{kappa}{k}[\char20]
+\DeclareTextGreekSymbol{lambda}{l}[\char21]
 \expandafter\ifx\csname?\string\textmu\endcsname\relax%
-\DeclareTextGreekSymbol{mu}{m}\fi
-\DeclareTextGreekSymbol{mugreek}{m}
-\DeclareTextGreekSymbol{nu}{n}
-\DeclareTextGreekSymbol{xi}{x}
+\DeclareTextGreekSymbol{mu}{m}[\char22]
+\fi
+\DeclareTextGreekSymbol{mugreek}{m}[\char22]
+\DeclareTextGreekSymbol{nu}{n}[\char23]
+\DeclareTextGreekSymbol{xi}{x}[\char24]
 \DeclareTextGreekSymbol{omikron}{o}
-\DeclareTextGreekSymbol{pi}{p}
-\DeclareTextGreekSymbol{rho}{r}
-\DeclareTextGreekSymbol{sigma}{s\noboundary}
-\DeclareTextGreekSymbol{varsigma}{c}
-\DeclareTextGreekSymbol{tau}{t}
-\DeclareTextGreekSymbol{upsilon}{u}
-\DeclareTextGreekSymbol{phi}{f}
-\DeclareTextGreekSymbol{chi}{q}
-\DeclareTextGreekSymbol{psi}{y}
-\DeclareTextGreekSymbol{omega}{w}
+\DeclareTextGreekSymbol{pi}{p}[\char25]
+\DeclareTextGreekSymbol{rho}{r}[\char26]
+\DeclareTextGreekSymbol{sigma}{s\noboundary}[\char27][s]
+\DeclareTextGreekSymbol{varsigma}{c}[][V]
+\DeclareTextGreekSymbol{tau}{t}[\char28]
+\DeclareTextGreekSymbol{upsilon}{u}[\char29]
+\DeclareTextGreekSymbol{phi}{f}[\char39][j]
+\DeclareTextGreekSymbol{chi}{q}[\char31][c]
+\DeclareTextGreekSymbol{psi}{y}[\char32]
+\DeclareTextGreekSymbol{omega}{w}[\char33]
 \DeclareTextGreekSymbol{Alpha}{A}
 \DeclareTextGreekSymbol{Beta}{B}
-\DeclareTextGreekSymbol{Gamma}{G}
-\DeclareTextGreekSymbol{Delta}{D}
+\DeclareTextGreekSymbol{Gamma}{G}[\char0]
+\DeclareTextGreekSymbol{Delta}{D}[\char1]
 \DeclareTextGreekSymbol{Epsilon}{E}
 \DeclareTextGreekSymbol{Zeta}{Z}
 \DeclareTextGreekSymbol{Eta}{H}
-\DeclareTextGreekSymbol{Theta}{J}
+\DeclareTextGreekSymbol{Theta}{J}[\char2][Q]
 \DeclareTextGreekSymbol{Iota}{I}
 \DeclareTextGreekSymbol{Kappa}{K}
-\DeclareTextGreekSymbol{Lambda}{L}
+\DeclareTextGreekSymbol{Lambda}{L}[\char3]
 \DeclareTextGreekSymbol{Mu}{M}
 \DeclareTextGreekSymbol{Nu}{N}
-\DeclareTextGreekSymbol{Xi}{X}
+\DeclareTextGreekSymbol{Xi}{X}[\char4]
 \DeclareTextGreekSymbol{Omikron}{O}
-\DeclareTextGreekSymbol{Pi}{P}
+\DeclareTextGreekSymbol{Pi}{P}[\char5]
 \DeclareTextGreekSymbol{Rho}{R}
-\DeclareTextGreekSymbol{Sigma}{S}
+\DeclareTextGreekSymbol{Sigma}{S}[\char6]
 \DeclareTextGreekSymbol{Tau}{T}
-\DeclareTextGreekSymbol{Upsilon}{U}
-\DeclareTextGreekSymbol{Phi}{F}
-\DeclareTextGreekSymbol{Chi}{Q}
-\DeclareTextGreekSymbol{Psi}{Y}
-\DeclareTextGreekSymbol{Omega}{W}
+\DeclareTextGreekSymbol{Upsilon}{U}[\char7]
+\DeclareTextGreekSymbol{Phi}{F}[\char8]
+\DeclareTextGreekSymbol{Chi}{Q}[][C]
+\DeclareTextGreekSymbol{Psi}{Y}[\char9]
+\DeclareTextGreekSymbol{Omega}{W}[\char10]
 \DeclareTextCommand{\straightphi}{PU}%
   {\83\325} % U+03D5 GREEK PHI SYMBOL
 \DeclareTextCommandDefault{\straightphi}{%
@@ -270,26 +219,18 @@
 \edef\tempb{\f@shape}%
 \def\tempc{eur}\def\tempd{psy}%
 \def\tempe{it}%
-\ifx\tempa\tempc\textgreek@return{\lgrtoeuler{v}}\fi%
-\ifx\tempa\tempd\textgreek@return{\lgrtosymbol{v}}\fi%
+\ifx\tempa\tempc\textgreek@return{\char30}\fi%
+\ifx\tempa\tempd\textgreek@return{f}\fi%
 \ifx\tempb\tempe\textgreek@return{%
   \fontencoding{OML}\selectfont\char30}\fi%
-\fontencoding{U}\fontfamily{eur}\selectfont\lgrtoeuler{v}%
+\textgreek@ematch{\f@series}{bx}{\fontseries{b}}{}%
+\fontencoding{U}\fontfamily{eur}\selectfont\char30%
 \textgreek@eof%
 \endgroup}%
 \DeclareTextCommand{\scripttheta}{PU}%
   {\83\321}% U+03D1 GREEK THETA SYMBOL
 \DeclareTextCommandDefault{\scripttheta}{%
-\begingroup\textgreekfont%
-\edef\tempa{\f@family}%
-\edef\tempb{\f@shape}%
-\def\tempc{eur}\def\tempd{psy}%
-\def\tempe{it}%
-\ifx\tempa\tempc\textgreek@return{\lgrtoeuler{0}}\fi%
-\ifx\tempa\tempd\textgreek@return{\lgrtosymbol{0}}\fi%
-j% default theta in cbgreek and artemisia
-\textgreek@eof%
-\endgroup}%
+  \TextGreek@Select{j}{\char35}{J}}%
 \DeclareTextCommand{\straighttheta}{PU}%
   {\83\270} % U+03B8 GREEK THETA SYMBOL
 \DeclareTextCommandDefault{\straighttheta}{%
@@ -298,11 +239,12 @@ j% default theta in cbgreek and artemisia
 \edef\tempb{\f@shape}%
 \def\tempc{eur}\def\tempd{psy}%
 \def\tempe{it}%
-\ifx\tempa\tempc\textgreek@return{\lgrtoeuler{j}}\fi%
-\ifx\tempa\tempd\textgreek@return{\lgrtosymbol{j}}\fi%
+\ifx\tempa\tempc\textgreek@return{\char18}\fi%
+\ifx\tempa\tempd\textgreek@return{q}\fi%
 \ifx\tempb\tempe\textgreek@return{%
   \fontencoding{OML}\selectfont\char18}\fi%
-\fontencoding{U}\fontfamily{eur}\selectfont\lgrtoeuler{j}%
+\textgreek@ematch{\f@series}{bx}{\fontseries{b}}{}%
+\fontencoding{U}\fontfamily{eur}\selectfont\char18%
 \textgreek@eof%
 \endgroup}%
 \iffalse\fi % U+03F5 GREEK LUNATE EPSILON SYMBOL
@@ -313,12 +255,13 @@ j% default theta in cbgreek and artemisia
 \edef\tempb{\f@shape}%
 \def\tempc{eur}\def\tempd{psy}%
 \def\tempe{it}%
-\ifx\tempa\tempc\textgreek@return{\lgrtoeuler{3}}\fi%
+\ifx\tempa\tempc\textgreek@return{\char15}\fi%
 \ifx\tempa\tempd\textgreek@return{%
-  \fontfamily{eur}\fontseries{b}\selectfont\lgrtoeuler{3}}\fi%
+  \fontfamily{eur}\fontseries{b}\selectfont\char15}\fi%
 \ifx\tempb\tempe\textgreek@return{%
   \fontencoding{OML}\selectfont\char15}\fi%
-\fontencoding{U}\fontfamily{eur}\selectfont\lgrtoeuler{3}%
+\textgreek@ematch{\f@series}{bx}{\fontseries{b}}{}%
+\fontencoding{U}\fontfamily{eur}\selectfont\char15%
 \textgreek@eof%
 \endgroup}%
 \endinput
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 002d33aa2f3..cd5d1f6f1ab 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1706,6 +1706,7 @@ $standardsource='\.(c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
  'thesis',	'install.01|install.ndx',
  'termlist',	'termlist.dtx',
  'teubner',	'teubner.dtx',
+ 'textgreek',	'textgreek.dtx',
  'toptesi',	'toptesi.dtx',
  'translation-filecontents-de', 'NULL',	# doc package
  'turnstile',	'turnstile-en.ins', # skip pt