greek-fontenc (1oct13)

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

6 files changed, 81 insertions, 108 deletions

diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/README b/Master/texmf-dist/doc/latex/greek-fontenc/README
index aa03bac981c..552bc52248c 100644
--- a/Master/texmf-dist/doc/latex/greek-fontenc/README
+++ b/Master/texmf-dist/doc/latex/greek-fontenc/README
@@ -25,20 +25,21 @@ News
 
 .. class:: borderless
 
-==========  ===== ==========================================================
-2013-07-03  0.9   greek-fontenc.def_ "outsourced" from lgrxenc.def
-..                experimental files xunicode-greek.sty and
-                  greek-euenc.def_: LICRs for XeTeX/LuaTeX.
-2013-07-18  0.9.1 bugfix: wrong breathings psilioxia -> dasiaoxia.
-2013-07-19  0.9.2 bugfix: Disable composite defs starting with char macro,
-..                fix "hiatus" handling.
-2013-07-24  0.9.3 fix "input" path in xunicode-greek and greek-euenc.def.
-2013-09-10  0.9.4 greek-fontenc.sty: Greek text font encoding setup package,
-..                remove xunicode-greek.sty.
-2013-09-13  0.10  textalpha.sty_ and alphabeta.sty_ moved here from lgrx and
-                  updated to work with XeTeX/LuaTeX.
-..                greek-fontenc.sty removed (obsoleted by textalpha.sty).
-==========  ===== ==========================================================
+==========  ====== ==========================================================
+2013-07-03  0.9    greek-fontenc.def_ "outsourced" from lgrxenc.def
+..                 experimental files xunicode-greek.sty and
+                   greek-euenc.def_: LICRs for XeTeX/LuaTeX.
+2013-07-18  0.9.1  bugfix: wrong breathings psilioxia -> dasiaoxia.
+2013-07-19  0.9.2  bugfix: Disable composite defs starting with char macro,
+..                 fix "hiatus" handling.
+2013-07-24  0.9.3  fix "input" path in xunicode-greek and greek-euenc.def.
+2013-09-10  0.9.4  greek-fontenc.sty: Greek text font encoding setup package,
+..                 remove xunicode-greek.sty.
+2013-09-13  0.10   textalpha.sty_ and alphabeta.sty_ moved here from lgrx and
+                   updated to work with XeTeX/LuaTeX.
+..                 greek-fontenc.sty removed (obsoleted by textalpha.sty).
+2013-10-01  0.10.1 bugfix in greek-euenc.def_ and alphabeta-euenc.def_.
+==========  ====== ==========================================================
 
 
 
@@ -62,6 +63,10 @@ LaTeX files
 `<alphabeta.sty>`_
   Generic macros for `Greek symbols in text and math <alphabeta.sty.html>`_.
 
+`<alphabeta-euenc.def>`_
+  `Composite defintions for alphabeta.sty_ with XeTeX/LuaTeX.
+  <alphabeta-euenc.def.html>`_
+
 Literate source files were converted with PyLit_ to reStructuredText and
 with Docutils_ to the HTML documentation.
 
diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/README.html b/Master/texmf-dist/doc/latex/greek-fontenc/README.html
index 791cad0f71a..7fe732243e7 100644
--- a/Master/texmf-dist/doc/latex/greek-fontenc/README.html
+++ b/Master/texmf-dist/doc/latex/greek-fontenc/README.html
@@ -47,8 +47,8 @@ punctuation may change in future versions.</p>
 <table class="borderless">
 <colgroup>
 <col width="14%" />
-<col width="7%" />
-<col width="79%" />
+<col width="8%" />
+<col width="78%" />
 </colgroup>
 <tbody>
 <tr><td><p>2013-07-03</p></td>
@@ -95,7 +95,11 @@ updated to work with XeTeX/LuaTeX.</p></td>
 <tr><td><!--  -->
 </td>
 <td>&nbsp;</td>
-<td><p>remove greek-fontenc.sty (obsoleted by textalpha.sty).</p></td>
+<td><p>greek-fontenc.sty removed (obsoleted by textalpha.sty).</p></td>
+</tr>
+<tr><td><p>2013-10-01</p></td>
+<td><p>0.10.1</p></td>
+<td><p>bugfix in <a class="reference external" href="greek-euenc.def">greek-euenc.def</a> and <a class="reference external" href="alphabeta-euenc.def">alphabeta-euenc.def</a>.</p></td>
 </tr>
 </tbody>
 </table>
