summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-05-07 23:09:57 +0000
committerKarl Berry <karl@freefriends.org>2013-05-07 23:09:57 +0000
commit6a057b80e722d16245808902ad41f9586a4d8a89 (patch)
tree0a2f7d53124dca7666fd11f08fa0342d560e731c /Master/texmf-dist/tex/latex
parent0c4f1e69c56f45ea333ba16590feae24922c880e (diff)
lgrx (7may13)
git-svn-id: svn://tug.org/texlive/trunk@30320 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/lgrx/alphabeta.sty303
-rw-r--r--Master/texmf-dist/tex/latex/lgrx/lgrenc.dfu558
-rw-r--r--Master/texmf-dist/tex/latex/lgrx/lgrxenc.def1310
-rw-r--r--Master/texmf-dist/tex/latex/lgrx/textalpha.sty163
4 files changed, 1255 insertions, 1079 deletions
diff --git a/Master/texmf-dist/tex/latex/lgrx/alphabeta.sty b/Master/texmf-dist/tex/latex/lgrx/alphabeta.sty
index a6bedc8f6b5..637a3c0a27f 100644
--- a/Master/texmf-dist/tex/latex/lgrx/alphabeta.sty
+++ b/Master/texmf-dist/tex/latex/lgrx/alphabeta.sty
@@ -13,7 +13,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{alphabeta}
-[2012/06/26 v0.1 macros for Greek letters in text and math]
+[2013/05/03 v0.2 macros for Greek letters in text and math]
% This package is part of the lgrx_ bundle.
%
@@ -22,6 +22,7 @@
%
% ========== ===== =========================================================
% 2012-06-26 0.1 initial version
+% 2013-05-03 0.2 new accent macro names with lgrxenc.def 0.7
% ========== ===== =========================================================
%
% Motivation
@@ -35,9 +36,9 @@
% without the need for an explicite font-encoding switch under the names
% ``\textalpha, \textbeta``, ..., ``\textOmega``.
%
-% With this package, the math macros are redefined to work both, text and
-% math, so that single Greek letters or simple words can be written with the
-% established command names.
+% With this package, the math macros are redefined to work in both, text and
+% math mode, so that Greek letters can be specified with the established
+% command names in text, too.
%
% Attention
% While the macros work reasonably well for single letters, the automatic
@@ -47,7 +48,7 @@
%
% Therefore, Greek text should be written with the help of babel_, setting
% the language to either ``greek`` or ``polutonikogreek`` or wrapped in the
-% provided ``\TextGreek`` macro.
+% provided ``\ensuregreek`` macro.
%
%
% Implementation
@@ -107,7 +108,6 @@
\let\mathpsi\psi
\let\mathomega\omega
-
% Commands to access Greek letters by name
% ----------------------------------------
%
@@ -115,7 +115,7 @@
%
% Some Greek letters look identic to Latin letters and can therefore not be
% used as variable symbols in math formulas. These letters are not defined in
-% TeX's math mode, but we define an alias to the corrsponding ``\text...``
+% TeX's math mode, we define just an alias to the corrsponding ``\text...``
% command.
% ::
@@ -170,158 +170,159 @@
\renewcommand{\psi}{\TextOrMath{\textpsi}{\mathpsi}}
\renewcommand{\omega}{\TextOrMath{\textomega}{\mathomega}}
+
% TextCompositeCommands for the generic macros
% --------------------------------------------
%
% The NFSS TextComposite mechanism looks for the next token without expanding
% it. In order to let compositions like ``\TextGreek{\'\Alpha}`` or
% ``\TextGreek{\>"\alpha}`` work as expected we define TextComposites with the
-% `letter name commands` (even so composition only works if the font encoding
+% `letter name commands`. (Composition only works if the active font encoding
% is LGR). ::
-\DeclareTextComposite{\Varia}{LGR}{\alpha}{128}
-\DeclareTextComposite{\Dasia}{LGR}{\alpha}{129}
-\DeclareTextComposite{\Psili}{LGR}{\alpha}{130}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\alpha}{131}
-\DeclareTextComposite{\Tonos}{LGR}{\alpha}{136}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\alpha}{137}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\alpha}{138}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\alpha}{139}
-\DeclareTextComposite{\Perispomeni}{LGR}{\alpha}{144}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\alpha}{145}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\alpha}{146}
-\DeclareTextComposite{\Varia}{LGR}{\eta}{152}
-\DeclareTextComposite{\Dasia}{LGR}{\eta}{153}
-\DeclareTextComposite{\Psili}{LGR}{\eta}{154}
-\DeclareTextComposite{\Tonos}{LGR}{\eta}{160}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\eta}{161}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\eta}{162}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\eta}{163}
-\DeclareTextComposite{\Perispomeni}{LGR}{\eta}{168}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\eta}{169}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\eta}{170}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\eta}{171}
-\DeclareTextComposite{\Varia}{LGR}{\omega}{176}
-\DeclareTextComposite{\Dasia}{LGR}{\omega}{177}
-\DeclareTextComposite{\Psili}{LGR}{\omega}{178}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\omega}{179}
-\DeclareTextComposite{\Tonos}{LGR}{\omega}{184}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\omega}{185}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\omega}{186}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\omega}{187}
-\DeclareTextComposite{\Perispomeni}{LGR}{\omega}{192}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\omega}{193}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\omega}{194}
-\DeclareTextComposite{\Varia}{LGR}{\iota}{200}
-\DeclareTextComposite{\Dasia}{LGR}{\iota}{201}
-\DeclareTextComposite{\Psili}{LGR}{\iota}{202}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\iota}{203}
-\DeclareTextComposite{\Tonos}{LGR}{\iota}{208}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\iota}{209}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\iota}{210}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\iota}{211}
-\DeclareTextComposite{\Perispomeni}{LGR}{\iota}{216}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\iota}{217}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\iota}{218}
-\DeclareTextComposite{\Dialytika}{LGR}{\iota}{240}
-\DeclareTextComposite{\DialytikaVaria}{LGR}{\iota}{241}
-\DeclareTextComposite{\DialytikaTonos}{LGR}{\iota}{242}
-\DeclareTextComposite{\DialytikaPerispomeni}{LGR}{\iota}{243}
-\DeclareTextComposite{\Varia}{LGR}{\upsilon}{204}
-\DeclareTextComposite{\Dasia}{LGR}{\upsilon}{205}
-\DeclareTextComposite{\Psili}{LGR}{\upsilon}{206}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\upsilon}{207}
-\DeclareTextComposite{\Tonos}{LGR}{\upsilon}{212}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\upsilon}{213}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\upsilon}{214}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\upsilon}{215}
-\DeclareTextComposite{\Perispomeni}{LGR}{\upsilon}{220}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\upsilon}{221}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\upsilon}{222}
-\DeclareTextComposite{\Dialytika}{LGR}{\upsilon}{244}
-\DeclareTextComposite{\DialytikaVaria}{LGR}{\upsilon}{245}
-\DeclareTextComposite{\DialytikaTonos}{LGR}{\upsilon}{246}
-\DeclareTextComposite{\DialytikaPerispomeni}{LGR}{\upsilon}{247}
-\DeclareTextComposite{\Varia}{LGR}{\epsilon}{224}
-\DeclareTextComposite{\Dasia}{LGR}{\epsilon}{225}
-\DeclareTextComposite{\Psili}{LGR}{\epsilon}{226}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\epsilon}{227}
-\DeclareTextComposite{\Tonos}{LGR}{\epsilon}{232}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\epsilon}{233}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\epsilon}{234}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\epsilon}{235}
-\DeclareTextComposite{\Varia}{LGR}{\omicron}{228}
-\DeclareTextComposite{\Dasia}{LGR}{\omicron}{229}
-\DeclareTextComposite{\Psili}{LGR}{\omicron}{230}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\omicron}{231}
-\DeclareTextComposite{\Tonos}{LGR}{\omicron}{236}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\omicron}{237}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\omicron}{238}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\omicron}{239}
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Alpha}{<A}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\Alpha}{<`A}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\Alpha}{<'A}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\Alpha}{<\char126A}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\Alpha}{>A}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\Alpha}{>`A}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\Alpha}{>'A}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{\Alpha}{>\char126A}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Alpha}{'A}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Alpha}{`A}
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Epsilon}{<E}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\Epsilon}{<'E}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\Epsilon}{<`E}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\Epsilon}{>E}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\Epsilon}{>'E}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\Epsilon}{>`E}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Epsilon}{'E}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Epsilon}{`E}
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Eta}{<H}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\Eta}{<`H}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\Eta}{<'H}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\Eta}{<\char126H}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\Eta}{>H}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\Eta}{>`H}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\Eta}{>'H}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{\Eta}{>\char126H}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Eta}{'H}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Eta}{`H}
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Iota}{<I}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\Iota}{<`I}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\Iota}{<'I}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\Iota}{<\char126I}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\Iota}{>I}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\Iota}{>`I}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\Iota}{>'I}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{\Iota}{>\char126I}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Iota}{'I}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Iota}{`I}
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Omicron}{<O}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\Omicron}{<`O}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\Omicron}{<'O}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\Omicron}{>O}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\Omicron}{>`O}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\Omicron}{>'O}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Omicron}{'O}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Omicron}{`O}
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Upsilon}{<U}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\Upsilon}{<`U}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\Upsilon}{<'U}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\Upsilon}{<\char126U}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Upsilon}{'U}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Upsilon}{`U}
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Omega}{<W}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\Omega}{<`W}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\Omega}{<'W}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\Omega}{<\char126W}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\Omega}{>W}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\Omega}{>`W}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\Omega}{>'W}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{\Omega}{>\char126W}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Omega}{'W}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Omega}{`W}
-\DeclareTextComposite{\Dialytika}{LGR}{\Iota}{219}
-\DeclareTextComposite{\Dialytika}{LGR}{\Upsilon}{223}
+\DeclareTextComposite{\accvaria}{LGR}{\alpha}{128}
+\DeclareTextComposite{\accdasia}{LGR}{\alpha}{129}
+\DeclareTextComposite{\accpsili}{LGR}{\alpha}{130}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\alpha}{131}
+\DeclareTextComposite{\acctonos}{LGR}{\alpha}{136}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\alpha}{137}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\alpha}{138}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\alpha}{139}
+\DeclareTextComposite{\accperispomeni}{LGR}{\alpha}{144}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\alpha}{145}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\alpha}{146}
+\DeclareTextComposite{\accvaria}{LGR}{\eta}{152}
+\DeclareTextComposite{\accdasia}{LGR}{\eta}{153}
+\DeclareTextComposite{\accpsili}{LGR}{\eta}{154}
+\DeclareTextComposite{\acctonos}{LGR}{\eta}{160}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\eta}{161}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\eta}{162}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\eta}{163}
+\DeclareTextComposite{\accperispomeni}{LGR}{\eta}{168}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\eta}{169}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\eta}{170}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\eta}{171}
+\DeclareTextComposite{\accvaria}{LGR}{\omega}{176}
+\DeclareTextComposite{\accdasia}{LGR}{\omega}{177}
+\DeclareTextComposite{\accpsili}{LGR}{\omega}{178}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\omega}{179}
+\DeclareTextComposite{\acctonos}{LGR}{\omega}{184}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\omega}{185}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\omega}{186}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\omega}{187}
+\DeclareTextComposite{\accperispomeni}{LGR}{\omega}{192}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\omega}{193}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\omega}{194}
+\DeclareTextComposite{\accvaria}{LGR}{\iota}{200}
+\DeclareTextComposite{\accdasia}{LGR}{\iota}{201}
+\DeclareTextComposite{\accpsili}{LGR}{\iota}{202}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\iota}{203}
+\DeclareTextComposite{\acctonos}{LGR}{\iota}{208}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\iota}{209}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\iota}{210}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\iota}{211}
+\DeclareTextComposite{\accperispomeni}{LGR}{\iota}{216}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\iota}{217}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\iota}{218}
+\DeclareTextComposite{\accdialytika}{LGR}{\iota}{240}
+\DeclareTextComposite{\accdialytikavaria}{LGR}{\iota}{241}
+\DeclareTextComposite{\accdialytikatonos}{LGR}{\iota}{242}
+\DeclareTextComposite{\accdialytikaperispomeni}{LGR}{\iota}{243}
+\DeclareTextComposite{\accvaria}{LGR}{\upsilon}{204}
+\DeclareTextComposite{\accdasia}{LGR}{\upsilon}{205}
+\DeclareTextComposite{\accpsili}{LGR}{\upsilon}{206}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\upsilon}{207}
+\DeclareTextComposite{\acctonos}{LGR}{\upsilon}{212}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\upsilon}{213}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\upsilon}{214}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\upsilon}{215}
+\DeclareTextComposite{\accperispomeni}{LGR}{\upsilon}{220}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\upsilon}{221}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\upsilon}{222}
+\DeclareTextComposite{\accdialytika}{LGR}{\upsilon}{244}
+\DeclareTextComposite{\accdialytikavaria}{LGR}{\upsilon}{245}
+\DeclareTextComposite{\accdialytikatonos}{LGR}{\upsilon}{246}
+\DeclareTextComposite{\accdialytikaperispomeni}{LGR}{\upsilon}{247}
+\DeclareTextComposite{\accvaria}{LGR}{\epsilon}{224}
+\DeclareTextComposite{\accdasia}{LGR}{\epsilon}{225}
+\DeclareTextComposite{\accpsili}{LGR}{\epsilon}{226}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\epsilon}{227}
+\DeclareTextComposite{\acctonos}{LGR}{\epsilon}{232}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\epsilon}{233}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\epsilon}{234}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\epsilon}{235}
+\DeclareTextComposite{\accvaria}{LGR}{\omicron}{228}
+\DeclareTextComposite{\accdasia}{LGR}{\omicron}{229}
+\DeclareTextComposite{\accpsili}{LGR}{\omicron}{230}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\omicron}{231}
+\DeclareTextComposite{\acctonos}{LGR}{\omicron}{236}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\omicron}{237}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\omicron}{238}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\omicron}{239}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\Alpha}{<A}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Alpha}{<`A}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Alpha}{<'A}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Alpha}{<\char126A}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\Alpha}{>A}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Alpha}{>`A}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Alpha}{>'A}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\Alpha}{>\char126A}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\Alpha}{'A}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\Alpha}{`A}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\Epsilon}{<E}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Epsilon}{<'E}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Epsilon}{<`E}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\Epsilon}{>E}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Epsilon}{>'E}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Epsilon}{>`E}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\Epsilon}{'E}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\Epsilon}{`E}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\Eta}{<H}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Eta}{<`H}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Eta}{<'H}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Eta}{<\char126H}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\Eta}{>H}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Eta}{>`H}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Eta}{>'H}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\Eta}{>\char126H}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\Eta}{'H}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\Eta}{`H}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\Iota}{<I}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Iota}{<`I}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Iota}{<'I}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Iota}{<\char126I}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\Iota}{>I}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Iota}{>`I}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Iota}{>'I}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\Iota}{>\char126I}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\Iota}{'I}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\Iota}{`I}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\Omicron}{<O}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Omicron}{<`O}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Omicron}{<'O}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\Omicron}{>O}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Omicron}{>`O}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Omicron}{>'O}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\Omicron}{'O}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\Omicron}{`O}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\Upsilon}{<U}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Upsilon}{<`U}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Upsilon}{<'U}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Upsilon}{<\char126U}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\Upsilon}{'U}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\Upsilon}{`U}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\Omega}{<W}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Omega}{<`W}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Omega}{<'W}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Omega}{<\char126W}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\Omega}{>W}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Omega}{>`W}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Omega}{>'W}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\Omega}{>\char126W}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\Omega}{'W}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\Omega}{`W}
+\DeclareTextComposite{\accdialytika}{LGR}{\Iota}{219}
+\DeclareTextComposite{\accdialytika}{LGR}{\Upsilon}{223}
\DeclareTextCompositeCommand{\@hiatus}{LGR}{\Alpha}{\A@hiatus}
\DeclareTextCompositeCommand{\@hiatus}{LGR}{\Epsilon}{\E@hiatus}
diff --git a/Master/texmf-dist/tex/latex/lgrx/lgrenc.dfu b/Master/texmf-dist/tex/latex/lgrx/lgrenc.dfu
index d9a98088421..21665dd6dee 100644
--- a/Master/texmf-dist/tex/latex/lgrx/lgrenc.dfu
+++ b/Master/texmf-dist/tex/latex/lgrx/lgrenc.dfu
@@ -22,6 +22,7 @@
% ========== ===== =========================================================
% 2010-06-16 0.1 initial version
% 2012-06-27 0.2 support for accented Greek characters with textalpha_
+% 2013-05-03 0.2 new accent macro names with lgrxenc.def 0.7
% ========== ===== =========================================================
%
% Usage
@@ -57,6 +58,19 @@
% to ensure the definitions match with other ``*.dfu`` and ``*enc.def``
% files.
%
+% Use ``\ensuregreek`` for composite definitions of Unicode characters to make
+% sure accented characters work in any font encoding if the textalpha_ package
+% is used.
+%
+% The order of parts in composite diacritics matches the Unicode names.
+% Exceptions are ``\`"`` and ``\'"`` to keep ``\MakeUppercase`` working with
+% babel's "greek" option (upcasing of oxia and tonos to an empty character
+% prevents selection of the pre-composed character with dialytika). Also, the
+% perispomeni ``~`` is never used in second position as otherwise
+% Makeuppercase fails if the document does not use babel's "greek" or
+% "polutonikogreek" option (the tilde beeing converted to a no-break space).
+%
+%
% Latin-1 Supplement (T1)
% ~~~~~~~~~~~~~~~~~~~~~~~
% ::
@@ -107,9 +121,7 @@
% PUenc.dfu (hyperref's PDF-Unicode encoding) as this is the one most likely
% to be used together with this file.
%
-% Use ``\TextGreek`` for compound definitions of Unicode characters to make
-% sure accented characters work in any font encoding if the textalpha_ package
-% is used::
+% ::
% NR Unicode Name % babel name, UCS name
% 0370 GREEK CAPITAL LETTER HETA % Ͱ
@@ -127,17 +139,17 @@
% 037D GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL %
\DeclareUnicodeCharacter{037E}{\erotimatiko} % ; \textquestion
-\DeclareUnicodeCharacter{0384}{\TextGreek{\@tabacckludge'\textcompwordmark}} % ΄
-\DeclareUnicodeCharacter{0385}{\TextGreek{\"'\textcompwordmark}} % ΅ \textdialytikatonos{\empty}}
-\DeclareUnicodeCharacter{0386}{\TextGreek{\@tabacckludge'\textAlpha}} % Ά
-\DeclareUnicodeCharacter{0387}{\anoteleia} % · \textanoteleia
-\DeclareUnicodeCharacter{0388}{\TextGreek{\@tabacckludge'\textEpsilon}} % Έ
-\DeclareUnicodeCharacter{0389}{\TextGreek{\@tabacckludge'\textEta}} % Ή
-\DeclareUnicodeCharacter{038A}{\TextGreek{\@tabacckludge'\textIota}} % Ί
-\DeclareUnicodeCharacter{038C}{\TextGreek{\@tabacckludge'\textOmicron}} % Ό
-\DeclareUnicodeCharacter{038E}{\TextGreek{\@tabacckludge'\textUpsilon}} % Ύ
-\DeclareUnicodeCharacter{038F}{\TextGreek{\@tabacckludge'\textOmega}} % Ώ
-\DeclareUnicodeCharacter{0390}{\TextGreek{\"'\textiota}} % ΐ \textdialytikatonos\textiota
+\DeclareUnicodeCharacter{0384}{\ensuregreek{\@tabacckludge'\textcompwordmark}} % ΄
+\DeclareUnicodeCharacter{0385}{\ensuregreek{\"'\textcompwordmark}} % ΅ \textdialytikatonos
+\DeclareUnicodeCharacter{0386}{\ensuregreek{\@tabacckludge'\textAlpha}} % Ά
+\DeclareUnicodeCharacter{0387}{\anoteleia} % · \textanoteleia
+\DeclareUnicodeCharacter{0388}{\ensuregreek{\@tabacckludge'\textEpsilon}} % Έ
+\DeclareUnicodeCharacter{0389}{\ensuregreek{\@tabacckludge'\textEta}} % Ή
+\DeclareUnicodeCharacter{038A}{\ensuregreek{\@tabacckludge'\textIota}} % Ί
+\DeclareUnicodeCharacter{038C}{\ensuregreek{\@tabacckludge'\textOmicron}} % Ό
+\DeclareUnicodeCharacter{038E}{\ensuregreek{\@tabacckludge'\textUpsilon}} % Ύ
+\DeclareUnicodeCharacter{038F}{\ensuregreek{\@tabacckludge'\textOmega}} % Ώ
+\DeclareUnicodeCharacter{0390}{\ensuregreek{\'"\textiota}} % ΐ
\DeclareUnicodeCharacter{0391}{\textAlpha} % Α
\DeclareUnicodeCharacter{0392}{\textBeta} % Β
@@ -164,13 +176,13 @@
\DeclareUnicodeCharacter{03A8}{\textPsi} % Ψ
\DeclareUnicodeCharacter{03A9}{\textOmega} % Ω
-\DeclareUnicodeCharacter{03AA}{\TextGreek{\"\textIota}} % Ϊ
-\DeclareUnicodeCharacter{03AB}{\TextGreek{\"\textUpsilon}} % Ϋ
-\DeclareUnicodeCharacter{03AC}{\TextGreek{\@tabacckludge'\textalpha}} % ά
-\DeclareUnicodeCharacter{03AD}{\TextGreek{\@tabacckludge'\textepsilon}} % έ
-\DeclareUnicodeCharacter{03AE}{\TextGreek{\@tabacckludge'\texteta}} % ή
-\DeclareUnicodeCharacter{03AF}{\TextGreek{\@tabacckludge'\textiota}} % ί
-\DeclareUnicodeCharacter{03B0}{\TextGreek{\"'\textupsilon}} % ΰ \textdialytikatonos\textupsilon, \"\textupsilonacute
+\DeclareUnicodeCharacter{03AA}{\ensuregreek{\"\textIota}} % Ϊ
+\DeclareUnicodeCharacter{03AB}{\ensuregreek{\"\textUpsilon}} % Ϋ
+\DeclareUnicodeCharacter{03AC}{\ensuregreek{\@tabacckludge'\textalpha}} % ά
+\DeclareUnicodeCharacter{03AD}{\ensuregreek{\@tabacckludge'\textepsilon}} % έ
+\DeclareUnicodeCharacter{03AE}{\ensuregreek{\@tabacckludge'\texteta}} % ή
+\DeclareUnicodeCharacter{03AF}{\ensuregreek{\@tabacckludge'\textiota}} % ί
+\DeclareUnicodeCharacter{03B0}{\ensuregreek{\"'\textupsilon}} % ΰ
\DeclareUnicodeCharacter{03B1}{\textalpha} % α
\DeclareUnicodeCharacter{03B2}{\textbeta} % β
@@ -198,11 +210,11 @@
\DeclareUnicodeCharacter{03C8}{\textpsi} % ψ
\DeclareUnicodeCharacter{03C9}{\textomega} % ω
-\DeclareUnicodeCharacter{03CA}{\TextGreek{\"\textiota}} % ϊ
-\DeclareUnicodeCharacter{03CB}{\TextGreek{\"\textupsilon}} % ϋ
-\DeclareUnicodeCharacter{03CC}{\TextGreek{\@tabacckludge'\textomicron}} % ό
-\DeclareUnicodeCharacter{03CD}{\TextGreek{\@tabacckludge'\textupsilon}} % ύ
-\DeclareUnicodeCharacter{03CE}{\TextGreek{\@tabacckludge'\textomega}} % ώ
+\DeclareUnicodeCharacter{03CA}{\ensuregreek{\"\textiota}} % ϊ
+\DeclareUnicodeCharacter{03CB}{\ensuregreek{\"\textupsilon}} % ϋ
+\DeclareUnicodeCharacter{03CC}{\ensuregreek{\@tabacckludge'\textomicron}} % ό
+\DeclareUnicodeCharacter{03CD}{\ensuregreek{\@tabacckludge'\textupsilon}} % ύ
+\DeclareUnicodeCharacter{03CE}{\ensuregreek{\@tabacckludge'\textomega}} % ώ
\DeclareUnicodeCharacter{03D8}{\Qoppa} % Ϙ
\DeclareUnicodeCharacter{03D9}{\qoppa} % ϙ
@@ -219,254 +231,254 @@
% ~~~~~~~~~~~~~~
% ::
-\DeclareUnicodeCharacter{1F00}{\TextGreek{\@tabacckludge>\textalpha}} % ἀ
-\DeclareUnicodeCharacter{1F01}{\TextGreek{\@tabacckludge<\textalpha}} % ἁ
-\DeclareUnicodeCharacter{1F02}{\TextGreek{\@tabacckludge>`\textalpha}} % ἂ
-\DeclareUnicodeCharacter{1F03}{\TextGreek{\@tabacckludge<`\textalpha}} % ἃ
-\DeclareUnicodeCharacter{1F04}{\TextGreek{\@tabacckludge>'\textalpha}} % ἄ
-\DeclareUnicodeCharacter{1F05}{\TextGreek{\@tabacckludge<'\textalpha}} % ἅ
-\DeclareUnicodeCharacter{1F06}{\TextGreek{\@tabacckludge>~\textalpha}} % ἆ
-\DeclareUnicodeCharacter{1F07}{\TextGreek{\@tabacckludge<\~\textalpha}} % ἇ
-\DeclareUnicodeCharacter{1F08}{\TextGreek{\@tabacckludge>\textAlpha}} % Ἀ
-\DeclareUnicodeCharacter{1F09}{\TextGreek{\@tabacckludge<\textAlpha}} % Ἁ
-\DeclareUnicodeCharacter{1F0A}{\TextGreek{\@tabacckludge>`\textAlpha}} % Ἂ
-\DeclareUnicodeCharacter{1F0B}{\TextGreek{\@tabacckludge<`\textAlpha}} % Ἃ
-\DeclareUnicodeCharacter{1F0C}{\TextGreek{\@tabacckludge>'\textAlpha}} % Ἄ
-\DeclareUnicodeCharacter{1F0D}{\TextGreek{\@tabacckludge<'\textAlpha}} % Ἅ
-\DeclareUnicodeCharacter{1F0E}{\TextGreek{\@tabacckludge>~\textAlpha}} % Ἆ
-\DeclareUnicodeCharacter{1F0F}{\TextGreek{\@tabacckludge<\~\textAlpha}} % Ἇ
-
-\DeclareUnicodeCharacter{1F10}{\TextGreek{\@tabacckludge>\textepsilon}} % ἐ
-\DeclareUnicodeCharacter{1F11}{\TextGreek{\@tabacckludge<\textepsilon}} % ἑ
-\DeclareUnicodeCharacter{1F12}{\TextGreek{\@tabacckludge>`\textepsilon}} % ἒ
-\DeclareUnicodeCharacter{1F13}{\TextGreek{\@tabacckludge<`\textepsilon}} % ἓ
-\DeclareUnicodeCharacter{1F14}{\TextGreek{\@tabacckludge>'\textepsilon}} % ἔ
-\DeclareUnicodeCharacter{1F15}{\TextGreek{\@tabacckludge<'\textepsilon}} % ἕ
-\DeclareUnicodeCharacter{1F18}{\TextGreek{\@tabacckludge>\textEpsilon}} % Ἐ
-\DeclareUnicodeCharacter{1F19}{\TextGreek{\@tabacckludge<\textEpsilon}} % Ἑ
-\DeclareUnicodeCharacter{1F1A}{\TextGreek{\@tabacckludge>`\textEpsilon}} % Ἒ
-\DeclareUnicodeCharacter{1F1B}{\TextGreek{\@tabacckludge<`\textEpsilon}} % Ἓ
-\DeclareUnicodeCharacter{1F1C}{\TextGreek{\@tabacckludge>'\textEpsilon}} % Ἔ
-\DeclareUnicodeCharacter{1F1D}{\TextGreek{\@tabacckludge<'\textEpsilon}} % Ἕ
-
-\DeclareUnicodeCharacter{1F20}{\TextGreek{\@tabacckludge>\texteta}} % ἠ
-\DeclareUnicodeCharacter{1F21}{\TextGreek{\@tabacckludge<\texteta}} % ἡ
-\DeclareUnicodeCharacter{1F22}{\TextGreek{\@tabacckludge>`\texteta}} % ἢ
-\DeclareUnicodeCharacter{1F23}{\TextGreek{\@tabacckludge<`\texteta}} % ἣ
-\DeclareUnicodeCharacter{1F24}{\TextGreek{\@tabacckludge>'\texteta}} % ἤ
-\DeclareUnicodeCharacter{1F25}{\TextGreek{\@tabacckludge<'\texteta}} % ἥ
-\DeclareUnicodeCharacter{1F26}{\TextGreek{\@tabacckludge>~\texteta}} % ἦ
-\DeclareUnicodeCharacter{1F27}{\TextGreek{\@tabacckludge<\~\texteta}} % ἧ
-\DeclareUnicodeCharacter{1F28}{\TextGreek{\@tabacckludge>\textEta}} % Ἠ
-\DeclareUnicodeCharacter{1F29}{\TextGreek{\@tabacckludge<\textEta}} % Ἡ
-\DeclareUnicodeCharacter{1F2A}{\TextGreek{\@tabacckludge>`\textEta}} % Ἢ
-\DeclareUnicodeCharacter{1F2B}{\TextGreek{\@tabacckludge<`\textEta}} % Ἣ
-\DeclareUnicodeCharacter{1F2C}{\TextGreek{\@tabacckludge>'\textEta}} % Ἤ
-\DeclareUnicodeCharacter{1F2D}{\TextGreek{\@tabacckludge<'\textEta}} % Ἥ
-\DeclareUnicodeCharacter{1F2E}{\TextGreek{\@tabacckludge>~\textEta}} % Ἦ
-\DeclareUnicodeCharacter{1F2F}{\TextGreek{\@tabacckludge<\~\textEta}} % Ἧ
-
-\DeclareUnicodeCharacter{1F30}{\TextGreek{\@tabacckludge>\textiota}} % ἰ
-\DeclareUnicodeCharacter{1F31}{\TextGreek{\@tabacckludge<\textiota}} % ἱ
-\DeclareUnicodeCharacter{1F32}{\TextGreek{\@tabacckludge>`\textiota}} % ἲ
-\DeclareUnicodeCharacter{1F33}{\TextGreek{\@tabacckludge<`\textiota}} % ἳ
-\DeclareUnicodeCharacter{1F34}{\TextGreek{\@tabacckludge>'\textiota}} % ἴ
-\DeclareUnicodeCharacter{1F35}{\TextGreek{\@tabacckludge<'\textiota}} % ἵ
-\DeclareUnicodeCharacter{1F36}{\TextGreek{\@tabacckludge>~\textiota}} % ἶ
-\DeclareUnicodeCharacter{1F37}{\TextGreek{\@tabacckludge<\~\textiota}} % ἷ
-\DeclareUnicodeCharacter{1F38}{\TextGreek{\@tabacckludge>\textIota}} % Ἰ
-\DeclareUnicodeCharacter{1F39}{\TextGreek{\@tabacckludge<\textIota}} % Ἱ
-\DeclareUnicodeCharacter{1F3A}{\TextGreek{\@tabacckludge>`\textIota}} % Ἲ
-\DeclareUnicodeCharacter{1F3B}{\TextGreek{\@tabacckludge<`\textIota}} % Ἳ
-\DeclareUnicodeCharacter{1F3C}{\TextGreek{\@tabacckludge>'\textIota}} % Ἴ
-\DeclareUnicodeCharacter{1F3D}{\TextGreek{\@tabacckludge<'\textIota}} % Ἵ
-\DeclareUnicodeCharacter{1F3E}{\TextGreek{\@tabacckludge>~\textIota}} % Ἶ
-\DeclareUnicodeCharacter{1F3F}{\TextGreek{\@tabacckludge<\~\textIota}} % Ἷ
-
-\DeclareUnicodeCharacter{1F40}{\TextGreek{\@tabacckludge>\textomicron}} % ὀ
-\DeclareUnicodeCharacter{1F41}{\TextGreek{\@tabacckludge<\textomicron}} % ὁ
-\DeclareUnicodeCharacter{1F42}{\TextGreek{\@tabacckludge>`\textomicron}} % ὂ
-\DeclareUnicodeCharacter{1F43}{\TextGreek{\@tabacckludge<`\textomicron}} % ὃ
-\DeclareUnicodeCharacter{1F44}{\TextGreek{\@tabacckludge>'\textomicron}} % ὄ
-\DeclareUnicodeCharacter{1F45}{\TextGreek{\@tabacckludge<'\textomicron}} % ὅ
-\DeclareUnicodeCharacter{1F48}{\TextGreek{\@tabacckludge>\textOmicron}} % Ὀ
-\DeclareUnicodeCharacter{1F49}{\TextGreek{\@tabacckludge<\textOmicron}} % Ὁ
-\DeclareUnicodeCharacter{1F4A}{\TextGreek{\@tabacckludge>`\textOmicron}} % Ὂ
-\DeclareUnicodeCharacter{1F4B}{\TextGreek{\@tabacckludge<`\textOmicron}} % Ὃ
-\DeclareUnicodeCharacter{1F4C}{\TextGreek{\@tabacckludge>'\textOmicron}} % Ὄ
-\DeclareUnicodeCharacter{1F4D}{\TextGreek{\@tabacckludge<'\textOmicron}} % Ὅ
-
-\DeclareUnicodeCharacter{1F50}{\TextGreek{\@tabacckludge>\textupsilon}} % ὐ
-\DeclareUnicodeCharacter{1F51}{\TextGreek{\@tabacckludge<\textupsilon}} % ὑ
-\DeclareUnicodeCharacter{1F52}{\TextGreek{\@tabacckludge>`\textupsilon}} % ὒ
-\DeclareUnicodeCharacter{1F53}{\TextGreek{\@tabacckludge<`\textupsilon}} % ὓ
-\DeclareUnicodeCharacter{1F54}{\TextGreek{\@tabacckludge>'\textupsilon}} % ὔ
-\DeclareUnicodeCharacter{1F55}{\TextGreek{\@tabacckludge<'\textupsilon}} % ὕ
-\DeclareUnicodeCharacter{1F56}{\TextGreek{\@tabacckludge>~\textupsilon}} % ὖ
-\DeclareUnicodeCharacter{1F57}{\TextGreek{\@tabacckludge<\~\textupsilon}} % ὗ
-\DeclareUnicodeCharacter{1F59}{\TextGreek{\@tabacckludge<\textUpsilon}} % Ὑ
-\DeclareUnicodeCharacter{1F5B}{\TextGreek{\@tabacckludge<`\textUpsilon}} % Ὓ
-\DeclareUnicodeCharacter{1F5D}{\TextGreek{\@tabacckludge<'\textUpsilon}} % Ὕ
-\DeclareUnicodeCharacter{1F5F}{\TextGreek{\@tabacckludge<\~\textUpsilon}} % Ὗ
-
-\DeclareUnicodeCharacter{1F60}{\TextGreek{\@tabacckludge>\textomega}} % ὠ
-\DeclareUnicodeCharacter{1F61}{\TextGreek{\@tabacckludge<\textomega}} % ὡ
-\DeclareUnicodeCharacter{1F62}{\TextGreek{\@tabacckludge>`\textomega}} % ὢ
-\DeclareUnicodeCharacter{1F63}{\TextGreek{\@tabacckludge<`\textomega}} % ὣ
-\DeclareUnicodeCharacter{1F64}{\TextGreek{\@tabacckludge>'\textomega}} % ὤ
-\DeclareUnicodeCharacter{1F65}{\TextGreek{\@tabacckludge<'\textomega}} % ὥ
-\DeclareUnicodeCharacter{1F66}{\TextGreek{\@tabacckludge>~\textomega}} % ὦ
-\DeclareUnicodeCharacter{1F67}{\TextGreek{\@tabacckludge<\~\textomega}} % ὧ
-\DeclareUnicodeCharacter{1F68}{\TextGreek{\@tabacckludge>\textOmega}} % Ὠ
-\DeclareUnicodeCharacter{1F69}{\TextGreek{\@tabacckludge<\textOmega}} % Ὡ
-\DeclareUnicodeCharacter{1F6A}{\TextGreek{\@tabacckludge>`\textOmega}} % Ὢ
-\DeclareUnicodeCharacter{1F6B}{\TextGreek{\@tabacckludge<`\textOmega}} % Ὣ
-\DeclareUnicodeCharacter{1F6C}{\TextGreek{\@tabacckludge>'\textOmega}} % Ὤ
-\DeclareUnicodeCharacter{1F6D}{\TextGreek{\@tabacckludge<'\textOmega}} % Ὥ
-\DeclareUnicodeCharacter{1F6E}{\TextGreek{\@tabacckludge>~\textOmega}} % Ὦ
-\DeclareUnicodeCharacter{1F6F}{\TextGreek{\@tabacckludge<\~\textOmega}} % Ὧ
-
-\DeclareUnicodeCharacter{1F70}{\TextGreek{\@tabacckludge`\textalpha}} % ὰ
-\DeclareUnicodeCharacter{1F71}{\TextGreek{\@tabacckludge'\textalpha}} % ά
-\DeclareUnicodeCharacter{1F72}{\TextGreek{\@tabacckludge`\textepsilon}} % ὲ
-\DeclareUnicodeCharacter{1F73}{\TextGreek{\@tabacckludge'\textepsilon}} % έ
-\DeclareUnicodeCharacter{1F74}{\TextGreek{\@tabacckludge`\texteta}} % ὴ
-\DeclareUnicodeCharacter{1F75}{\TextGreek{\@tabacckludge'\texteta}} % ή
-\DeclareUnicodeCharacter{1F76}{\TextGreek{\@tabacckludge`\textiota}} % ὶ
-\DeclareUnicodeCharacter{1F77}{\TextGreek{\@tabacckludge'\textiota}} % ί
-\DeclareUnicodeCharacter{1F78}{\TextGreek{\@tabacckludge`\textomicron}} % ὸ
-\DeclareUnicodeCharacter{1F79}{\TextGreek{\@tabacckludge'\textomicron}} % ό
-\DeclareUnicodeCharacter{1F7A}{\TextGreek{\@tabacckludge`\textupsilon}} % ὺ
-\DeclareUnicodeCharacter{1F7B}{\TextGreek{\@tabacckludge'\textupsilon}} % ύ
-\DeclareUnicodeCharacter{1F7C}{\TextGreek{\@tabacckludge`\textomega}} % ὼ
-\DeclareUnicodeCharacter{1F7D}{\TextGreek{\@tabacckludge'\textomega}} % ώ
-
-\DeclareUnicodeCharacter{1F80}{\TextGreek{\@tabacckludge>\textalpha|}} % ᾀ
-\DeclareUnicodeCharacter{1F81}{\TextGreek{\@tabacckludge<\textalpha|}} % ᾁ
-\DeclareUnicodeCharacter{1F82}{\TextGreek{\@tabacckludge>`\textalpha|}} % ᾂ
-\DeclareUnicodeCharacter{1F83}{\TextGreek{\@tabacckludge<`\textalpha|}} % ᾃ
-\DeclareUnicodeCharacter{1F84}{\TextGreek{\@tabacckludge>'\textalpha|}} % ᾄ
-\DeclareUnicodeCharacter{1F85}{\TextGreek{\@tabacckludge<'\textalpha|}} % ᾅ
-\DeclareUnicodeCharacter{1F86}{\TextGreek{\@tabacckludge>~\textalpha|}} % ᾆ
-\DeclareUnicodeCharacter{1F87}{\TextGreek{\@tabacckludge<\~\textalpha|}} % ᾇ
-\DeclareUnicodeCharacter{1F88}{\TextGreek{\@tabacckludge>\textAlpha|}} % ᾈ
-\DeclareUnicodeCharacter{1F89}{\TextGreek{\@tabacckludge<\textAlpha|}} % ᾉ
-\DeclareUnicodeCharacter{1F8A}{\TextGreek{\@tabacckludge>`\textAlpha|}} % ᾊ
-\DeclareUnicodeCharacter{1F8B}{\TextGreek{\@tabacckludge<`\textAlpha|}} % ᾋ
-\DeclareUnicodeCharacter{1F8C}{\TextGreek{\@tabacckludge>'\textAlpha|}} % ᾌ
-\DeclareUnicodeCharacter{1F8D}{\TextGreek{\@tabacckludge<'\textAlpha|}} % ᾍ
-\DeclareUnicodeCharacter{1F8E}{\TextGreek{\@tabacckludge>~\textAlpha|}} % ᾎ
-\DeclareUnicodeCharacter{1F8F}{\TextGreek{\@tabacckludge<\~\textAlpha|}} % ᾏ
-
-\DeclareUnicodeCharacter{1F90}{\TextGreek{\@tabacckludge>\texteta|}} % ᾐ
-\DeclareUnicodeCharacter{1F91}{\TextGreek{\@tabacckludge<\texteta|}} % ᾑ
-\DeclareUnicodeCharacter{1F92}{\TextGreek{\@tabacckludge>`\texteta|}} % ᾒ
-\DeclareUnicodeCharacter{1F93}{\TextGreek{\@tabacckludge<`\texteta|}} % ᾓ
-\DeclareUnicodeCharacter{1F94}{\TextGreek{\@tabacckludge>'\texteta|}} % ᾔ
-\DeclareUnicodeCharacter{1F95}{\TextGreek{\@tabacckludge<'\texteta|}} % ᾕ
-\DeclareUnicodeCharacter{1F96}{\TextGreek{\@tabacckludge>~\texteta|}} % ᾖ
-\DeclareUnicodeCharacter{1F97}{\TextGreek{\@tabacckludge<\~\texteta|}} % ᾗ
-\DeclareUnicodeCharacter{1F98}{\TextGreek{\@tabacckludge>\textEta|}} % ᾘ
-\DeclareUnicodeCharacter{1F99}{\TextGreek{\@tabacckludge<\textEta|}} % ᾙ
-\DeclareUnicodeCharacter{1F9A}{\TextGreek{\@tabacckludge>`\textEta|}} % ᾚ
-\DeclareUnicodeCharacter{1F9B}{\TextGreek{\@tabacckludge<`\textEta|}} % ᾛ
-\DeclareUnicodeCharacter{1F9C}{\TextGreek{\@tabacckludge>'\textEta|}} % ᾜ
-\DeclareUnicodeCharacter{1F9D}{\TextGreek{\@tabacckludge<'\textEta|}} % ᾝ
-\DeclareUnicodeCharacter{1F9E}{\TextGreek{\@tabacckludge>~\textEta|}} % ᾞ
-\DeclareUnicodeCharacter{1F9F}{\TextGreek{\@tabacckludge<\~\textEta|}} % ᾟ
-
-\DeclareUnicodeCharacter{1FA0}{\TextGreek{\@tabacckludge>\textomega|}} % ᾠ
-\DeclareUnicodeCharacter{1FA1}{\TextGreek{\@tabacckludge<\textomega|}} % ᾡ
-\DeclareUnicodeCharacter{1FA2}{\TextGreek{\@tabacckludge>`\textomega|}} % ᾢ
-\DeclareUnicodeCharacter{1FA3}{\TextGreek{\@tabacckludge<`\textomega|}} % ᾣ
-\DeclareUnicodeCharacter{1FA4}{\TextGreek{\@tabacckludge>'\textomega|}} % ᾤ
-\DeclareUnicodeCharacter{1FA5}{\TextGreek{\@tabacckludge<'\textomega|}} % ᾥ
-\DeclareUnicodeCharacter{1FA6}{\TextGreek{\@tabacckludge>~\textomega|}} % ᾦ
-\DeclareUnicodeCharacter{1FA7}{\TextGreek{\@tabacckludge<\~\textomega|}} % ᾧ
-\DeclareUnicodeCharacter{1FA8}{\TextGreek{\@tabacckludge>\textOmega|}} % ᾨ
-\DeclareUnicodeCharacter{1FA9}{\TextGreek{\@tabacckludge<\textOmega|}} % ᾩ
-\DeclareUnicodeCharacter{1FAA}{\TextGreek{\@tabacckludge>`\textOmega|}} % ᾪ
-\DeclareUnicodeCharacter{1FAB}{\TextGreek{\@tabacckludge<`\textOmega|}} % ᾫ
-\DeclareUnicodeCharacter{1FAC}{\TextGreek{\@tabacckludge>'\textOmega|}} % ᾬ
-\DeclareUnicodeCharacter{1FAD}{\TextGreek{\@tabacckludge<'\textOmega|}} % ᾭ
-\DeclareUnicodeCharacter{1FAE}{\TextGreek{\@tabacckludge>~\textOmega|}} % ᾮ
-\DeclareUnicodeCharacter{1FAF}{\TextGreek{\@tabacckludge<\~\textOmega|}} % ᾯ
-
-\DeclareUnicodeCharacter{1FB0}{\u\textalpha} % ᾰ
-\DeclareUnicodeCharacter{1FB1}{\TextGreek{\@tabacckludge=\textalpha}} % ᾱ
-\DeclareUnicodeCharacter{1FB2}{\TextGreek{\@tabacckludge`\textalpha|}} % ᾲ
-\DeclareUnicodeCharacter{1FB3}{\TextGreek{\textalpha|}} % ᾳ
-\DeclareUnicodeCharacter{1FB4}{\TextGreek{\@tabacckludge'\textalpha|}} % ᾴ
-\DeclareUnicodeCharacter{1FB6}{\TextGreek{\~\textalpha}} % ᾶ
-\DeclareUnicodeCharacter{1FB7}{\TextGreek{\~\textalpha|}} % ᾷ
-\DeclareUnicodeCharacter{1FB8}{\u\textAlpha} % Ᾰ
-\DeclareUnicodeCharacter{1FB9}{\TextGreek{\@tabacckludge=\textAlpha}} % Ᾱ
-\DeclareUnicodeCharacter{1FBA}{\TextGreek{\@tabacckludge`\textAlpha}} % Ὰ
-\DeclareUnicodeCharacter{1FBB}{\TextGreek{\@tabacckludge'\textAlpha}} % Ά
-\DeclareUnicodeCharacter{1FBC}{\TextGreek{\textAlpha|}} % ᾼ
-\DeclareUnicodeCharacter{1FBD}{\TextGreek{\@tabacckludge>\textcompwordmark}} % ᾽
+\DeclareUnicodeCharacter{1F00}{\ensuregreek{\@tabacckludge>\textalpha}} % ἀ
+\DeclareUnicodeCharacter{1F01}{\ensuregreek{\@tabacckludge<\textalpha}} % ἁ
+\DeclareUnicodeCharacter{1F02}{\ensuregreek{\@tabacckludge>`\textalpha}} % ἂ
+\DeclareUnicodeCharacter{1F03}{\ensuregreek{\@tabacckludge<`\textalpha}} % ἃ
+\DeclareUnicodeCharacter{1F04}{\ensuregreek{\@tabacckludge>'\textalpha}} % ἄ
+\DeclareUnicodeCharacter{1F05}{\ensuregreek{\@tabacckludge<'\textalpha}} % ἅ
+\DeclareUnicodeCharacter{1F06}{\ensuregreek{\@tabacckludge~>\textalpha}} % ἆ
+\DeclareUnicodeCharacter{1F07}{\ensuregreek{\@tabacckludge~<\textalpha}} % ἇ
+\DeclareUnicodeCharacter{1F08}{\ensuregreek{\@tabacckludge>\textAlpha}} % Ἀ
+\DeclareUnicodeCharacter{1F09}{\ensuregreek{\@tabacckludge<\textAlpha}} % Ἁ
+\DeclareUnicodeCharacter{1F0A}{\ensuregreek{\@tabacckludge>`\textAlpha}} % Ἂ
+\DeclareUnicodeCharacter{1F0B}{\ensuregreek{\@tabacckludge<`\textAlpha}} % Ἃ
+\DeclareUnicodeCharacter{1F0C}{\ensuregreek{\@tabacckludge>'\textAlpha}} % Ἄ
+\DeclareUnicodeCharacter{1F0D}{\ensuregreek{\@tabacckludge>'\textAlpha}} % Ἅ
+\DeclareUnicodeCharacter{1F0E}{\ensuregreek{\@tabacckludge~>\textAlpha}} % Ἆ
+\DeclareUnicodeCharacter{1F0F}{\ensuregreek{\@tabacckludge~<\textAlpha}} % Ἇ
+
+\DeclareUnicodeCharacter{1F10}{\ensuregreek{\@tabacckludge>\textepsilon}} % ἐ
+\DeclareUnicodeCharacter{1F11}{\ensuregreek{\@tabacckludge<\textepsilon}} % ἑ
+\DeclareUnicodeCharacter{1F12}{\ensuregreek{\@tabacckludge>`\textepsilon}} % ἒ
+\DeclareUnicodeCharacter{1F13}{\ensuregreek{\@tabacckludge<`\textepsilon}} % ἓ
+\DeclareUnicodeCharacter{1F14}{\ensuregreek{\@tabacckludge>'\textepsilon}} % ἔ
+\DeclareUnicodeCharacter{1F15}{\ensuregreek{\@tabacckludge>'\textepsilon}} % ἕ
+\DeclareUnicodeCharacter{1F18}{\ensuregreek{\@tabacckludge>\textEpsilon}} % Ἐ
+\DeclareUnicodeCharacter{1F19}{\ensuregreek{\@tabacckludge<\textEpsilon}} % Ἑ
+\DeclareUnicodeCharacter{1F1A}{\ensuregreek{\@tabacckludge>`\textEpsilon}} % Ἒ
+\DeclareUnicodeCharacter{1F1B}{\ensuregreek{\@tabacckludge<`\textEpsilon}} % Ἓ
+\DeclareUnicodeCharacter{1F1C}{\ensuregreek{\@tabacckludge>'\textEpsilon}} % Ἔ
+\DeclareUnicodeCharacter{1F1D}{\ensuregreek{\@tabacckludge>'\textEpsilon}} % Ἕ
+
+\DeclareUnicodeCharacter{1F20}{\ensuregreek{\@tabacckludge>\texteta}} % ἠ
+\DeclareUnicodeCharacter{1F21}{\ensuregreek{\@tabacckludge<\texteta}} % ἡ
+\DeclareUnicodeCharacter{1F22}{\ensuregreek{\@tabacckludge>`\texteta}} % ἢ
+\DeclareUnicodeCharacter{1F23}{\ensuregreek{\@tabacckludge<`\texteta}} % ἣ
+\DeclareUnicodeCharacter{1F24}{\ensuregreek{\@tabacckludge>'\texteta}} % ἤ
+\DeclareUnicodeCharacter{1F25}{\ensuregreek{\@tabacckludge>'\texteta}} % ἥ
+\DeclareUnicodeCharacter{1F26}{\ensuregreek{\@tabacckludge~>\texteta}} % ἦ
+\DeclareUnicodeCharacter{1F27}{\ensuregreek{\@tabacckludge~<\texteta}} % ἧ
+\DeclareUnicodeCharacter{1F28}{\ensuregreek{\@tabacckludge>\textEta}} % Ἠ
+\DeclareUnicodeCharacter{1F29}{\ensuregreek{\@tabacckludge<\textEta}} % Ἡ
+\DeclareUnicodeCharacter{1F2A}{\ensuregreek{\@tabacckludge>`\textEta}} % Ἢ
+\DeclareUnicodeCharacter{1F2B}{\ensuregreek{\@tabacckludge<`\textEta}} % Ἣ
+\DeclareUnicodeCharacter{1F2C}{\ensuregreek{\@tabacckludge>'\textEta}} % Ἤ
+\DeclareUnicodeCharacter{1F2D}{\ensuregreek{\@tabacckludge>'\textEta}} % Ἥ
+\DeclareUnicodeCharacter{1F2E}{\ensuregreek{\@tabacckludge~>\textEta}} % Ἦ
+\DeclareUnicodeCharacter{1F2F}{\ensuregreek{\@tabacckludge~<\textEta}} % Ἧ
+
+\DeclareUnicodeCharacter{1F30}{\ensuregreek{\@tabacckludge>\textiota}} % ἰ
+\DeclareUnicodeCharacter{1F31}{\ensuregreek{\@tabacckludge<\textiota}} % ἱ
+\DeclareUnicodeCharacter{1F32}{\ensuregreek{\@tabacckludge>`\textiota}} % ἲ
+\DeclareUnicodeCharacter{1F33}{\ensuregreek{\@tabacckludge<`\textiota}} % ἳ
+\DeclareUnicodeCharacter{1F34}{\ensuregreek{\@tabacckludge>'\textiota}} % ἴ
+\DeclareUnicodeCharacter{1F35}{\ensuregreek{\@tabacckludge>'\textiota}} % ἵ
+\DeclareUnicodeCharacter{1F36}{\ensuregreek{\@tabacckludge~>\textiota}} % ἶ
+\DeclareUnicodeCharacter{1F37}{\ensuregreek{\@tabacckludge~<\textiota}} % ἷ
+\DeclareUnicodeCharacter{1F38}{\ensuregreek{\@tabacckludge>\textIota}} % Ἰ
+\DeclareUnicodeCharacter{1F39}{\ensuregreek{\@tabacckludge<\textIota}} % Ἱ
+\DeclareUnicodeCharacter{1F3A}{\ensuregreek{\@tabacckludge>`\textIota}} % Ἲ
+\DeclareUnicodeCharacter{1F3B}{\ensuregreek{\@tabacckludge<`\textIota}} % Ἳ
+\DeclareUnicodeCharacter{1F3C}{\ensuregreek{\@tabacckludge>'\textIota}} % Ἴ
+\DeclareUnicodeCharacter{1F3D}{\ensuregreek{\@tabacckludge>'\textIota}} % Ἵ
+\DeclareUnicodeCharacter{1F3E}{\ensuregreek{\@tabacckludge~>\textIota}} % Ἶ
+\DeclareUnicodeCharacter{1F3F}{\ensuregreek{\@tabacckludge~<\textIota}} % Ἷ
+
+\DeclareUnicodeCharacter{1F40}{\ensuregreek{\@tabacckludge>\textomicron}} % ὀ
+\DeclareUnicodeCharacter{1F41}{\ensuregreek{\@tabacckludge<\textomicron}} % ὁ
+\DeclareUnicodeCharacter{1F42}{\ensuregreek{\@tabacckludge>`\textomicron}} % ὂ
+\DeclareUnicodeCharacter{1F43}{\ensuregreek{\@tabacckludge<`\textomicron}} % ὃ
+\DeclareUnicodeCharacter{1F44}{\ensuregreek{\@tabacckludge>'\textomicron}} % ὄ
+\DeclareUnicodeCharacter{1F45}{\ensuregreek{\@tabacckludge>'\textomicron}} % ὅ
+\DeclareUnicodeCharacter{1F48}{\ensuregreek{\@tabacckludge>\textOmicron}} % Ὀ
+\DeclareUnicodeCharacter{1F49}{\ensuregreek{\@tabacckludge<\textOmicron}} % Ὁ
+\DeclareUnicodeCharacter{1F4A}{\ensuregreek{\@tabacckludge>`\textOmicron}} % Ὂ
+\DeclareUnicodeCharacter{1F4B}{\ensuregreek{\@tabacckludge<`\textOmicron}} % Ὃ
+\DeclareUnicodeCharacter{1F4C}{\ensuregreek{\@tabacckludge>'\textOmicron}} % Ὄ
+\DeclareUnicodeCharacter{1F4D}{\ensuregreek{\@tabacckludge>'\textOmicron}} % Ὅ
+
+\DeclareUnicodeCharacter{1F50}{\ensuregreek{\@tabacckludge>\textupsilon}} % ὐ
+\DeclareUnicodeCharacter{1F51}{\ensuregreek{\@tabacckludge<\textupsilon}} % ὑ
+\DeclareUnicodeCharacter{1F52}{\ensuregreek{\@tabacckludge>`\textupsilon}} % ὒ
+\DeclareUnicodeCharacter{1F53}{\ensuregreek{\@tabacckludge<`\textupsilon}} % ὓ
+\DeclareUnicodeCharacter{1F54}{\ensuregreek{\@tabacckludge>'\textupsilon}} % ὔ
+\DeclareUnicodeCharacter{1F55}{\ensuregreek{\@tabacckludge>'\textupsilon}} % ὕ
+\DeclareUnicodeCharacter{1F56}{\ensuregreek{\@tabacckludge~>\textupsilon}} % ὖ
+\DeclareUnicodeCharacter{1F57}{\ensuregreek{\@tabacckludge~<\textupsilon}} % ὗ
+\DeclareUnicodeCharacter{1F59}{\ensuregreek{\@tabacckludge<\textUpsilon}} % Ὑ
+\DeclareUnicodeCharacter{1F5B}{\ensuregreek{\@tabacckludge<`\textUpsilon}} % Ὓ
+\DeclareUnicodeCharacter{1F5D}{\ensuregreek{\@tabacckludge>'\textUpsilon}} % Ὕ
+\DeclareUnicodeCharacter{1F5F}{\ensuregreek{\@tabacckludge~<\textUpsilon}} % Ὗ
+
+\DeclareUnicodeCharacter{1F60}{\ensuregreek{\@tabacckludge>\textomega}} % ὠ
+\DeclareUnicodeCharacter{1F61}{\ensuregreek{\@tabacckludge<\textomega}} % ὡ
+\DeclareUnicodeCharacter{1F62}{\ensuregreek{\@tabacckludge>`\textomega}} % ὢ
+\DeclareUnicodeCharacter{1F63}{\ensuregreek{\@tabacckludge<`\textomega}} % ὣ
+\DeclareUnicodeCharacter{1F64}{\ensuregreek{\@tabacckludge>'\textomega}} % ὤ
+\DeclareUnicodeCharacter{1F65}{\ensuregreek{\@tabacckludge>'\textomega}} % ὥ
+\DeclareUnicodeCharacter{1F66}{\ensuregreek{\@tabacckludge~>\textomega}} % ὦ
+\DeclareUnicodeCharacter{1F67}{\ensuregreek{\@tabacckludge~<\textomega}} % ὧ
+\DeclareUnicodeCharacter{1F68}{\ensuregreek{\@tabacckludge>\textOmega}} % Ὠ
+\DeclareUnicodeCharacter{1F69}{\ensuregreek{\@tabacckludge<\textOmega}} % Ὡ
+\DeclareUnicodeCharacter{1F6A}{\ensuregreek{\@tabacckludge>`\textOmega}} % Ὢ
+\DeclareUnicodeCharacter{1F6B}{\ensuregreek{\@tabacckludge<`\textOmega}} % Ὣ
+\DeclareUnicodeCharacter{1F6C}{\ensuregreek{\@tabacckludge>'\textOmega}} % Ὤ
+\DeclareUnicodeCharacter{1F6D}{\ensuregreek{\@tabacckludge>'\textOmega}} % Ὥ
+\DeclareUnicodeCharacter{1F6E}{\ensuregreek{\@tabacckludge~>\textOmega}} % Ὦ
+\DeclareUnicodeCharacter{1F6F}{\ensuregreek{\@tabacckludge~<\textOmega}} % Ὧ
+
+\DeclareUnicodeCharacter{1F70}{\ensuregreek{\@tabacckludge`\textalpha}} % ὰ
+\DeclareUnicodeCharacter{1F71}{\ensuregreek{\@tabacckludge'\textalpha}} % ά
+\DeclareUnicodeCharacter{1F72}{\ensuregreek{\@tabacckludge`\textepsilon}} % ὲ
+\DeclareUnicodeCharacter{1F73}{\ensuregreek{\@tabacckludge'\textepsilon}} % έ
+\DeclareUnicodeCharacter{1F74}{\ensuregreek{\@tabacckludge`\texteta}} % ὴ
+\DeclareUnicodeCharacter{1F75}{\ensuregreek{\@tabacckludge'\texteta}} % ή
+\DeclareUnicodeCharacter{1F76}{\ensuregreek{\@tabacckludge`\textiota}} % ὶ
+\DeclareUnicodeCharacter{1F77}{\ensuregreek{\@tabacckludge'\textiota}} % ί
+\DeclareUnicodeCharacter{1F78}{\ensuregreek{\@tabacckludge`\textomicron}} % ὸ
+\DeclareUnicodeCharacter{1F79}{\ensuregreek{\@tabacckludge'\textomicron}} % ό
+\DeclareUnicodeCharacter{1F7A}{\ensuregreek{\@tabacckludge`\textupsilon}} % ὺ
+\DeclareUnicodeCharacter{1F7B}{\ensuregreek{\@tabacckludge'\textupsilon}} % ύ
+\DeclareUnicodeCharacter{1F7C}{\ensuregreek{\@tabacckludge`\textomega}} % ὼ
+\DeclareUnicodeCharacter{1F7D}{\ensuregreek{\@tabacckludge'\textomega}} % ώ
+
+\DeclareUnicodeCharacter{1F80}{\ensuregreek{\@tabacckludge>\textalpha|}} % ᾀ
+\DeclareUnicodeCharacter{1F81}{\ensuregreek{\@tabacckludge<\textalpha|}} % ᾁ
+\DeclareUnicodeCharacter{1F82}{\ensuregreek{\@tabacckludge>`\textalpha|}} % ᾂ
+\DeclareUnicodeCharacter{1F83}{\ensuregreek{\@tabacckludge<`\textalpha|}} % ᾃ
+\DeclareUnicodeCharacter{1F84}{\ensuregreek{\@tabacckludge>'\textalpha|}} % ᾄ
+\DeclareUnicodeCharacter{1F85}{\ensuregreek{\@tabacckludge>'\textalpha|}} % ᾅ
+\DeclareUnicodeCharacter{1F86}{\ensuregreek{\@tabacckludge~>\textalpha|}} % ᾆ
+\DeclareUnicodeCharacter{1F87}{\ensuregreek{\@tabacckludge~<\textalpha|}} % ᾇ
+\DeclareUnicodeCharacter{1F88}{\ensuregreek{\@tabacckludge>\textAlpha|}} % ᾈ
+\DeclareUnicodeCharacter{1F89}{\ensuregreek{\@tabacckludge<\textAlpha|}} % ᾉ
+\DeclareUnicodeCharacter{1F8A}{\ensuregreek{\@tabacckludge>`\textAlpha|}} % ᾊ
+\DeclareUnicodeCharacter{1F8B}{\ensuregreek{\@tabacckludge<`\textAlpha|}} % ᾋ
+\DeclareUnicodeCharacter{1F8C}{\ensuregreek{\@tabacckludge>'\textAlpha|}} % ᾌ
+\DeclareUnicodeCharacter{1F8D}{\ensuregreek{\@tabacckludge>'\textAlpha|}} % ᾍ
+\DeclareUnicodeCharacter{1F8E}{\ensuregreek{\@tabacckludge~>\textAlpha|}} % ᾎ
+\DeclareUnicodeCharacter{1F8F}{\ensuregreek{\@tabacckludge~<\textAlpha|}} % ᾏ
+
+\DeclareUnicodeCharacter{1F90}{\ensuregreek{\@tabacckludge>\texteta|}} % ᾐ
+\DeclareUnicodeCharacter{1F91}{\ensuregreek{\@tabacckludge<\texteta|}} % ᾑ
+\DeclareUnicodeCharacter{1F92}{\ensuregreek{\@tabacckludge>`\texteta|}} % ᾒ
+\DeclareUnicodeCharacter{1F93}{\ensuregreek{\@tabacckludge<`\texteta|}} % ᾓ
+\DeclareUnicodeCharacter{1F94}{\ensuregreek{\@tabacckludge>'\texteta|}} % ᾔ
+\DeclareUnicodeCharacter{1F95}{\ensuregreek{\@tabacckludge>'\texteta|}} % ᾕ
+\DeclareUnicodeCharacter{1F96}{\ensuregreek{\@tabacckludge~>\texteta|}} % ᾖ
+\DeclareUnicodeCharacter{1F97}{\ensuregreek{\@tabacckludge~<\texteta|}} % ᾗ
+\DeclareUnicodeCharacter{1F98}{\ensuregreek{\@tabacckludge>\textEta|}} % ᾘ
+\DeclareUnicodeCharacter{1F99}{\ensuregreek{\@tabacckludge<\textEta|}} % ᾙ
+\DeclareUnicodeCharacter{1F9A}{\ensuregreek{\@tabacckludge>`\textEta|}} % ᾚ
+\DeclareUnicodeCharacter{1F9B}{\ensuregreek{\@tabacckludge<`\textEta|}} % ᾛ
+\DeclareUnicodeCharacter{1F9C}{\ensuregreek{\@tabacckludge>'\textEta|}} % ᾜ
+\DeclareUnicodeCharacter{1F9D}{\ensuregreek{\@tabacckludge>'\textEta|}} % ᾝ
+\DeclareUnicodeCharacter{1F9E}{\ensuregreek{\@tabacckludge~>\textEta|}} % ᾞ
+\DeclareUnicodeCharacter{1F9F}{\ensuregreek{\@tabacckludge~<\textEta|}} % ᾟ
+
+\DeclareUnicodeCharacter{1FA0}{\ensuregreek{\@tabacckludge>\textomega|}} % ᾠ
+\DeclareUnicodeCharacter{1FA1}{\ensuregreek{\@tabacckludge<\textomega|}} % ᾡ
+\DeclareUnicodeCharacter{1FA2}{\ensuregreek{\@tabacckludge>`\textomega|}} % ᾢ
+\DeclareUnicodeCharacter{1FA3}{\ensuregreek{\@tabacckludge<`\textomega|}} % ᾣ
+\DeclareUnicodeCharacter{1FA4}{\ensuregreek{\@tabacckludge>'\textomega|}} % ᾤ
+\DeclareUnicodeCharacter{1FA5}{\ensuregreek{\@tabacckludge>'\textomega|}} % ᾥ
+\DeclareUnicodeCharacter{1FA6}{\ensuregreek{\@tabacckludge~>\textomega|}} % ᾦ
+\DeclareUnicodeCharacter{1FA7}{\ensuregreek{\@tabacckludge~<\textomega|}} % ᾧ
+\DeclareUnicodeCharacter{1FA8}{\ensuregreek{\@tabacckludge>\textOmega|}} % ᾨ
+\DeclareUnicodeCharacter{1FA9}{\ensuregreek{\@tabacckludge<\textOmega|}} % ᾩ
+\DeclareUnicodeCharacter{1FAA}{\ensuregreek{\@tabacckludge>`\textOmega|}} % ᾪ
+\DeclareUnicodeCharacter{1FAB}{\ensuregreek{\@tabacckludge<`\textOmega|}} % ᾫ
+\DeclareUnicodeCharacter{1FAC}{\ensuregreek{\@tabacckludge>'\textOmega|}} % ᾬ
+\DeclareUnicodeCharacter{1FAD}{\ensuregreek{\@tabacckludge>'\textOmega|}} % ᾭ
+\DeclareUnicodeCharacter{1FAE}{\ensuregreek{\@tabacckludge~>\textOmega|}} % ᾮ
+\DeclareUnicodeCharacter{1FAF}{\ensuregreek{\@tabacckludge~<\textOmega|}} % ᾯ
+
+\DeclareUnicodeCharacter{1FB0}{\ensuregreek{\u\textalpha}} % ᾰ
+\DeclareUnicodeCharacter{1FB1}{\ensuregreek{\@tabacckludge=\textalpha}} % ᾱ
+\DeclareUnicodeCharacter{1FB2}{\ensuregreek{\@tabacckludge`\textalpha|}} % ᾲ
+\DeclareUnicodeCharacter{1FB3}{\ensuregreek{\textalpha|}} % ᾳ
+\DeclareUnicodeCharacter{1FB4}{\ensuregreek{\@tabacckludge'\textalpha|}} % ᾴ
+\DeclareUnicodeCharacter{1FB6}{\ensuregreek{\~\textalpha}} % ᾶ
+\DeclareUnicodeCharacter{1FB7}{\ensuregreek{\~\textalpha|}} % ᾷ
+\DeclareUnicodeCharacter{1FB8}{\ensuregreek{\u\textAlpha}} % Ᾰ
+\DeclareUnicodeCharacter{1FB9}{\ensuregreek{\@tabacckludge=\textAlpha}} % Ᾱ
+\DeclareUnicodeCharacter{1FBA}{\ensuregreek{\@tabacckludge`\textAlpha}} % Ὰ
+\DeclareUnicodeCharacter{1FBB}{\ensuregreek{\@tabacckludge'\textAlpha}} % Ά
+\DeclareUnicodeCharacter{1FBC}{\ensuregreek{\textAlpha|}} % ᾼ
+\DeclareUnicodeCharacter{1FBD}{\ensuregreek{\@tabacckludge>\textcompwordmark}} % ᾽
\DeclareUnicodeCharacter{1FBE}{\textcompwordmark\Prosgegrammeni} % ι
-\DeclareUnicodeCharacter{1FBF}{\TextGreek{\@tabacckludge>\textcompwordmark}} % ᾿
-
-\DeclareUnicodeCharacter{1FC0}{\TextGreek{\~\textcompwordmark}} % ῀
-\DeclareUnicodeCharacter{1FC1}{\TextGreek{\"\~\textcompwordmark}} % ῁
-\DeclareUnicodeCharacter{1FC2}{\TextGreek{\@tabacckludge`\texteta|}} % ῂ
-\DeclareUnicodeCharacter{1FC3}{\TextGreek{\texteta|}} % ῃ
-\DeclareUnicodeCharacter{1FC4}{\TextGreek{\@tabacckludge'\texteta|}} % ῄ
-\DeclareUnicodeCharacter{1FC6}{\TextGreek{\~\texteta}} % ῆ
-\DeclareUnicodeCharacter{1FC7}{\TextGreek{\~\texteta|}} % ῇ
-\DeclareUnicodeCharacter{1FC8}{\TextGreek{\@tabacckludge`\textEpsilon}} % Ὲ
-\DeclareUnicodeCharacter{1FC9}{\TextGreek{\@tabacckludge'\textEpsilon}} % Έ
-\DeclareUnicodeCharacter{1FCA}{\TextGreek{\@tabacckludge`\textEta}} % Ὴ
-\DeclareUnicodeCharacter{1FCB}{\TextGreek{\@tabacckludge'\textEta}} % Ή
-\DeclareUnicodeCharacter{1FCC}{\TextGreek{\textEta|}} % ῌ
-\DeclareUnicodeCharacter{1FCD}{\TextGreek{\@tabacckludge>`\textcompwordmark}} % ῍
-\DeclareUnicodeCharacter{1FCE}{\TextGreek{\@tabacckludge>'\textcompwordmark}} % ῎
-\DeclareUnicodeCharacter{1FCF}{\TextGreek{\@tabacckludge>~\textcompwordmark}} % ῏
-
-\DeclareUnicodeCharacter{1FD0}{\u\textiota} % ῐ
-\DeclareUnicodeCharacter{1FD1}{\TextGreek{\@tabacckludge=\textiota}} % ῑ
-\DeclareUnicodeCharacter{1FD2}{\TextGreek{\"`\textiota}} % ῒ
-\DeclareUnicodeCharacter{1FD3}{\TextGreek{\"'\textiota}} % ΐ
-\DeclareUnicodeCharacter{1FD6}{\TextGreek{\~\textiota}} % ῖ
-\DeclareUnicodeCharacter{1FD7}{\TextGreek{\"\~\textiota}} % ῗ
-\DeclareUnicodeCharacter{1FD8}{\u\textIota} % Ῐ
-\DeclareUnicodeCharacter{1FD9}{\TextGreek{\@tabacckludge=\textIota}} % Ῑ
-\DeclareUnicodeCharacter{1FDA}{\TextGreek{\@tabacckludge`\textIota}} % Ὶ
-\DeclareUnicodeCharacter{1FDB}{\TextGreek{\@tabacckludge'\textIota}} % Ί
-\DeclareUnicodeCharacter{1FDD}{\TextGreek{\@tabacckludge<`\textcompwordmark}} % ῝
-\DeclareUnicodeCharacter{1FDE}{\TextGreek{\@tabacckludge<'\textcompwordmark}} % ῞
-\DeclareUnicodeCharacter{1FDF}{\TextGreek{\@tabacckludge<\~\textcompwordmark}} % ῟
-
-\DeclareUnicodeCharacter{1FE0}{\u\textupsilon} % ῠ
-\DeclareUnicodeCharacter{1FE1}{\TextGreek{\@tabacckludge=\textupsilon}} % ῡ
-\DeclareUnicodeCharacter{1FE2}{\TextGreek{\"`\textupsilon}} % ῢ
-\DeclareUnicodeCharacter{1FE3}{\TextGreek{\"'\textupsilon}} % ΰ
-\DeclareUnicodeCharacter{1FE4}{\TextGreek{\@tabacckludge>r}} % ῤ
-\DeclareUnicodeCharacter{1FE5}{\TextGreek{\@tabacckludge<r}} % ῥ
-\DeclareUnicodeCharacter{1FE6}{\TextGreek{\~\textupsilon}} % ῦ
-\DeclareUnicodeCharacter{1FE7}{\TextGreek{\"\~\textupsilon}} % ῧ
-\DeclareUnicodeCharacter{1FE8}{\u\textUpsilon} % Ῠ
-\DeclareUnicodeCharacter{1FE9}{\TextGreek{\@tabacckludge=\textUpsilon}} % Ῡ
-\DeclareUnicodeCharacter{1FEA}{\TextGreek{\@tabacckludge`\textUpsilon}} % Ὺ
-\DeclareUnicodeCharacter{1FEB}{\TextGreek{\@tabacckludge'\textUpsilon}} % Ύ
-\DeclareUnicodeCharacter{1FEC}{\TextGreek{\@tabacckludge<\textRho}} % Ῥ
-\DeclareUnicodeCharacter{1FED}{\TextGreek{\"`\textcompwordmark}} % ῭
-\DeclareUnicodeCharacter{1FEE}{\TextGreek{\"'\textcompwordmark}} % ΅
-\DeclareUnicodeCharacter{1FEF}{\TextGreek{\@tabacckludge`\textcompwordmark}} % `
-
-\DeclareUnicodeCharacter{1FF2}{\TextGreek{\@tabacckludge`\textomega|}} % ῲ
-\DeclareUnicodeCharacter{1FF3}{\TextGreek{\textomega|}} % ῳ
-\DeclareUnicodeCharacter{1FF4}{\TextGreek{\@tabacckludge'\textomega|}} % ῴ
-\DeclareUnicodeCharacter{1FF6}{\TextGreek{\~\textomega}} % ῶ
-\DeclareUnicodeCharacter{1FF7}{\TextGreek{\~\textomega|}} % ῷ
-\DeclareUnicodeCharacter{1FF8}{\TextGreek{\@tabacckludge`\textOmicron}} % Ὸ
-\DeclareUnicodeCharacter{1FF9}{\TextGreek{\@tabacckludge'\textOmicron}} % Ό
-\DeclareUnicodeCharacter{1FFA}{\TextGreek{\@tabacckludge`\textOmega}} % Ὼ
-\DeclareUnicodeCharacter{1FFB}{\TextGreek{\@tabacckludge'\textOmega}} % Ώ
-\DeclareUnicodeCharacter{1FFC}{\TextGreek{\textOmega|}} % ῼ
-\DeclareUnicodeCharacter{1FFD}{\TextGreek{\@tabacckludge'\textcompwordmark}} % ´
-\DeclareUnicodeCharacter{1FFE}{\TextGreek{\@tabacckludge<\textcompwordmark}} % ῾
+\DeclareUnicodeCharacter{1FBF}{\ensuregreek{\@tabacckludge>\textcompwordmark}} % ᾿
+
+\DeclareUnicodeCharacter{1FC0}{\ensuregreek{\~\textcompwordmark}} % ῀
+\DeclareUnicodeCharacter{1FC1}{\ensuregreek{\"\~\textcompwordmark}} % ῁
+\DeclareUnicodeCharacter{1FC2}{\ensuregreek{\@tabacckludge`\texteta|}} % ῂ
+\DeclareUnicodeCharacter{1FC3}{\ensuregreek{\texteta|}} % ῃ
+\DeclareUnicodeCharacter{1FC4}{\ensuregreek{\@tabacckludge'\texteta|}} % ῄ
+\DeclareUnicodeCharacter{1FC6}{\ensuregreek{\~\texteta}} % ῆ
+\DeclareUnicodeCharacter{1FC7}{\ensuregreek{\~\texteta|}} % ῇ
+\DeclareUnicodeCharacter{1FC8}{\ensuregreek{\@tabacckludge`\textEpsilon}} % Ὲ
+\DeclareUnicodeCharacter{1FC9}{\ensuregreek{\@tabacckludge'\textEpsilon}} % Έ
+\DeclareUnicodeCharacter{1FCA}{\ensuregreek{\@tabacckludge`\textEta}} % Ὴ
+\DeclareUnicodeCharacter{1FCB}{\ensuregreek{\@tabacckludge'\textEta}} % Ή
+\DeclareUnicodeCharacter{1FCC}{\ensuregreek{\textEta|}} % ῌ
+\DeclareUnicodeCharacter{1FCD}{\ensuregreek{\@tabacckludge>`\textcompwordmark}} % ῍
+\DeclareUnicodeCharacter{1FCE}{\ensuregreek{\@tabacckludge>'\textcompwordmark}} % ῎
+\DeclareUnicodeCharacter{1FCF}{\ensuregreek{\@tabacckludge~>\textcompwordmark}} % ῏
+
+\DeclareUnicodeCharacter{1FD0}{\ensuregreek{\u\textiota}} % ῐ
+\DeclareUnicodeCharacter{1FD1}{\ensuregreek{\@tabacckludge=\textiota}} % ῑ
+\DeclareUnicodeCharacter{1FD2}{\ensuregreek{\`"\textiota}} % not \"`... % ῒ
+\DeclareUnicodeCharacter{1FD3}{\ensuregreek{\'"\textiota}} % not \"'... % ΐ
+\DeclareUnicodeCharacter{1FD6}{\ensuregreek{\~\textiota}} % ῖ
+\DeclareUnicodeCharacter{1FD7}{\ensuregreek{\~"\textiota}} % ῗ
+\DeclareUnicodeCharacter{1FD8}{\ensuregreek{\u\textIota}} % Ῐ
+\DeclareUnicodeCharacter{1FD9}{\ensuregreek{\@tabacckludge=\textIota}} % Ῑ
+\DeclareUnicodeCharacter{1FDA}{\ensuregreek{\@tabacckludge`\textIota}} % Ὶ
+\DeclareUnicodeCharacter{1FDB}{\ensuregreek{\@tabacckludge'\textIota}} % Ί
+\DeclareUnicodeCharacter{1FDD}{\ensuregreek{\@tabacckludge<`\textcompwordmark}} % ῝
+\DeclareUnicodeCharacter{1FDE}{\ensuregreek{\@tabacckludge>'\textcompwordmark}} % ῞
+\DeclareUnicodeCharacter{1FDF}{\ensuregreek{\@tabacckludge~<\textcompwordmark}} % ῟
+
+\DeclareUnicodeCharacter{1FE0}{\ensuregreek{\u\textupsilon}} % ῠ
+\DeclareUnicodeCharacter{1FE1}{\ensuregreek{\@tabacckludge=\textupsilon}} % ῡ
+\DeclareUnicodeCharacter{1FE2}{\ensuregreek{\`"\textupsilon}} % not \"`... % ῢ
+\DeclareUnicodeCharacter{1FE3}{\ensuregreek{\'"\textupsilon}} % not \"'... % ΰ
+\DeclareUnicodeCharacter{1FE4}{\ensuregreek{\@tabacckludge>r}} % ῤ
+\DeclareUnicodeCharacter{1FE5}{\ensuregreek{\@tabacckludge<r}} % ῥ
+\DeclareUnicodeCharacter{1FE6}{\ensuregreek{\~\textupsilon}} % ῦ
+\DeclareUnicodeCharacter{1FE7}{\ensuregreek{\~"\textupsilon}} % ῧ
+\DeclareUnicodeCharacter{1FE8}{\ensuregreek{\u\textUpsilon}} % Ῠ
+\DeclareUnicodeCharacter{1FE9}{\ensuregreek{\@tabacckludge=\textUpsilon}} % Ῡ
+\DeclareUnicodeCharacter{1FEA}{\ensuregreek{\@tabacckludge`\textUpsilon}} % Ὺ
+\DeclareUnicodeCharacter{1FEB}{\ensuregreek{\@tabacckludge'\textUpsilon}} % Ύ
+\DeclareUnicodeCharacter{1FEC}{\ensuregreek{\@tabacckludge<\textRho}} % Ῥ
+\DeclareUnicodeCharacter{1FED}{\ensuregreek{\`"\textcompwordmark}} % ῭
+\DeclareUnicodeCharacter{1FEE}{\ensuregreek{\'"\textcompwordmark}} % ΅
+\DeclareUnicodeCharacter{1FEF}{\ensuregreek{\@tabacckludge`\textcompwordmark}} % `
+
+\DeclareUnicodeCharacter{1FF2}{\ensuregreek{\@tabacckludge`\textomega|}} % ῲ
+\DeclareUnicodeCharacter{1FF3}{\ensuregreek{\textomega|}} % ῳ
+\DeclareUnicodeCharacter{1FF4}{\ensuregreek{\@tabacckludge'\textomega|}} % ῴ
+\DeclareUnicodeCharacter{1FF6}{\ensuregreek{\~\textomega}} % ῶ
+\DeclareUnicodeCharacter{1FF7}{\ensuregreek{\~\textomega|}} % ῷ
+\DeclareUnicodeCharacter{1FF8}{\ensuregreek{\@tabacckludge`\textOmicron}} % Ὸ
+\DeclareUnicodeCharacter{1FF9}{\ensuregreek{\@tabacckludge'\textOmicron}} % Ό
+\DeclareUnicodeCharacter{1FFA}{\ensuregreek{\@tabacckludge`\textOmega}} % Ὼ
+\DeclareUnicodeCharacter{1FFB}{\ensuregreek{\@tabacckludge'\textOmega}} % Ώ
+\DeclareUnicodeCharacter{1FFC}{\ensuregreek{\textOmega|}} % ῼ
+\DeclareUnicodeCharacter{1FFD}{\ensuregreek{\@tabacckludge'\textcompwordmark}} % ´
+\DeclareUnicodeCharacter{1FFE}{\ensuregreek{\@tabacckludge<\textcompwordmark}} % ῾
% General Punctuation
% ~~~~~~~~~~~~~~~~~~~
diff --git a/Master/texmf-dist/tex/latex/lgrx/lgrxenc.def b/Master/texmf-dist/tex/latex/lgrx/lgrxenc.def
index 0ca8547a3c4..c703c638380 100644
--- a/Master/texmf-dist/tex/latex/lgrx/lgrxenc.def
+++ b/Master/texmf-dist/tex/latex/lgrx/lgrxenc.def
@@ -10,16 +10,16 @@
% version 1.3 of this license or any later version.
%
% :Abstract: The LGR font encoding is the de-facto standard for Greek
-% typesetting with LaTeX. However, the encoding definition
-% file that ships with babel misses many of the definitions
-% common since the advent of the NFSS (see fntguide_ "Encodings").
+% typesetting with LaTeX. However, the encoding definition file
+% that ships with babel misses many of the definitions common
+% since the introduction of the NFSS (see fntguide_ "Encodings").
%
% This file provides a comprehensive set of macros to
% typeset Greek with LGR encoded fonts. It works for both,
% monotonic and polytonic Greek, independent of the `babel`
% package.
%
-% This package is part of the lgrx_ bundle.
+% This package is part of the lgrx_ bundle.
%
% .. contents::
%
@@ -42,12 +42,14 @@
% 0.5.1 2012-05-08 upload to CTAN
% 0.6 2012-06-29 ``\TextGreek`` wrapper command (used in lgrenc.dfu),
% aliases for ``puenc.def`` compatibility
+% 0.6.1 2013-02-12 ``\@uclclist`` entries for `PU` aliases
+% 0.7 unreleased documentation update, new accent macros names
% ===== ============ ====================================================
%
% Usage
% -----
%
-% To prevent confusion with Babel_'s rudimentary ``lgrenc.def``, this file is
+% To prevent confusion with Babel_'s ``lgrenc.def``, this file is
% named ``lgrxenc.def``. Load it by calling fontenc_ with the ``LGRx`` option
% or indirectly via the textalpha_ or alphabeta_ packages.
%
@@ -66,8 +68,8 @@
% ``\usepackage[LGRx,T1,LGR]{fontenc}``
%
%
-% Macro names
-% -----------
+% LICR macro names
+% ----------------
%
% The fntguide_ (section 6.4 Naming conventions) recommends:
%
@@ -77,81 +79,114 @@
% ``\math`` followed by the glyph name, for example
% ``\mathonequarter`` or ``\mathsterling``.
%
-% Open questions:
+% The `Adobe Glyph List For New Fonts`_ has names for many glyphs in the
+% `Greek and Coptic` Unicode block, but not for `Greek extended`.
+% The `Adobe Glyph List`_ (for existing fonts) lists additional glyph names
+% used in older fonts.
+%
+% Proposals
+% ~~~~~~~~~
%
-% * Can we omit the ``text`` prefix for macros that are already
-% established in short form (e.g. via babel's ``greek.ldf``) and do
-% not have a math counterpart?
+% * If there exists a math-mode macro for a symbol, form the corresponding text
+% macro by prepending ``text``?
%
-% Pro:
-% + Simpler.
+% Example:
+% The glyph name for the GREEK SMALL LETTER FINAL SIGMA is ``sigma1``,
+% the corresponding math-macro is ``\varsigma``. The text symbol could be
+% made available as ``\textvarsigma``.
+%
+% Problems:
+% ``\varepsilon`` and ``\varphi`` math macros map to characters named
+% "GREEK SMALL **LETTER** ...", while ``\\vartheta``, ``\\varkappa``,
+% ``\\varrho``, and ``\\varpi`` math macros map to "GREEK ... **SYMBOL**"
+% Unicode characters.
+%
+% In Greek text, these variants are interchangeable. The LGR font encoding
+% does not contain slots for "symbol" glyph variants. In some Greek fonts,
+% GREEK SMALL LETTERS use glyph variants resembling the corresponding
+% GREEK SYMBOL Unicode character's reference glyph.
+%
+% * Derive macro names from Unicode names?
+%
+% The `Unicode names list`_ provides standardized descriptive names for all
+% Unicode characters that use only capital letters of the Latin alphabet.
+% While not suited for direct use in a LICR macros, they can be either
+%
+% a) used as inspiration for new LICR macro names or
%
-% + Ease of use (less typing, better readability of source text).
+% b) converted to LICR macro names via a defined set of transformation rules.
%
-% + Backwards compatible (many established macro names).
+% Example:
+% ``\textfinalsigma`` or just ``\finalsigma`` as a more descriptive name
+% for GREEK SMALL LETTER FINAL SIGMA derived via the rules:
%
-% + There are examples of encoding-specific macros
-% without the ``text``-prefix, especially for letters:
+% * drop "LETTER" if the name remains unique,
+% * drop "GREEK" if the name remains unique,
+% * use capitalized name for capital letters, lowercase for "SMALL" letters
+% and drop "SMALL",
+% * concatenate
%
-% * ``\AE \DH \DJ \L \NG \OE \O \SS \TH \ae \dh \dj \guillemotleft``
-% ``\guillemotright \guilsinglleft \guilsinglright \i \j \l \ng``
-% ``\oe \o \quotedblbase \quotesinglbase \ss \th``
-% in `T1` and `OT1`,
-% * ``\CYR*`` and ``\cyr*`` in `T2*`
-% * ``\heb*`` or no prefix in `HE8`
-% * short descriptive names in the arabic part of `PU`
-% (``puarenc.def``) (but e.g. ``\textkoppagreek`` in
-% ``puenc.def``)
+% * Omit the "text" prefix for macros that do not have a math counterpart?
%
-% + ``text`` prefix does **not** mark a macro as
+% Pro:
+% + Simpler,
+%
+% + ease of use (less typing, better readability of source text),
+%
+% + many established text macro names without "text",
%
-% * encoding-specific
-% * inserting a glyph
+% + there are examples of encoding-specific macros
+% without the ``text``-prefix, especially for letters,
%
-% as there are e.g. font-changing macros (``\textbf``, ``\textit``)
-% and encoding-changing macros (``\textgreek``, ``\textcyr``).
+% :T1: ``\AE \DH \DJ \L \NG \OE \O \SS \TH \ae \dh \dj \guillemotleft``
+% ``\guillemotright \guilsinglleft \guilsinglright \i \j \l \ng``
+% ``\oe \o \quotedblbase \quotesinglbase \ss \th`` (also in OT1)
+% :T2*: ``\CYR*`` and ``\cyr*``
+% :HE8: ``\heb*`` or no prefix
+% :PU: short descriptive names in the arabic part (``puarenc.def``)
%
+% + ``text`` prefix does **not** mark a macro as encoding-specific or
+% "inserting a glyph". There are e.g. font-changing macros (``\textbf``,
+% ``\textit``) and encoding-changing macros (``\textgreek``,
+% ``\textcyr``).
%
% Contra:
% - Less consistent.
%
-% - ``text`` prefix marks a macro as confined to text mode
+% - ``text`` prefix marks a macro as confined to text mode.
%
-% - Short forms can be defined in a package.
%
-% * How to name *accent macros* (``\DeclareTextAccent`` definitions)?
+% How to name *accent macros*?
+% ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
%
-% - Should ``\texttonos`` be an accent macro or a spacing character?
+% * standard accent macros (``\DeclareTextAccent`` definitions in
+% ``latex/base/...``) are one-symbol macros (``\' \" ... \u \v ...``) .
%
-% - How about a common prefix ``\accent...`` or postfix ``\...Accent``?
+% * tipa.sty and ucs use the "text" prefix also for accents.
%
+% However, the `Adobe Glyph List For New Fonts`_ maps, e.g., "tonos" and
+% "dieresistonos" to 0384 GREEK TONOS and 0385 GREEK DIALYTIKA TONOS, hence
+% `\texttonos` and `\textdiaresistonos` should denote these spacing
+% characters.
%
-% * How about glyph names with numbers and dots?
+% * textcomp (ts1enc.def) defines ``\capital...`` accents (i.e. without
+% ``text`` prefix).
%
-% - Adobe recommends ``uni`` (or ``u``) + Unicode number for all
-% Unicode characters without established name.
+% * Use a common prefix ``\accent...`` or postfix ``\...accent``,
+% or short ``\acc...``?
%
-% While it is *possible* to apply this scheme to TeX macros, it is
-% hardly advisable: ``\koppa`` is far better readable than
-% ``\csname uni03DF\endcsname``.
+% Currently, `lgrx` uses for diacritics_:
%
-% * If there exists a math-mode macro for a symbol, the corresponding text
-% macro should be formed by prepending ``text``.
+% - Greek names like in Unicode, and ucsencs.def
%
-% Example: The glyph name for the final sigma is ``sigma1``, but the
-% corresponding math-macro is ``\varsigma``. IMO, the text symbol
-% should be available as ``\textvarsigma`` and not
-% ``\csname textsigma1\endcsname``.
+% - The prefix "acc" to distinguish the macros as `TextAaccent` and reduce the
+% risc of name clashes (cf ``\@tabacckludge``).
%
-% Could this become a general rule?
-%
-% Problems:
-% * ``\varepsilon`` and ``\varphi`` math macros map to "GREEK SMALL
-% LETTER \*", while others map to "GREEK * SYMBOL" Unicode chars.
+% - For the end-user "symbol macros" (``\~ \' \` \" \< \>``) are provided.
%
%
-% The `Adobe Glyph List For New Fonts`_ has names for many glyphs in the
-% `Greek and Coptic` Unicode block, but not for `Greek extended`.
+% References
+% ~~~~~~~~~~
%
% An alternative, more complete set of short mnemonic character names is
% the `XML Entity Definitions for Characters`_ W3C Recommendation from
@@ -164,14 +199,8 @@
% A full set of ``\text*`` symbol macros is defined in ``ucsencs.def``
% from the ucs_ package.
%
-% Using the names from ``puenc.def`` ensures that the hyperref_ package
-% will do the right conversion to a PDF-string
-% (see `<greek-part-of-puenc.def>`_).
-%
-% For accent macros, this file uses Greek names like in Unicode and
-% ucsencs.def (without ``text`` prefix). Accent macro names are Capitalized or
-% CamelCase, as they are intended for use in packages or classes. For the
-% end-user "symbol macros" (``\~ \' \` \" \< \>``) are provided.
+% Aliases from ``puenc.def`` ensure that the hyperref_ package can
+% convert Greek symbols to a PDF-string.
%
%
% Implementation
@@ -198,8 +227,7 @@
% ::
\ProvidesFile{lgrxenc.def}
- [2012/07/03 v0.6 %
- comprehensive LGR Greek Font Encoding definitions]
+[2013/05/03 v0.7 comprehensive LGR Greek Font Encoding definitions]
% Base setup
@@ -212,13 +240,14 @@
\DeclareFontSubstitution{LGR}{cmr}{m}{n}
\DeclareErrorFont{LGR}{cmr}{m}{n}{10}
-% The ``\TextGreek`` command can be used to ensure that its argument is set in
+% The ``\ensuregreek`` command can be used to ensure that its argument is set in
% a font encoding with support for Greek. If the font encoding is already LGR,
% kerning between adjacent command calls (e.g.
-% ``\TextGreek{A}\TextGreek{\Upsilon}``) is preserved. This allows wrapping of
+% ``\ensuregreek{A}\ensuregreek{\Upsilon}``) is preserved. This allows wrapping of
% compound Unicode character definitions. ::
-\DeclareTextCommand{\TextGreek}{LGR}[1]{#1}
+\DeclareTextCommand{\ensuregreek}{LGR}[1]{#1}
+\DeclareTextCommand{\TextGreek}{LGR}[1]{#1} % backwards compatibility
% Text symbols
@@ -230,11 +259,11 @@
% Greek letters are accessible by the Latin transcription, but the mapping is
% specific to the LGR font encoding.
%
-% The ``\text*`` macros provide a way to access the symbols in any font
-% encoding supporting Greek independent of the specific font encoding.
-% Alternative Greek font encodings are LGI (ibycus_) and PU (`PDF Unicode`
-% used by hyperref_ for PDF metadata). The `textalpha.sty` package makes these
-% macros available in any font encoding.
+% The LICR macros provide a way to access the symbols independent of the
+% specific font encoding, in any font encoding supporting Greek. Alternative
+% Greek font encodings are LGI (ibycus_) and PU (`PDF Unicode` used by
+% hyperref_ for PDF metadata). The textalpha_ package makes these macros
+% available independent of the current font encoding.
% ::
\DeclareTextSymbol{\textAlpha}{LGR}{65}
@@ -281,6 +310,7 @@
\DeclareTextSymbol{\textrho}{LGR}{114}
\DeclareTextCommand{\textsigma}{LGR}{s\noboundary} % σ
\DeclareTextSymbol{\textvarsigma}{LGR}{99} % ς final sigma
+\DeclareTextSymbol{\textfinalsigma}{LGR}{99} % ς final sigma
\DeclareTextSymbol{\textautosigma}{LGR}{115} % σ (ς at end of word)
\DeclareTextSymbol{\texttau}{LGR}{116}
\DeclareTextSymbol{\textupsilon}{LGR}{117}
@@ -315,56 +345,55 @@
% '''''''''''''''
% Names after babel_'s ``greek.ldf``, teubner_ and hyperref_'s puenc.def::
-\DeclareTextSymbol{\stigma}{LGR}{6} % ϛ (greek.df, teubner)
-\DeclareTextSymbol{\textstigmagreek}{LGR}{6} % ϛ (puenc.def)
+\DeclareTextSymbol{\stigma}{LGR}{6} % ϛ (greek.ldf, teubner)
\DeclareTextSymbol{\varstigma}{LGR}{7} % stigma variant (CB.enc, teubner)
-% \DeclareTextSymbol{\vardigamma}{LGR}{7} % digamma variant (greek.ldf)
\DeclareTextSymbol{\koppa}{LGR}{18} % ϟ (greek small letter koppa)
-\DeclareTextSymbol{\textkoppagreek}{LGR}{18} % ϟ (puenc.def)
\DeclareTextSymbol{\qoppa}{LGR}{19} % ϙ (archaic koppa)
\DeclareTextSymbol{\Qoppa}{LGR}{21} % Ϙ (archaic Koppa)
-\DeclareTextSymbol{\Stigma}{LGR}{22} % ϹΤ ligature (teubner)
-\DeclareTextSymbol{\textStigmagreek}{LGR}{22} % ϹΤ ligature (puenc.def)
-% \DeclareTextSymbol{\Stigma}{LGR}{??} % Ϛ
+\DeclareTextSymbol{\Stigma}{LGR}{22} % Ϛ (teubner) in some fonts ϹΤ ligature
\DeclareTextSymbol{\Sampi}{LGR}{23} % Ϡ
-\DeclareTextSymbol{\textSampigreek}{LGR}{23} % Ϡ (puenc.def)
\DeclareTextSymbol{\sampi}{LGR}{27} % ϡ
-\DeclareTextSymbol{\textsampigreek}{LGR}{27} % ϡ (puend.def)
\DeclareTextSymbol{\anoteleia}{LGR}{38} % ·
+\DeclareTextSymbol{\textanoteleia}{LGR}{38} % ·
\DeclareTextSymbol{\erotimatiko}{LGR}{63} % ;
% \digamma used by amsmath for math-macro:
-\DeclareTextSymbol{\ddigamma}{LGR}{147} % ϝ (greek.ldf)
-\DeclareTextSymbol{\Digamma}{LGR}{195} % Ϝ (greek.ldf)
-\DeclareTextSymbol{\textdigamma}{LGR}{147} % ϝ with "text" prefix
-\DeclareTextSymbol{\textDigamma}{LGR}{195} % Ϝ with "text" prefix
-\DeclareTextSymbol{\textdigammagreek}{LGR}{147} % ϝ (puenc.def)
-\DeclareTextSymbol{\textDigammagreek}{LGR}{195} % Ϝ (puenc.def)
+\DeclareTextSymbol{\textdigamma}{LGR}{147} % ϝ (uni-3.def (ucs))
+\DeclareTextSymbol{\textDigamma}{LGR}{195} % Ϝ (uni-3.def (ucs))
+
+% Compatibility aliases (defined via `TextCommand` so that up/downcasing works
+% without the need for additional uclclist entries::
+
+\DeclareTextCommand{\vardigamma}{LGR}{\varstigma} % greek.ldf
+\DeclareTextCommand{\textSampigreek}{LGR}{\Sampi} % puenc.def
+\DeclareTextCommand{\textsampigreek}{LGR}{\sampi} % puenc.def
+\DeclareTextCommand{\textstigmagreek}{LGR}{\stigma} % puenc.def
+\DeclareTextCommand{\textkoppagreek}{LGR}{\koppa} % puenc.def
+\DeclareTextCommand{\textStigmagreek}{LGR}{\Stigma} % puenc.def
+\DeclareTextCommand{\ddigamma}{LGR}{\textdigamma} % greek.ldf
+\DeclareTextCommand{\textdigammagreek}{LGR}{\textdigamma} % puenc.def
+\DeclareTextCommand{\Digamma}{LGR}{\textDigamma} % greek.ldf
+\DeclareTextCommand{\textDigammagreek}{LGR}{\textDigamma} % puenc.def
-% numeral signs
+% Numeral signs
% '''''''''''''
% See also http://en.wikipedia.org/wiki/Greek_numerals
%
-% Names from babel_ and teubner_::
+% Names from babel_, teubner_, and hyperref_'s puenc.def::
-\DeclareTextSymbol{\anwtonos}{LGR}{254} % ʹ (Dexia keraia)
-\DeclareTextSymbol{\katwtonos}{LGR}{255} % ͵ (Aristeri keraia)
-
-% alias names for compatibility with hyperref's puenc.def::
-
-\DeclareTextSymbol{\textnumeralsigngreek}{LGR}{254}
-\DeclareTextSymbol{\textnumeralsignlowergreek}{LGR}{255}
+\DeclareTextSymbol{\anwtonos}{LGR}{254} % ʹ (Dexia keraia)
+\DeclareTextSymbol{\textnumeralsigngreek}{LGR}{254} % ʹ (puenc.def)
+\DeclareTextSymbol{\katwtonos}{LGR}{255} % ͵ (Aristeri keraia)
+\DeclareTextSymbol{\textnumeralsignlowergreek}{LGR}{255} % ͵ (puenc.def)
% Other
% """""
%
-% Characters that also exist in other font encodings
-%
-% * Define them for LGR if there is a matching glyph,
-% so that they work if LGR is the only chosen font encoding.
+% Characters that also exist in other font encodings:
%
-% * Use established macro names that match with other ``*enc.def`` files and
+% * define them for LGR if there is a matching glyph,
+% * use established macro names that match with other ``*enc.def`` files and
% ``textcomp.sty``.
%
% ::
@@ -388,7 +417,7 @@
\ProvideTextCommand{\textasciiacute}{LGR}{\char39\textcompwordmark} % '
\ProvideTextCommand{\textasciigrave}{LGR}{\char96\textcompwordmark} % `
\DeclareTextCommand{\textasciitilde}{LGR}{\char126\textcompwordmark} % ~
-% \DeclareTextSymbol{\textohm}{LGR}{87} % Ω (Ohm sign ≠ Omega)
+\DeclareTextSymbol{\textohm}{LGR}{87} % Ω (Ohm sign -> Omega)
\DeclareTextSymbol{\texteuro}{LGR}{24} % € \euro in greek.ldf
\DeclareTextSymbol{\textpercent}{LGR}{37} % %
\DeclareTextSymbol{\textperthousand}{LGR}{25} % ‰ \permille in greek.ldf
@@ -396,13 +425,26 @@
% T3
\DeclareTextSymbol{\textschwa}{LGR}{26} % ə
+% Not implemented
+% """""""""""""""
+%
+% The characters at position 16 and 17 are used in the ``\nexus`` macro
+% of the teubner_ package to form an extensible, hat-like bracket. In
+% ``CB.enc``, they are mapped to
+%
+% 16--MODIFIER LETTER LOW ACUTE ACCENT
+% 17--MODIFIER LETTER LOW GRAVE ACCENT
+%
+% but according to the documentation of Werner Lemberg's `babel patch`_,
+% they rather represent the left and right part of U+23E0 TOP TORTOISE
+% SHELL BRACKET.
+%
% Babel's ``lgrenc.def`` has some definitions to prevent surprises with
% macros that expect a Latin script. These definitions are problematic
-% in the font-encoding definition file as they
+% in a font-encoding definition file as they
%
% * require ``\textlatin`` which is defined in ``babel.def``,
-%
-% * overwrite TS1 symbols set as default by ``textcomp.sty``.
+% * prevent use of TS1 symbols set as default by ``textcomp.sty``.
%
% ::
@@ -411,328 +453,402 @@
%\ProvideTextCommand{\texttrademark}{LGR}{\textsuperscript{\textlatin{TM}}}
%\ProvideTextCommand{\SS}{LGR}{\textlatin{SS}}
-% How about::
-
-%\ProvideTextCommand{\SS}{LGR}{\UseTextSymbol{T1}{\SS}}
-%\ProvideTextCommand{\textcopyright}{LGR}{{\UseTextSymbol{T1}{\textcopyright}}}
-% ...?
-
+% They may be moved to ``greek.ldf`` one day (with a caveat for textcomp/TS1).
+%
+%
% Diacritics
% ~~~~~~~~~~
%
-% Based on the teubner_ package by Claudio Beccari and the `babel
-% patch`_ by Werner Lemberg but with composite diacritic definitions
-% (iterative diacritics).
+% This section defines `named macros`_ for Greek diacritics and standard
+% `symbol macros`_ as alias for simple diacritics. Convenient input
+% conventions for `composite diacritics`_ are defined as `composite
+% definitions`_.
%
% Advantages:
%
-% * get accented characters without resorting to the
-% ligature mechanism (allows proper kerning, cf. teubner-doc_).
-% * reduced probability of incompatibilities (compared to teubner_
-% diacritic macros).
% * input convention similar to LGR input encodings (just prepend a ``\``).
%
-% simple diacritics
-% """""""""""""""""
+% * Access pre-composed characters without resorting to the
+% ligature mechanism (allows proper kerning, cf. teubner-doc_).
+%
+% * Named macros can be used to ensure a font encoding supporting Greek is
+% used. However, substitution with pre-composed characters works only for
+% the active font encoding (cf. textalpha_). Named accent macros can also be
+% used instead of the ``\@tabacckludge`` by to-LaTeX converters to ensure
+% working also inside the tabbing environment.
+%
+% * Named macros are required for upcasing according to Greek typesetting
+% conventions (cf. `UPPERCASE`_ below) and for composite diacritics.
%
-% Define Greek diacritics as named macros with shortcut alias.
%
-% Direct defining of ``\<`` and ``\>`` fails with
-% ```! Missing $ inserted.'`` (clash with math definitions).
-% Also, we need aliases for proper upcasing (cf. `UPPERCASE`_ below). ::
+% Named macros
+% """"""""""""
+%
+% Definitions are based on the teubner_ package by Claudio Beccari, the ucs_
+% package, and the `babel patch`_ by Werner Lemberg. Names are derived from
+% the Unicode name with the prefix "acc" (cf. `How to name accent macros?`_
+% above) resulting in reduced probability of incompatibilities compared to the
+% two-letter teubner_ diacritic macros.
+%
+% Simple Greek diacritics::
-\DeclareTextAccent{\Dasia}{LGR}{60} % δασεῖα spiritus asper (rough breathing)
-\DeclareTextAccent{\Psili}{LGR}{62} % ψιλή spiritus lenis (smooth breathing)
-\DeclareTextAccent{\Tonos}{LGR}{39} % τόνος/ὀξεῖα tonos/oxia (acute)
-\DeclareTextAccent{\Varia}{LGR}{96} % βαρεῖα (grave)
-\DeclareTextAccent{\Perispomeni}{LGR}{126} % περισπωμένη (circonflex/tilde)
-\DeclareTextAccent{\Dialytika}{LGR}{34} % διαλυτικά (diaeresis/trema)
+\DeclareTextAccent{\accdialytika}{LGR}{34} % διαλυτικά (diaeresis/trema)
+\DeclareTextAccent{\acctonos}{LGR}{39} % τόνος/ὀξεῖα tonos/oxia (acute)
+\DeclareTextAccent{\accdasia}{LGR}{60} % δασεῖα spiritus asper (rough breathing)
+\DeclareTextAccent{\accpsili}{LGR}{62} % ψιλή spiritus lenis (smooth breathing)
+\DeclareTextAccent{\accvaria}{LGR}{96} % βαρεῖα (grave)
+\DeclareTextAccent{\accperispomeni}{LGR}{126} % περισπωμένη (circonflex/tilde)
-\DeclareTextCommand{\<}{LGR}{\Dasia}
-\DeclareTextCommand{\>}{LGR}{\Psili}
-\DeclareTextCommand{\'}{LGR}{\Tonos}
-\DeclareTextCommand{\`}{LGR}{\Varia}
-\DeclareTextCommand{\~}{LGR}{\Perispomeni}
-\DeclareTextCommand{\"}{LGR}{\Dialytika}
+% The sub-iota is input after the base character. In LGR fonts, ligatures are
+% defined for pre-composed characters, the postfix ligature does not interfere
+% with kerning::
-% These are not required as the postfix ligature
-% does not interfere with kerning::
+\DeclareTextSymbol{\prosgegrammeni}{LGR}{8} % ι "capital" sub-iota
+\DeclareTextSymbol{\ypogegrammeni}{LGR}{124} % ͺ "small" sub-iota
-\DeclareTextSymbol{\Ypogegrammeni}{LGR}{124} % "small" sub-iota
-\DeclareTextSymbol{\Prosgegrammeni}{LGR}{8} % "capital" sub-iota
+% Composite diacritics::
-% for critical editions or classical Greek::
+% Teubner name
+\DeclareTextAccent{\accdialytikaperispomeni}{LGR}{32} % Cd
+\DeclareTextAccent{\accdialytikatonos}{LGR}{35} % Ad
+\DeclareTextAccent{\accdialytikavaria}{LGR}{36} % Gd
-\DeclareTextAccent{\lowbreve}{LGR}{20} % low breve
-\DeclareTextAccent{\u}{LGR}{30} % breve
-\DeclareTextAccent{\=}{LGR}{31} % macron
+\DeclareTextAccent{\accdasiaperispomeni}{LGR}{64} % Cr
+\DeclareTextAccent{\accdasiavaria}{LGR}{67} % Gr
+\DeclareTextAccent{\accdasiaoxia}{LGR}{86} % Ar
-% The characters at position 16 and 17 are used in the ``\nexus`` macro
-% of the teubner_ package to form an extensible, hat-like bracket. In
-% ``CB.enc``, they are mapped to
-%
-% 16--MODIFIER LETTER LOW ACUTE ACCENT
-% 17--MODIFIER LETTER LOW GRAVE ACCENT
+\DeclareTextAccent{\accpsiliperispomeni}{LGR}{92} % Cs
+\DeclareTextAccent{\accpsilioxia}{LGR}{94} % As
+\DeclareTextAccent{\accpsilivaria}{LGR}{95} % Gs
+
+% For classical Greek and linguistics, the LGR font encoding contains a number
+% of additional diacritic symbols::
+
+\DeclareTextAccent{\subinvertedbreve}{LGR}{1} % INVERTED BREVE BELOW
+\DeclareTextAccent{\textsubarch}{LGR}{1} % (tipa)
+\DeclareTextAccent{\subbreve}{LGR}{20} % BREVE BELOW
+\DeclareTextAccent{\u}{LGR}{30} % BREVE
+\DeclareTextAccent{\=}{LGR}{31} % MACRON
+
+
+% Aliases
+% """""""
%
-% but according to the documentation of Werner Lemberg's `babel patch`_,
-% they rather represent the left and right part of U+23E0 TOP TORTOISE
-% SHELL BRACKET.
+% _`Symbol macros`::
+
+\DeclareTextCommand{\"}{LGR}{\accdialytika}
+\DeclareTextCommand{\'}{LGR}{\acctonos}
+\DeclareTextCommand{\`}{LGR}{\accvaria}
+\DeclareTextCommand{\~}{LGR}{\accperispomeni}
+\DeclareTextCommand{\<}{LGR}{\accdasia}
+\DeclareTextCommand{\>}{LGR}{\accpsili}
+
+% TODO: do we also want alternative symbols for the breathings (cf. X compose
+% table, LCI encoding)? ::
+
+%\DeclareTextCommand{\(}{LGR}{\accdasia}
+%\DeclareTextCommand{\)}{LGR}{\accpsili}
+
+% Two Unicode names for one character::
+
+\DeclareTextCommand{\accoxia}{LGR}{\acctonos}
+\DeclareTextCommand{\acckoronis}{LGR}{\accpsili}
+
+% Backwards compatibility with LGRx versions < 0.7::
+
+\DeclareTextCommand{\Ypogegrammeni}{LGR}{\ypogegrammeni}
+\DeclareTextCommand{\Prosgegrammeni}{LGR}{\prosgegrammeni}
+
+\DeclareTextCommand{\lowbreve}{LGR}{\brevebelow}
+\DeclareTextCommand{\Dasia}{LGR}{\accdasia}
+\DeclareTextCommand{\Psili}{LGR}{\accpsili}
+\DeclareTextCommand{\Tonos}{LGR}{\acctonos}
+\DeclareTextCommand{\Varia}{LGR}{\accvaria}
+\DeclareTextCommand{\Perispomeni}{LGR}{\accperispomeni}
+\DeclareTextCommand{\Dialytika}{LGR}{\accdialytika}
+
+\DeclareTextCommand{\DialytikaPerispomeni}{LGR}{\accdialytikaperispomeni}
+\DeclareTextCommand{\DialytikaTonos}{LGR}{\accdialytikatonos}
+\DeclareTextCommand{\DialytikaVaria}{LGR}{\accdialytikavaria}
+\DeclareTextCommand{\DasiaPerispomeni}{LGR}{\accdasiaperispomeni}
+\DeclareTextCommand{\DasiaVaria}{LGR}{\accdasiavaria}
+\DeclareTextCommand{\DasiaOxia}{LGR}{\accdasiaoxia}
+\DeclareTextCommand{\PsiliPerispomeni}{LGR}{\accpsiliperispomeni}
+\DeclareTextCommand{\PsiliOxia}{LGR}{\accpsilioxia}
+\DeclareTextCommand{\PsiliVaria}{LGR}{\accpsilivaria}
+
+
+% Composite definitions
+% ~~~~~~~~~~~~~~~~~~~~~
%
+% Composite diacritics
+% """"""""""""""""""""
%
-% composite diacritics
+% Composite accents can be input as sequence of simple diacritics (in
+% arbitrary order) via named macro, symbol macro and "transcription
+% characters", e.g. ``\accdialytica\accvaria\textalpha``, ``\"\'\textalpha``,
+% ``\"'\textalpha``, or ``\'"\textalpha``.
+%
+% Separate definitions for the supported variants of the second input token
+% are required as composition is based on the non-expanded input
+
+% The composition with simple "transcription characters" must also be defined
+% for the symbol macros, otherwise it fails with ``\Makeuppercase``)::
+
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\acctonos}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\'}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{'}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\"}{LGR}{'}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\accvaria}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\`}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{`}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\"}{LGR}{`}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\accperispomeni}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\~}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{~}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\"}{LGR}{~}{\accdialytikaperispomeni}
+
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\accdialytika}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\"}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{"}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\'}{LGR}{"}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\accdasia}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\<}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{<}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\'}{LGR}{<}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\accpsili}{\accpsilioxia}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\>}{\accpsilioxia}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{>}{\accpsilioxia}
+\DeclareTextCompositeCommand{\'}{LGR}{>}{\accpsilioxia}
+
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\accdialytika}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\"}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{"}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\`}{LGR}{"}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\accdasia}{\accdasiavaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\<}{\accdasiavaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{<}{\accdasiavaria}
+\DeclareTextCompositeCommand{\`}{LGR}{<}{\accdasiavaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\accpsili}{\accpsilivaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\>}{\accpsilivaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{>}{\accpsilivaria}
+\DeclareTextCompositeCommand{\`}{LGR}{>}{\accpsilivaria}
+
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{\accdialytika}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{\"}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{"}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\~}{LGR}{"}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{\accdasia}{\accdasiaperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{\<}{\accdasiaperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{<}{\accdasiaperispomeni}
+\DeclareTextCompositeCommand{\~}{LGR}{<}{\accdasiaperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{\accpsili}{\accpsiliperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{\>}{\accpsiliperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{>}{\accpsiliperispomeni}
+\DeclareTextCompositeCommand{\~}{LGR}{>}{\accpsiliperispomeni}
+
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\acctonos}{\accpsilioxia}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\'}{\accpsilioxia}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{'}{\accpsilioxia}
+\DeclareTextCompositeCommand{\>}{LGR}{'}{\accpsilioxia}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\accvaria}{\accpsilivaria}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\`}{\accpsilivaria}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{`}{\accpsilivaria}
+\DeclareTextCompositeCommand{\>}{LGR}{`}{\accpsilivaria}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\accperispomeni}{\accpsiliperispomeni}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\~}{\accpsiliperispomeni}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{~}{\accpsiliperispomeni}
+\DeclareTextCompositeCommand{\>}{LGR}{~}{\accpsiliperispomeni}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\acctonos}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\'}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{'}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\<}{LGR}{'}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\accvaria}{\accdasiavaria}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\`}{\accdasiavaria}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{`}{\accdasiavaria}
+\DeclareTextCompositeCommand{\<}{LGR}{`}{\accdasiavaria}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\accperispomeni}{\accdasiaperispomeni}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\~}{\accdasiaperispomeni}
+\DeclareTextCompositeCommand{\<}{LGR}{~}{\accdasiaperispomeni}
+
+
+% Pre-composed letters
% """"""""""""""""""""
+% Small letters with diacritics
+% '''''''''''''''''''''''''''''
%
-% Definitions::
-
-% Unicode Name Teubner name
-\DeclareTextAccent{\DasiaOxia}{LGR}{86} % Ar
-\DeclareTextAccent{\DasiaVaria}{LGR}{67} % Gr
-\DeclareTextAccent{\DasiaPerispomeni}{LGR}{64} % Cr
-
-\DeclareTextAccent{\PsiliOxia}{LGR}{94} % As
-\DeclareTextAccent{\PsiliVaria}{LGR}{95} % Gs
-\DeclareTextAccent{\PsiliPerispomeni}{LGR}{92} % Cs
-
-\DeclareTextAccent{\DialytikaTonos}{LGR}{35} % Ad, tonos/oxia
-\DeclareTextAccent{\DialytikaVaria}{LGR}{36} % Gd
-\DeclareTextAccent{\DialytikaPerispomeni}{LGR}{32} % Cd
-
-% Composition from simple diacritics
-% (the composition with simple "transcription characters" is done for
-% the shortcut marcros, otherwise it fails with ``\Makeuppercase``)::
-
-\DeclareTextCompositeCommand{\Dialytika}{LGR}{\Tonos}{\DialytikaTonos}
-\DeclareTextCompositeCommand{\"}{LGR}{'}{\DialytikaTonos}
-\DeclareTextCompositeCommand{\"}{LGR}{\'}{\DialytikaTonos}
-\DeclareTextCompositeCommand{\Dialytika}{LGR}{\Varia}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\"}{LGR}{`}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\"}{LGR}{\`}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\Dialytika}{LGR}{\Perispomeni}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\"}{LGR}{~}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\"}{LGR}{\~}{\DialytikaPerispomeni}
-
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Dialytika}{\DialytikaTonos}
-\DeclareTextCompositeCommand{\'}{LGR}{"}{\DialytikaTonos}
-\DeclareTextCompositeCommand{\'}{LGR}{\"}{\DialytikaTonos}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Dasia}{\DasiaOxia}
-\DeclareTextCompositeCommand{\'}{LGR}{<}{\DasiaOxia}
-\DeclareTextCompositeCommand{\'}{LGR}{\<}{\DasiaOxia}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Psili}{\PsiliOxia}
-\DeclareTextCompositeCommand{\'}{LGR}{>}{\PsiliOxia}
-\DeclareTextCompositeCommand{\'}{LGR}{\>}{\PsiliOxia}
-
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Dialytika}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\`}{LGR}{"}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\`}{LGR}{\"}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Dasia}{\DasiaVaria}
-\DeclareTextCompositeCommand{\`}{LGR}{<}{\DasiaVaria}
-\DeclareTextCompositeCommand{\`}{LGR}{\<}{\DasiaVaria}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Psili}{\PsiliVaria}
-\DeclareTextCompositeCommand{\`}{LGR}{>}{\PsiliVaria}
-\DeclareTextCompositeCommand{\`}{LGR}{\>}{\PsiliVaria}
-
-\DeclareTextCompositeCommand{\Perispomeni}{LGR}{\Dialytika}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\~}{LGR}{"}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\~}{LGR}{\"}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\Perispomeni}{LGR}{\Dasia}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\~}{LGR}{<}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\~}{LGR}{\<}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\Perispomeni}{LGR}{\Psili}{\PsiliPerispomeni}
-\DeclareTextCompositeCommand{\~}{LGR}{>}{\PsiliPerispomeni}
-\DeclareTextCompositeCommand{\~}{LGR}{\>}{\PsiliPerispomeni}
-
-\DeclareTextCompositeCommand{\Psili}{LGR}{\Tonos}{\PsiliOxia}
-\DeclareTextCompositeCommand{\>}{LGR}{'}{\PsiliOxia}
-\DeclareTextCompositeCommand{\>}{LGR}{\'}{\PsiliOxia}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\Varia}{\PsiliVaria}
-\DeclareTextCompositeCommand{\>}{LGR}{`}{\PsiliVaria}
-\DeclareTextCompositeCommand{\>}{LGR}{\`}{\PsiliVaria}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\Perispomeni}{\PsiliPerispomeni}
-\DeclareTextCompositeCommand{\>}{LGR}{~}{\PsiliPerispomeni}
-\DeclareTextCompositeCommand{\>}{LGR}{\~}{\PsiliPerispomeni}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Tonos}{\DasiaOxia}
-\DeclareTextCompositeCommand{\<}{LGR}{'}{\DasiaOxia}
-\DeclareTextCompositeCommand{\<}{LGR}{\'}{\DasiaOxia}
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Varia}{\DasiaVaria}
-\DeclareTextCompositeCommand{\<}{LGR}{`}{\DasiaVaria}
-\DeclareTextCompositeCommand{\<}{LGR}{\`}{\DasiaVaria}
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Perispomeni}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\<}{LGR}{~}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\<}{LGR}{\~}{\DasiaPerispomeni}
-
-% Pre-composed letters with diacritics
% (from teubner_ with changed names of the composite accents)::
-\DeclareTextComposite{\Varia}{LGR}{a}{128}
-\DeclareTextComposite{\Dasia}{LGR}{a}{129}
-\DeclareTextComposite{\Psili}{LGR}{a}{130}
-\DeclareTextComposite{\DasiaVaria}{LGR}{a}{131}
-\DeclareTextComposite{\Tonos}{LGR}{a}{136}
-\DeclareTextComposite{\DasiaOxia}{LGR}{a}{137}
-\DeclareTextComposite{\PsiliOxia}{LGR}{a}{138}
-\DeclareTextComposite{\PsiliVaria}{LGR}{a}{139}
-\DeclareTextComposite{\Perispomeni}{LGR}{a}{144}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{a}{145}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{a}{146}
-\DeclareTextComposite{\Varia}{LGR}{h}{152}
-\DeclareTextComposite{\Dasia}{LGR}{h}{153}
-\DeclareTextComposite{\Psili}{LGR}{h}{154}
-\DeclareTextComposite{\Tonos}{LGR}{h}{160}
-\DeclareTextComposite{\DasiaOxia}{LGR}{h}{161}
-\DeclareTextComposite{\PsiliOxia}{LGR}{h}{162}
-\DeclareTextComposite{\DasiaVaria}{LGR}{h}{163}
-\DeclareTextComposite{\Perispomeni}{LGR}{h}{168}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{h}{169}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{h}{170}
-\DeclareTextComposite{\PsiliVaria}{LGR}{h}{171}
-\DeclareTextComposite{\Varia}{LGR}{w}{176}
-\DeclareTextComposite{\Dasia}{LGR}{w}{177}
-\DeclareTextComposite{\Psili}{LGR}{w}{178}
-\DeclareTextComposite{\DasiaVaria}{LGR}{w}{179}
-\DeclareTextComposite{\Tonos}{LGR}{w}{184}
-\DeclareTextComposite{\DasiaOxia}{LGR}{w}{185}
-\DeclareTextComposite{\PsiliOxia}{LGR}{w}{186}
-\DeclareTextComposite{\PsiliVaria}{LGR}{w}{187}
-\DeclareTextComposite{\Perispomeni}{LGR}{w}{192}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{w}{193}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{w}{194}
-\DeclareTextComposite{\Varia}{LGR}{i}{200}
-\DeclareTextComposite{\Dasia}{LGR}{i}{201}
-\DeclareTextComposite{\Psili}{LGR}{i}{202}
-\DeclareTextComposite{\DasiaVaria}{LGR}{i}{203}
-\DeclareTextComposite{\Tonos}{LGR}{i}{208}
-\DeclareTextComposite{\DasiaOxia}{LGR}{i}{209}
-\DeclareTextComposite{\PsiliOxia}{LGR}{i}{210}
-\DeclareTextComposite{\PsiliVaria}{LGR}{i}{211}
-\DeclareTextComposite{\Perispomeni}{LGR}{i}{216}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{i}{217}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{i}{218}
-\DeclareTextComposite{\Dialytika}{LGR}{i}{240}
-\DeclareTextComposite{\DialytikaVaria}{LGR}{i}{241}
-\DeclareTextComposite{\DialytikaTonos}{LGR}{i}{242}
-\DeclareTextComposite{\DialytikaPerispomeni}{LGR}{i}{243}
-\DeclareTextComposite{\Varia}{LGR}{u}{204}
-\DeclareTextComposite{\Dasia}{LGR}{u}{205}
-\DeclareTextComposite{\Psili}{LGR}{u}{206}
-\DeclareTextComposite{\DasiaVaria}{LGR}{u}{207}
-\DeclareTextComposite{\Tonos}{LGR}{u}{212}
-\DeclareTextComposite{\DasiaOxia}{LGR}{u}{213}
-\DeclareTextComposite{\PsiliOxia}{LGR}{u}{214}
-\DeclareTextComposite{\PsiliVaria}{LGR}{u}{215}
-\DeclareTextComposite{\Perispomeni}{LGR}{u}{220}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{u}{221}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{u}{222}
-\DeclareTextComposite{\Dialytika}{LGR}{u}{244}
-\DeclareTextComposite{\DialytikaVaria}{LGR}{u}{245}
-\DeclareTextComposite{\DialytikaTonos}{LGR}{u}{246}
-\DeclareTextComposite{\DialytikaPerispomeni}{LGR}{u}{247}
-\DeclareTextComposite{\Varia}{LGR}{e}{224}
-\DeclareTextComposite{\Dasia}{LGR}{e}{225}
-\DeclareTextComposite{\Psili}{LGR}{e}{226}
-\DeclareTextComposite{\DasiaVaria}{LGR}{e}{227}
-\DeclareTextComposite{\Tonos}{LGR}{e}{232}
-\DeclareTextComposite{\DasiaOxia}{LGR}{e}{233}
-\DeclareTextComposite{\PsiliOxia}{LGR}{e}{234}
-\DeclareTextComposite{\PsiliVaria}{LGR}{e}{235}
-\DeclareTextComposite{\Varia}{LGR}{o}{228}
-\DeclareTextComposite{\Dasia}{LGR}{o}{229}
-\DeclareTextComposite{\Psili}{LGR}{o}{230}
-\DeclareTextComposite{\DasiaVaria}{LGR}{o}{231}
-\DeclareTextComposite{\Tonos}{LGR}{o}{236}
-\DeclareTextComposite{\DasiaOxia}{LGR}{o}{237}
-\DeclareTextComposite{\PsiliOxia}{LGR}{o}{238}
-\DeclareTextComposite{\PsiliVaria}{LGR}{o}{239}
-\DeclareTextComposite{\Dasia}{LGR}{r}{251}
-\DeclareTextComposite{\Psili}{LGR}{r}{252}
-
-% Do the same for the ``\text*`` macros::
-
-\DeclareTextComposite{\Varia}{LGR}{\textalpha}{128}
-\DeclareTextComposite{\Dasia}{LGR}{\textalpha}{129}
-\DeclareTextComposite{\Psili}{LGR}{\textalpha}{130}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\textalpha}{131}
-\DeclareTextComposite{\Tonos}{LGR}{\textalpha}{136}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\textalpha}{137}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\textalpha}{138}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\textalpha}{139}
-\DeclareTextComposite{\Perispomeni}{LGR}{\textalpha}{144}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\textalpha}{145}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\textalpha}{146}
-\DeclareTextComposite{\Varia}{LGR}{\texteta}{152}
-\DeclareTextComposite{\Dasia}{LGR}{\texteta}{153}
-\DeclareTextComposite{\Psili}{LGR}{\texteta}{154}
-\DeclareTextComposite{\Tonos}{LGR}{\texteta}{160}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\texteta}{161}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\texteta}{162}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\texteta}{163}
-\DeclareTextComposite{\Perispomeni}{LGR}{\texteta}{168}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\texteta}{169}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\texteta}{170}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\texteta}{171}
-\DeclareTextComposite{\Varia}{LGR}{\textomega}{176}
-\DeclareTextComposite{\Dasia}{LGR}{\textomega}{177}
-\DeclareTextComposite{\Psili}{LGR}{\textomega}{178}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\textomega}{179}
-\DeclareTextComposite{\Tonos}{LGR}{\textomega}{184}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\textomega}{185}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\textomega}{186}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\textomega}{187}
-\DeclareTextComposite{\Perispomeni}{LGR}{\textomega}{192}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\textomega}{193}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\textomega}{194}
-\DeclareTextComposite{\Varia}{LGR}{\textiota}{200}
-\DeclareTextComposite{\Dasia}{LGR}{\textiota}{201}
-\DeclareTextComposite{\Psili}{LGR}{\textiota}{202}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\textiota}{203}
-\DeclareTextComposite{\Tonos}{LGR}{\textiota}{208}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\textiota}{209}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\textiota}{210}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\textiota}{211}
-\DeclareTextComposite{\Perispomeni}{LGR}{\textiota}{216}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\textiota}{217}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\textiota}{218}
-\DeclareTextComposite{\Dialytika}{LGR}{\textiota}{240}
-\DeclareTextComposite{\DialytikaVaria}{LGR}{\textiota}{241}
-\DeclareTextComposite{\DialytikaTonos}{LGR}{\textiota}{242}
-\DeclareTextComposite{\DialytikaPerispomeni}{LGR}{\textiota}{243}
-\DeclareTextComposite{\Varia}{LGR}{\textupsilon}{204}
-\DeclareTextComposite{\Dasia}{LGR}{\textupsilon}{205}
-\DeclareTextComposite{\Psili}{LGR}{\textupsilon}{206}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\textupsilon}{207}
-\DeclareTextComposite{\Tonos}{LGR}{\textupsilon}{212}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\textupsilon}{213}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\textupsilon}{214}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\textupsilon}{215}
-\DeclareTextComposite{\Perispomeni}{LGR}{\textupsilon}{220}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\textupsilon}{221}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\textupsilon}{222}
-\DeclareTextComposite{\Dialytika}{LGR}{\textupsilon}{244}
-\DeclareTextComposite{\DialytikaVaria}{LGR}{\textupsilon}{245}
-\DeclareTextComposite{\DialytikaTonos}{LGR}{\textupsilon}{246}
-\DeclareTextComposite{\DialytikaPerispomeni}{LGR}{\textupsilon}{247}
-\DeclareTextComposite{\Varia}{LGR}{\textepsilon}{224}
-\DeclareTextComposite{\Dasia}{LGR}{\textepsilon}{225}
-\DeclareTextComposite{\Psili}{LGR}{\textepsilon}{226}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\textepsilon}{227}
-\DeclareTextComposite{\Tonos}{LGR}{\textepsilon}{232}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\textepsilon}{233}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\textepsilon}{234}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\textepsilon}{235}
-\DeclareTextComposite{\Varia}{LGR}{\textomicron}{228}
-\DeclareTextComposite{\Dasia}{LGR}{\textomicron}{229}
-\DeclareTextComposite{\Psili}{LGR}{\textomicron}{230}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\textomicron}{231}
-\DeclareTextComposite{\Tonos}{LGR}{\textomicron}{236}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\textomicron}{237}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\textomicron}{238}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\textomicron}{239}
-\DeclareTextComposite{\Dasia}{LGR}{r}{251}
-\DeclareTextComposite{\Psili}{LGR}{r}{252}
-
-
-% Capital letters
-% ~~~~~~~~~~~~~~~
+\DeclareTextComposite{\accvaria}{LGR}{a}{128}
+\DeclareTextComposite{\accdasia}{LGR}{a}{129}
+\DeclareTextComposite{\accpsili}{LGR}{a}{130}
+\DeclareTextComposite{\accdasiavaria}{LGR}{a}{131}
+\DeclareTextComposite{\acctonos}{LGR}{a}{136}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{a}{137}
+\DeclareTextComposite{\accpsilioxia}{LGR}{a}{138}
+\DeclareTextComposite{\accpsilivaria}{LGR}{a}{139}
+\DeclareTextComposite{\accperispomeni}{LGR}{a}{144}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{a}{145}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{a}{146}
+\DeclareTextComposite{\accvaria}{LGR}{h}{152}
+\DeclareTextComposite{\accdasia}{LGR}{h}{153}
+\DeclareTextComposite{\accpsili}{LGR}{h}{154}
+\DeclareTextComposite{\acctonos}{LGR}{h}{160}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{h}{161}
+\DeclareTextComposite{\accpsilioxia}{LGR}{h}{162}
+\DeclareTextComposite{\accdasiavaria}{LGR}{h}{163}
+\DeclareTextComposite{\accperispomeni}{LGR}{h}{168}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{h}{169}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{h}{170}
+\DeclareTextComposite{\accpsilivaria}{LGR}{h}{171}
+\DeclareTextComposite{\accvaria}{LGR}{w}{176}
+\DeclareTextComposite{\accdasia}{LGR}{w}{177}
+\DeclareTextComposite{\accpsili}{LGR}{w}{178}
+\DeclareTextComposite{\accdasiavaria}{LGR}{w}{179}
+\DeclareTextComposite{\acctonos}{LGR}{w}{184}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{w}{185}
+\DeclareTextComposite{\accpsilioxia}{LGR}{w}{186}
+\DeclareTextComposite{\accpsilivaria}{LGR}{w}{187}
+\DeclareTextComposite{\accperispomeni}{LGR}{w}{192}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{w}{193}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{w}{194}
+\DeclareTextComposite{\accvaria}{LGR}{i}{200}
+\DeclareTextComposite{\accdasia}{LGR}{i}{201}
+\DeclareTextComposite{\accpsili}{LGR}{i}{202}
+\DeclareTextComposite{\accdasiavaria}{LGR}{i}{203}
+\DeclareTextComposite{\acctonos}{LGR}{i}{208}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{i}{209}
+\DeclareTextComposite{\accpsilioxia}{LGR}{i}{210}
+\DeclareTextComposite{\accpsilivaria}{LGR}{i}{211}
+\DeclareTextComposite{\accperispomeni}{LGR}{i}{216}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{i}{217}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{i}{218}
+\DeclareTextComposite{\accdialytika}{LGR}{i}{240}
+\DeclareTextComposite{\accdialytikavaria}{LGR}{i}{241}
+\DeclareTextComposite{\accdialytikatonos}{LGR}{i}{242}
+\DeclareTextComposite{\accdialytikaperispomeni}{LGR}{i}{243}
+\DeclareTextComposite{\accvaria}{LGR}{u}{204}
+\DeclareTextComposite{\accdasia}{LGR}{u}{205}
+\DeclareTextComposite{\accpsili}{LGR}{u}{206}
+\DeclareTextComposite{\accdasiavaria}{LGR}{u}{207}
+\DeclareTextComposite{\acctonos}{LGR}{u}{212}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{u}{213}
+\DeclareTextComposite{\accpsilioxia}{LGR}{u}{214}
+\DeclareTextComposite{\accpsilivaria}{LGR}{u}{215}
+\DeclareTextComposite{\accperispomeni}{LGR}{u}{220}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{u}{221}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{u}{222}
+\DeclareTextComposite{\accdialytika}{LGR}{u}{244}
+\DeclareTextComposite{\accdialytikavaria}{LGR}{u}{245}
+\DeclareTextComposite{\accdialytikatonos}{LGR}{u}{246}
+\DeclareTextComposite{\accdialytikaperispomeni}{LGR}{u}{247}
+\DeclareTextComposite{\accvaria}{LGR}{e}{224}
+\DeclareTextComposite{\accdasia}{LGR}{e}{225}
+\DeclareTextComposite{\accpsili}{LGR}{e}{226}
+\DeclareTextComposite{\accdasiavaria}{LGR}{e}{227}
+\DeclareTextComposite{\acctonos}{LGR}{e}{232}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{e}{233}
+\DeclareTextComposite{\accpsilioxia}{LGR}{e}{234}
+\DeclareTextComposite{\accpsilivaria}{LGR}{e}{235}
+\DeclareTextComposite{\accvaria}{LGR}{o}{228}
+\DeclareTextComposite{\accdasia}{LGR}{o}{229}
+\DeclareTextComposite{\accpsili}{LGR}{o}{230}
+\DeclareTextComposite{\accdasiavaria}{LGR}{o}{231}
+\DeclareTextComposite{\acctonos}{LGR}{o}{236}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{o}{237}
+\DeclareTextComposite{\accpsilioxia}{LGR}{o}{238}
+\DeclareTextComposite{\accpsilivaria}{LGR}{o}{239}
+\DeclareTextComposite{\accdasia}{LGR}{r}{251}
+\DeclareTextComposite{\accpsili}{LGR}{r}{252}
+
+% Pre-composed letters with diacritics + LICR macros::
+
+\DeclareTextComposite{\accvaria}{LGR}{\textalpha}{128}
+\DeclareTextComposite{\accdasia}{LGR}{\textalpha}{129}
+\DeclareTextComposite{\accpsili}{LGR}{\textalpha}{130}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\textalpha}{131}
+\DeclareTextComposite{\acctonos}{LGR}{\textalpha}{136}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\textalpha}{137}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\textalpha}{138}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\textalpha}{139}
+\DeclareTextComposite{\accperispomeni}{LGR}{\textalpha}{144}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\textalpha}{145}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\textalpha}{146}
+\DeclareTextComposite{\accvaria}{LGR}{\texteta}{152}
+\DeclareTextComposite{\accdasia}{LGR}{\texteta}{153}
+\DeclareTextComposite{\accpsili}{LGR}{\texteta}{154}
+\DeclareTextComposite{\acctonos}{LGR}{\texteta}{160}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\texteta}{161}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\texteta}{162}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\texteta}{163}
+\DeclareTextComposite{\accperispomeni}{LGR}{\texteta}{168}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\texteta}{169}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\texteta}{170}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\texteta}{171}
+\DeclareTextComposite{\accvaria}{LGR}{\textomega}{176}
+\DeclareTextComposite{\accdasia}{LGR}{\textomega}{177}
+\DeclareTextComposite{\accpsili}{LGR}{\textomega}{178}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\textomega}{179}
+\DeclareTextComposite{\acctonos}{LGR}{\textomega}{184}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\textomega}{185}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\textomega}{186}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\textomega}{187}
+\DeclareTextComposite{\accperispomeni}{LGR}{\textomega}{192}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\textomega}{193}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\textomega}{194}
+\DeclareTextComposite{\accvaria}{LGR}{\textiota}{200}
+\DeclareTextComposite{\accdasia}{LGR}{\textiota}{201}
+\DeclareTextComposite{\accpsili}{LGR}{\textiota}{202}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\textiota}{203}
+\DeclareTextComposite{\acctonos}{LGR}{\textiota}{208}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\textiota}{209}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\textiota}{210}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\textiota}{211}
+\DeclareTextComposite{\accperispomeni}{LGR}{\textiota}{216}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\textiota}{217}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\textiota}{218}
+\DeclareTextComposite{\accdialytika}{LGR}{\textiota}{240}
+\DeclareTextComposite{\accdialytikavaria}{LGR}{\textiota}{241}
+\DeclareTextComposite{\accdialytikatonos}{LGR}{\textiota}{242}
+\DeclareTextComposite{\accdialytikaperispomeni}{LGR}{\textiota}{243}
+\DeclareTextComposite{\accvaria}{LGR}{\textupsilon}{204}
+\DeclareTextComposite{\accdasia}{LGR}{\textupsilon}{205}
+\DeclareTextComposite{\accpsili}{LGR}{\textupsilon}{206}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\textupsilon}{207}
+\DeclareTextComposite{\acctonos}{LGR}{\textupsilon}{212}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\textupsilon}{213}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\textupsilon}{214}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\textupsilon}{215}
+\DeclareTextComposite{\accperispomeni}{LGR}{\textupsilon}{220}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\textupsilon}{221}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\textupsilon}{222}
+\DeclareTextComposite{\accdialytika}{LGR}{\textupsilon}{244}
+\DeclareTextComposite{\accdialytikavaria}{LGR}{\textupsilon}{245}
+\DeclareTextComposite{\accdialytikatonos}{LGR}{\textupsilon}{246}
+\DeclareTextComposite{\accdialytikaperispomeni}{LGR}{\textupsilon}{247}
+\DeclareTextComposite{\accvaria}{LGR}{\textepsilon}{224}
+\DeclareTextComposite{\accdasia}{LGR}{\textepsilon}{225}
+\DeclareTextComposite{\accpsili}{LGR}{\textepsilon}{226}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\textepsilon}{227}
+\DeclareTextComposite{\acctonos}{LGR}{\textepsilon}{232}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\textepsilon}{233}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\textepsilon}{234}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\textepsilon}{235}
+\DeclareTextComposite{\accvaria}{LGR}{\textomicron}{228}
+\DeclareTextComposite{\accdasia}{LGR}{\textomicron}{229}
+\DeclareTextComposite{\accpsili}{LGR}{\textomicron}{230}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\textomicron}{231}
+\DeclareTextComposite{\acctonos}{LGR}{\textomicron}{236}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\textomicron}{237}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\textomicron}{238}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\textomicron}{239}
+\DeclareTextComposite{\accdasia}{LGR}{r}{251}
+\DeclareTextComposite{\accpsili}{LGR}{r}{252}
+
+
+% Capital letters with diacritics
+% '''''''''''''''''''''''''''''''
%
% In Greek, diacritics are omitted in all-uppercase words, but kept as part
% of an uppercase initial (written before rather than above the letter).
@@ -742,160 +858,158 @@
%
% -- http://en.wikipedia.org/wiki/Capitalization
%
-% Title Case
-% """"""""""
-%
-% Place diacritics before instead of above::
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{A}{<A}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{A}{<`A}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{A}{<'A}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{A}{<\char126A}
-\DeclareTextCompositeCommand{\Psili}{LGR}{A}{>A}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{A}{>`A}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{A}{>'A}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{A}{>\char126A}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{A}{'A}
-\DeclareTextCompositeCommand{\Varia}{LGR}{A}{`A}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{E}{<E}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{E}{<'E}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{E}{<`E}
-\DeclareTextCompositeCommand{\Psili}{LGR}{E}{>E}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{E}{>'E}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{E}{>`E}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{E}{'E}
-\DeclareTextCompositeCommand{\Varia}{LGR}{E}{`E}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{H}{<H}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{H}{<`H}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{H}{<'H}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{H}{<\char126H}
-\DeclareTextCompositeCommand{\Psili}{LGR}{H}{>H}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{H}{>`H}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{H}{>'H}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{H}{>\char126H}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{H}{'H}
-\DeclareTextCompositeCommand{\Varia}{LGR}{H}{`H}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{I}{<I}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{I}{<`I}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{I}{<'I}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{I}{<\char126I}
-\DeclareTextCompositeCommand{\Psili}{LGR}{I}{>I}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{I}{>`I}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{I}{>'I}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{I}{>\char126I}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{I}{'I}
-\DeclareTextCompositeCommand{\Varia}{LGR}{I}{`I}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{O}{<O}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{O}{<`O}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{O}{<'O}
-\DeclareTextCompositeCommand{\Psili}{LGR}{O}{>O}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{O}{>`O}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{O}{>'O}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{O}{'O}
-\DeclareTextCompositeCommand{\Varia}{LGR}{O}{`O}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{U}{<U}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{U}{<`U}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{U}{<'U}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{U}{<\char126U}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{U}{'U}
-\DeclareTextCompositeCommand{\Varia}{LGR}{U}{`U}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{W}{<W}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{W}{<`W}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{W}{<'W}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{W}{<\char126W}
-\DeclareTextCompositeCommand{\Psili}{LGR}{W}{>W}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{W}{>`W}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{W}{>'W}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{W}{>\char126W}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{W}{'W}
-\DeclareTextCompositeCommand{\Varia}{LGR}{W}{`W}
+% In Title Case, place diacritics before instead of above the base character::
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{A}{<A}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{A}{<`A}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{A}{<'A}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{A}{<\char126A}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{A}{>A}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{A}{>`A}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{A}{>'A}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{A}{>\char126A}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{A}{'A}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{A}{`A}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{E}{<E}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{E}{<'E}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{E}{<`E}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{E}{>E}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{E}{>'E}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{E}{>`E}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{E}{'E}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{E}{`E}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{H}{<H}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{H}{<`H}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{H}{<'H}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{H}{<\char126H}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{H}{>H}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{H}{>`H}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{H}{>'H}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{H}{>\char126H}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{H}{'H}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{H}{`H}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{I}{<I}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{I}{<`I}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{I}{<'I}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{I}{<\char126I}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{I}{>I}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{I}{>`I}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{I}{>'I}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{I}{>\char126I}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{I}{'I}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{I}{`I}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{O}{<O}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{O}{<`O}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{O}{<'O}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{O}{>O}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{O}{>`O}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{O}{>'O}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{O}{'O}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{O}{`O}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{U}{<U}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{U}{<`U}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{U}{<'U}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{U}{<\char126U}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{U}{'U}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{U}{`U}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{W}{<W}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{W}{<`W}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{W}{<'W}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{W}{<\char126W}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{W}{>W}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{W}{>`W}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{W}{>'W}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{W}{>\char126W}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{W}{'W}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{W}{`W}
% Except for the dialytika::
-\DeclareTextComposite{\Dialytika}{LGR}{I}{219}
-\DeclareTextComposite{\Dialytika}{LGR}{U}{223}
-
-% Do the same for the ``\text*`` macros::
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textAlpha}{<A}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textAlpha}{<`A}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textAlpha}{<'A}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\textAlpha}{<\char126A}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\textAlpha}{>A}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\textAlpha}{>`A}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\textAlpha}{>'A}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{\textAlpha}{>\char126A}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textAlpha}{'A}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textAlpha}{`A}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textEpsilon}{<E}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textEpsilon}{<'E}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textEpsilon}{<`E}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\textEpsilon}{>E}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\textEpsilon}{>'E}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\textEpsilon}{>`E}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textEpsilon}{'E}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textEpsilon}{`E}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textEta}{<H}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textEta}{<`H}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textEta}{<'H}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\textEta}{<\char126H}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\textEta}{>H}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\textEta}{>`H}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\textEta}{>'H}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{\textEta}{>\char126H}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textEta}{'H}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textEta}{`H}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textIota}{<I}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textIota}{<`I}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textIota}{<'I}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\textIota}{<\char126I}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\textIota}{>I}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\textIota}{>`I}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\textIota}{>'I}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{\textIota}{>\char126I}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textIota}{'I}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textIota}{`I}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textOmicron}{<O}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textOmicron}{<`O}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textOmicron}{<'O}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\textOmicron}{>O}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\textOmicron}{>`O}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\textOmicron}{>'O}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textOmicron}{'O}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textOmicron}{`O}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textUpsilon}{<U}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textUpsilon}{<`U}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textUpsilon}{<'U}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\textUpsilon}{<\char126U}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textUpsilon}{'U}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textUpsilon}{`U}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textOmega}{<W}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textOmega}{<`W}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textOmega}{<'W}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\textOmega}{<\char126W}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\textOmega}{>W}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\textOmega}{>`W}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\textOmega}{>'W}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{\textOmega}{>\char126W}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textOmega}{'W}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textOmega}{`W}
+\DeclareTextComposite{\accdialytika}{LGR}{I}{219}
+\DeclareTextComposite{\accdialytika}{LGR}{U}{223}
+
+% Do the same for the LICR macros::
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textAlpha}{<A}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textAlpha}{<`A}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textAlpha}{<'A}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\textAlpha}{<\char126A}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\textAlpha}{>A}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\textAlpha}{>`A}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\textAlpha}{>'A}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\textAlpha}{>\char126A}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textAlpha}{'A}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textAlpha}{`A}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textEpsilon}{<E}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textEpsilon}{<'E}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textEpsilon}{<`E}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\textEpsilon}{>E}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\textEpsilon}{>'E}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\textEpsilon}{>`E}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textEpsilon}{'E}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textEpsilon}{`E}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textEta}{<H}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textEta}{<`H}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textEta}{<'H}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\textEta}{<\char126H}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\textEta}{>H}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\textEta}{>`H}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\textEta}{>'H}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\textEta}{>\char126H}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textEta}{'H}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textEta}{`H}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textIota}{<I}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textIota}{<`I}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textIota}{<'I}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\textIota}{<\char126I}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\textIota}{>I}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\textIota}{>`I}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\textIota}{>'I}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\textIota}{>\char126I}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textIota}{'I}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textIota}{`I}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textOmicron}{<O}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textOmicron}{<`O}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textOmicron}{<'O}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\textOmicron}{>O}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\textOmicron}{>`O}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\textOmicron}{>'O}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textOmicron}{'O}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textOmicron}{`O}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textUpsilon}{<U}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textUpsilon}{<`U}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textUpsilon}{<'U}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\textUpsilon}{<\char126U}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textUpsilon}{'U}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textUpsilon}{`U}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textOmega}{<W}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textOmega}{<`W}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textOmega}{<'W}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\textOmega}{<\char126W}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\textOmega}{>W}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\textOmega}{>`W}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\textOmega}{>'W}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\textOmega}{>\char126W}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textOmega}{'W}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textOmega}{`W}
% Except for the dialytika::
-\DeclareTextComposite{\Dialytika}{LGR}{\textIota}{219}
-\DeclareTextComposite{\Dialytika}{LGR}{\textUpsilon}{223}
+\DeclareTextComposite{\accdialytika}{LGR}{\textIota}{219}
+\DeclareTextComposite{\accdialytika}{LGR}{\textUpsilon}{223}
+
% UPPERCASE
% ~~~~~~~~~
@@ -912,21 +1026,21 @@
\expandafter\def\expandafter\@uclclist\expandafter{%
\@uclclist
- \Dasia\do@nothing
- \DasiaOxia\@hiatus
- \DasiaVaria\do@nothing
- \DasiaPerispomeni\do@nothing
- \Psili\@hiatus
- \PsiliOxia\@hiatus
- \PsiliVaria\@hiatus
- \PsiliPerispomeni\do@nothing
- \Tonos\@hiatus
- \Varia\do@nothing
- \DialytikaTonos\up@Dialytika
- \DialytikaVaria\up@Dialytika
- \DialytikaPerispomeni\up@Dialytika
- \Perispomeni\do@nothing
- \Ypogegrammeni\Prosgegrammeni
+ \accdasia\acc@invisible
+ \accdasiaoxia\@hiatus
+ \accdasiavaria\acc@invisible
+ \accdasiaperispomeni\acc@invisible
+ \accpsili\@hiatus
+ \accpsilioxia\@hiatus
+ \accpsilivaria\@hiatus
+ \accpsiliperispomeni\acc@invisible
+ \acctonos\@hiatus
+ \accvaria\acc@invisible
+ \accdialytikatonos\acc@Dialytika
+ \accdialytikavaria\acc@Dialytika
+ \accdialytikaperispomeni\acc@Dialytika
+ \accperispomeni\acc@invisible
+ \ypogegrammeni\prosgegrammeni
%
\textalpha \textAlpha
\textbeta \textBeta
@@ -959,7 +1073,7 @@
\varstigma \Stigma
\stigma \Stigma
\sampi \Sampi
- \ddigamma \Digamma
+ \textdigamma \textDigamma
}
% Substitution macros
@@ -969,31 +1083,48 @@
% '''''''''''''''
% ::
-\DeclareTextCommand{\do@nothing}{LGR}[1]{#1}
+\DeclareTextCommand{\acc@invisible}{LGR}[1]{#1}
% (The argument processing ensures that kerning is preserved)
%
% Keep dialytika.
% '''''''''''''''
%
-% Define an alias so that downcasing with ``\MakeLowercase`` does not
+% Define a dummy alias so that downcasing with ``\MakeLowercase`` does not
% convert a simple dialytika to a composite accent::
-\DeclareTextCommand{\up@Dialytika}{LGR}{\Dialytika}
+\DeclareTextCommand{\acc@Dialytika}{LGR}{\accdialytika}
+
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\@hiatus}{\accdialytika}
+% .. TODO: MakeUppercase with ``\"'`` fails if the language is "greek".
+% How can we specify a composite command with character ``"9F``,
+% the uccode of ``'``?
+%
+% % \DeclareTextCompositeCommand{\acc@Dialytika}{LGR}{"9F}{\accdialytika}
+% % \DeclareTextAccent{\acc@Dialytika}{LGR}{34} % upcase Dialytika
+% % \DeclareTextCompositeCommand{\acc@Dialytika}{LGR}{\@hiatus}{\accdialytika}
+% % \DeclareTextCompositeCommand{\acc@Dialytika}{LGR}{'}{\accdialytika}
+%
% Mark hiatus
% '''''''''''
%
-% Tonos and dasia mark a hiatus (break-up of a diphtong) if placed on the
+% Tonos and dasia mark a hiatus if placed on the
% first vowel of a diphthong (ΑΙ, ΑΥ, ΕΙ). A dialytika must be placed on the
% second vowel if they are dropped (άυλος → ΑΫΛΟΣ, μάινα → ΜΑΪΝΑ, κέικ → ΚΕΪΚ,
% ἀυπνία → ΑΫΠΝΙΑ)::
\DeclareTextCommand{\@hiatus}{LGR}[1]{#1}
+\DeclareTextCompositeCommand{\@hiatus}{LGR}{>}{\@hiatus}
+\DeclareTextCompositeCommand{\@hiatus}{LGR}{<}{\acc@invisible}
\DeclareTextCompositeCommand{\@hiatus}{LGR}{A}{\A@hiatus}
\DeclareTextCompositeCommand{\@hiatus}{LGR}{\textAlpha}{\A@hiatus}
\DeclareTextCompositeCommand{\@hiatus}{LGR}{E}{\E@hiatus}
\DeclareTextCompositeCommand{\@hiatus}{LGR}{\textEpsilon}{\E@hiatus}
+% What does the \@hiatus command "see" if an unicode literal follows?
+% \DeclareTextCompositeCommand{\@hiatus}{LGR}{\symbol{"ce}}{bluff}
+% \DeclareTextCompositeCommand{\@hiatus}{LGR}{"cf}{blaff}
+% \DeclareTextCompositeCommand{\@hiatus}{LGR}{ι}{blaff}
% Look ahead and place a diaeresis on Ι or Υ::
@@ -1062,23 +1193,26 @@
% .. References
% ----------
%
-% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
-% .. _lgrx: http://mirror.ctan.org/help/Catalogue/entries/lgrx.html
-% .. _textalpha: textalpha.sty.html
-% .. _alphabeta: alphabeta.sty.html
-% .. _Babel: http://mirror.ctan.org/help/Catalogue/entries/babel.html
-% .. _ibycus: http://mirror.ctan.org/help/Catalogue/entries/ibycus-babel.html
-% .. _libertine: http://mirror.ctan.org/help/Catalogue/entries/libertine-legacy.html
-% .. _hyperref: http://mirror.ctan.org/help/Catalogue/entries/hyperref.html
-% .. _fontenc: http://mirror.ctan.org/help/Catalogue/entries/fontenc.html
% .. _Adobe Glyph List For New Fonts:
-% http://www.adobe.com/devnet/opentype/archives/aglfn.txt
-% .. _athnum: http://mirror.ctan.org/help/Catalogue/entries/athnum.html
-% .. _fntguide: http://mirror.ctan.org/macros/latex/doc/fntguide.pdf
+% http://www.adobe.com/devnet-archive/opentype/archives/aglfn.txt
+% .. _Adobe Glyph List:
+% http://partners.adobe.com/public/developer/en/opentype/glyphlist.txt
+% .. _alphabeta: alphabeta.sty.html
+% .. _athnum: http://www.ctan.org/pkg/athnum
+% .. _Babel: http://www.ctan.org/pkg/babel
% .. _babel patch: http://www.eutypon.gr/eutypon/pdf/e2008-20/e20-a03.pdf
-% .. _teubner: http://mirror.ctan.org/help/Catalogue/entries/teubner.html
+% .. _fntguide: http://mirror.ctan.org/macros/latex/doc/fntguide.pdf
+% .. _fontenc: http://www.ctan.org/pkg/fontenc
+% .. _hyperref: http://www.ctan.org/pkg/hyperref
+% .. _ibycus: http://www.ctan.org/pkg/ibycus-babel
+% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
+% .. _lgrx: http://www.ctan.org/pkg/lgrx
+% .. _libertine: http://www.ctan.org/pkg/libertine-legacy
+% .. _teubner: http://www.ctan.org/pkg/teubner
% .. _teubner-doc:
-% http://mirror.ctan.org/macros/latex/contrib/teubner/teubner-doc.pdf
-% .. _ucs: http://mirror.ctan.org/help/Catalogue/entries/unicode.html
+% http://mirror.ctan.org/macros/latex/contrib/teubner/teubner-doc.pdf
+% .. _textalpha: textalpha.sty.html
+% .. _ucs: http://www.ctan.org/pkg/unicode
+% .. _Unicode names list: http://www.unicode.org/Public/UNIDATA/NamesList.txt
% .. _XML Entity Definitions for Characters:
-% http://www.w3.org/TR/xml-entity-names/
+% http://www.w3.org/TR/xml-entity-names/
diff --git a/Master/texmf-dist/tex/latex/lgrx/textalpha.sty b/Master/texmf-dist/tex/latex/lgrx/textalpha.sty
index 86741a240ee..be762209959 100644
--- a/Master/texmf-dist/tex/latex/lgrx/textalpha.sty
+++ b/Master/texmf-dist/tex/latex/lgrx/textalpha.sty
@@ -14,7 +14,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{textalpha}
-[2012/07/03 v0.2 macros for Greek letters in text]
+[2013/05/03 v0.3 macros for Greek letters in text]
% This package is part of the lgrx_ bundle.
%
@@ -30,47 +30,44 @@
% ========== ===== =========================================================
% 2010-06-16 0.1 initial version
% 2012-06-27 0.2 support for compound Unicode definitions outside LGR
+% 2013-05-03 0.3 new accent macro names with lgrxenc.def 0.7
% ========== ===== =========================================================
%
% Motivation
% ==========
%
-% By default, macros for Greek letters
+% By default, TeX macros for Greek letters
%
% * are only valid in mathematical mode,
% * do not change shape (default shape is italic).
%
-% In Greek text fonts with the LGR font encoding, letters are
-% accessible by a Latin transcription.
+% In Greek text fonts with the LGR font encoding, letters are accessible by a
+% Latin transcription or, with lgrx_, ``\textalpha`` -- ``\textOmega``
+% LICR macros.
%
-% This package provides a set of macros that can be used to access Greek
-% symbols from a font in LGR encoding (e.g. the `CB fonts`_) without the
-% need for an explicite font-encoding switch.
+% This package declares the LGR font encoding as default for Greek LICR
+% macros. After loading it, symbols from a Greek text font (e.g. the `CB
+% fonts`_) can be accessed without the need for an explicite font-encoding
+% switch.
%
-% The macro names follow the established scheme to prepend ``\text*`` to
-% the Adobe glyph name (if it exists) or the corresponding math-macro, so
-% ``\textalpha`` -- ``\textOmega`` prints α – Ω.
+% * In combination with the ``\text`` macro from amsmath, this can be used to
+% get matching upright and bold upright Greek symbols in math mode.
%
-% * In combination with the ``\text`` macro from amsmath, this can be
-% used to get matching upright and bold upright Greek symbols in math
-% as well.
-%
-% * In combination with ``\usepackage[utf8]{inputenc}`` and the
-% accompanying ``lgrenc.dfu`` file, Unicode input of Greek characters
-% is supported.
-%
-% This is done using NFSS default definitions as explained in the
-% fntguide_ (section 5.3).
+% * In combination with ``\usepackage[utf8]{inputenc}`` and the accompanying
+% ``lgrenc.dfu`` file, Unicode input of Greek characters is supported.
%
% Attention
-% While the macros work reasonably well for single letters, the automatic
-% font-encoding switches behind the doors interferes with the kerning
-% between the letters and replacement of accent+character with a
-% pre-composed character.
+% While the font-encoding independent macros work reasonably well for single
+% symbols, the automatic font-encoding switches behind the doors interferes
+% with the kerning between letters and replacement of accent+character
+% with a pre-composed character.
%
% Therefore, Greek text should be written with the help of babel_, setting
% the language to either ``greek`` or ``polutonikogreek`` or wrapped in the
-% provided ``\TextGreek`` macro.
+% provided ``\ensuregreek`` macro.
+%
+% The package uses NFSS default definitions as explained in the fntguide_
+% (section 5.3).
%
%
% Implementation
@@ -83,14 +80,14 @@
\input{lgrxenc.def}
-% TextGreek
-% ---------
+% ensuregreek
+% -----------
%
-% The ``\TextGreek`` command can be used to ensure that its argument is set in
+% The ``\ensuregreek`` command can be used to ensure that its argument is set in
% a font encoding with support for Greek. We define LGR as default encoding for
% Greek text::
-\DeclareTextCommandDefault{\TextGreek}[1]{{\fontencoding{LGR}\selectfont #1}}
+\DeclareTextCommandDefault{\ensuregreek}[1]{{\fontencoding{LGR}\selectfont #1}}
% .. The [fntguide_] writes
%
@@ -98,24 +95,29 @@
% one-argument encoding-specific command, not just those defined with
% ``\DeclareTextAccent``.
%
-% However, the simpler alternative:
-% ``\DeclareTextAccentDefault{\TextGreek}{LGR}`` this fails with the table
-% of Unicode characters in the test document `<textalpha-test.tex>`__:
+% However, the simpler alternative
+% ``\DeclareTextAccentDefault{\ensuregreek}{LGR}`` fails with the table of
+% Unicode characters in the test document `<textalpha-test.tex>`__:
%
% ``! You can't use a prefix with `end-group character }'.``
%
-% Font encodings supporting Greek script (e.g. LGI) may declare a specific
-% text command that passes the argument unchanged. This way, kerning and
-% selection of precomposed glyphs work also for cases like
-% ``\TextGreek{\'A}U``.
-%
-% .. Do this for PU here? ``\DeclareTextCommand{\TextGreek}{PU}[1]{#1}``
+% Eventually, all font encodings supporting Greek script (e.g. LGI, PU, EU1,
+% EU2) will declare ``\ensuregreek`` as text command that passes the argument
+% unchanged. This way, kerning and selection of precomposed glyphs would work
+% also for cases like ``\ensuregreek{\'A}U``.
%
-% Rather not: Not required, as hyperref's PDF string preparation
-% ignores unknown commands. Can lead to infinite recursion (``TeX capacity
-% exeeded``) without the ``unicode=true`` hyperref option.:
+% .. Do this for PU here? ``\DeclareTextCommand{\ensuregreek}{PU}[1]{#1}``
%
+% Can lead to infinite recursion (``TeX capacity exeeded``) without the
+% ``unicode=true`` hyperref option.
+% (How about a test whether the PU font encoding is defined?).
%
+% Backwards compatibility definition: versions < 0.3 used the macro
+% name ``\TextGreek``::
+
+\DeclareTextCommandDefault{\TextGreek}[1]{{\fontencoding{LGR}\selectfont #1}}
+
+
% Greek Alphabet
% --------------
%
@@ -165,6 +167,8 @@
\DeclareTextSymbolDefault{\textrho}{LGR}
\DeclareTextSymbolDefault{\textsigma}{LGR}
\DeclareTextSymbolDefault{\textvarsigma}{LGR}
+\DeclareTextSymbolDefault{\textfinalsigma}{LGR} % alias for \textvarsigma
+\DeclareTextSymbolDefault{\textautosigma}{LGR} % char 115 in LGR
\DeclareTextSymbolDefault{\texttau}{LGR}
\DeclareTextSymbolDefault{\textupsilon}{LGR}
\DeclareTextSymbolDefault{\textphi}{LGR}
@@ -175,6 +179,9 @@
% Additional Greek symbols
% """"""""""""""""""""""""
%
+% Including alias names for compatibility with hyperref's puenc.def and babel's
+% greek.ldf.
+%
% Ancient Greek Numbers (Athenian Numerals)::
\DeclareTextSymbolDefault{\PiDelta}{LGR} % GREEK ACROPHONIC ATTIC FIFTY
@@ -203,19 +210,18 @@
\DeclareTextSymbolDefault{\anoteleia}{LGR} % ·
\DeclareTextSymbolDefault{\erotimatiko}{LGR} % ;
% \digamma used by amsmath!
+\DeclareTextSymbolDefault{\textdigamma}{LGR} % ϝ (LGRx)
+\DeclareTextSymbolDefault{\textDigamma}{LGR} % Ϝ
\DeclareTextSymbolDefault{\ddigamma}{LGR} % ϝ (greek.ldf)
\DeclareTextSymbolDefault{\Digamma}{LGR} % Ϝ
-\DeclareTextSymbolDefault{\textdigamma}{LGR} % ϝ alias using "text" prefix
-\DeclareTextSymbolDefault{\textDigamma}{LGR} % Ϝ alias using "text" prefix
\DeclareTextSymbolDefault{\textdigammagreek}{LGR} % ϝ (puenc.def)
\DeclareTextSymbolDefault{\textDigammagreek}{LGR} % Ϝ (puenc.def)
% numeral signs: http://en.wikipedia.org/wiki/Greek_numerals
\DeclareTextSymbolDefault{\anwtonos}{LGR} % ʹ (Dexia keraia)
\DeclareTextSymbolDefault{\katwtonos}{LGR} % ͵ (Aristeri keraia)
-% alias names for compatibility with hyperref's puenc.def:
-\DeclareTextSymbolDefault{\textnumeralsigngreek}{LGR}
-\DeclareTextSymbolDefault{\textnumeralsignlowergreek}{LGR}
+\DeclareTextSymbolDefault{\textnumeralsigngreek}{LGR} % (puenc.def)
+\DeclareTextSymbolDefault{\textnumeralsignlowergreek}{LGR} % (puenc.def)
% Diacritics
% ----------
@@ -223,42 +229,65 @@
% Diacritics are defined via "named" macros in ``lgrxenc.def``. Make them
% default in any encoding::
-\DeclareTextAccentDefault{\Dasia}{LGR}
-\DeclareTextAccentDefault{\Psili}{LGR}
-\DeclareTextAccentDefault{\Tonos}{LGR}
-\DeclareTextAccentDefault{\Varia}{LGR}
-\DeclareTextAccentDefault{\Perispomeni}{LGR}
-\DeclareTextAccentDefault{\Dialytika}{LGR}
+\DeclareTextAccentDefault{\accdasia}{LGR}
+\DeclareTextAccentDefault{\accpsili}{LGR}
+\DeclareTextAccentDefault{\acctonos}{LGR}
+\DeclareTextAccentDefault{\accvaria}{LGR}
+\DeclareTextAccentDefault{\accperispomeni}{LGR}
+\DeclareTextAccentDefault{\accdialytika}{LGR}
\DeclareTextAccentDefault{\<}{LGR}
\DeclareTextAccentDefault{\>}{LGR}
%
-\DeclareTextAccentDefault{\DasiaOxia}{LGR}
-\DeclareTextAccentDefault{\DasiaVaria}{LGR}
-\DeclareTextAccentDefault{\DasiaPerispomeni}{LGR}
-\DeclareTextAccentDefault{\PsiliOxia}{LGR}
-\DeclareTextAccentDefault{\PsiliVaria}{LGR}
-\DeclareTextAccentDefault{\PsiliPerispomeni}{LGR}
-\DeclareTextAccentDefault{\DialytikaTonos}{LGR}
-\DeclareTextAccentDefault{\DialytikaVaria}{LGR}
-\DeclareTextAccentDefault{\DialytikaPerispomeni}{LGR}
+\DeclareTextAccentDefault{\accdasiaoxia}{LGR}
+\DeclareTextAccentDefault{\accdasiavaria}{LGR}
+\DeclareTextAccentDefault{\accdasiaperispomeni}{LGR}
+\DeclareTextAccentDefault{\accpsilioxia}{LGR}
+\DeclareTextAccentDefault{\accpsilivaria}{LGR}
+\DeclareTextAccentDefault{\accpsiliperispomeni}{LGR}
+\DeclareTextAccentDefault{\accdialytikatonos}{LGR}
+\DeclareTextAccentDefault{\accdialytikavaria}{LGR}
+\DeclareTextAccentDefault{\accdialytikaperispomeni}{LGR}
% Postfix accents::
-\DeclareTextSymbolDefault{\Ypogegrammeni}{LGR} % "small" sub-iota
-\DeclareTextSymbolDefault{\Prosgegrammeni}{LGR} % "capital" sub-iota
+\DeclareTextSymbolDefault{\ypogegrammeni}{LGR} % "small" sub-iota
+\DeclareTextSymbolDefault{\prosgegrammeni}{LGR} % "capital" sub-iota
-% Auxiliary commands
-% ------------------
+% Auxiliary macros
+% ----------------
%
-% ``\MakeUppercase`` requires some internal commands::
+% ``\MakeUppercase`` requires two internal commands::
\DeclareTextAccentDefault{\@hiatus}{LGR}
-\DeclareTextAccentDefault{\up@Dialytika}{LGR}
+\DeclareTextAccentDefault{\@Dialytika}{LGR}
+
+% Backwards compatibility with LGRx versions < 0.7::
+
+\DeclareTextSymbolDefault{\Ypogegrammeni}{LGR}
+\DeclareTextSymbolDefault{\Prosgegrammeni}{LGR}
+\DeclareTextAccentDefault{\Dasia}{LGR}
+\DeclareTextAccentDefault{\Psili}{LGR}
+\DeclareTextAccentDefault{\Tonos}{LGR}
+\DeclareTextAccentDefault{\Varia}{LGR}
+\DeclareTextAccentDefault{\Perispomeni}{LGR}
+\DeclareTextAccentDefault{\Dialytika}{LGR}
+
+\DeclareTextAccentDefault{\DialytikaPerispomeni}{LGR}
+\DeclareTextAccentDefault{\DialytikaTonos}{LGR}
+\DeclareTextAccentDefault{\DialytikaVaria}{LGR}
+\DeclareTextAccentDefault{\DasiaPerispomeni}{LGR}
+\DeclareTextAccentDefault{\DasiaVaria}{LGR}
+\DeclareTextAccentDefault{\DasiaOxia}{LGR}
+\DeclareTextAccentDefault{\PsiliPerispomeni}{LGR}
+\DeclareTextAccentDefault{\PsiliOxia}{LGR}
+\DeclareTextAccentDefault{\PsiliVaria}{LGR}
+
% .. References
% ----------
% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
% .. _lgrx: http://www.ctan.org/pkg/lgrx
+% .. _textgreek: http://www.ctan.org/pkg/textgreek
% .. _babel: http://www.ctan.org/cgi-bin/ctanPackageInformation.py?id=babel
% .. _fntguide: http://www.ctan.org/tex-archive/macros/latex/doc/fntguide.pdf
% .. _CB fonts: http://www.ctan.org/pkg/cbgreek-complete