summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/greek-fontenc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-05 22:00:16 +0000
committerKarl Berry <karl@freefriends.org>2015-09-05 22:00:16 +0000
commit62cb48658056cee12fac2741b88adac4d664851e (patch)
treea06a15d042d5db480314b5a436d63ca3e02a2c0e /Master/texmf-dist/tex/latex/greek-fontenc
parentb87d035e26c6d72bc073ee6a6cf5459e444afbd2 (diff)
greek-fontenc (4sep15)
git-svn-id: svn://tug.org/texlive/trunk@38297 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/greek-fontenc')
-rw-r--r--Master/texmf-dist/tex/latex/greek-fontenc/alphabeta-euenc.def70
-rw-r--r--Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty176
-rw-r--r--Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def478
-rw-r--r--Master/texmf-dist/tex/latex/greek-fontenc/greek-fontenc.def24
-rw-r--r--Master/texmf-dist/tex/latex/greek-fontenc/lgrenc.def261
-rw-r--r--Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty302
6 files changed, 910 insertions, 401 deletions
diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta-euenc.def b/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta-euenc.def
index f99ff55a9f2..8b465eebe87 100644
--- a/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta-euenc.def
+++ b/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta-euenc.def
@@ -66,6 +66,7 @@
% Greek Extended
% ~~~~~~~~~~~~~~
+% Postfix ypogegrammeni cannot be second part of composite defs.
% ::
\DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\alpha}{ἀ}
@@ -183,84 +184,21 @@
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\upsilon}{ὺ}
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\omega}{ὼ}
-%% postfix ypogegrammeni cannot be second part of composite defs.
-% \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾀ}
-% \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾁ}
-% \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾂ}
-% \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾃ}
-% \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾄ}
-% \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾅ}
-% \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾆ}
-% \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾇ}
-% \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\Alpha\prosgegrammeni}{ᾈ}
-% \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Alpha\prosgegrammeni}{ᾉ}
-% \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\Alpha\prosgegrammeni}{ᾊ}
-% \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\Alpha\prosgegrammeni}{ᾋ}
-% \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\Alpha\prosgegrammeni}{ᾌ}
-% \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\Alpha\prosgegrammeni}{ᾍ}
-% \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\Alpha\prosgegrammeni}{ᾎ}
-% \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\Alpha\prosgegrammeni}{ᾏ}
-%
-% \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ᾐ}
-% \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ᾑ}
-% \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ᾒ}
-% \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ᾓ}
-% \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ᾔ}
-% \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ᾕ}
-% \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ᾖ}
-% \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ᾗ}
-% \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\Eta\prosgegrammeni}{ᾘ}
-% \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Eta\prosgegrammeni}{ᾙ}
-% \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\Eta\prosgegrammeni}{ᾚ}
-% \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\Eta\prosgegrammeni}{ᾛ}
-% \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\Eta\prosgegrammeni}{ᾜ}
-% \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\Eta\prosgegrammeni}{ᾝ}
-% \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\Eta\prosgegrammeni}{ᾞ}
-% \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\Eta\prosgegrammeni}{ᾟ}
-%
-% \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ᾠ}
-% \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ᾡ}
-% \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ᾢ}
-% \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ᾣ}
-% \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ᾤ}
-% \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ᾥ}
-% \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ᾦ}
-% \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ᾧ}
-% \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\Omega\prosgegrammeni}{ᾨ}
-% \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Omega\prosgegrammeni}{ᾩ}
-% \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\Omega\prosgegrammeni}{ᾪ}
-% \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\Omega\prosgegrammeni}{ᾫ}
-% \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\Omega\prosgegrammeni}{ᾬ}
-% \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\Omega\prosgegrammeni}{ᾭ}
-% \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\Omega\prosgegrammeni}{ᾮ}
-% \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\Omega\prosgegrammeni}{ᾯ}
-
\DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\alpha}{ᾰ}
\DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\alpha}{ᾱ}
-% \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾲ}
-% \DeclareTextCompositeCommand{\alpha}{\LastDeclaredEncoding}{\ypogegrammeni}{ᾳ}
-% \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾴ}
\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\alpha}{ᾶ}
\DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\alpha}{ᾶ}
-% \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾷ}
\DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\Alpha}{Ᾰ}
\DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\Alpha}{Ᾱ}
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Alpha}{Ὰ}
\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Alpha}{Ὰ}
-% \DeclareTextCompositeCommand{\Alpha}{\LastDeclaredEncoding}{\prosgegrammeni}{ᾼ}
-% \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ῂ}
-% \DeclareTextCompositeCommand{\eta}{\LastDeclaredEncoding}{\ypogegrammeni}{ῃ}
-% \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ῄ}
\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\eta}{ῆ}
\DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\eta}{ῆ}
-% \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ῇ}
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Epsilon}{Ὲ}
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Eta}{Ὴ}
\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Epsilon}{Ὲ}
\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Eta}{Ὴ}
-% \DeclareTextCompositeCommand{\Eta}{\LastDeclaredEncoding}{\prosgegrammeni}{ῌ}
-
\DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\iota}{ῐ}
\DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\iota}{ῑ}
@@ -289,18 +227,12 @@
\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Upsilon}{Ὺ}
\DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Rho}{Ῥ}
-% \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ῲ}
-% \DeclareTextCompositeCommand{\omega}{\LastDeclaredEncoding}{\ypogegrammeni}{ῳ}
-% \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ῴ}
\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\omega}{ῶ}
\DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\omega}{ῶ}
-% \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ῷ}
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Omicron}{Ὸ}
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Omega}{Ὼ}
\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Omicron}{Ὸ}
\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Omega}{Ὼ}
-% \DeclareTextCompositeCommand{\Omega}{\LastDeclaredEncoding}{\prosgegrammeni}{ῼ}
-
% .. References
%
diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty b/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty
index 65af90c5b62..eca931db9a8 100644
--- a/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty
+++ b/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty
@@ -14,7 +14,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{alphabeta}
-[2013/09/11 v0.4 macros for Greek letters in text and math]
+[2015/09/04 v0.13 macros for Greek letters in text and math]
% Changelog:
% .. class:: borderless
@@ -25,6 +25,7 @@
% 2013-05-28 0.3 use ``lgrenc.def`` from greek-fontenc,
% .. enable Unicode input in math mode.
% 2013-09-11 0.4 move to greek-fontenc_, support XeTeX/LuaTeX.
+% 2015-09-04 0.13 Support for `variant symbols`.
% ========== ===== =========================================================
%
% Motivation
@@ -59,6 +60,15 @@
%
% \usepackage{alphabeta}
%
+% The greek-inputenc_ package provides support for Unicode (utf-8) input
+% of Greek characters with 8-bit TeX and the inputenc_ package:
+%
+% .. code:: latex
+%
+% \usepackage[utf-8]{inputenc}
+% \usepackage{alphabeta}
+%
+%
% For details see `<alphabeta-doc.tex>`_ and `<alphabeta-doc.pdf>`_.
%
%
@@ -68,12 +78,12 @@
% Requirements
% ------------
%
-% This package extends the `textalpha <textalpha.sty.html>`_ package::
+% This package extends the `textalpha <textalpha.sty.html>`_ package.
+% Package options are passed on to `textalpha`::
-\RequirePackage{textalpha}
+\RequirePackageWithOptions{textalpha}
-% `textalpha` depends on greek-fontenc_ and (with 8-bit TeX) recommends
-% greek-inputenc_.
+% Just like `alphabeta`, `textalpha` is part of greek-fontenc_.
%
% This package requires the e-TeX_ extensions (i.e. a not too old TeX
% distribution) for the ``\ifdefined`` test.
@@ -81,8 +91,8 @@
% It uses the ``\TextOrMath`` test from the fixltx2e_ standard LaTeX
% package::
-\RequirePackage{fixltx2e}
-
+% fixltx2e is not required with releases after 2015
+%\RequirePackage{fixltx2e}
% Postpone the re-definitions
% ---------------------------
@@ -114,9 +124,11 @@
\let\mathgamma\gamma
\let\mathdelta\delta
\let\mathepsilon\epsilon
+\let\mathvarepsilon\varepsilon
\let\mathzeta\zeta
\let\matheta\eta
\let\maththeta\theta
+\let\mathvartheta\vartheta
\let\mathiota\iota
\let\mathkappa\kappa
\let\mathlambda\lambda
@@ -124,12 +136,16 @@
\let\mathnu\nu
\let\mathxi\xi
\let\mathpi\pi
+\let\mathvarpi\varpi
\let\mathrho\rho
+\let\mathvarrho\varrho
\let\mathsigma\sigma
\let\mathvarsigma\varsigma
+\let\mathfinalsigma\varsigma
\let\mathtau\tau
\let\mathupsilon\upsilon
\let\mathphi\phi
+\let\mathvarphi\varphi
\let\mathchi\chi
\let\mathpsi\psi
\let\mathomega\omega
@@ -137,6 +153,13 @@
\providecommand*{\digamma}{\textit{\textdigamma}}
\let\mathdigamma\digamma
+% \varkappa and \varbeta are defined by some math packages
+\ifdefined\varbeta
+ \let\mathvarbeta\varbeta
+\fi
+\ifdefined\varkappa % e.g. with newtxmath
+ \let\mathvarkappa\varkappa
+\fi
% Commands to access Greek letters by name
% ----------------------------------------
@@ -147,6 +170,21 @@
% used as variable symbols in math formulas. These letters are not defined in
% TeX's math mode, we provide an alias to the corrsponding ``\text...``
% command.
+%
+% Mathematical notation distinguishes `variant shape symbols`_ for pi, phi,
+% rho, theta (small and capital), beta, and kappa (characters for the latter
+% three symbols are not included in TeX’s math fonts). These variations have
+% no syntactic meaning in Greek text and are not given code-points in the LGR
+% encoding while Unicode defines separate code points for the symbol variants.
+%
+% Greek Alphabet:
+%
+% Macros keep their meaning in mathematical mode (i.e. use the same shape as
+% without this package) and refer to GREEK LETTER ... in text. For
+% ``\epsilon`` and ``phi``, this means that the selected symbol variant
+% differs in text vs. math mode. Use ``\varepsilon`` and ``\varphi`` (see
+% section `variant shape symbols`_ below) to select the GREEK LETTER ...” in both,
+% text and math mode.
% ::
\providecommand*{\Alpha}{\textAlpha}
@@ -178,7 +216,7 @@
\renewcommand*{\beta}{\TextOrMath{\textbeta}{\mathbeta}}
\renewcommand*{\gamma}{\TextOrMath{\textgamma}{\mathgamma}}
\renewcommand*{\delta}{\TextOrMath{\textdelta}{\mathdelta}}
-\renewcommand*{\epsilon}{\TextOrMath{\textepsilon}{\mathepsilon}}
+\renewcommand*{\epsilon}{\TextOrMath{\textepsilon}{\mathepsilon}} % ε/ϵ
\renewcommand*{\zeta}{\TextOrMath{\textzeta}{\mathzeta}}
\renewcommand*{\eta}{\TextOrMath{\texteta}{\matheta}}
\renewcommand*{\theta}{\TextOrMath{\texttheta}{\maththeta}}
@@ -196,7 +234,7 @@
\providecommand*{\finalsigma}{\varsigma}
\renewcommand*{\tau}{\TextOrMath{\texttau}{\mathtau}}
\renewcommand*{\upsilon}{\TextOrMath{\textupsilon}{\mathupsilon}}
-\renewcommand*{\phi}{\TextOrMath{\textphi}{\mathphi}}
+\renewcommand*{\phi}{\TextOrMath{\textphi}{\mathphi}} % ϕ/φ
\renewcommand*{\chi}{\TextOrMath{\textchi}{\mathchi}}
\renewcommand*{\psi}{\TextOrMath{\textpsi}{\mathpsi}}
\renewcommand*{\omega}{\TextOrMath{\textomega}{\mathomega}}
@@ -218,6 +256,46 @@
\providecommand*{\Sampi}{\textSampi} % Ϡ
\providecommand*{\sampi}{\textsampi} % ϡ
+% Variant shape symbols
+% '''''''''''''''''''''
+%
+% TeX’s concept of “standard” vs. “variant” math symbols does not map to the
+% distinction between GREEK LETTER ... vs. GREEK ... SYMBOL in the Unicode
+% standard (see `<greek-euenc-doc.pdf>`_).
+%
+% The ``\...symbol`` macros select the GREEK ... SYMBOL in both, text and
+% math mode. For ``\epsilonsymbol`` and ``\phisymbol`` this is the default
+% shape in math mode. The ``\var...`` macros select the shape used by TeX
+% math (or, if not supported, the SYMBOL shape)::
+
+% ..symbol == var..
+\renewcommand*{\varpi}{\TextOrMath{\textpisymbol}{\mathvarpi}} % ϖ
+\providecommand*{\pisymbol}{\varpi} % ϖ
+\renewcommand*{\varrho}{\TextOrMath{\textrhosymbol}{\mathvarrho}} % ϱ
+\providecommand*{\rhosymbol}{\TextOrMath{\textrhosymbol}{\mathvarrho}} % ϱ
+\renewcommand*{\vartheta}{\TextOrMath{\textthetasymbol}{\mathvartheta}} % ϑ
+\providecommand*{\thetasymbol}{\vartheta} % ϑ
+% ..symbol != var..
+\renewcommand*{\varepsilon}{\TextOrMath{\textepsilon}{\mathvarepsilon}} % ε
+\providecommand*{\epsilonsymbol}{\TextOrMath{\textepsilonsymbol}{\mathepsilon}} % ϵ
+\renewcommand*{\varphi}{\TextOrMath{\textphi}{\mathvarphi}} % φ
+\providecommand*{\phisymbol}{\TextOrMath{\textphisymbol}{\mathphi}} % ϕ
+% only text (in standard 8-bit TeX, may be defined with additional packages):
+\ifdefined\mathvarbeta
+ \renewcommand*{\varbeta}{\TextOrMath{\textbetasymbol}{\mathvarbeta}} % ϐ
+\else
+ \providecommand*{\varbeta}{\textbetasymbol}
+\fi
+\providecommand*{\betasymbol}{\varbeta}
+\ifdefined\mathvarkappa % ϰ
+ \renewcommand*{\varkappa}{\TextOrMath{\textkappasymbol}{\mathvarkappa}}
+\else
+ \providecommand*{\varkappa}{\textkappasymbol}
+\fi
+\providecommand*{\kappasymbol}{\varkappa}
+% \Theta/\varTheta are not a symbol variants but upright/italic shape of Theta
+\providecommand*{\Thetasymbol}{\textThetasymbol} % ϴ
+
% TextCompositeCommands for the generic macros
% --------------------------------------------
@@ -245,50 +323,56 @@
% Check with ``\ifdefined`` for the definition of
% ``\DeclareUnicodeCharacter``. In contrast to ``\@ifdefined``, this works
% without side-effects. It makes the package dependent on the `e-TeX`_
-% extensions but theses are standard in all current TeX distributions anyway.
+% extensions but these are standard in all current TeX distributions anyway.
%
% Map Greek characters that are also defined in math mode to the generic
% macros::
\ifdefined\DeclareUnicodeCharacter
- \DeclareUnicodeCharacter{0393}{\Gamma} % Γ
- \DeclareUnicodeCharacter{0394}{\Delta} % Δ
- \DeclareUnicodeCharacter{0398}{\Theta} % Θ
- \DeclareUnicodeCharacter{039B}{\Lambda} % Λ
- \DeclareUnicodeCharacter{039E}{\Xi} % Ξ
- \DeclareUnicodeCharacter{03A0}{\Pi} % Π
- \DeclareUnicodeCharacter{03A3}{\Sigma} % Σ
- \DeclareUnicodeCharacter{03A5}{\Upsilon} % Υ
- \DeclareUnicodeCharacter{03A6}{\Phi} % Φ
- \DeclareUnicodeCharacter{03A8}{\Psi} % Ψ
- \DeclareUnicodeCharacter{03A9}{\Omega} % Ω
+ \DeclareUnicodeCharacter{0393}{\Gamma} % Γ
+ \DeclareUnicodeCharacter{0394}{\Delta} % Δ
+ \DeclareUnicodeCharacter{0398}{\Theta} % Θ
+ \DeclareUnicodeCharacter{039B}{\Lambda} % Λ
+ \DeclareUnicodeCharacter{039E}{\Xi} % Ξ
+ \DeclareUnicodeCharacter{03A0}{\Pi} % Π
+ \DeclareUnicodeCharacter{03A3}{\Sigma} % Σ
+ \DeclareUnicodeCharacter{03A5}{\Upsilon} % Υ
+ \DeclareUnicodeCharacter{03A6}{\Phi} % Φ
+ \DeclareUnicodeCharacter{03A8}{\Psi} % Ψ
+ \DeclareUnicodeCharacter{03A9}{\Omega} % Ω
+
+ \DeclareUnicodeCharacter{03B1}{\alpha} % α
+ \DeclareUnicodeCharacter{03B2}{\beta} % β
+ \DeclareUnicodeCharacter{03B3}{\gamma} % γ
+ \DeclareUnicodeCharacter{03B4}{\delta} % δ
+ \DeclareUnicodeCharacter{03B5}{\varepsilon} % ε textepsilon/varepsilon
+ \DeclareUnicodeCharacter{03B6}{\zeta} % ζ
+ \DeclareUnicodeCharacter{03B7}{\eta} % η
+ \DeclareUnicodeCharacter{03B8}{\theta} % θ
+ \DeclareUnicodeCharacter{03B9}{\iota} % ι
+ \DeclareUnicodeCharacter{03BA}{\kappa} % κ
+ \DeclareUnicodeCharacter{03BB}{\lambda} % λ
+ \DeclareUnicodeCharacter{03BC}{\mu} % μ
+ \DeclareUnicodeCharacter{03BD}{\nu} % ν
+ \DeclareUnicodeCharacter{03BE}{\xi} % ξ
+ \DeclareUnicodeCharacter{03C0}{\pi} % π
+ \DeclareUnicodeCharacter{03C1}{\rho} % ρ
+ \DeclareUnicodeCharacter{03C2}{\varsigma} % ς
+ \DeclareUnicodeCharacter{03C3}{\sigma} % σ
+ \DeclareUnicodeCharacter{03C4}{\tau} % τ
+ \DeclareUnicodeCharacter{03C5}{\upsilon} % υ
+ \DeclareUnicodeCharacter{03C6}{\varphi} % φ textphi/varphi
+ \DeclareUnicodeCharacter{03C7}{\chi} % χ
+ \DeclareUnicodeCharacter{03C8}{\psi} % ψ
+ \DeclareUnicodeCharacter{03C9}{\omega} % ω
- \DeclareUnicodeCharacter{03B1}{\alpha} % α
- \DeclareUnicodeCharacter{03B2}{\beta} % β
- \DeclareUnicodeCharacter{03B3}{\gamma} % γ
- \DeclareUnicodeCharacter{03B4}{\delta} % δ
- \DeclareUnicodeCharacter{03B5}{\epsilon} % ε
- \DeclareUnicodeCharacter{03B6}{\zeta} % ζ
- \DeclareUnicodeCharacter{03B7}{\eta} % η
- \DeclareUnicodeCharacter{03B8}{\theta} % θ
- \DeclareUnicodeCharacter{03B9}{\iota} % ι
- \DeclareUnicodeCharacter{03BA}{\kappa} % κ
- \DeclareUnicodeCharacter{03BB}{\lambda} % λ
- \DeclareUnicodeCharacter{03BC}{\mu} % μ
- \DeclareUnicodeCharacter{03BD}{\nu} % ν
- \DeclareUnicodeCharacter{03BE}{\xi} % ξ
- \DeclareUnicodeCharacter{03C0}{\pi} % π
- \DeclareUnicodeCharacter{03C1}{\rho} % ρ
- \DeclareUnicodeCharacter{03C2}{\varsigma} % ς
- \DeclareUnicodeCharacter{03C3}{\sigma} % σ
- \DeclareUnicodeCharacter{03C4}{\tau} % τ
- \DeclareUnicodeCharacter{03C5}{\upsilon} % υ
- \DeclareUnicodeCharacter{03C6}{\phi} % φ
- \DeclareUnicodeCharacter{03C7}{\chi} % χ
- \DeclareUnicodeCharacter{03C8}{\psi} % ψ
- \DeclareUnicodeCharacter{03C9}{\omega} % ω
+ \DeclareUnicodeCharacter{03D1}{\thetasymbol} % ϑ
+ \DeclareUnicodeCharacter{03D5}{\phisymbol} % ϕ $\phi$
+ \DeclareUnicodeCharacter{03D6}{\pisymbol} % ϖ
+ \DeclareUnicodeCharacter{03DD}{\digamma} % ϝ
+ \DeclareUnicodeCharacter{03F1}{\rhosymbol} % ϱ
+ \DeclareUnicodeCharacter{03F5}{\epsilonsymbol} % ϵ $\epsilon$
- \DeclareUnicodeCharacter{03DD}{\digamma} % ϝ
\fi
% ::
diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def b/Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def
index b03bb7ff4bb..2e76e1f31cc 100644
--- a/Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def
+++ b/Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def
@@ -11,13 +11,13 @@
% ::
\ProvidesFile{greek-euenc.def}
-[2014/12/12 0.12 Greek LICRs for XeTeX and LuaTeX]
+[2015/08/07 0.13 Greek LICRs for XeTeX and LuaTeX]
% :abstract:
% Experimental support for Greek LICR macros with XeTeX and LuaTeX.
% Extends euenc_. Used by babel-greek_ and textalpha_.
%
-% History:
+% **History**:
% .. class:: borderless
%
% ====== ========== ========================================================
@@ -32,8 +32,12 @@
% 0.11.2 2014-09-08 ``\textKoppa`` macro
% .. (Capital Koppa is not defined in LGR but Unicode).
% 0.12 2014-12-12 Remove symbol macros for breathing accents.
+% 0.13 2015-08-07 ``\lccode``/``\uccode`` corrections from xgreek_.
+% .. LICR macros for symbol variants.
% ====== ========== ========================================================
%
+% .. contents::
+%
% Motivation
% ==========
%
@@ -72,7 +76,11 @@
\DeclareTextCommand{\acctonos}{\LastDeclaredEncoding}{\@tabacckludge'}
\DeclareTextCommand{\accvaria}{\LastDeclaredEncoding}{\@tabacckludge`}
\DeclareTextCommand{\accdialytika}{\LastDeclaredEncoding}{\@tabacckludge"}
-\DeclareTextCommand{\accperispomeni}{\LastDeclaredEncoding}{\@tabacckludge~}
+
+% The combining perispomeni character is normalized with Greek base letters,
+% while the (standard) combining tilde is not::
+
+\DeclareTextCommand{\accperispomeni}{\LastDeclaredEncoding}[1]{#1\char"0342 }
% Breathings:
%
@@ -81,8 +89,6 @@
\DeclareTextCommand{\accpsili}{\LastDeclaredEncoding}[1]{#1\char"0313 } % ψιλή spiritus lenis (smooth breathing)
\DeclareTextCommand{\accdasia}{\LastDeclaredEncoding}[1]{#1\char"0314 } % δασεῖα spiritus asper (rough breathing)
-% \DeclareTextCommand{\>}{\LastDeclaredEncoding}{\accpsili}
-% \DeclareTextCommand{\<}{\LastDeclaredEncoding}{\accdasia}
% Sub-iota:
@@ -144,7 +150,7 @@
% 037B GREEK SMALL REVERSED LUNATE SIGMA SYMBOL
% 037C GREEK SMALL DOTTED LUNATE SIGMA SYMBOL
% 037D GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL
-\DeclareTextCommand{\texterotimatiko}{\LastDeclaredEncoding}{;} % \textquestion
+\DeclareTextCommand{\texterotimatiko}{\LastDeclaredEncoding}{;} % 037E GREEK QUESTION MARK
\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textcompwordmark}{΄}
\DeclareTextCompositeCommand{\accdialytikatonos}{\LastDeclaredEncoding}{\textcompwordmark}{΅}
@@ -196,6 +202,7 @@
\DeclareTextCommand{\textgamma}{\LastDeclaredEncoding}{γ}
\DeclareTextCommand{\textdelta}{\LastDeclaredEncoding}{δ}
\DeclareTextCommand{\textepsilon}{\LastDeclaredEncoding}{ε}
+\DeclareTextCommand{\textvarepsilon}{\LastDeclaredEncoding}{ε} % cf. $\varepsiolon$
\DeclareTextCommand{\textzeta}{\LastDeclaredEncoding}{ζ}
\DeclareTextCommand{\texteta}{\LastDeclaredEncoding}{η}
\DeclareTextCommand{\texttheta}{\LastDeclaredEncoding}{θ}
@@ -216,6 +223,7 @@
\DeclareTextCommand{\texttau}{\LastDeclaredEncoding}{τ}
\DeclareTextCommand{\textupsilon}{\LastDeclaredEncoding}{υ}
\DeclareTextCommand{\textphi}{\LastDeclaredEncoding}{φ}
+\DeclareTextCommand{\textvarphi}{\LastDeclaredEncoding}{φ} % cf. $\varphi$
\DeclareTextCommand{\textchi}{\LastDeclaredEncoding}{χ}
\DeclareTextCommand{\textpsi}{\LastDeclaredEncoding}{ψ}
\DeclareTextCommand{\textomega}{\LastDeclaredEncoding}{ω}
@@ -237,6 +245,24 @@
\DeclareTextCommand{\textSampi}{\LastDeclaredEncoding}{Ϡ}
\DeclareTextCommand{\textsampi}{\LastDeclaredEncoding}{ϡ}
+% Symbol variants
+\DeclareTextCommand{\textbetasymbol}{\LastDeclaredEncoding}{ϐ}
+\DeclareTextCommand{\textkappasymbol}{\LastDeclaredEncoding}{ϰ}
+\DeclareTextCommand{\textThetasymbol}{\LastDeclaredEncoding}{ϴ}
+\DeclareTextCommand{\textthetasymbol}{\LastDeclaredEncoding}{ϑ}
+\DeclareTextCommand{\textphisymbol}{\LastDeclaredEncoding}{ϕ}
+\DeclareTextCommand{\textpisymbol}{\LastDeclaredEncoding}{ϖ}
+\DeclareTextCommand{\textrhosymbol}{\LastDeclaredEncoding}{ϱ}
+\DeclareTextCommand{\textepsilonsymbol}{\LastDeclaredEncoding}{ϵ}
+% math compatibility aliases
+% $\varphi$ and $\varepsilon$ refer to the letter characters (see above)!
+\DeclareTextCommand{\textvarbeta}{\LastDeclaredEncoding}{\textbetasymbol}
+\DeclareTextCommand{\textvarkappa}{\LastDeclaredEncoding}{ϰ}
+\DeclareTextCommand{\textvarTheta}{\LastDeclaredEncoding}{ϴ}
+\DeclareTextCommand{\textvartheta}{\LastDeclaredEncoding}{ϑ}
+\DeclareTextCommand{\textvarpi}{\LastDeclaredEncoding}{ϖ}
+\DeclareTextCommand{\textvarrho}{\LastDeclaredEncoding}{ϱ}
+
% Greek Extended
% ~~~~~~~~~~~~~~
%
@@ -361,86 +387,35 @@
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textupsilon}{ὺ}
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textomega}{ὼ}
-%% postfix ypogegrammeni cannot be second part of composite defs.
-% \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾀ}
-% \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾁ}
-% \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾂ}
-% \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾃ}
-% \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾄ}
-% \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾅ}
-% \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾆ}
-% \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾇ}
-% \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textAlpha\prosgegrammeni}{ᾈ}
-% \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textAlpha\prosgegrammeni}{ᾉ}
-% \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\textAlpha\prosgegrammeni}{ᾊ}
-% \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\textAlpha\prosgegrammeni}{ᾋ}
-% \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\textAlpha\prosgegrammeni}{ᾌ}
-% \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\textAlpha\prosgegrammeni}{ᾍ}
-% \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\textAlpha\prosgegrammeni}{ᾎ}
-% \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\textAlpha\prosgegrammeni}{ᾏ}
-%
-% \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ᾐ}
-% \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ᾑ}
-% \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ᾒ}
-% \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ᾓ}
-% \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ᾔ}
-% \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ᾕ}
-% \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ᾖ}
-% \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ᾗ}
-% \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textEta\prosgegrammeni}{ᾘ}
-% \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textEta\prosgegrammeni}{ᾙ}
-% \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\textEta\prosgegrammeni}{ᾚ}
-% \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\textEta\prosgegrammeni}{ᾛ}
-% \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\textEta\prosgegrammeni}{ᾜ}
-% \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\textEta\prosgegrammeni}{ᾝ}
-% \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\textEta\prosgegrammeni}{ᾞ}
-% \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\textEta\prosgegrammeni}{ᾟ}
-%
-% \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ᾠ}
-% \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ᾡ}
-% \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ᾢ}
-% \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ᾣ}
-% \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ᾤ}
-% \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ᾥ}
-% \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ᾦ}
-% \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ᾧ}
-% \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textOmega\prosgegrammeni}{ᾨ}
-% \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textOmega\prosgegrammeni}{ᾩ}
-% \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\textOmega\prosgegrammeni}{ᾪ}
-% \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\textOmega\prosgegrammeni}{ᾫ}
-% \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\textOmega\prosgegrammeni}{ᾬ}
-% \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\textOmega\prosgegrammeni}{ᾭ}
-% \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\textOmega\prosgegrammeni}{ᾮ}
-% \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\textOmega\prosgegrammeni}{ᾯ}
-
\DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\textalpha}{ᾰ}
\DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\textalpha}{ᾱ}
-% \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾲ}
-% \DeclareTextCompositeCommand{\textalpha}{\LastDeclaredEncoding}{\ypogegrammeni}{ᾳ}
-% \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾴ}
+% ᾲ
+% ᾳ
+% ᾴ
\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\textalpha}{ᾶ}
+\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{α}{ᾶ}
\DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textalpha}{ᾶ}
-% \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾷ}
+% ᾷ
\DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\textAlpha}{Ᾰ}
\DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\textAlpha}{Ᾱ}
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textAlpha}{Ὰ}
-% \DeclareTextCompositeCommand{\textAlpha}{\LastDeclaredEncoding}{\prosgegrammeni}{ᾼ}
+% ᾼ
\DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textcompwordmark}{᾽}
\DeclareTextCommand{\prosgegrammeni}{\LastDeclaredEncoding}{ι}
\DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textcompwordmark}{᾿}
-\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\textcompwordmark}{῀}
\DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textcompwordmark}{῀}
\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\LastDeclaredEncoding}{\textcompwordmark}{῁}
-% \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ῂ}
-% \DeclareTextCompositeCommand{\texteta}{\LastDeclaredEncoding}{\ypogegrammeni}{ῃ}
-% \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ῄ}
+% ῂ
+% ῃ
+% ῄ
\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\texteta}{ῆ}
+\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{η}{ῆ}
\DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\texteta}{ῆ}
-% \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ῇ}
+% ῇ
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textEpsilon}{Ὲ}
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textEta}{Ὴ}
-% \DeclareTextCompositeCommand{\textEta}{\LastDeclaredEncoding}{\prosgegrammeni}{ῌ}
+% ῌ
\DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\textcompwordmark}{῍}
\DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\textcompwordmark}{῎}
\DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\textcompwordmark}{῏}
@@ -450,6 +425,7 @@
\DeclareTextCompositeCommand{\accdialytikavaria}{\LastDeclaredEncoding}{\textiota}{ῒ}
\DeclareTextCompositeCommand{\accdialytikaoxia}{\LastDeclaredEncoding}{\textiota}{ΐ}
\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\textiota}{ῖ}
+\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{ι}{ῖ}
\DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textiota}{ῖ}
\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\LastDeclaredEncoding}{\textiota}{ῗ}
\DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\textIota}{Ῐ}
@@ -466,6 +442,7 @@
\DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textrho}{ῤ}
\DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textrho}{ῥ}
\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\textupsilon}{ῦ}
+\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{υ}{ῦ}
\DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textupsilon}{ῦ}
\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\LastDeclaredEncoding}{\textupsilon}{ῧ}
\DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\textUpsilon}{Ῠ}
@@ -475,15 +452,16 @@
\DeclareTextCompositeCommand{\accdialytikavaria}{\LastDeclaredEncoding}{\textcompwordmark}{῭}
\DeclareTextCompositeCommand{\accdialytikaoxia}{\LastDeclaredEncoding}{\textcompwordmark}{΅}
-% \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ῲ}
-% \DeclareTextCompositeCommand{\textomega}{\LastDeclaredEncoding}{\ypogegrammeni}{ῳ}
-% \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ῴ}
+% ῲ
+% ῳ
+% ῴ
\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\textomega}{ῶ}
+\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{ω}{ῶ}
\DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textomega}{ῶ}
-% \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ῷ}
+% ῷ
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textOmicron}{Ὸ}
\DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textOmega}{Ὼ}
-% \DeclareTextCompositeCommand{\textOmega}{\LastDeclaredEncoding}{\prosgegrammeni}{ῼ}
+% ῼ
\DeclareTextCompositeCommand{\accoxia}{\LastDeclaredEncoding}{\textcompwordmark}{´}
\DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textcompwordmark}{῾}
@@ -512,11 +490,356 @@
% UPPERCASE
% =========
%
+% Greek letters drop diacritics (eccept dialytika and sub-iota) in UPPERCASE.
+%
+% uc/lc values
+% ~~~~~~~~~~~~
+%
+% ``\lccode`` and ``\uccode`` corrections from the xgreek_ package by Apostolos Syropoulos::
+
+\global\lccode"0370="0371 \global\uccode"0370="0370
+\global\lccode"0371="0371 \global\uccode"0371="0370
+\global\lccode"0372="0373 \global\uccode"0372="0372
+\global\lccode"0373="0373 \global\uccode"0373="0372
+\global\lccode"0376="0377 \global\uccode"0376="0376
+\global\lccode"0377="0377 \global\uccode"0377="0376
+\global\lccode"03FD="037B \global\uccode"03FD="03FD
+\global\lccode"037B="037B \global\uccode"037B="03FD
+\global\lccode"03FE="037C \global\uccode"03FE="03FE
+\global\lccode"037C="037C \global\uccode"037C="03FE
+\global\lccode"03FF="037D \global\uccode"03FF="03FF
+\global\lccode"037D="037D \global\uccode"037D="03FF
+\global\lccode"0386="03AC \global\uccode"0386="0391
+\global\lccode"0388="03AD \global\uccode"0388="0395
+\global\lccode"0389="03AC \global\uccode"0389="0397
+\global\lccode"038A="03AF \global\uccode"038A="0399
+\global\lccode"038C="03CC \global\uccode"038C="039F
+\global\lccode"038E="03CD \global\uccode"038E="03A5
+\global\lccode"038F="03CE \global\uccode"038F="03A9
+\global\lccode"0390="0390 \global\uccode"0390="03AA
+\global\lccode"0391="03B1 \global\uccode"0391="0391
+\global\lccode"0392="03B2 \global\uccode"0392="0392
+\global\lccode"0393="03B3 \global\uccode"0393="0393
+\global\lccode"0394="03B4 \global\uccode"0394="0394
+\global\lccode"0395="03B5 \global\uccode"0395="0395
+\global\lccode"0396="03B6 \global\uccode"0396="0396
+\global\lccode"0397="03B7 \global\uccode"0397="0397
+\global\lccode"0398="03B8 \global\uccode"0398="0398
+\global\lccode"0399="03B9 \global\uccode"0399="0399
+\global\lccode"039A="03BA \global\uccode"039A="039A
+\global\lccode"039B="03BB \global\uccode"039B="039B
+\global\lccode"039C="03BC \global\uccode"039C="039C
+\global\lccode"039D="03BD \global\uccode"039D="039D
+\global\lccode"039E="03BE \global\uccode"039E="039E
+\global\lccode"039F="03BF \global\uccode"039F="039F
+\global\lccode"03A0="03C0 \global\uccode"03A0="03A0
+\global\lccode"03A1="03C1 \global\uccode"03A1="03A1
+\global\lccode"03A3="03C3 \global\uccode"03A3="03A3
+\global\lccode"03A4="03C4 \global\uccode"03A4="03A4
+\global\lccode"03A5="03C5 \global\uccode"03A5="03A5
+\global\lccode"03A6="03C6 \global\uccode"03A6="03A6
+\global\lccode"03A7="03C7 \global\uccode"03A7="03A7
+\global\lccode"03A8="03C8 \global\uccode"03A8="03A8
+\global\lccode"03A9="03C9 \global\uccode"03A9="03A9
+\global\lccode"03AA="03CA \global\uccode"03AA="03AA
+\global\lccode"03AB="03CB \global\uccode"03AB="03AB
+\global\lccode"03AC="03AC \global\uccode"03AC="0391
+\global\lccode"03AD="03AD \global\uccode"03AD="0395
+\global\lccode"03AE="03AE \global\uccode"03AE="0397
+\global\lccode"03AF="03AF \global\uccode"03AF="0399
+\global\lccode"03B0="03B0 \global\uccode"03B0="03AB
+\global\lccode"03B1="03B1 \global\uccode"03B1="0391
+\global\lccode"03B2="03B2 \global\uccode"03B2="0392
+\global\lccode"03B3="03B3 \global\uccode"03B3="0393
+\global\lccode"03B4="03B4 \global\uccode"03B4="0394
+\global\lccode"03B5="03B5 \global\uccode"03B5="0395
+\global\lccode"03B6="03B6 \global\uccode"03B6="0396
+\global\lccode"03B7="03B7 \global\uccode"03B7="0397
+\global\lccode"03B8="03B8 \global\uccode"03B8="0398
+\global\lccode"03B9="03B9 \global\uccode"03B9="0399
+\global\lccode"03BA="03BA \global\uccode"03BA="039A
+\global\lccode"03BB="03BB \global\uccode"03BB="039B
+\global\lccode"03BC="03BC \global\uccode"03BC="039C
+\global\lccode"03BD="03BD \global\uccode"03BD="039D
+\global\lccode"03BE="03BE \global\uccode"03BE="039E
+\global\lccode"03BF="03BF \global\uccode"03BF="039F
+\global\lccode"03C0="03C0 \global\uccode"03C0="03A0
+\global\lccode"03C1="03C1 \global\uccode"03C1="03A1
+\global\lccode"03C2="03C2 \global\uccode"03C2="03A3
+\global\lccode"03C3="03C3 \global\uccode"03C3="03A3
+\global\lccode"03C4="03C4 \global\uccode"03C4="03A4
+\global\lccode"03C5="03C5 \global\uccode"03C5="03A5
+\global\lccode"03C6="03C6 \global\uccode"03C6="03A6
+\global\lccode"03C7="03C7 \global\uccode"03C7="03A7
+\global\lccode"03C8="03C8 \global\uccode"03C8="03A8
+\global\lccode"03C9="03C9 \global\uccode"03C9="03A9
+\global\lccode"03CA="03CA \global\uccode"03CA="03AA
+\global\lccode"03CB="03CB \global\uccode"03CB="03AB
+\global\lccode"03CC="03CC \global\uccode"03CC="039F
+\global\lccode"03CD="03CD \global\uccode"03CD="03A5
+\global\lccode"03CE="03CE \global\uccode"03CE="03A9
+\global\lccode"03D0="03D0 \global\uccode"03D0="0392
+\global\lccode"03D1="03D1 \global\uccode"03D1="0398
+\global\lccode"03D2="03C5 \global\uccode"03D2="03A5
+\global\lccode"03D3="03CD \global\uccode"03D3="03A5
+\global\lccode"03D4="03CB \global\uccode"03D4="03AB
+\global\lccode"03D5="03C6 \global\uccode"03D5="03A6
+\global\lccode"03D6="03C0 \global\uccode"03D6="03A0
+\global\lccode"03DA="03DB \global\uccode"03DA="03DA
+\global\lccode"03DB="03DB \global\uccode"03DB="03DA
+\global\lccode"03DC="03DD \global\uccode"03DC="03DC
+\global\lccode"03DD="03DD \global\uccode"03DD="03DC
+\global\lccode"03DE="03DF \global\uccode"03DE="03DE
+\global\lccode"03DF="03DF \global\uccode"03DF="03DE
+\global\lccode"03E0="03E1 \global\uccode"03E0="03E0
+\global\lccode"03E1="03E1 \global\uccode"03E1="03E0
+\global\lccode"03F0="03BA \global\uccode"03F0="039A
+\global\lccode"03F1="03C1 \global\uccode"03F1="03A1
+\global\lccode"03F2="03F2 \global\uccode"03F2="03F9
+\global\lccode"03F9="03F2 \global\uccode"03F9="03F9
+\global\lccode"1F00="1F00 \global\uccode"1F00="0391
+\global\lccode"1F01="1F01 \global\uccode"1F01="0391
+\global\lccode"1F02="1F02 \global\uccode"1F02="0391
+\global\lccode"1F03="1F03 \global\uccode"1F03="0391
+\global\lccode"1F04="1F04 \global\uccode"1F04="0391
+\global\lccode"1F05="1F05 \global\uccode"1F05="0391
+\global\lccode"1F06="1F06 \global\uccode"1F06="0391
+\global\lccode"1F07="1F07 \global\uccode"1F07="0391
+\global\lccode"1F08="1F00 \global\uccode"1F08="0391
+\global\lccode"1F09="1F01 \global\uccode"1F09="0391
+\global\lccode"1F0A="1F02 \global\uccode"1F0A="0391
+\global\lccode"1F0B="1F03 \global\uccode"1F0B="0391
+\global\lccode"1F0C="1F04 \global\uccode"1F0C="0391
+\global\lccode"1F0D="1F05 \global\uccode"1F0D="0391
+\global\lccode"1F0E="1F06 \global\uccode"1F0E="0391
+\global\lccode"1F0F="1F07 \global\uccode"1F0F="0391
+\global\lccode"1F10="1F10 \global\uccode"1F10="0395
+\global\lccode"1F11="1F11 \global\uccode"1F11="0395
+\global\lccode"1F12="1F12 \global\uccode"1F12="0395
+\global\lccode"1F13="1F13 \global\uccode"1F13="0395
+\global\lccode"1F14="1F14 \global\uccode"1F14="0395
+\global\lccode"1F15="1F15 \global\uccode"1F15="0395
+\global\lccode"1F18="1F10 \global\uccode"1F18="0395
+\global\lccode"1F19="1F11 \global\uccode"1F19="0395
+\global\lccode"1F1A="1F12 \global\uccode"1F1A="0395
+\global\lccode"1F1B="1F13 \global\uccode"1F1B="0395
+\global\lccode"1F1C="1F14 \global\uccode"1F1C="0395
+\global\lccode"1F1D="1F15 \global\uccode"1F1D="0395
+\global\lccode"1F20="1F20 \global\uccode"1F20="0397
+\global\lccode"1F21="1F21 \global\uccode"1F21="0397
+\global\lccode"1F22="1F22 \global\uccode"1F22="0397
+\global\lccode"1F23="1F23 \global\uccode"1F23="0397
+\global\lccode"1F24="1F24 \global\uccode"1F24="0397
+\global\lccode"1F25="1F25 \global\uccode"1F25="0397
+\global\lccode"1F26="1F26 \global\uccode"1F26="0397
+\global\lccode"1F27="1F27 \global\uccode"1F27="0397
+\global\lccode"1F28="1F20 \global\uccode"1F28="0397
+\global\lccode"1F29="1F21 \global\uccode"1F29="0397
+\global\lccode"1F2A="1F22 \global\uccode"1F2A="0397
+\global\lccode"1F2B="1F23 \global\uccode"1F2B="0397
+\global\lccode"1F2C="1F24 \global\uccode"1F2C="0397
+\global\lccode"1F2D="1F25 \global\uccode"1F2D="0397
+\global\lccode"1F2E="1F26 \global\uccode"1F2E="0397
+\global\lccode"1F2F="1F27 \global\uccode"1F2F="0397
+\global\lccode"1F30="1F30 \global\uccode"1F30="0399
+\global\lccode"1F31="1F31 \global\uccode"1F31="0399
+\global\lccode"1F32="1F32 \global\uccode"1F32="0399
+\global\lccode"1F33="1F33 \global\uccode"1F33="0399
+\global\lccode"1F34="1F34 \global\uccode"1F34="0399
+\global\lccode"1F35="1F35 \global\uccode"1F35="0399
+\global\lccode"1F36="1F36 \global\uccode"1F36="0399
+\global\lccode"1F37="1F37 \global\uccode"1F37="0399
+\global\lccode"1F38="1F30 \global\uccode"1F38="0399
+\global\lccode"1F39="1F31 \global\uccode"1F39="0399
+\global\lccode"1F3A="1F32 \global\uccode"1F3A="0399
+\global\lccode"1F3B="1F33 \global\uccode"1F3B="0399
+\global\lccode"1F3C="1F34 \global\uccode"1F3C="0399
+\global\lccode"1F3D="1F35 \global\uccode"1F3D="0399
+\global\lccode"1F3E="1F36 \global\uccode"1F3E="0399
+\global\lccode"1F3F="1F37 \global\uccode"1F3F="0399
+\global\lccode"1F40="1F40 \global\uccode"1F40="039F
+\global\lccode"1F41="1F41 \global\uccode"1F41="039F
+\global\lccode"1F42="1F42 \global\uccode"1F42="039F
+\global\lccode"1F43="1F43 \global\uccode"1F43="039F
+\global\lccode"1F44="1F44 \global\uccode"1F44="039F
+\global\lccode"1F45="1F45 \global\uccode"1F45="039F
+\global\lccode"1F48="1F40 \global\uccode"1F48="039F
+\global\lccode"1F49="1F41 \global\uccode"1F49="039F
+\global\lccode"1F4A="1F42 \global\uccode"1F4A="039F
+\global\lccode"1F4B="1F43 \global\uccode"1F4B="039F
+\global\lccode"1F4C="1F44 \global\uccode"1F4C="039F
+\global\lccode"1F4D="1F45 \global\uccode"1F4D="039F
+\global\lccode"1F50="1F50 \global\uccode"1F50="03A5
+\global\lccode"1F51="1F51 \global\uccode"1F51="03A5
+\global\lccode"1F52="1F52 \global\uccode"1F52="03A5
+\global\lccode"1F53="1F53 \global\uccode"1F53="03A5
+\global\lccode"1F54="1F54 \global\uccode"1F54="03A5
+\global\lccode"1F55="1F55 \global\uccode"1F55="03A5
+\global\lccode"1F56="1F56 \global\uccode"1F56="03A5
+\global\lccode"1F57="1F57 \global\uccode"1F57="03A5
+\global\lccode"1F59="1F51 \global\uccode"1F59="03A5
+\global\lccode"1F5B="1F53 \global\uccode"1F5B="03A5
+\global\lccode"1F5D="1F55 \global\uccode"1F5D="03A5
+\global\lccode"1F5F="1F57 \global\uccode"1F5F="03A5
+\global\lccode"1F60="1F60 \global\uccode"1F60="03A9
+\global\lccode"1F61="1F61 \global\uccode"1F61="03A9
+\global\lccode"1F62="1F62 \global\uccode"1F62="03A9
+\global\lccode"1F63="1F63 \global\uccode"1F63="03A9
+\global\lccode"1F64="1F64 \global\uccode"1F64="03A9
+\global\lccode"1F65="1F65 \global\uccode"1F65="03A9
+\global\lccode"1F66="1F66 \global\uccode"1F66="03A9
+\global\lccode"1F67="1F67 \global\uccode"1F67="03A9
+\global\lccode"1F68="1F60 \global\uccode"1F68="03A9
+\global\lccode"1F69="1F61 \global\uccode"1F69="03A9
+\global\lccode"1F6A="1F62 \global\uccode"1F6A="03A9
+\global\lccode"1F6B="1F63 \global\uccode"1F6B="03A9
+\global\lccode"1F6C="1F64 \global\uccode"1F6C="03A9
+\global\lccode"1F6D="1F65 \global\uccode"1F6D="03A9
+\global\lccode"1F6E="1F66 \global\uccode"1F6E="03A9
+\global\lccode"1F6F="1F67 \global\uccode"1F6F="03A9
+\global\lccode"1F70="1F70 \global\uccode"1F70="0391
+\global\lccode"1F71="1F71 \global\uccode"1F71="0391
+\global\lccode"1F72="1F72 \global\uccode"1F72="0395
+\global\lccode"1F73="1F73 \global\uccode"1F73="0395
+\global\lccode"1F74="1F74 \global\uccode"1F74="0397
+\global\lccode"1F75="1F75 \global\uccode"1F75="0397
+\global\lccode"1F76="1F76 \global\uccode"1F76="0399
+\global\lccode"1F77="1F77 \global\uccode"1F77="0399
+\global\lccode"1F78="1F78 \global\uccode"1F78="039F
+\global\lccode"1F79="1F79 \global\uccode"1F79="039F
+\global\lccode"1F7A="1F7A \global\uccode"1F7A="03A5
+\global\lccode"1F7B="1F7B \global\uccode"1F7B="03A5
+\global\lccode"1F7C="1F7C \global\uccode"1F7C="03A9
+\global\lccode"1F7D="1F7D \global\uccode"1F7D="03A9
+\global\lccode"1F80="1F80 \global\uccode"1F80="1FBC
+\global\lccode"1F81="1F81 \global\uccode"1F81="1FBC
+\global\lccode"1F82="1F82 \global\uccode"1F82="1FBC
+\global\lccode"1F83="1F83 \global\uccode"1F83="1FBC
+\global\lccode"1F84="1F84 \global\uccode"1F84="1FBC
+\global\lccode"1F85="1F85 \global\uccode"1F85="1FBC
+\global\lccode"1F86="1F86 \global\uccode"1F86="1FBC
+\global\lccode"1F87="1F87 \global\uccode"1F87="1FBC
+\global\lccode"1F88="1F80 \global\uccode"1F88="1FBC
+\global\lccode"1F89="1F81 \global\uccode"1F89="1FBC
+\global\lccode"1F8A="1F82 \global\uccode"1F8A="1FBC
+\global\lccode"1F8B="1F83 \global\uccode"1F8B="1FBC
+\global\lccode"1F8C="1F84 \global\uccode"1F8C="1FBC
+\global\lccode"1F8D="1F85 \global\uccode"1F8D="1FBC
+\global\lccode"1F8E="1F86 \global\uccode"1F8E="1FBC
+\global\lccode"1F8F="1F87 \global\uccode"1F8F="1FBC
+\global\lccode"1F90="1F90 \global\uccode"1F90="1FCC
+\global\lccode"1F91="1F91 \global\uccode"1F91="1FCC
+\global\lccode"1F92="1F92 \global\uccode"1F92="1FCC
+\global\lccode"1F93="1F93 \global\uccode"1F93="1FCC
+\global\lccode"1F94="1F94 \global\uccode"1F94="1FCC
+\global\lccode"1F95="1F95 \global\uccode"1F95="1FCC
+\global\lccode"1F96="1F96 \global\uccode"1F96="1FCC
+\global\lccode"1F97="1F97 \global\uccode"1F97="1FCC
+\global\lccode"1F98="1F90 \global\uccode"1F98="1FCC
+\global\lccode"1F99="1F91 \global\uccode"1F99="1FCC
+\global\lccode"1F9A="1F92 \global\uccode"1F9A="1FCC
+\global\lccode"1F9B="1F93 \global\uccode"1F9B="1FCC
+\global\lccode"1F9C="1F94 \global\uccode"1F9C="1FCC
+\global\lccode"1F9D="1F95 \global\uccode"1F9D="1FCC
+\global\lccode"1F9E="1F96 \global\uccode"1F9E="1FCC
+\global\lccode"1F9F="1F97 \global\uccode"1F9F="1FCC
+\global\lccode"1FA0="1FA0 \global\uccode"1FA0="1FFC
+\global\lccode"1FA1="1FA1 \global\uccode"1FA1="1FFC
+\global\lccode"1FA2="1FA2 \global\uccode"1FA2="1FFC
+\global\lccode"1FA3="1FA3 \global\uccode"1FA3="1FFC
+\global\lccode"1FA4="1FA4 \global\uccode"1FA4="1FFC
+\global\lccode"1FA5="1FA5 \global\uccode"1FA5="1FFC
+\global\lccode"1FA6="1FA6 \global\uccode"1FA6="1FFC
+\global\lccode"1FA7="1FA7 \global\uccode"1FA7="1FFC
+\global\lccode"1FA8="1FA0 \global\uccode"1FA8="1FFC
+\global\lccode"1FA9="1FA1 \global\uccode"1FA9="1FFC
+\global\lccode"1FAA="1FA2 \global\uccode"1FAA="1FFC
+\global\lccode"1FAB="1FA3 \global\uccode"1FAB="1FFC
+\global\lccode"1FAC="1FA4 \global\uccode"1FAC="1FFC
+\global\lccode"1FAD="1FA5 \global\uccode"1FAD="1FFC
+\global\lccode"1FAE="1FA6 \global\uccode"1FAE="1FFC
+\global\lccode"1FAF="1FA7 \global\uccode"1FAF="1FFC
+\global\lccode"1FB0="1FB0 \global\uccode"1FB0="1FB8
+\global\lccode"1FB1="1FB1 \global\uccode"1FB1="1FB9
+\global\lccode"1FB2="1FB2 \global\uccode"1FB2="1FBC
+\global\lccode"1FB3="1FB3 \global\uccode"1FB3="1FBC
+\global\lccode"1FB4="1FB4 \global\uccode"1FB4="1FBC
+\global\lccode"1FB6="1FB6 \global\uccode"1FB6="0391
+\global\lccode"1FB7="1FB7 \global\uccode"1FB7="1FBC
+\global\lccode"1FB8="1FB0 \global\uccode"1FB8="1FB8
+\global\lccode"1FB9="1FB1 \global\uccode"1FB9="1FB9
+\global\lccode"1FBA="1F70 \global\uccode"1FBA="0391
+\global\lccode"1FBB="1F71 \global\uccode"1FBB="0391
+\global\lccode"1FBC="1FB3 \global\uccode"1FBC="1FBC
+\global\lccode"1FBD="1FBD \global\uccode"1FBD="1FBD
+\global\lccode"1FC2="1FC2 \global\uccode"1FC2="1FCC
+\global\lccode"1FC3="1FC3 \global\uccode"1FC3="1FCC
+\global\lccode"1FC4="1FC4 \global\uccode"1FC4="1FCC
+\global\lccode"1FC6="1FC6 \global\uccode"1FC6="0397
+\global\lccode"1FC7="1FC7 \global\uccode"1FC7="1FCC
+\global\lccode"1FC8="1F72 \global\uccode"1FC8="0395
+\global\lccode"1FC9="1F73 \global\uccode"1FC9="0395
+\global\lccode"1FCA="1F74 \global\uccode"1FCA="0397
+\global\lccode"1FCB="1F75 \global\uccode"1FCB="0397
+\global\lccode"1FCC="1FC3 \global\uccode"1FCC="1FCC
+\global\lccode"1FD0="1FD0 \global\uccode"1FD0="1FD8
+\global\lccode"1FD1="1FD1 \global\uccode"1FD1="1FD9
+\global\lccode"1FD2="1FD2 \global\uccode"1FD2="03AA
+\global\lccode"1FD3="1FD3 \global\uccode"1FD3="03AA
+\global\lccode"1FD6="1FD6 \global\uccode"1FD6="0399
+\global\lccode"1FD7="1FD7 \global\uccode"1FD7="03AA
+\global\lccode"1FD8="1FD0 \global\uccode"1FD8="1FD8
+\global\lccode"1FD9="1FD1 \global\uccode"1FD9="1FD9
+\global\lccode"1FDA="1F76 \global\uccode"1FDA="0399
+\global\lccode"1FDB="1F77 \global\uccode"1FDB="0399
+\global\lccode"1FE0="1FE0 \global\uccode"1FE0="1FE8
+\global\lccode"1FE1="1FE1 \global\uccode"1FE1="1FE9
+\global\lccode"1FE2="1FE2 \global\uccode"1FE2="03AB
+\global\lccode"1FE3="1FE3 \global\uccode"1FE3="03AB
+\global\lccode"1FE4="1FE4 \global\uccode"1FE4="03A1
+\global\lccode"1FE5="1FE5 \global\uccode"1FE5="03A1
+\global\lccode"1FE6="1FE6 \global\uccode"1FE6="03A5
+\global\lccode"1FE7="1FE7 \global\uccode"1FE7="03AB
+\global\lccode"1FE8="1FE0 \global\uccode"1FE8="1FE8
+\global\lccode"1FE9="1FE1 \global\uccode"1FE9="1FE9
+\global\lccode"1FEA="1F7A \global\uccode"1FEA="03A5
+\global\lccode"1FEB="1F7B \global\uccode"1FEB="03A5
+\global\lccode"1FEC="1FE5 \global\uccode"1FEC="03A1
+\global\lccode"1FF2="1FF2 \global\uccode"1FF2="1FFC
+\global\lccode"1FF3="1FF3 \global\uccode"1FF3="1FFC
+\global\lccode"1FF4="1FF4 \global\uccode"1FF4="1FFC
+\global\lccode"1FF6="1FF6 \global\uccode"1FF6="03A9
+\global\lccode"1FF7="1FF7 \global\uccode"1FF7="1FFC
+\global\lccode"1FF8="1F78 \global\uccode"1FF8="039F
+\global\lccode"1FF9="1F79 \global\uccode"1FF9="039F
+\global\lccode"1FFA="1F7C \global\uccode"1FFA="03A9
+\global\lccode"1FFB="1F7D \global\uccode"1FFB="03A9
+\global\lccode"1FFC="1FF3 \global\uccode"1FFC="1FFC
+
+
+% uclclist
+% ~~~~~~~~
+%
% The common Greek font encoding definitions in greek-fontenc.def_ extend the
-% `uclclist` with Greek LICR macros. Here, we add Unicode-specific "hiatus_"
-% handling (copied from lgrenc.def_ and changed Latin transcription to Unicode
-% literals)::
+% `uclclist` with Greek LICR macros. Here, we add textkoppa/textKoppa and
+% Unicode-specific "hiatus_" handling (copied from lgrenc.def_ and changed
+% Latin transcription to Unicode literals).
+%
+% @uclclist extension (see also greek-fontenc.def_)::
+
+\providecommand*\greek@euenc@update@uclclist{%
+ \expandafter\def\expandafter\@uclclist\expandafter{%
+ \@uclclist
+ \textkoppa \textKoppa
+ }%
+ \let\greek@euenc@update@uclclist\relax
+}
+
+% Expand the uclc list using the just defined macro::
+
+\greek@euenc@update@uclclist
+% Now the hiatus definition modifications::
\DeclareTextCommand{\LGR@A@hiatus}{\LastDeclaredEncoding}{%
\LGR@ifnextchar{Ι}{\textAlpha\"}{%
@@ -547,6 +870,7 @@
% .. _grnumalt: http://www.ctan.org/pkg/grnumalt
% .. _inputenc: http://www.ctan.org/pkg/inputenc
% .. _textalpha: textalpha.sty.html
+% .. _xgreek: http://www.ctan.org/pkg/xgreek
% .. _xunicode: http://www.ctan.org/pkg/xunicode
%
% .. _LaTeX2e font selection:
diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/greek-fontenc.def b/Master/texmf-dist/tex/latex/greek-fontenc/greek-fontenc.def
index c7128dc3684..14c4a449fdf 100644
--- a/Master/texmf-dist/tex/latex/greek-fontenc/greek-fontenc.def
+++ b/Master/texmf-dist/tex/latex/greek-fontenc/greek-fontenc.def
@@ -12,7 +12,7 @@
% ::
\ProvidesFile{greek-fontenc.def}
-[2014/12/12 v0.12 Common Greek font encoding definitions]
+[2015/08/04 v0.13 Common Greek font encoding definitions]
% :Abstract: This file provides definitions that are shared between
% font encodings providing Greek characters.
@@ -25,6 +25,7 @@
% 0.9.1 2013-07-17 composite definitions starting with standard accent cmds
% 0.11 2013-11-28 ``\greekscript`` TextCommand
% 0.12 2014-12-12 Remove symbol macros for breathing accents.
+% 0.13 2015/08/04 No @uclclist entry for ypogegrammeni/prosgegrammeni.
% ===== ============ ========================================================
%
% Usage
@@ -78,7 +79,14 @@
\DeclareTextCommand{\textnumeralsigngreek}{\LastDeclaredEncoding}{\textdexiakeraia}
\DeclareTextCommand{\textnumeralsignlowergreek}{\LastDeclaredEncoding}{\textaristerikeraia}
-% Two Unicode names for one character::
+% Names from babel_ and teubner_ (do we want to define them here as alias?)
+%
+% .. code:: latex
+%
+% \DeclareTextCommand{\anwtonos}{\LastDeclaredEncoding}{\textdexiakeraia} % ʹ
+% \DeclareTextCommand{\katwtonos}{\LastDeclaredEncoding}{\textaristerikeraia} % ͵
+%
+% Two Unicode code points and names for one character::
\DeclareTextCommand{\accoxia}{\LastDeclaredEncoding}{\acctonos}
\DeclareTextCommand{\acckoronis}{\LastDeclaredEncoding}{\accpsili}
@@ -101,7 +109,7 @@
% \DeclareTextCompositeCommand{\<}{LGR}{`}{\accdasiavaria}
% \DeclareTextCompositeCommand{\<}{LGR}{~}{\accdasiaperispomeni}
%
-% TODO: do we also want alternative symbols for the breathings (cf. X compose
+% Or use alternative symbols for the breathings (cf. X compose
% table, LCI encoding)?
%
% .. code:: latex
@@ -109,14 +117,6 @@
% \DeclareTextCommand{\(}{\LastDeclaredEncoding}{\accdasia}
% \DeclareTextCommand{\)}{\LastDeclaredEncoding}{\accpsili}
%
-% Names from babel_ and teubner_ (do we want to define them here as alias?)
-%
-% .. code:: latex
-%
-% \DeclareTextCommand{\anwtonos}{\LastDeclaredEncoding}{\textdexiakeraia} % ʹ
-% \DeclareTextCommand{\katwtonos}{\LastDeclaredEncoding}{\textaristerikeraia} % ͵
-%
-%
% Composite diacritics
% ~~~~~~~~~~~~~~~~~~~~
%
@@ -267,7 +267,7 @@
\accdialytikavaria\LGR@accDialytika
\accdialytikaperispomeni\LGR@accDialytika
\accperispomeni\LGR@accdropped
- \ypogegrammeni\prosgegrammeni
+ % \ypogegrammeni\prosgegrammeni
\textalpha \textAlpha
\textbeta \textBeta
\textgamma \textGamma
diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/lgrenc.def b/Master/texmf-dist/tex/latex/greek-fontenc/lgrenc.def
index 06cc8ad798d..c6f0f54134a 100644
--- a/Master/texmf-dist/tex/latex/greek-fontenc/lgrenc.def
+++ b/Master/texmf-dist/tex/latex/greek-fontenc/lgrenc.def
@@ -1,31 +1,31 @@
% lgrenc.def
% ***********
-%
+%
% LGR Greek font encoding definitions
% ===================================
-%
+%
% :Copyright: © 2010, 2014 Günter Milde
% :Licence: This work may be distributed and/or modified under the
% conditions of the `LaTeX Project Public License`_, either
% version 1.3 of this license or any later version.
-%
+%
% :Abstract: The LGR font encoding is the de-facto standard for Greek
% typesetting with LaTeX. 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.
-%
+%
% .. contents::
-%
-%
+%
+%
% Changelog
% ---------
-%
+%
% Development of this file started under the name "lgrxenc.def" as part of the
% lgrx_ bundle. With version 0.8, it moved to ``greek-fontenc/lgrx.def``.
-%
+%
% .. class:: borderless
-%
+%
% ====== ============ ========================================================
% 0.1 2010-03-31 initial attempt
% 0.2 2010-04-20 diacritics dropped in UPPERCASE.
@@ -51,24 +51,25 @@
% .. add composite command for Ῥ (Rho with Dasia).
% 0.9 2013-07-16 move common definitions to ``greek-fontenc.def``,
% .. add composite commands for single quotation marks.
-% 0.11.2 unpublished remove duplicate code.
+% 0.11.2 2014-09-04 remove duplicate code.
+% 0.13 2015-08-04 Support for symbol variants.
% ====== ============ ========================================================
-%
+%
% Usage
% -----
-%
+%
% Load this file by calling fontenc_ with the ``LGR`` option
% or indirectly via the babel_, textalpha_ or alphabeta_ packages.
-%
+%
% Example:
% Select font encodings `T1` (as default) and `LGR` (for Greek):
-%
+%
% ``\usepackage[LGR,T1]{fontenc}``
-%
-%
+%
+%
% Implementation
% --------------
-%
+%
% Read this file only once
% ~~~~~~~~~~~~~~~~~~~~~~~~
% .. note:: The use of ``\@ifundefined`` has the side-effect that the tested
@@ -76,7 +77,7 @@
% interfering with tests via eTeX's ``\ifdefined``). However, in this case
% no harm is done as the macro is defined by the identification_ below
% anyway.
-%
+%
% ::
% read this file only once
@@ -92,7 +93,7 @@
% ::
\ProvidesFile{lgrenc.def}
-[2013/12/02 v0.11.2 LGR Greek font encoding definitions]
+[2015/08/08 v0.13 LGR Greek font encoding definitions]
% Copyright © 2010 Günter Milde
% This file is part of the "greek-fontenc" package.
% It may be distributed and/or modified under the
@@ -100,17 +101,17 @@
% version 1.3 of this license or any later version.
% You can test the version date using
-%
+%
% .. code:: latex
-%
+%
% \@ifl@ter {extension}{filename}{date}{YES}{NO}
-%
+%
% or using ltxcmds_' ``\@iffilelater``.
-%
-%
+%
+%
% Base setup
% ~~~~~~~~~~
-%
+%
% Declare the LGR font encoding and base substitutions::
\DeclareFontEncoding{LGR}{}{}
@@ -119,13 +120,13 @@
% Text symbols
% ~~~~~~~~~~~~
-%
+%
% Greek Alphabet
% """"""""""""""
-%
+%
% Greek letters are accessible by the Latin transcription, but the mapping is
% specific to the LGR font encoding.
-%
+%
% The LICR macros provide a way to access the symbols independent of the
% specific font encoding, in any font encoding supporting Greek. An
% alternative Greek font encodings is LGI (ibycus_). Greek script is also
@@ -191,10 +192,10 @@
% Additional Greek symbols
% """"""""""""""""""""""""
-%
+%
% Ancient Greek Numbers (Athenian Numerals)
% '''''''''''''''''''''''''''''''''''''''''
-%
+%
% Names from ucs_ (``ucsencs.def``)
% (In ucs, five hundred is (wrongly?) named \textpentehkaton.) ::
@@ -225,22 +226,61 @@
% Numeral signs
% '''''''''''''
% See also http://en.wikipedia.org/wiki/Greek_numerals
-%
+%
% Names from ucs_::
\DeclareTextSymbol{\textdexiakeraia}{LGR}{254} % ʹ (Dexia keraia)
\DeclareTextSymbol{\textaristerikeraia}{LGR}{255} % ͵ (Aristeri keraia)
+% variant symbols
+% '''''''''''''''
+%
+% Mathematical notation distinguishes variant shapes for pi, phi, rho, theta
+% (small and capital), beta, and kappa (characters for the latter three
+% symbols are not included in TeX’s math fonts). These variations have no
+% syntactic meaning in Greek text and are not given code-points in the LGR
+% encoding. Greek text fonts use the shape variants interchangeabely.
+%
+% However, as Unicode defines separate code points for the symbol variants, we
+% provide fallback LICR macros with detailed error reporting::
+
+\providecommand*{\LGR@TextSymbolUnavailable}[1]{%
+ \PackageError{greek-fontenc}{character \string#1 not available \MessageBreak
+ in 8-bit TeX}
+ {Use XeTeX/LuaTeX if you need to distinguish the symbol from the letter.\MessageBreak
+ The package `textalpha' with `normalize-symbols' maps the GREEK SYMBOL\MessageBreak
+ character to the corresponding GREEK LETTER.\MessageBreak
+ Press <return> to proceed (dropping the symbol from the document).}
+}
+
+\providecommand*{\LGR@TextSymbolOnlyMath}[2]{%
+ \PackageError{greek-fontenc}{character \string#1 not available in text mode}
+ {Use #2 or XeTeX/LuaTeX if you need to distinguish\MessageBreak
+ the symbol from the letter.\MessageBreak
+ The package `textalpha' with `normalize-symbols' maps the GREEK SYMBOL\MessageBreak
+ character to the corresponding GREEK LETTER.\MessageBreak
+ Press <return> to proceed (dropping the symbol from the document).}
+}
+
+\ProvideTextCommand{\textbetasymbol} {LGR}{\LGR@TextSymbolUnavailable{ϐ beta symbol}}
+\ProvideTextCommand{\textkappasymbol}{LGR}{\LGR@TextSymbolUnavailable{ϰ kappa symbol}}
+\ProvideTextCommand{\textThetasymbol}{LGR}{\LGR@TextSymbolUnavailable{ϴ Theta symbol}}
+
+\ProvideTextCommand{\textthetasymbol} {LGR}{\LGR@TextSymbolOnlyMath{ϑ theta symbol}{$\vartheta$}}
+\ProvideTextCommand{\textphisymbol} {LGR}{\LGR@TextSymbolOnlyMath{ϕ phi symbol}{$\phi$}}
+\ProvideTextCommand{\textpisymbol} {LGR}{\LGR@TextSymbolOnlyMath{ϖ pi symbol}{$\varpi$}}
+\ProvideTextCommand{\textrhosymbol} {LGR}{\LGR@TextSymbolOnlyMath{ϱ rho symbol}{$\varrho$}}
+\ProvideTextCommand{\textepsilonsymbol}{LGR}{\LGR@TextSymbolOnlyMath{ϵ lunate epsilon symbol}{$\epsilon$}}
% Other
% """""
-%
+%
% Characters that also exist in other font encodings:
-%
+%
% * define them for LGR if there is a matching glyph,
% * use established macro names that match with other ``*enc.def`` files and
% ``textcomp.sty``.
-%
+%
% All encodings: See usrguide.pdf, chapter 3.14 ff::
\DeclareTextSymbol{\textendash}{LGR}{0} % EN DASH
@@ -274,103 +314,102 @@
% T3 also defines some greek letters as well as Latin characters with Greek
% names:
-%
+%
% According to the Unicode standard, the following IPA characters are identic
% to the Greek letters:
-%
-% - 03B2 greek small letter beta
-% - 03B8 greek small letter theta
-% - 03BB greek small letter lamda
-% - 03C7 greek small letter chi
-%
-% The following characters in the IPA block are not Greek letters:
-%
-% - 0251 LATIN SMALL LETTER ALPHA ≠ greek small letter alpha - 03B1
-% - 025B LATIN SMALL LETTER OPEN E = epsilon ≠ greek small letter epsilon - 03B5
-% - 0263 LATIN SMALL LETTER GAMMA ≠ greek small letter gamma - 03B3
-% - 0269 LATIN SMALL LETTER IOTA ≠ greek small letter iota - 03B9
-% - 0278 LATIN SMALL LETTER PHI ≠ greek small letter phi - 03C6
-% - 028A LATIN SMALL LETTER UPSILON ≠ greek small letter upsilon - 03C5
-%
-% Unfortunately, `tipa` uses the macro names ``\textepsilon``, ``\textgamma``,
-% ``\textiota``, ``\textphi``, and ``\textupsilon`` for the Latin characters.
-% This is no problem with 8-bit fonts (set the font encoding to T3 vs. LGR to
-% disambiguate), but leads to name clashes with Unicode fonts. xunicode_ uses
-% the ``gr`` infix and alias names to disambiguate:
-%
+%
+% - 03B2 greek small letter beta
+% - 03B8 greek small letter theta
+% - 03BB greek small letter lamda
+% - 03C7 greek small letter chi
+%
+% The following characters in the IPA block refer to Greek letters:
+%
+% - 0251 LATIN SMALL LETTER ALPHA → greek small letter alpha - 03B1
+% - 025B LATIN SMALL LETTER OPEN E = epsilon → greek small letter epsilon - 03B5
+% - 0263 LATIN SMALL LETTER GAMMA → greek small letter gamma - 03B3
+% - 0269 LATIN SMALL LETTER IOTA → greek small letter iota - 03B9
+% - 0278 LATIN SMALL LETTER PHI → greek small letter phi - 03C6
+% - 028A LATIN SMALL LETTER UPSILON → greek small letter upsilon - 03C5
+%
+% `tipa` uses the macro names ``\textepsilon``, ``\textgamma``, ``\textiota``,
+% ``\textphi``, and ``\textupsilon`` for the Latin characters. This is no
+% problem with 8-bit fonts (set the font encoding to T3 vs. LGR to
+% disambiguate), but leads to ambiguity with Unicode fonts. xunicode_ uses the
+% ``gr`` infix and alias names to disambiguate:
+%
% - 03B3 ``\textgrgamma``
% - 03B9 ``\textgriota``
% - 03C6 ``\textgrphi`` (see x0278 )
-%
+%
% but not for epsilon and upsilon (03C2 ``\textgrsigma`` is the final sigma).
-%
+%
% It also assigns alias names to the Latin counterparts, however not on a
% systematical basis:
-%
+%
% - 0194 ``\textGammaafrican``
% - 0196 ``\textIotaafrican``
% - 0251 ``\textscripta``
% - 025B ``\texteopen``
% - 0263 ``\textbabygamma``, ``\textgammalatinsmall``
-% - 0269 ``\textiotalatin``
+% - 0269 ``\textiotalatin``
% - 028A ``\textscupsilon`` % TIPA-U
-%
-%
-%
+%
+%
+%
% 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 a
% font-encoding definition file as they require ``\textlatin`` which is
% defined in ``babel.def``. They were moved to ``greek.ldf``.
-%
-%
+%
% 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:
-%
+%
% * input convention similar to LGR input encodings (just prepend a ``\``).
-%
+%
% * 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.
-%
-%
+%
+%
% 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?`
% in the README_) reducing the probability of incompatibilities compared to the
% two-letter teubner_ diacritic macros or the "text" prefix used by ucs_.
-%
+%
% Simple Greek diacritics::
\DeclareTextAccent{\accdialytika}{LGR}{34} % διαλυτικά (diaeresis/trema)
@@ -388,7 +427,7 @@
\DeclareTextSymbol{\ypogegrammeni}{LGR}{124} % ͺ "small" sub-iota
% __ http://en.wikipedia.org/wiki/Hypogegrammeni
-%
+%
% Composite diacritics::
% Teubner name
@@ -410,12 +449,12 @@
\DeclareTextAccent{\accinvertedbrevebelow}{LGR}{1} % INVERTED BREVE BELOW
\DeclareTextAccent{\textsubarch}{LGR}{1} % (tipa)
\DeclareTextAccent{\accbrevebelow}{LGR}{20} % BREVE BELOW
-\DeclareTextAccent{\u}{LGR}{30} % BREVE
+\DeclareTextAccent{\u}{LGR}{30} % BREVE (Greek vrachy)
\DeclareTextAccent{\=}{LGR}{31} % MACRON
% Aliases
% """""""
-%
+%
% The standard _`symbol macros` are exclusively used for Greek diacritics
% in LGR::
@@ -426,7 +465,7 @@
% Common Greek font encoding definitions
% ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-%
+%
% The file greek-fontenc.def contains font encoding definitions that are
% shared by font encodings providing Greek characters::
@@ -435,24 +474,24 @@
% Composite definitions
% ~~~~~~~~~~~~~~~~~~~~~
-%
+%
% 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``.
-%
+%
% The actual declarations are part of the `common Greek font encoding
% definitions`_.
-%
-%
+%
+%
% Pre-composed letters
% """"""""""""""""""""
% Small letters with diacritics
% '''''''''''''''''''''''''''''
-%
+%
% (from teubner_ with changed names of the composite accents)::
\DeclareTextComposite{\accvaria}{LGR}{a}{128}
@@ -624,15 +663,15 @@
% 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).
-%
+%
% The diaytika should also always be used in all-uppercase words (even
% in cases where they are not needed when writing in lowercase)
-%
+%
% -- http://en.wikipedia.org/wiki/Capitalization
-%
+%
% In Title Case, place diacritics before instead of above the base character::
\DeclareTextCompositeCommand{\accdasia}{LGR}{A}{<A}
@@ -792,24 +831,24 @@
% UPPERCASE
% ~~~~~~~~~
-%
+%
% The `common Greek font encoding definitions`_ in ``greek-fontenc.def`` extend
% the `uclclist` with Greek LICR macros. Here, we add LGR specific "hiatus"
% handling.
-%
+%
% Composite commands for Latin transliteration::
-
+
\DeclareTextCompositeCommand{\LGR@hiatus}{LGR}{A}{\LGR@A@hiatus}
\DeclareTextCompositeCommand{\LGR@hiatus}{LGR}{E}{\LGR@E@hiatus}
% TODO: What does the \LGR@hiatus command "see" if a Unicode literal follows?
-%
+%
% .. code:: latex
-%
+%
% % \DeclareTextCompositeCommand{\LGR@hiatus}{LGR}{\symbol{"ce}}{bluff}
% % \DeclareTextCompositeCommand{\LGR@hiatus}{LGR}{"cf}{blaff}
% % \DeclareTextCompositeCommand{\LGR@hiatus}{LGR}{ι}{blaff}
-%
+%
% Look ahead and place a diaeresis on Ι or Υ::
\DeclareTextCommand{\LGR@A@hiatus}{LGR}{%
@@ -832,36 +871,36 @@
}
% Unfortunately, the lookahead breaks kerning.
-%
+%
% Alternatives tried:
-%
+%
% * CompositeCommands fail at the end of a macro, e.g. ``\emph{\'a}``
-%
+%
% .. code:: latex
-%
+%
% \DeclareTextCommand{\LGR@A@hiatus}{LGR}{A}
% \DeclareTextCommand{\LGR@E@hiatus}{LGR}{E}
-%
+%
% \DeclareTextCompositeCommand{\LGR@A@hiatus}{LGR}{}{A}
% \DeclareTextCompositeCommand{\LGR@A@hiatus}{LGR}{I}{A\"I}
% \DeclareTextCompositeCommand{\LGR@A@hiatus}{LGR}{U}{A\"U}
-%
-%
+%
+%
% * The glyph No 12 is a special "Upcase Alpha" that in ligature with Y
% and I adds a diaresis to them. However, it seems that it has only
% kerning definitions for I and Y (as it is not intended for direct
% use)
-%
+%
% .. code:: latex
-%
+%
% \DeclareTextComposite{\LGR@hiatus}{LGR}{A}{12}
-%
+%
% No such glyph exists for E but this is no problem as E does
% not require kerning anyway.
-%
+%
% .. References
% ----------
-%
+%
% .. _README: README.html
% .. _alphabeta: alphabeta.sty.html
% .. _athnum: http://www.ctan.org/pkg/athnum
diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty b/Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty
index 61932d7d5fc..2f122f25d9e 100644
--- a/Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty
+++ b/Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty
@@ -2,31 +2,31 @@
% +++++++++++++
% Greek symbols in text
% *********************
-%
+%
% :Copyright: © 2010 Günter Milde
% :Licence: This work may be distributed and/or modified under the
% conditions of the `LaTeX Project Public License`_, either
% version 1.3 of this license or any later version.
-%
+%
% :Abstract: Provide a set of ``\text*`` macros for Greek characters
% in text mode.
-%
+%
% :Identification:
% ::
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{textalpha}
-[2014/12/12 v0.12 macros for Greek letters in text]
+[2015/09/04 v0.13 macros for Greek letters in text]
% .. note::
-%
+%
% The package was renamed from `textgreek` to `textalpha` to prevent
% confusion with the textgreek_ package by Leonard Michlmayr.
-%
-%
+%
+%
% Changelog:
% .. class:: borderless
-%
+%
% ========== ===== =========================================================
% 2010-06-16 0.1 initial version
% 2012-06-27 0.2 support for compound Unicode definitions outside LGR
@@ -37,76 +37,160 @@
% 2013-11-28 0.11 compatibility with Xe/LuaTeX in 8-bit mode.
% 2014-12-12 0.12 fix auxiliary macro names,
% define symbol macros for breathing accents.
+% 2015-09-04 0.13 Option normalize-symbols_: support for symbol variants.
+% .. Option keep-semicolon_: use semicolon as erotimatiko
+% in LGR.
% ========== ===== =========================================================
-%
+%
+% .. contents::
+%
% Motivation
% ==========
-%
+%
% By default, TeX macros for Greek letters are only valid in mathematical
-% mode. This package sets up a suitable font encoding and Greek LICR
-% definitions (``\textalpha`` -- ``\textOmega``).
-%
+% mode. This package sets up a suitable `font encoding`_ and `LaTeX internal
+% character representations` (LICR) definitions for Greek (``\textalpha`` --
+% ``\textOmega``).
+%
% To allow documents using Greek LICR macros without worrying about the TeX
% engine used to compile them, this package tests the declared font encodings
% and does "the right thing" to set up Greek text font support:
-%
+%
% * If the Unicode font encodings EU1 (XeTeX) or EU2 (LuaTeX) are declared,
-% before loading this package (e.g. vie ``fontspec``) the package provides
+% before loading this package (e.g. via ``fontspec``) the package provides
% Greek LICR definitions for them.
-%
-% * If the LGR font encoding is declared before loading this package, it is
-% set as default for Greek LICR macros (cf. fntguide_ section 5.3).
-%
-% With XeTeX or LuaTex, Unicode fonts and LGR encoded 8-bit fonts can be
-% used in the same document (see greek-euenc-doc.tex_).
-%
+%
+% * Otherwise, the `LGR font encoding`_ is set as `default font encoding`
+% (cf. fntguide_ section 5.3) for Greek.
+%
% Advantages:
-%
+%
% * Symbols from a Greek text font (e.g. the `CB fonts`_) can be accessed
% without the need for an explicite font-encoding switch anywhere in the
% text.
-%
+%
% * Unicode input of Greek characters is supported
-%
+%
% + via ``\usepackage[utf8]{inputenc}`` and ``lgrenc.dfu`` from
% greek-inputenc_ for 8-bit TeX or XeTeX/LuaTeX in 8-bit compatibility
% mode in any font encoding (see textalpha-doc.tex_).
-%
+%
% + natively by XeTeX/LuaTeX for Unicode fonts. As inputenc_ does not work
% with these engines, text input can be done via the Latin transcription
% or LICR but *not via literal Unicode characters* for 8-bit font encodings
% like LGR (see greek-euenc-doc.tex_).
-%
+%
% .. Attention:: The macros work well in any font encoding for single symbols.
% However, with 8-bit TeX engines, the automatic font-encoding switches
% behind the doors interfere with kerning between letters and replacement
% of accent+character with a pre-composed character.
-%
+%
% Therefore, Greek text should be written with the help of babel_ or
% polyglossia_ (setting the language to ``greek``) or wrapped in the
% provided ``ensuregreek`` macro. Using babel_ or polyglossia_ also helps
% to ensure correct hyphenation of Greek text.
-%
-%
+%
+%
% Usage
% =====
-%
+%
+% Ensure support for Greek characters in text mode with
+%
% .. code:: latex
-%
-% \usepackage{textalpha}
-%
+%
+% \usepackage{textalpha}
+%
+% eventually with the options_ to normalize symbols variants
+%
+% .. code:: latex
+%
+% \usepackage[normalize-symbols]{textalpha}
+%
+% and/or to use the semicolon as erotimatiko_ also in 8-bit TeX
+%
+% .. code:: latex
+%
+% \usepackage[normalize-symbols,keep-semicolon]{textalpha}
+%
+%
+% To give ``textalpha.sty`` a chance of finding out which `font encodings`_
+% are used, load it after fontspec_ and/or fontenc_.
+%
+%
+%
% For detailled examples see `<textalpha-doc.tex>`_ and `<textalpha-doc.pdf>`_
% (8-bit TeX and XeTeX/LuaTeX in 8-bit compatibility mode) as well as
% `<greek-euenc-doc.tex>`_ and `<greek-euenc-doc.pdf>`_ (XeTeX/LuaTeX with
% Unicode fonts).
-%
-%
+%
+% With XeTeX or LuaTex, Unicode fonts and LGR encoded 8-bit fonts can be used
+% in the same document (see greek-euenc-doc.tex_).
+%
+%
% Implementation
% ==============
-%
-% Requirements
-% ------------
-%
+%
+% Options
+% -------
+%
+% normalize-symbols
+% """""""""""""""""
+%
+% The "variant shape" symbol characters like ``03D1 GREEK THETA SYMBOL`` are
+% mathematical charcters for mathematical use
+% (similar to ``1D440 MATHEMATICAL ITALIC CAPITAL M``).
+% Unfortunately, some Greek texts sources in Unicode encoding mix letter and
+% symbol characters .
+%
+% The "normalize-symbols" option controls the handling of `variant shape
+% symbols`_ under 8-bit TeX:
+%
+% * The option activates a simple "folding" mechanism that merges ϰ and κ to
+% \textkappa etc. for text copied from external sources which may use the
+% GREEK SYMBOL characters in place of GREEK LETTERS,
+%
+% * Without this option, variant shape symbols in the input are reported as
+% errors to prevent information loss in cases where the distinction between
+% ϰ and κ is intended (e.g. in mathematical or scientific context).
+%
+% With XeTeX/LuaTeX and Unicode fonts, this option is ignored.
+% ::
+
+\newif\iftextalpha@normalizeSymbols
+\DeclareOption{normalize-symbols}{\textalpha@normalizeSymbolstrue}
+
+% keep-semicolon
+% """"""""""""""
+%
+% The erotimatiko_ looks like a semicolon but is a
+% **Greek question mark**:
+%
+% * The `LGR font encoding`_ uses the Latin question mark as input for the
+% `erotimatiko` and maps the semicolon to a middle dot (`ano teleia`).
+% * The Unicode standard provides the code point ``037E GREEK QUESTION MARK``
+% but says: "character ``003B SEMICOLON`` (and not 037E) is the preferred
+% character for Greek question mark".
+%
+% The ``keep-semicolon`` option allows to use the `semicolon as erotimatiko`_
+% in both, Xe/LuaTeX and 8-bit TeX. (The `ano teleia` can be input as
+% ``\textanoteleia`` or using character ``00B7 MIDDLE DOT``.)
+% With XeTeX/LuaTeX and Unicode fonts, this option is ignored.
+% ::
+
+\newif\iftextalpha@keepSemicolon
+\DeclareOption{keep-semicolon}{\textalpha@keepSemicolontrue}
+
+\ProcessOptions\relax
+
+% .. _font encoding:
+%
+% Font encodings
+% --------------
+%
+% With 8-bit LaTeX, the `LGR font encoding`_ is used for Greek characters. If
+% no Greek-supporting font encoding (EU1, EU2, or LGR) is declared, LGR is
+% loaded and set up as default Greek font encoding by this package.
+%
% With XeTeX or LuaTeX, there is one common input and font encoding --
% Unicode. 8-bit TeX font encodings are only used in compatibility mode or for
% fonts not available otherwise. For compatibility with the LaTeX font
@@ -115,30 +199,19 @@
% define LICR macros. We therefore explicitely load Greek LICR definitions for
% XeTeX/LuaTeX from `greek-euenc.def <greek-euenc.def.html>`_ which in turn
% includes `greek-fontenc.def <greek-fontenc.def.html>`_.
-%
-% With 8-bit LaTeX, the LGR font encoding is used for Greek characters. If no
-% Greek-supporting font encoding (EU1, EU2, or LGR) is declared, LGR is loaded
-% and set up as default Greek font encoding by this package.
-%
-% To give ``textalpha.sty`` a chance of finding out which font encodings are
-% used, load it after fontspec_ and/or fontenc_.
-%
-% Font encodings
-% """"""""""""""
-%
+%
+% .. _LGR font encoding: README.html#lgr
+%
% Ensure a Greek-supporting font encoding exists and supports Greek LICR
% macros:
-%
-% Load the Greek LICR definitions for Unicode if font encoding EU1 (XeTeX) or
-% EU2 (LuaTeX) is detected. [#EU]_ In an ideal world, this would be done in
-% the ``eu1enc.def`` (or ``eu2enc.def``) file of the euenc_ package. If none
-% of EU1, EU2, and LGR is declared, load ``lgrenc.def``:
-%
-% Re-set the ``\LastDeclaredEncoding``: Because fontenc loads font
-% encoding definition files only once, it may happen that another font
-% encoding is defined afterwards --- for example fontspec_ leaves
-% ``\LastDeclaredEncoding`` at ``T3`` (tipa), because it inputs the xunicode_
-% package which in turn loads ``t3enc.def``. ::
+%
+% * Load the Greek LICR definitions for Unicode if font encoding EU1 (XeTeX)
+% or EU2 (LuaTeX) is detected. [#EU]_ (In an ideal world, this would be done
+% in the ``eu1enc.def`` (or ``eu2enc.def``) file of the euenc_ package.)
+% * Re-set ``\LastDeclaredEncoding`` (used in some included font-encoding files).
+% * If none of EU1, EU2, or LGR is declared, load ``lgrenc.def``.
+%
+% ::
\@ifl@aded{def}{eu1enc}{
\renewcommand{\LastDeclaredEncoding}{EU1}
@@ -150,16 +223,13 @@
}{% else
\@ifl@aded{def}{lgrenc}{
% LGR already declared and set up
+ \renewcommand{\LastDeclaredEncoding}{LGR}
}{
\input{lgrenc.def}
}
}
}
-% .. [#EU] The two different (pseudo) font encodings allow different font setups for
-% XeTeX vs. LuaTeX using differently named ``*.fd`` files (see euenc_ for
-% details).
-%
% The package hyperref_ defines the PU font encoding which also supports
% (monotonic) Greek. It currently misses polytonic greek and the
% ``\greekscript`` and ``\ensuregreek`` TextCommands::
@@ -169,13 +239,18 @@
\ProvideTextCommand{\ensuregreek}{PU}[1]{#1}}
{}
+% .. [#EU] The two different (pseudo) font encodings allow different font
+% setups for XeTeX vs. LuaTeX using differently named ``*.fd`` files (see
+% euenc_ for details).
+%
+%
% Symbol macros for breathings
-% """"""""""""""""""""""""""""
-%
+% ----------------------------
+%
% In the Latin transcription provided by LGR, breathing accents (Dasia and
% Psili) are input as < and >. We provide the corresponding NFSS macro accents
% (moved here from `greek-fontenc.def`_).
-%
+%
% As Xe/LuaTeX may use LGR in combination with EU1 or EU2, we define the
% macros for both, LGR and Unicode font encodings (if they are defined)::
@@ -205,7 +280,7 @@
% Default declarations
% --------------------
-%
+%
% The following definitions ensure that the Greek LICR macros can be used
% anywhere in the document also with 8-bit TeX by declaring LGR as their
% default font encoding. Abort here, if the LGR font encoding is not defined::
@@ -215,15 +290,16 @@
% else return:
{\expandafter\endinput}
+
% greekscript, ensuregreek
% """"""""""""""""""""""""
-%
+%
% The ``\greekscript`` declaration ensures the current font encoding supports
% the Greek script. ``greek-fontenc.def`` sets this to the empty declaration
% for font encodings that do so. This is currently used by ``lgrenc.def``
% (LGR) and ``greek-euenc.def`` (Greek LICR macros for EU1 and EU2).
-%
-%
+%
+%
% We define LGR as default encoding for Greek text. We use
% ``\ProvideTextCommandDefault`` to enable the author or other packages to use
% an alternative definition (see [fntguide_])::
@@ -236,26 +312,26 @@
\ProvideTextCommandDefault{\ensuregreek}[1]{\leavevmode{\greekscript #1}}
% .. The [fntguide_] writes
-%
+%
% Note that ``\DeclareTextAccentDefault`` can be used on any
% one-argument encoding-specific command, not just those defined with
% ``\DeclareTextAccent``.
-%
+%
% However, the simpler alternative
% ``\DeclareTextAccentDefault{\ensuregreek}{LGR}`` fails with the table of
% Unicode characters in the test document `<textalpha-doc.tex>`__:
-%
+%
% ``! You can't use a prefix with `end-group character }'.``
-%
+%
% 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``.
-%
-%
+%
+%
% Greek Alphabet
% """"""""""""""
-%
+%
% Define the ``text*`` marcos as default for all font encodings::
\DeclareTextSymbolDefault{\textAlpha}{LGR}
@@ -312,10 +388,10 @@
\DeclareTextSymbolDefault{\textomega}{LGR}
% Additional Greek symbols
-% ''''''''''''''''''''''''
-%
+% """"""""""""""""""""""""
+%
% Including alias names for compatibility with hyperref's puenc.def.
-%
+%
% Ancient Greek Numbers (Athenian Numerals)::
\DeclareTextSymbolDefault{\textpentedeka}{LGR} % GREEK ACROPHONIC ATTIC FIFTY
@@ -350,9 +426,40 @@
\DeclareTextSymbolDefault{\textnumeralsigngreek}{LGR} % (puenc.def)
\DeclareTextSymbolDefault{\textnumeralsignlowergreek}{LGR} % (puenc.def)
+% variant shape symbols
+% '''''''''''''''''''''
+%
+% Mathematical notation uses variant shapes of some Greek letters as
+% additional symbols. There are separate code points for the symbol variants
+% in Unicode but not in the LGR font encoding used for Greek in 8-bit TeX.
+% The variations have no syntactic meaning in Greek text. ::
+
+\DeclareTextSymbolDefault{\textbetasymbol}{LGR} % ϐ GREEK BETA SYMBOL
+\DeclareTextSymbolDefault{\textthetasymbol}{LGR} % ϑ $\vartheta$ GREEK THETA SYMBOL
+\DeclareTextSymbolDefault{\textphisymbol}{LGR} % ϕ $\phi$ GREEK PHI SYMBOL
+\DeclareTextSymbolDefault{\textpisymbol}{LGR} % ϖ $\varpi$ GREEK PI SYMBOL
+\DeclareTextSymbolDefault{\textkappasymbol}{LGR} % ϰ GREEK KAPPA SYMBOL
+\DeclareTextSymbolDefault{\textrhosymbol}{LGR} % ϱ $\varrho$ GREEK RHO SYMBOL
+\DeclareTextSymbolDefault{\textThetasymbol}{LGR} % ϴ GREEK CAPITAL THETA SYMBOL
+\DeclareTextSymbolDefault{\textepsilonsymbol}{LGR} % ϵ $\epsilon$ GREEK LUNATE EPSILON SYMBOL
+
+% Define compatibility mappings if the normalize-symbols_ option is set::
+
+\iftextalpha@normalizeSymbols
+ \DeclareTextCommand{\textbetasymbol} {LGR}{\textbeta}
+ \DeclareTextCommand{\textthetasymbol} {LGR}{\texttheta}
+ \DeclareTextCommand{\textphisymbol} {LGR}{\textphi}
+ \DeclareTextCommand{\textpisymbol} {LGR}{\textpi}
+ \DeclareTextCommand{\textkappasymbol} {LGR}{\textkappa}
+ \DeclareTextCommand{\textrhosymbol} {LGR}{\textrho}
+ \DeclareTextCommand{\textThetasymbol} {LGR}{\textTheta}
+ \DeclareTextCommand{\textepsilonsymbol}{LGR}{\textepsilon}
+\fi
+
+
% Diacritics
% """"""""""
-%
+%
% Greek diacritics via "named" macros::
\DeclareTextAccentDefault{\accdasia}{LGR}
@@ -391,13 +498,34 @@
% Auxiliary macros
% """"""""""""""""
-%
+%
% ``\MakeUppercase`` requires three internal commands::
\DeclareTextAccentDefault{\LGR@accdropped}{LGR}
\DeclareTextAccentDefault{\LGR@accDialytika}{LGR}
\DeclareTextAccentDefault{\LGR@hiatus}{LGR}
+
+% semicolon as erotimatiko
+% """"""""""""""""""""""""
+%
+% The text command ``\textsemicolon`` inserts ``\texterotimatiko``
+% in LGR font encoding and a "normal" semicolon else::
+
+\ProvideTextCommandDefault{\textsemicolon}{;}
+\ProvideTextCommand{\textsemicolon}{LGR}{\texterotimatiko}
+
+% The LGR font encoding maps ";" to a middle dot (ano teleia). With the
+% keep-semicolon_ option, the semicolon is made an active character and calls
+% ``\textsemicolon``::
+
+\iftextalpha@keepSemicolon
+ \catcode`;=\active
+ \newcommand{;}{\textsemicolon}
+\fi
+
+
+
% .. References
% ----------
% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
@@ -407,7 +535,7 @@
% .. _e-TeX: http://www.tex.ac.uk/cgi-bin/texfaq2html?label=etex
% .. _fontenc: http://www.ctan.org/pkg/fontenc
% .. _fontspec: http://www.ctan.org/pkg/fontspec
-% .. _fntguide: http://www.ctan.org/tex-archive/macros/latex/doc/fntguide.pdf
+% .. _fntguide: http://mirror.ctan.org/macros/latex/doc/fntguide.pdf
% .. _greek-fontenc: http://www.ctan.org/pkg/greek-fontenc
% .. _greek-inputenc: http://www.ctan.org/pkg/greek-inputenc
% .. _hyperref: http://www.ctan.org/pkg/hyperref
@@ -415,3 +543,5 @@
% .. _polyglossia: http://www.ctan.org/pkg/polyglossia
% .. _textgreek: http://www.ctan.org/pkg/textgreek
% .. _xunicode: http://www.ctan.org/pkg/xunicode
+%
+% .. _erotimatiko: https://en.wikipedia.org/wiki/Question_mark#Erotimatiko