@@ -119,6 +123,9 @@ independent of font encoding and TeX engine.</p>
 <dt><a class="reference external" href="alphabeta.sty">alphabeta.sty</a></dt>
 <dd><p>Generic macros for <a class="reference external" href="alphabeta.sty.html">Greek symbols in text and math</a>.</p>
 </dd>
+<dt><a class="reference external" href="alphabeta-euenc.def">alphabeta-euenc.def</a></dt>
+<dd><p><a class="reference external" href="alphabeta-euenc.def.html">Composite defintions for alphabeta.sty_ with XeTeX/LuaTeX.</a></p>
+</dd>
 </dl>
 <p>Literate source files were converted with <a class="reference external" href="http://pylit.berlios.de">PyLit</a> to reStructuredText and
 with <a class="reference external" href="http://docutils.sourceforge.net/rst.html">Docutils</a> to the HTML documentation.</p>
diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-euenc.def.html b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-euenc.def.html
index 2a6ded6df26..12b124c4aaf 100644
--- a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-euenc.def.html
+++ b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-euenc.def.html
@@ -41,11 +41,15 @@ version&nbsp;1.3 of this license or any later version.</p>
 <td><p>0.1</p></td>
 <td><p>initial version</p></td>
 </tr>
+<tr><td><p>2013-10-01</p></td>
+<td><p>0.1.1</p></td>
+<td><p>remove clashing defs for legacy characters with oxia.</p></td>
+</tr>
 </tbody>
 </table>
 </dd>
 </dl>
-<p>The <a class="reference external" href="http://www.ctan.org/pkg/lgrx">alphabeta</a> package re-defines the math macros for Greek letters to work
+<p>The <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">alphabeta</a> package re-defines the math macros for Greek letters to work
 in both, text and math mode, so that Greek letters can be specified with
 the established command names in text, too.</p>
 <p>The NFSS TextComposite mechanism looks for the next token without expanding
@@ -189,34 +193,12 @@ commands for the EU1 and EU2 encoding</p>
 \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\Omega}{Ὧ}
 
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\alpha}{ὰ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\alpha}{ά}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\epsilon}{ὲ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\epsilon}{έ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\eta}{ὴ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\eta}{ή}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\iota}{ὶ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\iota}{ί}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\omicron}{ὸ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\omicron}{ό}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\upsilon}{ὺ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\upsilon}{ύ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\omega}{ὼ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\omega}{ώ}
-
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\alpha}{ὰ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\alpha}{ά}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\epsilon}{ὲ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\epsilon}{έ}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\eta}{ὴ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\eta}{ή}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\iota}{ὶ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\iota}{ί}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\omicron}{ὸ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\omicron}{ό}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\upsilon}{ὺ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\upsilon}{ύ}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\omega}{ὼ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\omega}{ώ}
 
 %% postfix ypogegrammeni cannot be second part of composite defs.
 % \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾀ}
@@ -281,9 +263,7 @@ commands for the EU1 and EU2 encoding</p>
 \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\Alpha}{Ᾰ}
 \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\Alpha}{Ᾱ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Alpha}{Ὰ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Alpha}{Ά}
 \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Alpha}{Ὰ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Alpha}{Ά}
 % \DeclareTextCompositeCommand{\Alpha}{\LastDeclaredEncoding}{\prosgegrammeni}{ᾼ}
 
 % \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ῂ}
@@ -293,13 +273,9 @@ commands for the EU1 and EU2 encoding</p>
 \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\eta}{ῆ}
 % \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ῇ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Epsilon}{Ὲ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Epsilon}{Έ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Eta}{Ὴ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Eta}{Ή}
 \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Epsilon}{Ὲ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Epsilon}{Έ}
 \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Eta}{Ὴ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Eta}{Ή}
 % \DeclareTextCompositeCommand{\Eta}{\LastDeclaredEncoding}{\prosgegrammeni}{ῌ}
 
 
