diff options
Diffstat (limited to 'Master/texmf-dist')
21 files changed, 957 insertions, 475 deletions
diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/README b/Master/texmf-dist/doc/latex/greek-fontenc/README index 552bc52248c..fa84ec05db8 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/README +++ b/Master/texmf-dist/doc/latex/greek-fontenc/README @@ -4,7 +4,7 @@ Greek font encoding definition files ************************************ :Author: Günter Milde -:Date: 2013-09-10 +:Date: 2013-10-01 :Copyright: © 2013 Günter Milde <milde@users.sf.net> :Licence: This work may be distributed and/or modified under the conditions of the `LaTeX Project Public License`_, either @@ -39,10 +39,11 @@ News 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_. +2013-11-28 0.11 compatibility with Xe/LuaTeX in 8-bit mode, +.. ``\greekscript`` TextCommand. ========== ====== ========================================================== - LaTeX files =========== @@ -67,7 +68,11 @@ LaTeX files `Composite defintions for alphabeta.sty_ with XeTeX/LuaTeX. <alphabeta-euenc.def.html>`_ -Literate source files were converted with PyLit_ to reStructuredText and +`<greek-euenc.def>`_ + `Greek LICR definitions for XeTeX and LuaTeX <greek-euenc.def.html>`_. + Requires euenc_. + +Literate source files were converted with PyLit_ to reStructuredText_ and with Docutils_ to the HTML documentation. @@ -83,6 +88,11 @@ Documentation and test documents `<lgrenc-test.tex>`_, `<lgrenc-test.pdf>`_ Test and usage example. +`<euenc-test.tex>`_, `<euenc-test.pdf>`_ + Example for use of the experimental Greek LICR definitions with XeTeX or + LuaTeX. + + `<greekhyperref.tex>`_, `<greekhyperref.pdf>`_ `Greek script in PDF metadata`. @@ -95,14 +105,6 @@ Experimental files These files are still in development and will eventually be moved to/merged with other packages or removed in future versions: -`<greek-euenc.def>`_ - `Greek LICR definitions for XeTeX and LuaTeX <greek-euenc.def.html>`_. - Requires euenc_. - -`<test-euenc.tex>`_ - Example for use of the experimental Greek LICR definitions with XeTeX or - LuaTeX. - `<lgr2licr.lua>`_ `LGR Transcription to Greek LICR transformation <lgr2licr.lua.html>`_ @@ -125,31 +127,42 @@ Otherwise, make sure LaTeX can find the package and definition files: Usage ===== -To ensure Greek support independent of the TeX engine write :: +There are many alternatives to use the Greek font encoding setup +provided by this package/bundle, e.g.: + +* Ensure Greek support in text mode with `textalpha`:: \usepackage{textalpha} -For details see `<textalpha-test.tex>`_ and `<textalpha-test.pdf>`_ (8-bit -TeX) as well as `<test-euenc.tex>`_ and `<test-euenc.pdf>`_ (XeTeX/LuaTeX). + For details see `<textalpha-test.tex>`_ and `<textalpha-test.pdf>`_ (8-bit + TeX) as well as `<euenc-test.tex>`_ and `<euenc-test.pdf>`_ + (XeTeX/LuaTeX). -To use the established macro names (``\alpha`` ... ``\Omega``) in text and -math mode, write :: +* To use the short macro names (``\alpha`` ... ``\Omega``) known from math + mode in both, text and math mode, write :: \usepackage{alphabeta} -For details see `<alphabeta-test.tex>`_ and `<alphabeta-test.pdf>`_. + For details see `<alphabeta-test.tex>`_ and `<alphabeta-test.pdf>`_. -For 8-bit TeX, you may also pass LGR as option to fontenc_. For example, -specify T1 (Latin) as default font encoding and LGR for Greek with :: +* Use the ``greek`` option with Babel_ (requires babel-greek_):: - \usepackage[LGR,T1]{fontenc} + \usepackage[greek]{babel} -In this case, using Greek text macros without explicite font switch will -lead to errors. +* Declare LGR via fontenc_. For example, specify T1 (8-bit + Latin) as default font encoding and LGR for Greek with :: -See [fntguide]_ for details and `<lgrenc-test.tex>`_ for an example. + \usepackage[LGR,T1]{fontenc} + Note that without ``textalpha`` or ``alphabeta``, Greek text macros work + only if the current font encoding supports Greek. See [fntguide]_ for + details and `<lgrenc-test.tex>`_ for an example. +* LGR encoded fonts can also be used alongside Unicode fonts with + XeTeX/LuaTeX to enable the input of Greek letters via the Latin + transcription provided by this font encoding. + See `<euenc-test.tex>`_ -> `<euenc-test.pdf>`_ and + `<lgrenc-test.tex>`_ -> `<lgrenc-test.tex>`_. Greek text font encodings ========================= @@ -381,6 +394,7 @@ as-is). .. _GFS font collection: http://www.ctan.org/pkg/gfs .. _Kerkis: http://www.ctan.org/pkg/kerkis .. _babel: http://www.ctan.org/pkg/babel +.. _babel-greek: http://www.ctan.org/pkg/babel-greek .. _euenc: http://www.ctan.org/pkg/euenc .. _fontenc: http://www.ctan.org/pkg/fontenc .. _grtimes: http://www.ctan.org/pkg/grtimes diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/README.html b/Master/texmf-dist/doc/latex/greek-fontenc/README.html index 7fe732243e7..4f48d45d1c5 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/README.html +++ b/Master/texmf-dist/doc/latex/greek-fontenc/README.html @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> <title>greek-fontenc</title> <meta name="author" content="Günter Milde" /> -<meta name="date" content="2013-09-10" /> +<meta name="date" content="2013-10-01" /> <meta name="copyright" content="© 2013 Günter Milde <milde@users.sf.net>" /> <link rel="stylesheet" href="../../../../../Python/docutils-svn/docutils/docutils/writers/html4strict/html4css1.css" type="text/css" /> <link rel="stylesheet" href="../../../../../Python/docutils-svn/docutils/docutils/writers/html4strict/html4css2.css" type="text/css" /> @@ -20,7 +20,7 @@ <dt class="author">Author</dt> <dd class="author">Günter Milde</dd> <dt class="date">Date</dt> -<dd class="date">2013-09-10</dd> +<dd class="date">2013-10-01</dd> <dt class="copyright">Copyright</dt> <dd class="copyright">© 2013 Günter Milde <<a class="reference external" href="mailto:milde@users.sf.net">milde@users.sf.net</a>></dd> <dt>Licence</dt> @@ -101,6 +101,15 @@ updated to work with XeTeX/LuaTeX.</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> +<tr><td><p>2013-11-28</p></td> +<td><p>0.11</p></td> +<td><p>compatibility with Xe/LuaTeX in 8-bit mode,</p></td> +</tr> +<tr><td><!-- --> +</td> +<td> </td> +<td><p><tt class="literal">\greekscript</tt> TextCommand.</p></td> +</tr> </tbody> </table> </div> @@ -126,8 +135,12 @@ independent of font encoding and TeX engine.</p> <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> +<dt><a class="reference external" href="greek-euenc.def">greek-euenc.def</a></dt> +<dd><p><a class="reference external" href="greek-euenc.def.html">Greek LICR definitions for XeTeX and LuaTeX</a>. +Requires <a class="reference external" href="http://www.ctan.org/pkg/euenc">euenc</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 +<p>Literate source files were converted with <a class="reference external" href="http://pylit.berlios.de">PyLit</a> to <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> and with <a class="reference external" href="http://docutils.sourceforge.net/rst.html">Docutils</a> to the HTML documentation.</p> </div> <div class="section" id="documentation-and-test-documents"> @@ -142,6 +155,10 @@ with <a class="reference external" href="http://docutils.sourceforge.net/rst.htm <dt><a class="reference external" href="lgrenc-test.tex">lgrenc-test.tex</a>, <a class="reference external" href="lgrenc-test.pdf">lgrenc-test.pdf</a></dt> <dd><p>Test and usage example.</p> </dd> +<dt><a class="reference external" href="euenc-test.tex">euenc-test.tex</a>, <a class="reference external" href="euenc-test.pdf">euenc-test.pdf</a></dt> +<dd><p>Example for use of the experimental Greek LICR definitions with XeTeX or +LuaTeX.</p> +</dd> <dt><a class="reference external" href="greekhyperref.tex">greekhyperref.tex</a>, <a class="reference external" href="greekhyperref.pdf">greekhyperref.pdf</a></dt> <dd><p><cite>Greek script in PDF metadata</cite>.</p> <p>The package <a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a> defines the PU font encoding which also supports @@ -154,14 +171,6 @@ with <a class="reference external" href="http://docutils.sourceforge.net/rst.htm <p>These files are still in development and will eventually be moved to/merged with other packages or removed in future versions:</p> <dl class="docutils"> -<dt><a class="reference external" href="greek-euenc.def">greek-euenc.def</a></dt> -<dd><p><a class="reference external" href="greek-euenc.def.html">Greek LICR definitions for XeTeX and LuaTeX</a>. -Requires <a class="reference external" href="http://www.ctan.org/pkg/euenc">euenc</a>.</p> -</dd> -<dt><a class="reference external" href="test-euenc.tex">test-euenc.tex</a></dt> -<dd><p>Example for use of the experimental Greek LICR definitions with XeTeX or -LuaTeX.</p> -</dd> <dt><a class="reference external" href="lgr2licr.lua">lgr2licr.lua</a></dt> <dd><p><a class="reference external" href="lgr2licr.lua.html">LGR Transcription to Greek LICR transformation</a></p> </dd> @@ -181,23 +190,40 @@ directory (e.g. for testing).</p></li> </div> <div class="section" id="usage"> <h1>Usage</h1> -<p>To ensure Greek support independent of the TeX engine write</p> +<p>There are many alternatives to use the Greek font encoding setup +provided by this package/bundle, e.g.:</p> +<ul> +<li><p>Ensure Greek support in text mode with <cite>textalpha</cite>:</p> <pre class="literal-block">\usepackage{textalpha} </pre> <p>For details see <a class="reference external" href="textalpha-test.tex">textalpha-test.tex</a> and <a class="reference external" href="textalpha-test.pdf">textalpha-test.pdf</a> (8-bit -TeX) as well as <a class="reference external" href="test-euenc.tex">test-euenc.tex</a> and <a class="reference external" href="test-euenc.pdf">test-euenc.pdf</a> (XeTeX/LuaTeX).</p> -<p>To use the established macro names (<tt class="literal">\alpha</tt> … <tt class="literal">\Omega</tt>) in text and -math mode, write</p> +TeX) as well as <a class="reference external" href="euenc-test.tex">euenc-test.tex</a> and <a class="reference external" href="euenc-test.pdf">euenc-test.pdf</a> +(XeTeX/LuaTeX).</p> +</li> +<li><p>To use the short macro names (<tt class="literal">\alpha</tt> … <tt class="literal">\Omega</tt>) known from math +mode in both, text and math mode, write</p> <pre class="literal-block">\usepackage{alphabeta} </pre> <p>For details see <a class="reference external" href="alphabeta-test.tex">alphabeta-test.tex</a> and <a class="reference external" href="alphabeta-test.pdf">alphabeta-test.pdf</a>.</p> -<p>For 8-bit TeX, you may also pass LGR as option to <a class="reference external" href="http://www.ctan.org/pkg/fontenc">fontenc</a>. For example, -specify T1 (Latin) as default font encoding and LGR for Greek with</p> +</li> +<li><p>Use the <tt class="literal">greek</tt> option with <a class="reference external" href="http://www.ctan.org/pkg/babel">Babel</a> (requires <a class="reference external" href="http://www.ctan.org/pkg/babel-greek">babel-greek</a>):</p> +<pre class="literal-block">\usepackage[greek]{babel} +</pre> +</li> +<li><p>Declare LGR via <a class="reference external" href="http://www.ctan.org/pkg/fontenc">fontenc</a>. For example, specify T1 (8-bit +Latin) as default font encoding and LGR for Greek with</p> <pre class="literal-block">\usepackage[LGR,T1]{fontenc} </pre> -<p>In this case, using Greek text macros without explicite font switch will -lead to errors.</p> -<p>See <a class="citation-reference" href="#fntguide" id="id4">[fntguide]</a> for details and <a class="reference external" href="lgrenc-test.tex">lgrenc-test.tex</a> for an example.</p> +<p>Note that without <tt class="literal">textalpha</tt> or <tt class="literal">alphabeta</tt>, Greek text macros work +only if the current font encoding supports Greek. See <a class="citation-reference" href="#fntguide" id="id5">[fntguide]</a> for +details and <a class="reference external" href="lgrenc-test.tex">lgrenc-test.tex</a> for an example.</p> +</li> +<li><p>LGR encoded fonts can also be used alongside Unicode fonts with +XeTeX/LuaTeX to enable the input of Greek letters via the Latin +transcription provided by this font encoding. +See <a class="reference external" href="euenc-test.tex">euenc-test.tex</a> -> <a class="reference external" href="euenc-test.pdf">euenc-test.pdf</a> and +<a class="reference external" href="lgrenc-test.tex">lgrenc-test.tex</a> -> <a class="reference external" href="lgrenc-test.tex">lgrenc-test.tex</a>.</p></li> +</ul> </div> <div class="section" id="greek-text-font-encodings"> <h1>Greek text font encodings</h1> @@ -206,7 +232,7 @@ Greek letters and symbols are also defined in the Unicode-based font encodings EU1 (XeTeX), EU2 (LuaTeX) and PU (<a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a>).</p> <div class="section" id="t7"> <h2>T7</h2> -<p>The <a class="citation-reference" href="#encguide" id="id6">[encguide]</a> reserves the name T7 for a Greek <cite>standard font encoding</cite>. +<p>The <a class="citation-reference" href="#encguide" id="id11">[encguide]</a> reserves the name T7 for a Greek <cite>standard font encoding</cite>. However, up to now, there is no agreement on an implementation because the restrictions for general text encodings are too severe for typesetting polytonic Greek.</p> @@ -221,7 +247,7 @@ is facilitated by the <a class="reference external" href="http://www.ctan.org/pk <p>The LGR font encoding allows to access Greek characters via an ASCII transliteration. This enables simple input with a Latin keyboard. Characters with diacritics can be selected by ligature definitions in the -font (see <a class="citation-reference" href="#greek-usage" id="id7">[greek-usage]</a>, <a class="citation-reference" href="#teubner-doc" id="id8">[teubner-doc]</a>, <a class="citation-reference" href="#cbfonts" id="id9">[cbfonts]</a>).</p> +font (see <a class="citation-reference" href="#greek-usage" id="id12">[greek-usage]</a>, <a class="citation-reference" href="#teubner-doc" id="id13">[teubner-doc]</a>, <a class="citation-reference" href="#cbfonts" id="id14">[cbfonts]</a>).</p> <p>A major drawback of the transliteration is, that you cannot access Latin letters if LGR is the active font encoding (e.g. in documents or parts of documents given the <cite>Babel</cite> language <tt class="literal">greek</tt> or <tt class="literal">polutionikogreek</tt>). @@ -233,7 +259,7 @@ Unicode (with XeTeX or LuaTeX).</p> <div class="section" id="lgi"> <h2>LGI</h2> <p>The ‘Ibycus’ fonts from the package <a class="reference external" href="http://www.ctan.org/pkg/ibygrk">ibygrk</a> implement an alternative -transliteration scheme (also explained in <a class="citation-reference" href="#babel-patch" id="id10">[babel-patch]</a>). +transliteration scheme (also explained in <a class="citation-reference" href="#babel-patch" id="id15">[babel-patch]</a>). It is currently not supported by <cite>greek-fontenc</cite>.</p> <p>The font encoding file <tt class="literal">lgienc.def</tt> from <a class="reference external" href="http://www.ctan.org/pkg/ibycus-babel">ibycus-babel</a> provides a basic setup (without any LICR macros or composite definitions).</p> @@ -385,40 +411,40 @@ from the <a class="reference external" href="http://www.ctan.org/pkg/unicode">uc <p>Aliases from <tt class="literal">puenc.def</tt> ensure that the <a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a> package can convert Greek text in “LICR encoding” to a PDF-string (utf-8 encoded input is used as-is).</p> -<dl class="citation"><dt class="label"><a class="fn-backref" href="#id4">[fntguide]</a></dt> +<dl class="citation"><dt class="label"><a class="fn-backref" href="#id5">[fntguide]</a></dt> <dd id="fntguide"> <p class="first last">LaTeX3 Project Team, <cite>LaTeX2ε font selection</cite>, 2005. <a class="reference external" href="http://mirror.ctan.org/macros/latex/doc/fntguide.pdf">http://mirror.ctan.org/macros/latex/doc/fntguide.pdf</a></p> </dd> </dl> -<dl class="citation"><dt class="label"><a class="fn-backref" href="#id6">[encguide]</a></dt> +<dl class="citation"><dt class="label"><a class="fn-backref" href="#id11">[encguide]</a></dt> <dd id="encguide"> <p class="first last">Frank Mittelbach, Robin Fairbairns, Werner Lemberg, LaTeX3 Project Team, <cite>LaTeX font encodings</cite>, 2006. <a class="reference external" href="http://mirror.ctan.org/macros/latex/doc/encguide.pdf">http://mirror.ctan.org/macros/latex/doc/encguide.pdf</a></p> </dd> </dl> -<dl class="citation"><dt class="label"><a class="fn-backref" href="#id7">[greek-usage]</a></dt> +<dl class="citation"><dt class="label"><a class="fn-backref" href="#id12">[greek-usage]</a></dt> <dd id="greek-usage"> <p class="first last">Apostolos Syropoulos, <cite>Writing Greek with the greek option of the babel package</cite>, 1997. <a class="reference external" href="http://www.tug.org/texlive/Contents/live/texmf-dist/doc/generic/babel/greek-usage.pdf">http://www.tug.org/texlive/Contents/live/texmf-dist/doc/generic/babel/greek-usage.pdf</a></p> </dd> </dl> -<dl class="citation"><dt class="label"><a class="fn-backref" href="#id9">[cbfonts]</a></dt> +<dl class="citation"><dt class="label"><a class="fn-backref" href="#id14">[cbfonts]</a></dt> <dd id="cbfonts"> <p class="first last">Claudio Beccari, <cite>The CB Greek fonts</cite>, Εὔτυπον, τεῦχος № 21, 2008. <a class="reference external" href="http://www.eutypon.gr/eutypon/pdf/e2008-21/e21-a01.pdf">http://www.eutypon.gr/eutypon/pdf/e2008-21/e21-a01.pdf</a></p> </dd> </dl> -<dl class="citation"><dt class="label"><a class="fn-backref" href="#id8">[teubner-doc]</a></dt> +<dl class="citation"><dt class="label"><a class="fn-backref" href="#id13">[teubner-doc]</a></dt> <dd id="teubner-doc"> <p class="first last">Claudio Beccari, <tt class="literal">teubner.sty</tt> <cite>An extension to the greek option of the babel package</cite>, 2011. <a class="reference external" href="http://mirror.ctan.org/macros/latex/contrib/teubner/teubner-doc.pdf">http://mirror.ctan.org/macros/latex/contrib/teubner/teubner-doc.pdf</a></p> </dd> </dl> -<dl class="citation"><dt class="label"><a class="fn-backref" href="#id10">[babel-patch]</a></dt> +<dl class="citation"><dt class="label"><a class="fn-backref" href="#id15">[babel-patch]</a></dt> <dd id="babel-patch"> <p class="first last">Werner Lemberg, <cite>Unicode support for the Greek LGR encoding</cite> Εὔτυπον, τεῦχος № 20, 2008. diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-euenc.def.txt b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-euenc.def.txt new file mode 100644 index 00000000000..3a50f46cc0e --- /dev/null +++ b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-euenc.def.txt @@ -0,0 +1,304 @@ +alphabeta-euenc.def: Composite definitions for XeTeX and LuaTeX +*************************************************************** + +:Copyright: © 2013 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. +:Identification: + :: + + \ProvidesFile{alphabeta-euenc} + [2013/07/24 0.1.3 Composite definitions for XeTeX and LuaTeX] + +Domposite definitions for ``alphabeta.sty`` with XeTeX and LuaTeX. + +Changelog: + .. class:: borderless + + ========== ===== ========================================================= + 2013-09-12 0.1 initial version + 2013-10-01 0.1.1 remove clashing defs for legacy characters with oxia. + ========== ===== ========================================================= + +The alphabeta_ 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. + +The NFSS TextComposite mechanism looks for the next token without expanding +it. In order to let compositions like ``\>"\alpha`` work as expected we +define TextComposites with the `letter name commands`. + +For use with Unicode fonts (XeTeX/LuaTeX), we need to define composite +commands for the EU1 and EU2 encoding + +Greek and Coptic +~~~~~~~~~~~~~~~~ +:: + + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Alpha}{Ά} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Epsilon}{Έ} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Eta}{Ή} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Iota}{Ί} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Omicron}{Ό} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Upsilon}{Ύ} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Omega}{Ώ} + \DeclareTextCompositeCommand{\accdialytikatonos}{\LastDeclaredEncoding}{\iota}{ΐ} + + \DeclareTextCompositeCommand{\"}{\LastDeclaredEncoding}{\Iota}{Ϊ} + \DeclareTextCompositeCommand{\"}{\LastDeclaredEncoding}{\Upsilon}{Ϋ} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\alpha}{ά} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\epsilon}{έ} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\eta}{ή} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\iota}{ί} + \DeclareTextCompositeCommand{\accdialytikatonos}{\LastDeclaredEncoding}{\upsilon}{ΰ} + + \DeclareTextCompositeCommand{\"}{\LastDeclaredEncoding}{\iota}{ϊ} + \DeclareTextCompositeCommand{\"}{\LastDeclaredEncoding}{\upsilon}{ϋ} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\omicron}{ό} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\upsilon}{ύ} + \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\omega}{ώ} + + +Greek Extended +~~~~~~~~~~~~~~ +:: + + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\alpha}{ἀ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\alpha}{ἁ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\alpha}{ἂ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\alpha}{ἃ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\alpha}{ἄ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\alpha}{ἅ} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\alpha}{ἆ} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\alpha}{ἇ} + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\Alpha}{Ἀ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Alpha}{Ἁ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\Alpha}{Ἂ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\Alpha}{Ἃ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\Alpha}{Ἄ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\Alpha}{Ἅ} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\Alpha}{Ἆ} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\Alpha}{Ἇ} + + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\epsilon}{ἐ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\epsilon}{ἑ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\epsilon}{ἒ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\epsilon}{ἓ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\epsilon}{ἔ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\epsilon}{ἕ} + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\Epsilon}{Ἐ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Epsilon}{Ἑ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\Epsilon}{Ἒ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\Epsilon}{Ἓ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\Epsilon}{Ἔ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\Epsilon}{Ἕ} + + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\eta}{ἠ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\eta}{ἡ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\eta}{ἢ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\eta}{ἣ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\eta}{ἤ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\eta}{ἥ} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\eta}{ἦ} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\eta}{ἧ} + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\Eta}{Ἠ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Eta}{Ἡ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\Eta}{Ἢ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\Eta}{Ἣ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\Eta}{Ἤ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\Eta}{Ἥ} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\Eta}{Ἦ} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\Eta}{Ἧ} + + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\iota}{ἰ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\iota}{ἱ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\iota}{ἲ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\iota}{ἳ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\iota}{ἴ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\iota}{ἵ} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\iota}{ἶ} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\iota}{ἷ} + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\Iota}{Ἰ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Iota}{Ἱ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\Iota}{Ἲ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\Iota}{Ἳ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\Iota}{Ἴ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\Iota}{Ἵ} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\Iota}{Ἶ} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\Iota}{Ἷ} + + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\omicron}{ὀ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\omicron}{ὁ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\omicron}{ὂ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\omicron}{ὃ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\omicron}{ὄ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\omicron}{ὅ} + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\Omicron}{Ὀ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Omicron}{Ὁ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\Omicron}{Ὂ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\Omicron}{Ὃ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\Omicron}{Ὄ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\Omicron}{Ὅ} + + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\upsilon}{ὐ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\upsilon}{ὑ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\upsilon}{ὒ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\upsilon}{ὓ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\upsilon}{ὔ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\upsilon}{ὕ} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\upsilon}{ὖ} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\upsilon}{ὗ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Upsilon}{Ὑ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\Upsilon}{Ὓ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\Upsilon}{Ὕ} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\Upsilon}{Ὗ} + + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\omega}{ὠ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\omega}{ὡ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\omega}{ὢ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\omega}{ὣ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\omega}{ὤ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\omega}{ὥ} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\omega}{ὦ} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\omega}{ὧ} + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\Omega}{Ὠ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Omega}{Ὡ} + \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\Omega}{Ὢ} + \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\Omega}{Ὣ} + \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\Omega}{Ὤ} + \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\Omega}{Ὥ} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\Omega}{Ὦ} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\Omega}{Ὧ} + + \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\alpha}{ὰ} + \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\epsilon}{ὲ} + \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\eta}{ὴ} + \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\iota}{ὶ} + \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\omicron}{ὸ} + \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}{ῑ} + \DeclareTextCompositeCommand{\accdialytikavaria}{\LastDeclaredEncoding}{\iota}{ῒ} + \DeclareTextCompositeCommand{\accdialytikaoxia}{\LastDeclaredEncoding}{\iota}{ΐ} + \DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\iota}{ῖ} + \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\iota}{ῖ} + \DeclareTextCompositeCommand{\accdialytikaperispomeni}{\LastDeclaredEncoding}{\iota}{ῗ} + \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\Iota}{Ῐ} + \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\Iota}{Ῑ} + \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Iota}{Ὶ} + \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Iota}{Ὶ} + + \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\upsilon}{ῠ} + \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\upsilon}{ῡ} + \DeclareTextCompositeCommand{\accdialytikavaria}{\LastDeclaredEncoding}{\upsilon}{ῢ} + \DeclareTextCompositeCommand{\accdialytikaoxia}{\LastDeclaredEncoding}{\upsilon}{ΰ} + \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\rho}{ῤ} + \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\rho}{ῥ} + \DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\upsilon}{ῦ} + \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\upsilon}{ῦ} + \DeclareTextCompositeCommand{\accdialytikaperispomeni}{\LastDeclaredEncoding}{\upsilon}{ῧ} + \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\Upsilon}{Ῠ} + \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\Upsilon}{Ῡ} + \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Upsilon}{Ὺ} + \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 + +.. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt +.. _alphabeta: http://www.ctan.org/pkg/greek-fontenc diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-test.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-test.pdf Binary files differindex d041e4a197d..b52ab6f5246 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-test.pdf +++ b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-test.pdf diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-test.tex b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-test.tex index 3bebcd475c7..b215b016c63 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-test.tex +++ b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-test.tex @@ -1,27 +1,29 @@ \documentclass{article} -\usepackage{hyperref} +\usepackage{hyperref,bookmark} \hypersetup{colorlinks=true,linkcolor=blue,urlcolor=blue,pdfencoding=auto} -\usepackage{bookmark} \usepackage{parskip} \usepackage{amsmath} \ifdefined\XeTeXrevision \usepackage[no-math]{fontspec} \setmainfont{Linux Libertine O} - \usepackage[libertine,slantedGreek ]{newtxmath} + \usepackage[libertine,slantedGreek]{newtxmath} \else\ifdefined\luatexversion \usepackage{fontspec} \setmainfont{Linux Libertine O} - \usepackage[libertine,slantedGreek ]{newtxmath} + \usepackage[libertine,slantedGreek]{newtxmath} \else + \usepackage[utf8]{inputenc} + \usepackage[LGR,T1]{fontenc} \usepackage{textcomp} - \usepackage{lmodern} + % \usepackage{lmodern} % \usepackage{gfsdidot} % \usepackage{kerkis} - \usepackage{fixmath} - \usepackage[T1]{fontenc} - \usepackage[utf8]{inputenc} + \usepackage{newtxtext,newtxmath} + \usepackage{substitutefont} + \substitutefont{LGR}{\rmdefault}{artemisia} + \usepackage{isomath} \fi\fi % No section numbers but PDF bookmarks for sections @@ -32,9 +34,6 @@ % Avoid warnigns with PDF string generation for "alphabeta" commands: -% PU supports (monotonic) Greek LICR macros -\DeclareTextCommand{\ensuregreek}{PU}[1]{#1} - % let \TextOrMath (from fixltx2e) return the "text" argument: \pdfstringdefDisableCommands{% \let\TextOrMath\@firstoftwo% @@ -57,6 +56,7 @@ Just like Latin letters, the Greek counterparts are by default italic in math mode (capital letters upright without \emph{fixmath} or \emph{\href{http://www.ctan.org/pkg/isomath}{isomath}}) and upright in text: + \begin{quote} Text: L \Gamma{} l \gamma, emphasized text: \emph{L \Gamma{} l \gamma}, @@ -118,7 +118,7 @@ macros. Wrapping in \verb+\ensuregreek+ ensures the right placement of the accents and breathings (before, not above capital letters). With LICR input (accent macros + symbol macros), non-standard diacritics are missing in the PDF data, as hyperref's PU encoding currently does not support polytonic -Greek. (Here, the dasia dropped at the start of the word in parentheses in +Greek. (Here, the dasia is dropped at the start of the word in parentheses in the PDF toc. The warning ``\texttt{Glyph not defined in PU encoding, removing `\textbackslash<' on input line 145.}'' is written to the log.) @@ -149,6 +149,8 @@ mathematical mode (for XeTeX/LuaTeX use unicode-math): Greek letters in math (there are no math macros for Greek letters wich exist with similar shape in the Latin alphabet): +Input as macro: + \begin{align*} & % \Alpha{} \Beta{} @@ -176,8 +178,8 @@ with similar shape in the Latin alphabet): \, \digamma{} \end{align*} -Unicode input in math mode works with 8-bit TeX. With XeTeX/LuaTeX, it requires the unicode-math -package. +Input as Unicode literals (with XeTeX/LuaTeX, this requires the unicode-math +package): \begin{align*} & Γ ΔΘΛΞΠΣΥ ΦΨ Ω \\ & αβγδεζηθικλμνξπρσςτ υφχψω \, ϝ diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.pdf Binary files differindex d605f3bae95..9cb463008a2 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.pdf +++ b/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.pdf diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.tex b/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.tex index 121693f4531..e05f24b38d4 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.tex +++ b/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.tex @@ -25,13 +25,15 @@ \usepackage{listings} \lstset{basicstyle=\ttfamily} -% Babel package:: +% Babel package: \usepackage{babel} -% revert the polutonikogreek definition of \~: -% not required with babel-greek >= 1.4 -% \addto\extraspolutonikogreek{\renewcommand*{\~}{\a~}} -% \addto\extrasgreek{\renewcommand*{\~}{\a~}} + +% With XeTeX/LuaTeX, load fontspec after babel to use Unicode +% fonts for Latin script and LGR for Greek: +\ifdefined\luatexversion \usepackage{fontspec}\fi +\ifdefined\XeTeXrevision \usepackage{fontspec}\fi + % "Lipsiakos" italic font `cbleipzig`: \newcommand*{\lishape}{\fontencoding{LGR}\fontfamily{cmr}% @@ -45,8 +47,9 @@ \section*{Greek diacritics with standard accent macros} -\texttt{lgrxenc.def} is a comprehensive font encoding definition file. -LICR macros are defined for all non-ASCII characters. +The font encoding definition file \texttt{lgrxenc.def} defines +LICR macros for all non-ASCII characters in the LGR font encoding. + Diacritics can be input using an extension of the standard macro commands with composite diacritics input as backslash followed by the LGR transliteration.% diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/euenc-test.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/euenc-test.pdf Binary files differnew file mode 100644 index 00000000000..e83f4351026 --- /dev/null +++ b/Master/texmf-dist/doc/latex/greek-fontenc/euenc-test.pdf diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.tex b/Master/texmf-dist/doc/latex/greek-fontenc/euenc-test.tex index e4b7fac6066..a5f49bdb201 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.tex +++ b/Master/texmf-dist/doc/latex/greek-fontenc/euenc-test.tex @@ -4,6 +4,7 @@ \usepackage{parskip} % \usepackage{booktabs} +\usepackage[LGR]{fontenc} \usepackage{fontspec} % \setmainfont{DejaVu Serif} % \setsansfont{DejaVu Sans} @@ -20,6 +21,10 @@ % \newcommand{\UTFencname}{\LastDeclaredEncoding} % \usepackage{xunicode} +% Accent+Unicode character: proof of concept: +\DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{α}{ἆ} + + \begin{document} \section*{Greek LICR definitions with XeTeX/LuaTeX} @@ -140,8 +145,6 @@ are defined in xunicode-greek.sty for \verb|\LastDeclaredEncoding| (here 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 α \`α @@ -150,9 +153,17 @@ pre-composed characters.) \accpsili α \>α \accdasia α \<α + +Please mail a feature request if there is demand for definitions selecting +precomposed characters. +As proof of concept, this document defines a composite command for +alpha with psili and perispomeni. Compare \<~α with \>~α. + + + 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 +composite definitions for all precomposed characters, the fallback definition uses combining characters: \accdialytikatonos\textiota{} \"'\textiota{} \"\'\textiota{} @@ -202,10 +213,10 @@ 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: +However, when the tonos, varia, and perispomeni accents are input using the +symbol macros (\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 @@ -215,8 +226,8 @@ named macro: 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{% +Ligature definitions in the 8-bit LGR fonts ensure that precomposed +characters are used. This does not work with Unicode fonts:\footnote{% When copy/pasting generated output from the “evince” PDF viewer, the COMBINING GREEK YPOGEGRAMMENI is merged with the base character. A capital letter + combining ypogegrammeni results in GREEK @@ -346,7 +357,7 @@ Greek symbols from the Greek and Coptic Unicode block are fully supported: \subsection{Greek Extended Unicode block} Characters from the Greek Extended Unicode block are only partially -supported (multi-accented characters with sub-iota currently use a combining +supported, accented characters with sub-iota currently use a combining prosgegrammeni or ypogegrammeni character. For comparision, the LICR macro is followed by the corresponding literal @@ -609,5 +620,44 @@ Deja Vu). The “FreeSerif” font works fine. \textpenteqilioi % GREEK ACROPHONIC ATTIC FIVE THOUSAND \textpentemuria % GREEK ACROPHONIC ATTIC FIFTY THOUSAND +If the LGR font encoding is loaded via «fontenc» in the document preamble, +Ancient Greek Numbers (as well as any other character) from LGR encoded +8-bit TeX fonts can be used after a font-encoding switch. babel-greek +defines the \verb|\textgreek| command for this purpose: + +\providecommand*{\textgreek}[1]{\leavevmode{% + \fontfamily{cmr}\fontencoding{LGR}\selectfont#1}% +} + +\textgreek{ +\textpentedeka % GREEK ACROPHONIC ATTIC FIFTY +\textpentehekaton % GREEK ACROPHONIC ATTIC FIVE HUNDRED +\textpenteqilioi % GREEK ACROPHONIC ATTIC FIVE THOUSAND +\textpentemuria % GREEK ACROPHONIC ATTIC FIFTY THOUSAND +} + +\section{Latin transcription} + +The \verb|\textgreek| macro and LGR encoded fonts can also be used for the +input of Greek letters via the \emph{Latin transcription} provided by this +font encoding, e.g. «logos» becomes «\textgreek{logos}» +and «\verb|\>aupn\'ia|» +becomes «\textgreek{\>aupn\'ia}» (capitalized +«\textgreek{\MakeUppercase{\>aupn\'ia}}»). For details of the Latin +transliteration see the teubner package or the file usage.pdf from the +babel-greek package. + +Mark, that you cannot use Unicode input with LGR encoded fonts except when +running in 8-bit compatibility mode because of the incompatibility between +Xe/LuaTeX and the inputenc package. + +LICR macros work in both, Unicode font encoding and LGR: compare +\>\textIota\textalpha\textnu\textomicron\textupsilon\textalpha +\textrho\acctonos\textiota\textomicron\textupsilon{} (Unicode font set up +via fontspec) vs. +\textgreek{\>\textIota\textalpha\textnu\textomicron\textupsilon\textalpha + \textrho\acctonos\textiota\textomicron\textupsilon} +(LGR-encoded 8-bit font set up via NFSS commands, see \emph{The LaTeX font +guide} [fntguide.pdf]). \end{document} diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/greek-fontenc.def.html b/Master/texmf-dist/doc/latex/greek-fontenc/greek-fontenc.def.html index 78e5e52f5f7..7f2dfe2f70c 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/greek-fontenc.def.html +++ b/Master/texmf-dist/doc/latex/greek-fontenc/greek-fontenc.def.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> <title>greek-fontenc.def</title> <meta name="copyright" content="© 2013 Günter Milde" /> <link rel="stylesheet" href="../../../../../Python/docutils-svn/docutils/docutils/writers/html4strict/html4css1.css" type="text/css" /> @@ -45,6 +45,10 @@ font encodings providing Greek characters.</p> <td><p>2013-07-17</p></td> <td><p>composite definitions starting with standard accent cmds</p></td> </tr> +<tr><td><p>0.11</p></td> +<td><p>2013-11-28</p></td> +<td><p><tt class="literal">\greekscript</tt> TextCommand</p></td> +</tr> </tbody> </table> </div> @@ -68,17 +72,25 @@ font encoding.</p> <div class="section" id="identification"> <h2>Identification</h2> <pre class="literal-block">\ProvidesFile{greek-fontenc.def} -[2013/07/18 v0.9.1 Common Greek font encoding definitions] +[2013/11/28 v0.11 Common Greek font encoding definitions] </pre> </div> -<div class="section" id="ensuregreek"> -<h2>Ensuregreek</h2> -<p>The <tt class="literal">\ensuregreek</tt> command can be used to ensure that its argument is set +<div class="section" id="ensuregreek-greekscript"> +<h2>ensuregreek, greekscript</h2> +<p>Provide “empty” encoding-specific definitions for <tt class="literal">\ensuregreek</tt> and +<tt class="literal">\greekscript</tt>. The definitions in this file make the font encoding fit +for use with the Greek script. (See <tt class="literal">textalpha.sty</tt> for default +definitions.)</p> +<p>The <tt class="literal">\ensuregreek</tt> macro can be used to ensure that its argument is set in a font encoding with support for Greek. If the active font encoding supports it, kerning between adjacent command calls (e.g. <tt class="literal"><span class="pre">\ensuregreek{A}\ensuregreek{\Upsilon}</span></tt>) is preserved. This allows, e.g., wrapping of compound Unicode character definitions.</p> -<pre class="literal-block">\DeclareTextCommand{\ensuregreek}{\LastDeclaredEncoding}[1]{#1} +<pre class="literal-block">\ProvideTextCommand{\ensuregreek}{\LastDeclaredEncoding}[1]{#1} +</pre> +<p>The <tt class="literal">\greekscript</tt> declaration ensures the current font encoding supports +the Greek script:</p> +<pre class="literal-block">\ProvideTextCommand{\greekscript}{\LastDeclaredEncoding}{} </pre> </div> <div class="section" id="aliases"> diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/greekhyperref.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/greekhyperref.pdf Binary files differindex a49d6697873..4d1ef3dd3b4 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/greekhyperref.pdf +++ b/Master/texmf-dist/doc/latex/greek-fontenc/greekhyperref.pdf diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.pdf Binary files differindex 35d3e750ff9..986893e1e18 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.pdf +++ b/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.pdf diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.tex b/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.tex index e569e6cdc5d..619a130003e 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.tex +++ b/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.tex @@ -1,5 +1,4 @@ \documentclass{article} -\usepackage{cmap} % fix search and cut-and-paste in Acrobat Reader % Test with various LGR-encoded fonts: \usepackage% @@ -20,15 +19,26 @@ \usepackage{textcomp} \usepackage[LGR,T1]{fontenc} -\usepackage[utf8]{inputenc} +% With XeTeX/LuaTeX, use Unicode for Latin script: +\ifdefined\luatexversion \usepackage{fontspec}\else + \ifdefined\XeTeXrevision \usepackage{fontspec}\else + \usepackage[utf8]{inputenc} + \fi +\fi +% This is experimental. The general advise is not to mix fontenc and fontspec. +% One problem is that xunicode makes \nobreakspace font encoding specific +% We provide a default: +\DeclareTextCommandDefault{\nobreakspace}{\leavevmode\nobreak\ } + +% PDF hyperlinks: \usepackage[pdfencoding=auto]{hyperref} +\usepackage{bookmark} +\hypersetup{colorlinks=true,linkcolor=blue,urlcolor=blue,pdfencoding=auto} +% font encoding switch declarations: \newcommand{\LGR}{\fontencoding{LGR}\selectfont} -\newcommand{\Latin}{\fontencoding{T1}\selectfont} -\DeclareTextCommandDefault{\ensuregreek}[1]{{\fontencoding{LGR}\selectfont #1}} +\newcommand{\Latin}{\fontencoding{\encodingdefault}\selectfont} -% \pagestyle{empty} -% ------------------------------------------------------------------------- \begin{document} diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.pdf Binary files differdeleted file mode 100644 index a16a92e3c3a..00000000000 --- a/Master/texmf-dist/doc/latex/greek-fontenc/test-euenc.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-test.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-test.pdf Binary files differindex 74fc6892390..bdc52975c6e 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-test.pdf +++ b/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-test.pdf diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-test.tex b/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-test.tex index 1a0f796faad..ed90a87b636 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-test.tex +++ b/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-test.tex @@ -4,8 +4,17 @@ \usepackage{lmodern} \usepackage{textcomp} -\usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} +\usepackage[LGR,T1]{fontenc} + +% UTF8 input encoding for pdfTeX or Xe/LuaTeX in 8-bit compatibility mode: +\ifdefined \luatexversion + \usepackage[utf8]{luainputenc} +\else + \usepackage[utf8]{inputenc} + \ifdefined \XeTeXrevision + \XeTeXinputencoding "bytes" + \fi +\fi \usepackage[pdfencoding=auto,colorlinks=true]{hyperref} \usepackage{bookmark} @@ -263,4 +272,6 @@ internal font encoding switch: compare \ensuregreek{\textAlpha\textUpsilon\textAlpha} (LGR) to \textAlpha\textUpsilon\textAlpha (T1). +Compiling with LuaTeX provides kerning also over font encoding boundaries. + \end{document} diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/textalpha.sty.html b/Master/texmf-dist/doc/latex/greek-fontenc/textalpha.sty.html index 49876aeabe7..14574d9a88f 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/textalpha.sty.html +++ b/Master/texmf-dist/doc/latex/greek-fontenc/textalpha.sty.html @@ -24,7 +24,7 @@ version 1.3 of this license or any later version.</p> <dt>Identification</dt> <dd><pre class="literal-block">\NeedsTeXFormat{LaTeX2e} \ProvidesPackage{textalpha} -[2013/09/11 v0.5 macros for Greek letters in text] +[2013/11/28 v0.11 macros for Greek letters in text] </pre> </dd> </dl> @@ -72,6 +72,10 @@ confusion with the <a class="reference external" href="http://www.ctan.org/pkg/t <td> </td> <td><p>support XeTeX/LuaTeX, add breve below accents.</p></td> </tr> +<tr><td><p>2013-11-28</p></td> +<td><p>0.11</p></td> +<td><p>Compatibility with Xe/LuaTeX in 8-bit mode.</p></td> +</tr> </tbody> </table> </dd> @@ -82,28 +86,45 @@ confusion with the <a class="reference external" href="http://www.ctan.org/pkg/t mode. This package sets up a suitable font encoding and Greek LICR definitions (<tt class="literal">\textalpha</tt> – <tt class="literal">\textOmega</tt>).</p> <p>To allow documents using Greek LICR macros without worrying about the TeX -engine used to compile them, this package does a simple test (based on the -<tt class="literal">\ifdefined</tt> command provided by the <a class="reference external" href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=etex">e-TeX</a> extension) and does “the right -thing” to set up Greek text font support for the detected engine.</p> -<p>For 8-bit TeX, this package also declares the LGR font encoding as default -for Greek LICR macros (cf. <a class="reference external" href="http://www.ctan.org/tex-archive/macros/latex/doc/fntguide.pdf">fntguide</a> section 5.3):</p> +engine used to compile them, this package tests the declared font encodings +and does “the right thing” to set up Greek text font support:</p> +<ul> +<li><p>If the Unicode font encodings EU1 (XeTeX) or EU2 (LuaTeX) are declared, +before loading this package (e.g. vie <tt class="literal">fontspec</tt>) the package provides +Greek LICR definitions for them.</p></li> +<li><p>If the LGR font encoding is declared before loading this package, it is +set as default for Greek LICR macros (cf. <a class="reference external" href="http://www.ctan.org/tex-archive/macros/latex/doc/fntguide.pdf">fntguide</a> section 5.3).</p> +<p>With XeTeX or LuaTex, Unicode fonts and LGR encoded 8-bit fonts can be +used in the same document (see <a class="reference external" href="test-euenc.tex">test-euenc.tex</a>).</p> +</li> +</ul> +<p>Advantages:</p> <ul class="simple"> <li><p>Symbols from a Greek text font (e.g. the <a class="reference external" href="http://www.ctan.org/pkg/cbgreek-complete">CB fonts</a>) can be accessed -without the need for an explicite font-encoding switch.</p></li> -<li><p>In combination with <tt class="literal"><span class="pre">\usepackage[utf8]{inputenc}</span></tt> and <tt class="literal">lgrenc.dfu</tt> -from <a class="reference external" href="http://www.ctan.org/pkg/greek-inputenc">greek-inputenc</a>, Unicode input of Greek characters is supported in -any font encoding.</p></li> +without the need for an explicite font-encoding switch anywhere in the +text.</p></li> +<li><p>Unicode input of Greek characters is supported</p> +<ul> +<li><p>via <tt class="literal"><span class="pre">\usepackage[utf8]{inputenc}</span></tt> and <tt class="literal">lgrenc.dfu</tt> from +<a class="reference external" href="http://www.ctan.org/pkg/greek-inputenc">greek-inputenc</a> for 8-bit TeX or XeTeX/LuaTeX in 8-bit compatibility +mode in any font encoding (see <a class="reference external" href="textalpha-test.tex">textalpha-test.tex</a>).</p></li> +<li><p>natively by XeTeX/LuaTeX for Unicode fonts. As <a class="reference external" href="http://www.ctan.org/pkg/inputenc">inputenc</a> does not work +with these engines, text input can be done via the Latin transcription +or LICR but <em>not via literal Unicode characters</em> for 8-bit font encodings +like LGR (see <a class="reference external" href="test-euenc.tex">test-euenc.tex</a>).</p></li> +</ul> +</li> </ul> <div class="attention"> <p class="admonition-title">Attention!</p> <p>The macros work well in any font encoding for single symbols. -However, with 8-bit TeX, the automatic font-encoding switches behind the -doors interfere with kerning between letters and replacement of -accent+character with a pre-composed character.</p> +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.</p> <p>Therefore, Greek text should be written with the help of <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> or <a class="reference external" href="http://www.ctan.org/pkg/polyglossia">polyglossia</a> (setting the language to <tt class="literal">greek</tt>) or wrapped in the provided <tt class="literal">ensuregreek</tt> macro. Using <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> or <a class="reference external" href="http://www.ctan.org/pkg/polyglossia">polyglossia</a> also helps -to ensure proper hyphenation.</p> +to ensure correct hyphenation of Greek text.</p> </div> </div> <div class="section" id="usage"> @@ -111,49 +132,55 @@ to ensure proper hyphenation.</p> <pre class="code latex literal-block"><span class="keyword">\usepackage</span><span class="name builtin">{</span>textalpha<span class="name builtin">}</span> </pre> <p>For details see <a class="reference external" href="textalpha-test.tex">textalpha-test.tex</a> and <a class="reference external" href="textalpha-test.pdf">textalpha-test.pdf</a> (8-bit -TeX) as well as <a class="reference external" href="test-euenc.tex">test-euenc.tex</a> and <a class="reference external" href="test-euenc.pdf">test-euenc.pdf</a> (XeTeX/LuaTeX).</p> +TeX and XeTeX/LuaTeX in 8-bit compatibility mode) as well as +<a class="reference external" href="test-euenc.tex">test-euenc.tex</a> and <a class="reference external" href="test-euenc.pdf">test-euenc.pdf</a> (XeTeX/LuaTeX with Unicode +fonts).</p> </div> <div class="section" id="implementation"> <h1>Implementation</h1> <div class="section" id="requirements"> <h2>Requirements</h2> <p>With XeTeX or LuaTeX, there is one common input and font encoding – -Unicode. 8-bit TeX font encodings should generally not be used. For -compatibility with the LaTeX font selection system, the package <a class="reference external" href="http://www.ctan.org/pkg/euenc">euenc</a> -defines the (pseudo) font encodings EU1 and EU2 for XeTeX and LuaTeX -respectively. However euenc does not (yet) define LICR macros. We therefore -explicitely load Greek LICR definitions for XeTeX/LuaTeX from <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a>.</p> -<div class="section" id="xetex"> -<h3>XeTeX</h3> -<p>Use the EU1 font encoding. This is the only font encoding used with XeTeX, -so loading it with <a class="reference external" href="http://www.ctan.org/pkg/fontenc">fontenc</a> cannot mix up the default font encoding:</p> -<pre class="literal-block">\ifdefined\XeTeXrevision - \usepackage[EU1]{fontenc} -</pre> -<p>Load the Greek LICR definitions for XeTeX/LuaTeX. In an ideal world, this -should be done in the eu1enc.def file of the <a class="reference external" href="http://www.ctan.org/pkg/euenc">euenc</a> package.</p> -<p>Before that, we must ensure EU1 is the <tt class="literal">\LastDeclaredEncoding</tt>: Beacause -fontenc loads font encoding definition files only once, it may happen that -another font encoding is defined after EU1 — for example <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a> -declares EU1 but leaves <tt class="literal">\LastDeclaredEncoding</tt> at <tt class="literal">T3</tt> (tipa), because -it later inputs the <a class="reference external" href="http://www.ctan.org/pkg/xunicode">xunicode</a> package which in turn loads <tt class="literal">t3enc.def</tt>.</p> -<pre class="literal-block">\renewcommand{\LastDeclaredEncoding}{EU1} -\input{greek-euenc.def} -</pre> -<p>No other action is required with Unicode-aware TeX engines:</p> -<pre class="literal-block"> \expandafter\endinput % "return" -\fi -</pre> -</div> -<div class="section" id="luatex"> -<h3>LuaTeX</h3> -<p>Similar actions to XeTeX, but use the font encoding EU2:<a class="footnote-reference" href="#eu" id="id1"><sup>1</sup></a></p> -<pre class="literal-block">\ifdefined\luatexversion - \usepackage[EU2]{fontenc} - \renewcommand{\LastDeclaredEncoding}{EU2} +Unicode. 8-bit TeX font encodings are only used in compatibility mode or for +fonts not available otherwise. For compatibility with the LaTeX font +selection system, the package <a class="reference external" href="http://www.ctan.org/pkg/euenc">euenc</a> defines the (pseudo) font encodings EU1 +and EU2 for XeTeX and LuaTeX respectively. However euenc does not (yet) +define LICR macros. We therefore explicitely load Greek LICR definitions for +XeTeX/LuaTeX from <a class="reference external" href="greek-euenc.def.html">greek-euenc.def</a> which in turn +includes <a class="reference external" href="greek-fontenc.def.html">greek-fontenc.def</a>.</p> +<p>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.</p> +<p>To give <tt class="literal">textalpha.sty</tt> a chance of finding out which font encodings are +used, load it after <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a> and/or <a class="reference external" href="http://www.ctan.org/pkg/fontenc">fontenc</a>.</p> +<div class="section" id="font-encodings"> +<h3>Font encodings</h3> +<p>Ensure a Greek-supporting font encoding exists and supports Greek LICR +macros:</p> +<p>Load the Greek LICR definitions for Unicode if font encoding EU1 (XeTeX) or +EU2 (LuaTeX) is detected.<a class="footnote-reference" href="#eu" id="id1"><sup>1</sup></a> In an ideal world, this would be done in +the <tt class="literal">eu1enc.def</tt> (or <tt class="literal">eu2enc.def</tt>) file of the <a class="reference external" href="http://www.ctan.org/pkg/euenc">euenc</a> package. If none +of EU1, EU2, and LGR is declared, load <tt class="literal">lgrenc.def</tt>:</p> +<p>Re-set the <tt class="literal">\LastDeclaredEncoding</tt>: Because fontenc loads font +encoding definition files only once, it may happen that another font +encoding is defined afterwards — for example <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a> leaves +<tt class="literal">\LastDeclaredEncoding</tt> at <tt class="literal">T3</tt> (tipa), because it inputs the <a class="reference external" href="http://www.ctan.org/pkg/xunicode">xunicode</a> +package which in turn loads <tt class="literal">t3enc.def</tt>.</p> +<pre class="literal-block">\@ifl@aded{def}{eu1enc}{ + \renewcommand{\LastDeclaredEncoding}{EU1} \input{greek-euenc.def} - \expandafter\endinput % "return" -\fi +}{% else + \@ifl@aded{def}{eu2enc}{ + \renewcommand{\LastDeclaredEncoding}{EU2} + \input{greek-euenc.def} + }{% else + \@ifl@aded{def}{lgrenc}{ + % LGR already declared and set up + }{ + \input{lgrenc.def} + } + } +} </pre> <dl class="footnote"><dt class="label"><a class="fn-backref" href="#id1">1</a></dt> <dd id="eu"> @@ -162,26 +189,13 @@ XeTeX vs. LuaTeX using differently named <tt class="literal">*.fd</tt> files (se details).</p> </dd> </dl> -</div> -<div class="section" id="bit-tex"> -<h3>8-bit TeX</h3> -<p>With 8-bit TeX, you usually pass the font encoding name(s) as option to -<a class="reference external" href="http://www.ctan.org/pkg/fontenc">fontenc</a> which then loads the corresponding <tt class="literal">*.def</tt> file(s). The last -option indicates the document’s default font encoding. (See <a class="citation-reference" href="#" id="id2">[fntguide]</a> for -details and <a class="reference external" href="lgrenc-test.tex">lgrenc-test.tex</a> for an example.) Therefore, we do not know -the documents main font encoding and hence cannot use -<tt class="literal"><span class="pre">\usepackage[LGR]{inputenc}</span></tt>. We load <tt class="literal">lgrenc.def</tt> directly, if it is -not already done and re-set <tt class="literal">\LastDeclaredEncoding</tt> else.</p> -<div class="note"> -<p class="admonition-title">Note</p> -<p>The use of <tt class="literal">\@ifundefined</tt> has the side-effect that the tested -macro becomes defined and set to <tt class="literal">\relax</tt> (polluting the namespace and -interfering with tests via eTeX’s <tt class="literal">\ifdefined</tt>). However, in this case -no harm is done as the macro is defined by <tt class="literal">lgrenc.def</tt> anyway.</p> -</div> -<pre class="literal-block">\@ifundefined{ver@lgrenc.def} - {\input{lgrenc.def}} - {\renewcommand{\LastDeclaredEncoding}{EU1}} +<p>The package <a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a> defines the PU font encoding which also supports +(monotonic) Greek. It currently misses polytonic greek and the +<tt class="literal">\greekscript</tt> and <tt class="literal">\ensuregreek</tt> TextCommands:</p> +<pre class="literal-block">\@ifl@aded{def}{puenc} + {\ProvideTextCommand{\greekscript}{PU}{} + \ProvideTextCommand{\ensuregreek}{PU}[1]{#1}} + {} </pre> </div> </div> @@ -189,13 +203,26 @@ no harm is done as the macro is defined by <tt class="literal">lgrenc.def</tt> a <h2>Default declarations</h2> <p>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.</p> -<div class="section" id="ensuregreek"> -<h3>ensuregreek</h3> +default font encoding. Abort here, if another Greek-supporting +font encoding is used instead of LGR:</p> +<pre class="literal-block">\@ifl@aded{def}{lgrenc} + {\renewcommand{\LastDeclaredEncoding}{LGR}} + {\expandafter\endinput} % "return" +</pre> +<div class="section" id="greekscript-ensuregreek"> +<h3>greekscript, ensuregreek</h3> +<p>The <tt class="literal">\greekscript</tt> declaration ensures the current font encoding supports +the Greek script. <tt class="literal"><span class="pre">greek-fontenc.def</span></tt> sets this to the empty declaration +for font encodings that do so. This is currently used by <tt class="literal">lgrenc.def</tt> +(LGR) and <tt class="literal"><span class="pre">greek-euenc.def</span></tt> (Greek LICR macros for EU1 and EU2).</p> +<p>We define LGR as default encoding for Greek text. We use +<tt class="literal">\ProvideTextCommandDefault</tt> to enable the author or other packages to use +an alternative definition (see [<a class="reference external" href="http://www.ctan.org/tex-archive/macros/latex/doc/fntguide.pdf">fntguide</a>]):</p> +<pre class="literal-block">\ProvideTextCommandDefault{\greekscript}{\fontencoding{LGR}\selectfont} +</pre> <p>The <tt class="literal">\ensuregreek</tt> command can be used to ensure that its argument is set in -a font encoding with support for Greek. We define LGR as default encoding for -Greek text:</p> -<pre class="literal-block">\DeclareTextCommandDefault{\ensuregreek}[1]{{\fontencoding{LGR}\selectfont #1}} +a font encoding with support for Greek. Again the default is LGR:</p> +<pre class="literal-block">\ProvideTextCommandDefault{\ensuregreek}[1]{\leavevmode{\greekscript #1}} </pre> <!-- The [fntguide_] writes @@ -212,11 +239,6 @@ Unicode characters in the test document `<textalpha-test.tex>`__: EU2) will declare <tt class="literal">\ensuregreek</tt> as text command that passes the argument unchanged. This way, kerning and selection of precomposed glyphs would work also for cases like <tt class="literal"><span class="pre">\ensuregreek{\'A}U</span></tt>.</p> -<!-- Do this for PU here? ``\DeclareTextCommand{\ensuregreek}{PU}[1]{#1}`` - -Can lead to infinite recursion (``TeX capacity exeeded``) without the -``unicode=true`` hyperref option. -(How about a test whether the PU font encoding is defined?). --> </div> <div class="section" id="greek-alphabet"> <h3>Greek Alphabet</h3> diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty b/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty index c76e60f0ae0..1ef72d2313f 100644 --- a/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty +++ b/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty @@ -230,163 +230,160 @@ \ifdefined\XeTeXrevision \input{alphabeta-euenc.def} - \expandafter\endinput % "return" -\fi -\ifdefined\luatexversion + % \expandafter\endinput % "return" +\else\ifdefined\luatexversion \input{alphabeta-euenc.def} - \expandafter\endinput % "return" -\fi + % \expandafter\endinput % "return" +\else % 8-bit TeX -% No other action is required with Unicode-aware TeX engines. -% % Composite commands for 8-bit TeX:: - -\DeclareTextComposite{\accvaria}{LGR}{\alpha}{128} -\DeclareTextComposite{\accdasia}{LGR}{\alpha}{129} -\DeclareTextComposite{\accpsili}{LGR}{\alpha}{130} -\DeclareTextComposite{\accdasiavaria}{LGR}{\alpha}{131} -\DeclareTextComposite{\acctonos}{LGR}{\alpha}{136} -\DeclareTextComposite{\accdasiaoxia}{LGR}{\alpha}{137} -\DeclareTextComposite{\accpsilioxia}{LGR}{\alpha}{138} -\DeclareTextComposite{\accpsilivaria}{LGR}{\alpha}{139} -\DeclareTextComposite{\accperispomeni}{LGR}{\alpha}{144} -\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\alpha}{145} -\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\alpha}{146} -\DeclareTextComposite{\accvaria}{LGR}{\eta}{152} -\DeclareTextComposite{\accdasia}{LGR}{\eta}{153} -\DeclareTextComposite{\accpsili}{LGR}{\eta}{154} -\DeclareTextComposite{\acctonos}{LGR}{\eta}{160} -\DeclareTextComposite{\accdasiaoxia}{LGR}{\eta}{161} -\DeclareTextComposite{\accpsilioxia}{LGR}{\eta}{162} -\DeclareTextComposite{\accdasiavaria}{LGR}{\eta}{163} -\DeclareTextComposite{\accperispomeni}{LGR}{\eta}{168} -\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\eta}{169} -\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\eta}{170} -\DeclareTextComposite{\accpsilivaria}{LGR}{\eta}{171} -\DeclareTextComposite{\accvaria}{LGR}{\omega}{176} -\DeclareTextComposite{\accdasia}{LGR}{\omega}{177} -\DeclareTextComposite{\accpsili}{LGR}{\omega}{178} -\DeclareTextComposite{\accdasiavaria}{LGR}{\omega}{179} -\DeclareTextComposite{\acctonos}{LGR}{\omega}{184} -\DeclareTextComposite{\accdasiaoxia}{LGR}{\omega}{185} -\DeclareTextComposite{\accpsilioxia}{LGR}{\omega}{186} -\DeclareTextComposite{\accpsilivaria}{LGR}{\omega}{187} -\DeclareTextComposite{\accperispomeni}{LGR}{\omega}{192} -\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\omega}{193} -\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\omega}{194} -\DeclareTextComposite{\accvaria}{LGR}{\iota}{200} -\DeclareTextComposite{\accdasia}{LGR}{\iota}{201} -\DeclareTextComposite{\accpsili}{LGR}{\iota}{202} -\DeclareTextComposite{\accdasiavaria}{LGR}{\iota}{203} -\DeclareTextComposite{\acctonos}{LGR}{\iota}{208} -\DeclareTextComposite{\accdasiaoxia}{LGR}{\iota}{209} -\DeclareTextComposite{\accpsilioxia}{LGR}{\iota}{210} -\DeclareTextComposite{\accpsilivaria}{LGR}{\iota}{211} -\DeclareTextComposite{\accperispomeni}{LGR}{\iota}{216} -\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\iota}{217} -\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\iota}{218} -\DeclareTextComposite{\accdialytika}{LGR}{\iota}{240} -\DeclareTextComposite{\accdialytikavaria}{LGR}{\iota}{241} -\DeclareTextComposite{\accdialytikatonos}{LGR}{\iota}{242} -\DeclareTextComposite{\accdialytikaperispomeni}{LGR}{\iota}{243} -\DeclareTextComposite{\accvaria}{LGR}{\upsilon}{204} -\DeclareTextComposite{\accdasia}{LGR}{\upsilon}{205} -\DeclareTextComposite{\accpsili}{LGR}{\upsilon}{206} -\DeclareTextComposite{\accdasiavaria}{LGR}{\upsilon}{207} -\DeclareTextComposite{\acctonos}{LGR}{\upsilon}{212} -\DeclareTextComposite{\accdasiaoxia}{LGR}{\upsilon}{213} -\DeclareTextComposite{\accpsilioxia}{LGR}{\upsilon}{214} -\DeclareTextComposite{\accpsilivaria}{LGR}{\upsilon}{215} -\DeclareTextComposite{\accperispomeni}{LGR}{\upsilon}{220} -\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\upsilon}{221} -\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\upsilon}{222} -\DeclareTextComposite{\accdialytika}{LGR}{\upsilon}{244} -\DeclareTextComposite{\accdialytikavaria}{LGR}{\upsilon}{245} -\DeclareTextComposite{\accdialytikatonos}{LGR}{\upsilon}{246} -\DeclareTextComposite{\accdialytikaperispomeni}{LGR}{\upsilon}{247} -\DeclareTextComposite{\accvaria}{LGR}{\epsilon}{224} -\DeclareTextComposite{\accdasia}{LGR}{\epsilon}{225} -\DeclareTextComposite{\accpsili}{LGR}{\epsilon}{226} -\DeclareTextComposite{\accdasiavaria}{LGR}{\epsilon}{227} -\DeclareTextComposite{\acctonos}{LGR}{\epsilon}{232} -\DeclareTextComposite{\accdasiaoxia}{LGR}{\epsilon}{233} -\DeclareTextComposite{\accpsilioxia}{LGR}{\epsilon}{234} -\DeclareTextComposite{\accpsilivaria}{LGR}{\epsilon}{235} -\DeclareTextComposite{\accvaria}{LGR}{\omicron}{228} -\DeclareTextComposite{\accdasia}{LGR}{\omicron}{229} -\DeclareTextComposite{\accpsili}{LGR}{\omicron}{230} -\DeclareTextComposite{\accdasiavaria}{LGR}{\omicron}{231} -\DeclareTextComposite{\acctonos}{LGR}{\omicron}{236} -\DeclareTextComposite{\accdasiaoxia}{LGR}{\omicron}{237} -\DeclareTextComposite{\accpsilioxia}{LGR}{\omicron}{238} -\DeclareTextComposite{\accpsilivaria}{LGR}{\omicron}{239} -\DeclareTextCompositeCommand{\accdasia}{LGR}{\Alpha}{<A} -\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Alpha}{<`A} -\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Alpha}{<'A} -\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Alpha}{<\char126A} -\DeclareTextCompositeCommand{\accpsili}{LGR}{\Alpha}{>A} -\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Alpha}{>`A} -\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Alpha}{>'A} -\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\Alpha}{>\char126A} -\DeclareTextCompositeCommand{\acctonos}{LGR}{\Alpha}{'A} -\DeclareTextCompositeCommand{\accvaria}{LGR}{\Alpha}{`A} -\DeclareTextCompositeCommand{\accdasia}{LGR}{\Epsilon}{<E} -\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Epsilon}{<'E} -\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Epsilon}{<`E} -\DeclareTextCompositeCommand{\accpsili}{LGR}{\Epsilon}{>E} -\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Epsilon}{>'E} -\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Epsilon}{>`E} -\DeclareTextCompositeCommand{\acctonos}{LGR}{\Epsilon}{'E} -\DeclareTextCompositeCommand{\accvaria}{LGR}{\Epsilon}{`E} -\DeclareTextCompositeCommand{\accdasia}{LGR}{\Eta}{<H} -\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Eta}{<`H} -\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Eta}{<'H} -\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Eta}{<\char126H} -\DeclareTextCompositeCommand{\accpsili}{LGR}{\Eta}{>H} -\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Eta}{>`H} -\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Eta}{>'H} -\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\Eta}{>\char126H} -\DeclareTextCompositeCommand{\acctonos}{LGR}{\Eta}{'H} -\DeclareTextCompositeCommand{\accvaria}{LGR}{\Eta}{`H} -\DeclareTextCompositeCommand{\accdasia}{LGR}{\Iota}{<I} -\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Iota}{<`I} -\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Iota}{<'I} -\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Iota}{<\char126I} -\DeclareTextCompositeCommand{\accpsili}{LGR}{\Iota}{>I} -\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Iota}{>`I} -\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Iota}{>'I} -\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\Iota}{>\char126I} -\DeclareTextCompositeCommand{\acctonos}{LGR}{\Iota}{'I} -\DeclareTextCompositeCommand{\accvaria}{LGR}{\Iota}{`I} -\DeclareTextCompositeCommand{\accdasia}{LGR}{\Omicron}{<O} -\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Omicron}{<`O} -\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Omicron}{<'O} -\DeclareTextCompositeCommand{\accpsili}{LGR}{\Omicron}{>O} -\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Omicron}{>`O} -\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Omicron}{>'O} -\DeclareTextCompositeCommand{\acctonos}{LGR}{\Omicron}{'O} -\DeclareTextCompositeCommand{\accvaria}{LGR}{\Omicron}{`O} -\DeclareTextCompositeCommand{\accdasia}{LGR}{\Upsilon}{<U} -\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Upsilon}{<`U} -\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Upsilon}{<'U} -\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Upsilon}{<\char126U} -\DeclareTextCompositeCommand{\acctonos}{LGR}{\Upsilon}{'U} -\DeclareTextCompositeCommand{\accvaria}{LGR}{\Upsilon}{`U} -\DeclareTextCompositeCommand{\accdasia}{LGR}{\Omega}{<W} -\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Omega}{<`W} -\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Omega}{<'W} -\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Omega}{<\char126W} -\DeclareTextCompositeCommand{\accpsili}{LGR}{\Omega}{>W} -\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Omega}{>`W} -\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Omega}{>'W} -\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\Omega}{>\char126W} -\DeclareTextCompositeCommand{\acctonos}{LGR}{\Omega}{'W} -\DeclareTextCompositeCommand{\accvaria}{LGR}{\Omega}{`W} -\DeclareTextComposite{\accdialytika}{LGR}{\Iota}{219} -\DeclareTextComposite{\accdialytika}{LGR}{\Upsilon}{223} -\DeclareTextCompositeCommand{\LGR@hiatus}{LGR}{\Alpha}{\LGR@A@hiatus} -\DeclareTextCompositeCommand{\LGR@hiatus}{LGR}{\Epsilon}{\LGR@E@hiatus} + \DeclareTextComposite{\accvaria}{LGR}{\alpha}{128} + \DeclareTextComposite{\accdasia}{LGR}{\alpha}{129} + \DeclareTextComposite{\accpsili}{LGR}{\alpha}{130} + \DeclareTextComposite{\accdasiavaria}{LGR}{\alpha}{131} + \DeclareTextComposite{\acctonos}{LGR}{\alpha}{136} + \DeclareTextComposite{\accdasiaoxia}{LGR}{\alpha}{137} + \DeclareTextComposite{\accpsilioxia}{LGR}{\alpha}{138} + \DeclareTextComposite{\accpsilivaria}{LGR}{\alpha}{139} + \DeclareTextComposite{\accperispomeni}{LGR}{\alpha}{144} + \DeclareTextComposite{\accdasiaperispomeni}{LGR}{\alpha}{145} + \DeclareTextComposite{\accpsiliperispomeni}{LGR}{\alpha}{146} + \DeclareTextComposite{\accvaria}{LGR}{\eta}{152} + \DeclareTextComposite{\accdasia}{LGR}{\eta}{153} + \DeclareTextComposite{\accpsili}{LGR}{\eta}{154} + \DeclareTextComposite{\acctonos}{LGR}{\eta}{160} + \DeclareTextComposite{\accdasiaoxia}{LGR}{\eta}{161} + \DeclareTextComposite{\accpsilioxia}{LGR}{\eta}{162} + \DeclareTextComposite{\accdasiavaria}{LGR}{\eta}{163} + \DeclareTextComposite{\accperispomeni}{LGR}{\eta}{168} + \DeclareTextComposite{\accdasiaperispomeni}{LGR}{\eta}{169} + \DeclareTextComposite{\accpsiliperispomeni}{LGR}{\eta}{170} + \DeclareTextComposite{\accpsilivaria}{LGR}{\eta}{171} + \DeclareTextComposite{\accvaria}{LGR}{\omega}{176} + \DeclareTextComposite{\accdasia}{LGR}{\omega}{177} + \DeclareTextComposite{\accpsili}{LGR}{\omega}{178} + \DeclareTextComposite{\accdasiavaria}{LGR}{\omega}{179} + \DeclareTextComposite{\acctonos}{LGR}{\omega}{184} + \DeclareTextComposite{\accdasiaoxia}{LGR}{\omega}{185} + \DeclareTextComposite{\accpsilioxia}{LGR}{\omega}{186} + \DeclareTextComposite{\accpsilivaria}{LGR}{\omega}{187} + \DeclareTextComposite{\accperispomeni}{LGR}{\omega}{192} + \DeclareTextComposite{\accdasiaperispomeni}{LGR}{\omega}{193} + \DeclareTextComposite{\accpsiliperispomeni}{LGR}{\omega}{194} + \DeclareTextComposite{\accvaria}{LGR}{\iota}{200} + \DeclareTextComposite{\accdasia}{LGR}{\iota}{201} + \DeclareTextComposite{\accpsili}{LGR}{\iota}{202} + \DeclareTextComposite{\accdasiavaria}{LGR}{\iota}{203} + \DeclareTextComposite{\acctonos}{LGR}{\iota}{208} + \DeclareTextComposite{\accdasiaoxia}{LGR}{\iota}{209} + \DeclareTextComposite{\accpsilioxia}{LGR}{\iota}{210} + \DeclareTextComposite{\accpsilivaria}{LGR}{\iota}{211} + \DeclareTextComposite{\accperispomeni}{LGR}{\iota}{216} + \DeclareTextComposite{\accdasiaperispomeni}{LGR}{\iota}{217} + \DeclareTextComposite{\accpsiliperispomeni}{LGR}{\iota}{218} + \DeclareTextComposite{\accdialytika}{LGR}{\iota}{240} + \DeclareTextComposite{\accdialytikavaria}{LGR}{\iota}{241} + \DeclareTextComposite{\accdialytikatonos}{LGR}{\iota}{242} + \DeclareTextComposite{\accdialytikaperispomeni}{LGR}{\iota}{243} + \DeclareTextComposite{\accvaria}{LGR}{\upsilon}{204} + \DeclareTextComposite{\accdasia}{LGR}{\upsilon}{205} + \DeclareTextComposite{\accpsili}{LGR}{\upsilon}{206} + \DeclareTextComposite{\accdasiavaria}{LGR}{\upsilon}{207} + \DeclareTextComposite{\acctonos}{LGR}{\upsilon}{212} + \DeclareTextComposite{\accdasiaoxia}{LGR}{\upsilon}{213} + \DeclareTextComposite{\accpsilioxia}{LGR}{\upsilon}{214} + \DeclareTextComposite{\accpsilivaria}{LGR}{\upsilon}{215} + \DeclareTextComposite{\accperispomeni}{LGR}{\upsilon}{220} + \DeclareTextComposite{\accdasiaperispomeni}{LGR}{\upsilon}{221} + \DeclareTextComposite{\accpsiliperispomeni}{LGR}{\upsilon}{222} + \DeclareTextComposite{\accdialytika}{LGR}{\upsilon}{244} + \DeclareTextComposite{\accdialytikavaria}{LGR}{\upsilon}{245} + \DeclareTextComposite{\accdialytikatonos}{LGR}{\upsilon}{246} + \DeclareTextComposite{\accdialytikaperispomeni}{LGR}{\upsilon}{247} + \DeclareTextComposite{\accvaria}{LGR}{\epsilon}{224} + \DeclareTextComposite{\accdasia}{LGR}{\epsilon}{225} + \DeclareTextComposite{\accpsili}{LGR}{\epsilon}{226} + \DeclareTextComposite{\accdasiavaria}{LGR}{\epsilon}{227} + \DeclareTextComposite{\acctonos}{LGR}{\epsilon}{232} + \DeclareTextComposite{\accdasiaoxia}{LGR}{\epsilon}{233} + \DeclareTextComposite{\accpsilioxia}{LGR}{\epsilon}{234} + \DeclareTextComposite{\accpsilivaria}{LGR}{\epsilon}{235} + \DeclareTextComposite{\accvaria}{LGR}{\omicron}{228} + \DeclareTextComposite{\accdasia}{LGR}{\omicron}{229} + \DeclareTextComposite{\accpsili}{LGR}{\omicron}{230} + \DeclareTextComposite{\accdasiavaria}{LGR}{\omicron}{231} + \DeclareTextComposite{\acctonos}{LGR}{\omicron}{236} + \DeclareTextComposite{\accdasiaoxia}{LGR}{\omicron}{237} + \DeclareTextComposite{\accpsilioxia}{LGR}{\omicron}{238} + \DeclareTextComposite{\accpsilivaria}{LGR}{\omicron}{239} + \DeclareTextCompositeCommand{\accdasia}{LGR}{\Alpha}{<A} + \DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Alpha}{<`A} + \DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Alpha}{<'A} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Alpha}{<\char126A} + \DeclareTextCompositeCommand{\accpsili}{LGR}{\Alpha}{>A} + \DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Alpha}{>`A} + \DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Alpha}{>'A} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\Alpha}{>\char126A} + \DeclareTextCompositeCommand{\acctonos}{LGR}{\Alpha}{'A} + \DeclareTextCompositeCommand{\accvaria}{LGR}{\Alpha}{`A} + \DeclareTextCompositeCommand{\accdasia}{LGR}{\Epsilon}{<E} + \DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Epsilon}{<'E} + \DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Epsilon}{<`E} + \DeclareTextCompositeCommand{\accpsili}{LGR}{\Epsilon}{>E} + \DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Epsilon}{>'E} + \DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Epsilon}{>`E} + \DeclareTextCompositeCommand{\acctonos}{LGR}{\Epsilon}{'E} + \DeclareTextCompositeCommand{\accvaria}{LGR}{\Epsilon}{`E} + \DeclareTextCompositeCommand{\accdasia}{LGR}{\Eta}{<H} + \DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Eta}{<`H} + \DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Eta}{<'H} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Eta}{<\char126H} + \DeclareTextCompositeCommand{\accpsili}{LGR}{\Eta}{>H} + \DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Eta}{>`H} + \DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Eta}{>'H} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\Eta}{>\char126H} + \DeclareTextCompositeCommand{\acctonos}{LGR}{\Eta}{'H} + \DeclareTextCompositeCommand{\accvaria}{LGR}{\Eta}{`H} + \DeclareTextCompositeCommand{\accdasia}{LGR}{\Iota}{<I} + \DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Iota}{<`I} + \DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Iota}{<'I} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Iota}{<\char126I} + \DeclareTextCompositeCommand{\accpsili}{LGR}{\Iota}{>I} + \DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Iota}{>`I} + \DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Iota}{>'I} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\Iota}{>\char126I} + \DeclareTextCompositeCommand{\acctonos}{LGR}{\Iota}{'I} + \DeclareTextCompositeCommand{\accvaria}{LGR}{\Iota}{`I} + \DeclareTextCompositeCommand{\accdasia}{LGR}{\Omicron}{<O} + \DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Omicron}{<`O} + \DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Omicron}{<'O} + \DeclareTextCompositeCommand{\accpsili}{LGR}{\Omicron}{>O} + \DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Omicron}{>`O} + \DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Omicron}{>'O} + \DeclareTextCompositeCommand{\acctonos}{LGR}{\Omicron}{'O} + \DeclareTextCompositeCommand{\accvaria}{LGR}{\Omicron}{`O} + \DeclareTextCompositeCommand{\accdasia}{LGR}{\Upsilon}{<U} + \DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Upsilon}{<`U} + \DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Upsilon}{<'U} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Upsilon}{<\char126U} + \DeclareTextCompositeCommand{\acctonos}{LGR}{\Upsilon}{'U} + \DeclareTextCompositeCommand{\accvaria}{LGR}{\Upsilon}{`U} + \DeclareTextCompositeCommand{\accdasia}{LGR}{\Omega}{<W} + \DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\Omega}{<`W} + \DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\Omega}{<'W} + \DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\Omega}{<\char126W} + \DeclareTextCompositeCommand{\accpsili}{LGR}{\Omega}{>W} + \DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\Omega}{>`W} + \DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\Omega}{>'W} + \DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\Omega}{>\char126W} + \DeclareTextCompositeCommand{\acctonos}{LGR}{\Omega}{'W} + \DeclareTextCompositeCommand{\accvaria}{LGR}{\Omega}{`W} + \DeclareTextComposite{\accdialytika}{LGR}{\Iota}{219} + \DeclareTextComposite{\accdialytika}{LGR}{\Upsilon}{223} + \DeclareTextCompositeCommand{\LGR@hiatus}{LGR}{\Alpha}{\LGR@A@hiatus} + \DeclareTextCompositeCommand{\LGR@hiatus}{LGR}{\Epsilon}{\LGR@E@hiatus} +\fi\fi % Re-definition for Greek Unicode input in math mode 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 2df92567144..d602e0afe16 100644 --- a/Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def +++ b/Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def @@ -199,6 +199,8 @@ \DeclareTextCommand{\textvarsigma}{\LastDeclaredEncoding}{ς} % final sigma \DeclareTextCommand{\textfinalsigma}{\LastDeclaredEncoding}{\textvarsigma} \DeclareTextCommand{\textsigma}{\LastDeclaredEncoding}{σ} +% Dummy definition (\textautosigma is lowercase of \textSigma): +\ProvideTextCommand{\textautosigma}{\LastDeclaredEncoding}{\textsigma} \DeclareTextCommand{\texttau}{\LastDeclaredEncoding}{τ} \DeclareTextCommand{\textupsilon}{\LastDeclaredEncoding}{υ} \DeclareTextCommand{\textphi}{\LastDeclaredEncoding}{φ} 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 b3705a132f3..b2510b6137e 100644 --- a/Master/texmf-dist/tex/latex/greek-fontenc/greek-fontenc.def +++ b/Master/texmf-dist/tex/latex/greek-fontenc/greek-fontenc.def @@ -20,6 +20,7 @@ % ===== ============ ======================================================== % 0.9 2013-07-03 code "outsourced" from lgrxenc.def % 0.9.1 2013-07-17 composite definitions starting with standard accent cmds +% 0.11 2013-11-28 ``\greekscript`` TextCommand % ===== ============ ======================================================== % % Usage @@ -47,19 +48,29 @@ % :: \ProvidesFile{greek-fontenc.def} -[2013/07/18 v0.9.1 Common Greek font encoding definitions] +[2013/11/28 v0.11 Common Greek font encoding definitions] - -% Ensuregreek -% ~~~~~~~~~~~ +% ensuregreek, greekscript +% ~~~~~~~~~~~~~~~~~~~~~~~~ +% +% Provide "empty" encoding-specific definitions for ``\ensuregreek`` and +% ``\greekscript``. The definitions in this file make the font encoding fit +% for use with the Greek script. (See ``textalpha.sty`` for default +% definitions.) % -% The ``\ensuregreek`` command can be used to ensure that its argument is set +% The ``\ensuregreek`` macro can be used to ensure that its argument is set % in a font encoding with support for Greek. If the active font encoding % supports it, kerning between adjacent command calls (e.g. % ``\ensuregreek{A}\ensuregreek{\Upsilon}``) is preserved. This allows, e.g., % wrapping of compound Unicode character definitions. :: -\DeclareTextCommand{\ensuregreek}{\LastDeclaredEncoding}[1]{#1} +\ProvideTextCommand{\ensuregreek}{\LastDeclaredEncoding}[1]{#1} + +% The ``\greekscript`` declaration ensures the current font encoding supports +% the Greek script:: + +\ProvideTextCommand{\greekscript}{\LastDeclaredEncoding}{} + % Aliases % ~~~~~~~ @@ -103,8 +114,8 @@ % % \DeclareTextCommand{\anwtonos}{\LastDeclaredEncoding}{\textdexiakeraia} % ʹ % \DeclareTextCommand{\katwtonos}{\LastDeclaredEncoding}{\textaristerikeraia} % ͵ -% -% +% +% % Composite diacritics % ~~~~~~~~~~~~~~~~~~~~ % @@ -116,7 +127,7 @@ % % \accdialytica\accvaria\textalpha, % \"\'\textalpha, -% \"'\textalpha, or +% \"'\textalpha, or % \'"\textalpha. % % Separate definitions for the supported variants of the second input token diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty b/Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty index dcac9f746b6..876e837f5e2 100644 --- a/Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty +++ b/Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty @@ -1,30 +1,30 @@ % textalpha: 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 letters -% outside math. -% +% +% :Abstract: Provide a set of ``\text*`` macros for Greek characters +% in text mode. +% % :Identification: % :: \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{textalpha} -[2013/09/11 v0.5 macros for Greek letters in text] +[2013/11/28 v0.11 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 @@ -32,177 +32,193 @@ % 2013-05-28 0.4 use ``lgrenc.def`` from greek-fontenc. % 2013-09-11 0.5 move to greek-fontenc_, % .. support XeTeX/LuaTeX, add breve below accents. +% 2013-11-28 0.11 Compatibility with Xe/LuaTeX in 8-bit mode. % ========== ===== ========================================================= -% +% % 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``). -% +% % To allow documents using Greek LICR macros without worrying about the TeX -% engine used to compile them, this package does a simple test (based on the -% ``\ifdefined`` command provided by the e-TeX_ extension) and does "the right -% thing" to set up Greek text font support for the detected engine. -% -% For 8-bit TeX, this package also declares the LGR font encoding as default -% for Greek LICR macros (cf. fntguide_ section 5.3): -% +% 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 +% 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 test-euenc.tex_). +% +% Advantages: +% % * Symbols from a Greek text font (e.g. the `CB fonts`_) can be accessed -% without the need for an explicite font-encoding switch. -% -% * In combination with ``\usepackage[utf8]{inputenc}`` and ``lgrenc.dfu`` -% from greek-inputenc_, Unicode input of Greek characters is supported in -% any font encoding. -% -% .. Attention:: -% The macros work well in any font encoding for single symbols. -% However, with 8-bit TeX, the automatic font-encoding switches behind the -% doors interfere with kerning between letters and replacement of -% accent+character with a pre-composed character. -% +% 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-test.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 test-euenc.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 proper hyphenation. -% -% +% to ensure correct hyphenation of Greek text. +% +% % Usage % ===== -% +% % .. code:: latex -% +% % \usepackage{textalpha} -% +% % For details see `<textalpha-test.tex>`_ and `<textalpha-test.pdf>`_ (8-bit -% TeX) as well as `<test-euenc.tex>`_ and `<test-euenc.pdf>`_ (XeTeX/LuaTeX). -% -% +% TeX and XeTeX/LuaTeX in 8-bit compatibility mode) as well as +% `<test-euenc.tex>`_ and `<test-euenc.pdf>`_ (XeTeX/LuaTeX with Unicode +% fonts). +% +% % Implementation % ============== -% -% +% % Requirements % ------------ -% +% % With XeTeX or LuaTeX, there is one common input and font encoding -- -% Unicode. 8-bit TeX font encodings should generally not be used. For -% compatibility with the LaTeX font selection system, the package euenc_ -% defines the (pseudo) font encodings EU1 and EU2 for XeTeX and LuaTeX -% respectively. However euenc does not (yet) define LICR macros. We therefore -% explicitely load Greek LICR definitions for XeTeX/LuaTeX from greek-fontenc_. -% -% XeTeX -% """"" -% -% Use the EU1 font encoding. This is the only font encoding used with XeTeX, -% so loading it with fontenc_ cannot mix up the default font encoding:: - -\ifdefined\XeTeXrevision - \usepackage[EU1]{fontenc} - -% Load the Greek LICR definitions for XeTeX/LuaTeX. In an ideal world, this -% should be done in the eu1enc.def file of the euenc_ package. -% -% Before that, we must ensure EU1 is the ``\LastDeclaredEncoding``: Beacause -% fontenc loads font encoding definition files only once, it may happen that -% another font encoding is defined after EU1 --- for example fontspec_ -% declares EU1 but leaves ``\LastDeclaredEncoding`` at ``T3`` (tipa), because -% it later inputs the xunicode_ package which in turn loads ``t3enc.def``. :: - +% Unicode. 8-bit TeX font encodings are only used in compatibility mode or for +% fonts not available otherwise. For compatibility with the LaTeX font +% selection system, the package euenc_ defines the (pseudo) font encodings EU1 +% and EU2 for XeTeX and LuaTeX respectively. However euenc does not (yet) +% 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 +% """""""""""""" +% +% 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``. :: + +\@ifl@aded{def}{eu1enc}{ \renewcommand{\LastDeclaredEncoding}{EU1} \input{greek-euenc.def} - -% No other action is required with Unicode-aware TeX engines:: - - \expandafter\endinput % "return" -\fi - - -% LuaTeX -% """""" -% -% Similar actions to XeTeX, but use the font encoding EU2: [#EU]_ :: - -\ifdefined\luatexversion - \usepackage[EU2]{fontenc} - \renewcommand{\LastDeclaredEncoding}{EU2} - \input{greek-euenc.def} - \expandafter\endinput % "return" -\fi +}{% else + \@ifl@aded{def}{eu2enc}{ + \renewcommand{\LastDeclaredEncoding}{EU2} + \input{greek-euenc.def} + }{% else + \@ifl@aded{def}{lgrenc}{ + % LGR already declared and set up + }{ + \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). -% -% -% 8-bit TeX -% """"""""" -% -% With 8-bit TeX, you usually pass the font encoding name(s) as option to -% fontenc_ which then loads the corresponding ``*.def`` file(s). The last -% option indicates the document's default font encoding. (See [fntguide]_ for -% details and `<lgrenc-test.tex>`_ for an example.) Therefore, we do not know -% the documents main font encoding and hence cannot use -% ``\usepackage[LGR]{inputenc}``. We load ``lgrenc.def`` directly, if it is -% not already done and re-set ``\LastDeclaredEncoding`` else. -% -% .. note:: The use of ``\@ifundefined`` has the side-effect that the tested -% macro becomes defined and set to ``\relax`` (polluting the namespace and -% interfering with tests via eTeX's ``\ifdefined``). However, in this case -% no harm is done as the macro is defined by ``lgrenc.def`` anyway. -% -% :: - -\@ifundefined{ver@lgrenc.def} - {\input{lgrenc.def}} - {\renewcommand{\LastDeclaredEncoding}{EU1}} +% +% +% The package hyperref_ defines the PU font encoding which also supports +% (monotonic) Greek. It currently misses polytonic greek and the +% ``\greekscript`` and ``\ensuregreek`` TextCommands:: +\@ifl@aded{def}{puenc} + {\ProvideTextCommand{\greekscript}{PU}{} + \ProvideTextCommand{\ensuregreek}{PU}[1]{#1}} + {} % 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. -% -% ensuregreek -% """"""""""" -% +% default font encoding. Abort here, if another Greek-supporting +% font encoding is used instead of LGR:: + + \@ifl@aded{def}{lgrenc} + {\renewcommand{\LastDeclaredEncoding}{LGR}} + {\expandafter\endinput} % "return" + +% 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_]):: + +\ProvideTextCommandDefault{\greekscript}{\fontencoding{LGR}\selectfont} + % The ``\ensuregreek`` command can be used to ensure that its argument is set in -% a font encoding with support for Greek. We define LGR as default encoding for -% Greek text:: +% a font encoding with support for Greek. Again the default is LGR:: -\DeclareTextCommandDefault{\ensuregreek}[1]{{\fontencoding{LGR}\selectfont #1}} +\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-test.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``. -% -% .. Do this for PU here? ``\DeclareTextCommand{\ensuregreek}{PU}[1]{#1}`` -% -% Can lead to infinite recursion (``TeX capacity exeeded``) without the -% ``unicode=true`` hyperref option. -% (How about a test whether the PU font encoding is defined?). -% -% +% +% % Greek Alphabet % """""""""""""" -% +% % Define the ``text*`` marcos as default for all font encodings:: \DeclareTextSymbolDefault{\textAlpha}{LGR} @@ -260,9 +276,9 @@ % 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 @@ -299,7 +315,7 @@ % Diacritics % """""""""" -% +% % Greek diacritics via "named" macros:: \DeclareTextAccentDefault{\accdasia}{LGR} @@ -335,7 +351,7 @@ % Auxiliary macros % """""""""""""""" -% +% % ``\MakeUppercase`` requires two internal commands:: \DeclareTextAccentDefault{\LGR@hiatus}{LGR} @@ -354,6 +370,8 @@ % .. _fntguide: http://www.ctan.org/tex-archive/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 +% .. _inputenc: http://www.ctan.org/pkg/inputenc % .. _polyglossia: http://www.ctan.org/pkg/polyglossia % .. _textgreek: http://www.ctan.org/pkg/textgreek % .. _xunicode: http://www.ctan.org/pkg/xunicode |