@@ -313,9 +289,7 @@ commands for the EU1 and EU2 encoding</p>
 \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\Iota}{Ῐ}
 \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\Iota}{Ῑ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Iota}{Ὶ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Iota}{Ί}
 \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Iota}{Ὶ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Iota}{Ί}
 
 \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\upsilon}{ῠ}
 \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\upsilon}{ῡ}
@@ -329,9 +303,7 @@ commands for the EU1 and EU2 encoding</p>
 \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\Upsilon}{Ῠ}
 \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\Upsilon}{Ῡ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Upsilon}{Ὺ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Upsilon}{Ύ}
 \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Upsilon}{Ὺ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Upsilon}{Ύ}
 \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Rho}{Ῥ}
 
 % \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ῲ}
@@ -341,13 +313,9 @@ commands for the EU1 and EU2 encoding</p>
 \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\omega}{ῶ}
 % \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ῷ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Omicron}{Ὸ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Omicron}{Ό}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Omega}{Ὼ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Omega}{Ώ}
 \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Omicron}{Ὸ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Omicron}{Ό}
 \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Omega}{Ὼ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Omega}{Ώ}
 % \DeclareTextCompositeCommand{\Omega}{\LastDeclaredEncoding}{\prosgegrammeni}{ῼ}
 </pre>
 <!-- References -->
diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc.def.html b/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc.def.html
index 3d1cdd9f12a..03de974d41c 100644
--- a/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc.def.html
+++ b/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc.def.html
@@ -59,6 +59,15 @@ Based on <cite>lgrenc.def</cite> and <cite>lgrenc.dfu</cite>.</p>
 <td><p>0.1.3</p></td>
 <td><p>fix “input” path.</p></td>
 </tr>
+<tr><td><p>2013-10-01</p></td>
+<td><p>0.1.4</p></td>
+<td><p>remove clashing defs for legacy characters with oxia,</p></td>
+</tr>
+<tr><td><!--  -->
+</td>
+<td>&nbsp;</td>
+<td><p>fix upcasing of <tt class="literal">\finalsigma</tt>.</p></td>
+</tr>
 </tbody>
 </table>
 </dd>
@@ -211,8 +220,8 @@ COMBINING COMMA ABOVE)</p>
 \DeclareTextCommand{\textomicron}{\LastDeclaredEncoding}{ο}
 \DeclareTextCommand{\textpi}{\LastDeclaredEncoding}{π}
 \DeclareTextCommand{\textrho}{\LastDeclaredEncoding}{ρ}
-\DeclareTextCommand{\textvarsigma}{\LastDeclaredEncoding}{ς}
-\DeclareTextCommand{\textfinalsigma}{\LastDeclaredEncoding}{ς}
+\DeclareTextCommand{\textvarsigma}{\LastDeclaredEncoding}{ς} % final sigma
+\DeclareTextCommand{\textfinalsigma}{\LastDeclaredEncoding}{\textvarsigma}
 \DeclareTextCommand{\textsigma}{\LastDeclaredEncoding}{σ}
 \DeclareTextCommand{\texttau}{\LastDeclaredEncoding}{τ}
 \DeclareTextCommand{\textupsilon}{\LastDeclaredEncoding}{υ}
@@ -229,18 +238,21 @@ COMBINING COMMA ABOVE)</p>
 
 \DeclareTextCommand{\textQoppa}{\LastDeclaredEncoding}{Ϙ}
 \DeclareTextCommand{\textqoppa}{\LastDeclaredEncoding}{ϙ}
-\DeclareTextCommand{\textStigma}{\LastDeclaredEncoding}{Ϛ} % \Stigma
-\DeclareTextCommand{\textstigma}{\LastDeclaredEncoding}{ϛ} % \stigma
-\DeclareTextCommand{\textDigamma}{\LastDeclaredEncoding}{Ϝ} % \Digamma
-\DeclareTextCommand{\textdigamma}{\LastDeclaredEncoding}{ϝ} % \ddigamma
+\DeclareTextCommand{\textStigma}{\LastDeclaredEncoding}{Ϛ}
+\DeclareTextCommand{\textstigma}{\LastDeclaredEncoding}{ϛ}
+\DeclareTextCommand{\textDigamma}{\LastDeclaredEncoding}{Ϝ}
+\DeclareTextCommand{\textdigamma}{\LastDeclaredEncoding}{ϝ}
 %03DE&nbsp;GREEK&nbsp;LETTER&nbsp;KOPPA                      % Ϟ \textKoppa
 \DeclareTextCommand{\textkoppa}{\LastDeclaredEncoding}{ϟ} % \koppa, \textqoppa&nbsp;[sic!]
-\DeclareTextCommand{\textSampi}{\LastDeclaredEncoding}{Ϡ} % \Sampi
-\DeclareTextCommand{\textsampi}{\LastDeclaredEncoding}{ϡ} % \sampi
+\DeclareTextCommand{\textSampi}{\LastDeclaredEncoding}{Ϡ}
+\DeclareTextCommand{\textsampi}{\LastDeclaredEncoding}{ϡ}
 </pre>
 </div>
 <div class="section" id="greek-extended">
 <h2>Greek Extended</h2>
+<p>We skip definitions for characters “… WITH OXIA”, because they would
+overwrite the defintions for “… WITH TONOS” in the <cite>Greek and Coptic</cite>
+block.</p>
 <pre class="literal-block">\DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textalpha}{ἀ}
 \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textalpha}{ἁ}
 \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\textalpha}{ἂ}
@@ -349,34 +361,12 @@ COMBINING COMMA ABOVE)</p>
 \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\textOmega}{Ὧ}
 
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textalpha}{ὰ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textalpha}{ά}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textepsilon}{ὲ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textepsilon}{έ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\texteta}{ὴ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\texteta}{ή}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textiota}{ὶ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textiota}{ί}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textomicron}{ὸ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textomicron}{ό}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textupsilon}{ὺ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textupsilon}{ύ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textomega}{ὼ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textomega}{ώ}
-
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textalpha}{ὰ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textalpha}{ά}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textepsilon}{ὲ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textepsilon}{έ}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\texteta}{ὴ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\texteta}{ή}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textiota}{ὶ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textiota}{ί}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textomicron}{ὸ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textomicron}{ό}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textupsilon}{ὺ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textupsilon}{ύ}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textomega}{ὼ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textomega}{ώ}
 
 %% postfix ypogegrammeni cannot be second part of composite defs.
 % \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾀ}
@@ -441,9 +431,6 @@ COMBINING COMMA ABOVE)</p>
 \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\textAlpha}{Ᾰ}
 \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\textAlpha}{Ᾱ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textAlpha}{Ὰ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textAlpha}{Ά}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textAlpha}{Ὰ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textAlpha}{Ά}
 % \DeclareTextCompositeCommand{\textAlpha}{\LastDeclaredEncoding}{\prosgegrammeni}{ᾼ}
 \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textcompwordmark}{᾽}
 \DeclareTextCommand{\prosgegrammeni}{\LastDeclaredEncoding}{ι}
@@ -459,13 +446,7 @@ COMBINING COMMA ABOVE)</p>
 \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\texteta}{ῆ}
 % \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ῇ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textEpsilon}{Ὲ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textEpsilon}{Έ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textEta}{Ὴ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textEta}{Ή}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textEpsilon}{Ὲ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textEpsilon}{Έ}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textEta}{Ὴ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textEta}{Ή}
 % \DeclareTextCompositeCommand{\textEta}{\LastDeclaredEncoding}{\prosgegrammeni}{ῌ}
 \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\textcompwordmark}{῍}
 \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\textcompwordmark}{῎}
@@ -481,9 +462,6 @@ COMBINING COMMA ABOVE)</p>
 \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\textIota}{Ῐ}
 \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\textIota}{Ῑ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textIota}{Ὶ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textIota}{Ί}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textIota}{Ὶ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textIota}{Ί}
 \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\textcompwordmark}{῝}
 \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\textcompwordmark}{῞}
 \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\textcompwordmark}{῟}
@@ -500,13 +478,9 @@ COMBINING COMMA ABOVE)</p>
 \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\textUpsilon}{Ῠ}
 \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\textUpsilon}{Ῡ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textUpsilon}{Ὺ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textUpsilon}{Ύ}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textUpsilon}{Ὺ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textUpsilon}{Ύ}
 \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textRho}{Ῥ}
 \DeclareTextCompositeCommand{\accdialytikavaria}{\LastDeclaredEncoding}{\textcompwordmark}{῭}
 \DeclareTextCompositeCommand{\accdialytikaoxia}{\LastDeclaredEncoding}{\textcompwordmark}{΅}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textcompwordmark}{`}
 
 % \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ῲ}
 % \DeclareTextCompositeCommand{\textomega}{\LastDeclaredEncoding}{\ypogegrammeni}{ῳ}
@@ -515,13 +489,7 @@ COMBINING COMMA ABOVE)</p>
 \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textomega}{ῶ}
 % \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ῷ}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textOmicron}{Ὸ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textOmicron}{Ό}
 \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textOmega}{Ὼ}
-\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textOmega}{Ώ}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textOmicron}{Ὸ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textOmicron}{Ό}
-\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textOmega}{Ὼ}
-\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textOmega}{Ώ}
 % \DeclareTextCompositeCommand{\textOmega}{\LastDeclaredEncoding}{\prosgegrammeni}{ῼ}
 \DeclareTextCompositeCommand{\accoxia}{\LastDeclaredEncoding}{\textcompwordmark}{´}
 \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textcompwordmark}{῾}
diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.pdf
index 7d2b1726177..a16a92e3c3a 100644
--- a/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.pdf
+++ b/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.pdf
diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.tex b/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.tex
index 80ab208797f..e4b7fac6066 100644
--- a/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.tex
+++ b/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.tex
@@ -11,6 +11,7 @@
 \setmainfont{Linux Libertine O}
 \setsansfont{Linux Biolinum O}
 % \setmainfont{FreeSerif}
+% \setmainfont{Droid Sans}
 
 % Declare the font encoding and Greek LICR definitions:
 \usepackage{textalpha}
@@ -23,7 +24,7 @@
 
 \section*{Greek LICR definitions with XeTeX/LuaTeX}
 
-The \verb|textalpha| package from the lgrx bundle is a convenient way to
+The \verb|textalpha| package from the greek-fontenc bundle is a convenient way to
 load Greek LICR macros for use anywhere in the document and with any
 TeX engine supporting the e-TeX extensions (pdfTeX, XeTeX, or LuaTeX).
 With XeTeX or LuaTeX, it loads the file greek-euenc.def.
@@ -137,10 +138,22 @@ are defined in xunicode-greek.sty for \verb|\LastDeclaredEncoding| (here
 \accpsili\textalpha       \>\textalpha{}  \accpsili       x\>x
 \accdasia\textalpha       \<\textalpha{}  \accdasia       x\<x
 
+There are currently no defintions for accent macros combined with literal
+unicode characters. Combining diacritical characters are used in the output.
+(Please mail a feature request if there is demand for definitions selecting
+pre-composed characters.)
+
+\acctonos α       \'α
+\accvaria α       \`α
+\accdialytika ι   \"ι
+\accperispomeni α \~α
+\accpsili α       \>α
+\accdasia α       \<α
+
 Composite commands for combined diacritics are defined in
 “greek-fontenc.def”, also for the \verb|\LastDeclaredEncoding|. There are
 composite definitions for all pre-composed characters, the fallback
-definition uses composite characters:
+definition uses combining characters:
 
 \accdialytikatonos\textiota{}     \"'\textiota{} \"\'\textiota{}
 \accdialytikatonos x              \"'x           \"\'x
@@ -189,6 +202,18 @@ dialytika and sub-iota):
 }
 
 
+However, when the tonos, varia, and perispomeni accents are input as symbols
+(\verb|\' \` \~|) they behave like standard accents with XeTeX/LuaTeX. If
+these accents should be dropped by MakeUppercase, they must be input as
+named macro:
+
+\MakeUppercase{
+\acctonos\textalpha       \'\textalpha{}  \acctonos       x\'x
+\accvaria\textalpha       \`\textalpha{}  \accvaria       x\`x
+\accperispomeni\textalpha \~\textalpha{}  \accperispomeni x\~x
+}
+
+
 The sub-iota is input after the base letter.
 Ligature definitions in the 8-bit LGR fonts ensure that pre-composed
 characters are used. This does not work with XeTeX/LuaTeX:\footnote{%