diff options
author | Karl Berry <karl@freefriends.org> | 2019-07-10 20:28:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-07-10 20:28:23 +0000 |
commit | 93dc906dc01c75bdbe19ebd78c0a1538bfc25b53 (patch) | |
tree | 31f48869b8f24446b6778d464dc4bd5aa7b6ea03 /Master/texmf-dist/tex/latex/greek-fontenc | |
parent | 38035d16f502e46fac8ff2451219410a87edf7e9 (diff) |
greek-fontenc (10jul19)
git-svn-id: svn://tug.org/texlive/trunk@51597 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/greek-fontenc')
4 files changed, 100 insertions, 84 deletions
diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty b/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty index 5b76dc736c7..a799a6cd90c 100644 --- a/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty +++ b/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta.sty @@ -1,14 +1,14 @@ % alphabeta: Greek symbols in text and math % ***************************************** -% +% % :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: Use ``\alpha, \beta, ...`` for Greek letters in text and math % mode. -% +% % :Identification: % :: @@ -18,7 +18,7 @@ % Changelog: % .. class:: borderless -% +% % ====== ========== ========================================================= % 0.1 2012-06-26 initial version % 0.2 2013-05-03 new accent macro names with ``lgrxenc.def`` 0.7 @@ -29,76 +29,85 @@ % 0.13.2 2016-02-05 Support for standard Unicode text font encoding "TU" % (new in fontspec v2.5a). % ====== ========== ========================================================= -% +% % Motivation % ========== -% +% % By default, the ``\alpha, \beta, ...`` macros for Greek letters % are only valid in mathematical mode. -% +% % With this package, the math macros are redefined to work in both, text and % math mode, so that Greek letters can be specified with the established % command names in text, too. -% +% % If used together with the ``utf8`` option of inputenc_, literal Unicode % characters can be used for Greek symbols in mathematical formulas. -% +% % .. 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. -% +% % 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. -% -% +% +% % Usage % ===== -% +% % .. code:: latex -% +% % \usepackage{alphabeta} -% +% % The greek-inputenc_ package provides support for Unicode (utf-8) input % of Greek characters with 8-bit TeX and the inputenc_ package: -% +% % .. code:: latex -% +% % \usepackage[utf-8]{inputenc} % \usepackage{alphabeta} -% -% +% +% Conflicts +% ---------- +% +% `alphabeta` does not work if the ``utf8x`` input encoding is selected. +% (``utf8x`` is an interface to the ``ucs`` package which uses a +% non-compatible definition of ``\DeclareUnicodeCharacter``.) +% % For details see `<alphabeta-doc.tex>`_ and `<alphabeta-doc.pdf>`_. -% -% +% +% % Implementation % ============== -% +% % Requirements % ------------ -% +% % This package extends the `textalpha <textalpha.sty.html>`_ package. % Package options are passed on to `textalpha`:: \RequirePackageWithOptions{textalpha} % Just like `alphabeta`, `textalpha` is part of greek-fontenc_. -% +% % This package requires the e-TeX_ extensions (i.e. a not too old TeX % distribution) for the ``\ifdefined`` test. -% -% It uses the ``\TextOrMath`` test from the fixltx2e_ standard LaTeX -% package:: - -% fixltx2e is not required with releases after 2015 -%\RequirePackage{fixltx2e} - +% +% It uses the ``\TextOrMath`` test from the fixltx2e_ standard LaTeX package. +% ``fixltx2e`` is loaded by default since TeXLive 2015. In case of an +% ``\TextOrMath undefined`` error, load it in the document preamble via +% +% .. code:: latex +% +% \usepackage{fixltx2e} +% +% % Postpone the re-definitions % --------------------------- -% +% % To prevent other packages overwriting the re-defined commands we postpone % the next steps until the start of the document body:: @@ -106,7 +115,7 @@ % Save math macros % ---------------- -% +% % Provide an alias for the standard math commands:: \let\mathGamma\Gamma @@ -165,28 +174,28 @@ % Commands to access Greek letters by name % ---------------------------------------- -% +% % For letters defined in math mode, the commands work in both, text and math. -% +% % Some Greek letters look identical to Latin letters and can therefore not be % used as variable symbols in math formulas. These letters are not defined in % TeX's math mode, we provide an alias to the corrsponding ``\text...`` % command. -% +% % Mathematical notation distinguishes `variant shape symbols`_ for pi, phi, % rho, theta (small and capital), beta, and kappa (characters for the latter % three symbols are not included in TeX’s math fonts). These variations have % no syntactic meaning in Greek text and are not given code-points in the LGR % encoding while Unicode defines separate code points for the symbol variants. -% +% % Greek Alphabet: -% +% % Macros keep their meaning in mathematical mode (i.e. use the same shape as % without this package) and refer to GREEK LETTER ... in text. For % ``\epsilon`` and ``phi``, this means that the selected symbol variant % differs in text vs. math mode. Use ``\varepsilon`` and ``\varphi`` (see -% section `variant shape symbols`_ below) to select the GREEK LETTER ...” in both, -% text and math mode. +% section `variant shape symbols`_ below) to select the GREEK LETTER ...” +% in both, text and math mode. % :: \providecommand*{\Alpha}{\textAlpha} @@ -244,7 +253,7 @@ % Archaic letters % ''''''''''''''' -% +% % :: \renewcommand*{\digamma}{\TextOrMath{\textdigamma}{\mathdigamma}} % ϝ @@ -260,11 +269,11 @@ % Variant shape symbols % ''''''''''''''''''''' -% +% % TeX’s concept of “standard” vs. “variant” math symbols does not map to the % distinction between GREEK LETTER ... vs. GREEK ... SYMBOL in the Unicode % standard (see `<greek-euenc-doc.pdf>`_). -% +% % The ``\...symbol`` macros select the GREEK ... SYMBOL in both, text and % math mode. For ``\epsilonsymbol`` and ``\phisymbol`` this is the default % shape in math mode. The ``\var...`` macros select the shape used by TeX @@ -301,7 +310,7 @@ % TextCompositeCommands for the generic macros % -------------------------------------------- -% +% % The NFSS TextComposite mechanism looks for the next token without expanding % it. In order to let compositions like ``\ensuregreek{\'\Alpha}`` or % ``\ensuregreek{\>"\alpha}`` work as expected we define TextComposites with the @@ -321,12 +330,12 @@ % Re-definition for Greek Unicode input in math mode % -------------------------------------------------- -% +% % Check with ``\ifdefined`` for the definition of % ``\DeclareUnicodeCharacter``. In contrast to ``\@ifdefined``, this works % without side-effects. It makes the package dependent on the `e-TeX`_ % extensions but these are standard in all current TeX distributions anyway. -% +% % Map Greek characters that are also defined in math mode to the generic % macros:: 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 2e76e1f31cc..b48535fe30b 100644 --- a/Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def +++ b/Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def @@ -2,7 +2,7 @@ % +++++++++++++++ % Greek LICR 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 @@ -11,15 +11,15 @@ % :: \ProvidesFile{greek-euenc.def} -[2015/08/07 0.13 Greek LICRs for XeTeX and LuaTeX] +[2018/01/06 0.13.3 Greek LICRs for XeTeX and LuaTeX] % :abstract: % Experimental support for Greek LICR macros with XeTeX and LuaTeX. % Extends euenc_. Used by babel-greek_ and textalpha_. -% +% % **History**: % .. class:: borderless -% +% % ====== ========== ======================================================== % 0.1 2013-07-16 initial version % 0.1.1 2013-07-18 bugfix: wrong breathings psilioxia -> dasiaoxia @@ -34,43 +34,43 @@ % 0.12 2014-12-12 Remove symbol macros for breathing accents. % 0.13 2015-08-07 ``\lccode``/``\uccode`` corrections from xgreek_. % .. LICR macros for symbol variants. +% 0.13.3 2018-01-06 Documentation update. % ====== ========== ======================================================== -% +% % .. contents:: -% +% % Motivation % ========== -% +% % LICR macro definitions for the Greek script are missing in both, xunicode_ % and euenc_. -% +% % This file expands the font encoding definition files ``eu1enc.def`` rsp. % ``eu2enc.def`` from euenc_ defining `LaTeX Internal Character % Representaction` (LICR) macros for Greek letters and symbols. It works % independed of xunicode_ using the standard commands for `LaTeX2e font % selection`_. -% +% % Requirements % ============ -% -% Requires XeTeX or LuaTeX, euenc_ (usually loaded via fontspec_), and a font -% with Greek characters. -% +% +% Requires XeTeX or LuaTeX, fontspec_, and a font with Greek characters. +% % See `<greek-euenc-doc.tex>`_ and `<greek-euenc-doc.pdf>`_ for setup and % usage examples. -% -% +% +% % Greek Diacritics % ================ -% +% % Define "named macros" for simple and combined diacritics. -% +% % * Named accent macros can be used instead of the ``\@tabacckludge`` by % to-LaTeX converters to ensure working also inside the tabbing environment. -% +% % * Named macros are required for upcasing according to Greek typesetting % conventions and in the definition of composite commands. -% +% % Greek alias names for standard accents:: \DeclareTextCommand{\acctonos}{\LastDeclaredEncoding}{\@tabacckludge'} @@ -83,7 +83,7 @@ \DeclareTextCommand{\accperispomeni}{\LastDeclaredEncoding}[1]{#1\char"0342 } % Breathings: -% +% % (The COMBINING GREEK KORONIS is a legacy character, discarded in favour of % COMBINING COMMA ABOVE) :: @@ -92,7 +92,7 @@ % Sub-iota: -% +% % ``\ypogegrammeni`` is a postfix accent (ligature in LGR) :: \DeclareTextSymbol{\ypogegrammeni}{\LastDeclaredEncoding}{0837} % COMBINING GREEK YPOGEGRAMMENI @@ -115,7 +115,7 @@ % Common Definitions % ================== -% +% % Use the `common Greek font encoding definitions`_:: \input{greek-fontenc.def} @@ -123,17 +123,17 @@ % Character Definitions % ===================== -% +% % General Punctuation % ~~~~~~~~~~~~~~~~~~~ -% +% % Ligature break up with ZERO WIDTH NON-JOINER:: \DeclareTextCommand{\textcompwordmark}{\LastDeclaredEncoding}{\char"200C} % Greek and Coptic % ~~~~~~~~~~~~~~~~ -% +% % :: % NR Unicode Name % babel name, % PU name @@ -265,11 +265,11 @@ % Greek Extended % ~~~~~~~~~~~~~~ -% +% % We skip definitions for characters "... WITH OXIA", because they would % overwrite the defintions for "... WITH TONOS" in the `Greek and Coptic` % block. -% +% % :: \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textalpha}{ἀ} @@ -475,10 +475,10 @@ % ~~~~~~~~~~~~~~~~~~~~~ % TODO: map other chars to corresponding Greek letters. % See also the grnumalt_ package. -% +% % Definition with literal Unicode characters, because the code-point has 5 % hexadecimal digits: -% +% % :: \DeclareTextCommand{\textpentedeka}{\LastDeclaredEncoding}{𐅄} % GREEK ACROPHONIC ATTIC FIFTY @@ -489,12 +489,12 @@ % UPPERCASE % ========= -% +% % Greek letters drop diacritics (eccept dialytika and sub-iota) in UPPERCASE. -% +% % uc/lc values % ~~~~~~~~~~~~ -% +% % ``\lccode`` and ``\uccode`` corrections from the xgreek_ package by Apostolos Syropoulos:: \global\lccode"0370="0371 \global\uccode"0370="0370 @@ -819,12 +819,12 @@ % uclclist % ~~~~~~~~ -% +% % The common Greek font encoding definitions in greek-fontenc.def_ extend the % `uclclist` with Greek LICR macros. Here, we add textkoppa/textKoppa and % Unicode-specific "hiatus_" handling (copied from lgrenc.def_ and changed % Latin transcription to Unicode literals). -% +% % @uclclist extension (see also greek-fontenc.def_):: \providecommand*\greek@euenc@update@uclclist{% @@ -861,7 +861,7 @@ } % .. References -% +% % .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt % .. _babel-greek: http://www.ctan.org/pkg/babel-greek % .. _euenc: http://www.ctan.org/pkg/euenc @@ -872,7 +872,7 @@ % .. _textalpha: textalpha.sty.html % .. _xgreek: http://www.ctan.org/pkg/xgreek % .. _xunicode: http://www.ctan.org/pkg/xunicode -% +% % .. _LaTeX2e font selection: % http://mirror.ctan.org/macros/latex/doc/fntguide.pdf % .. _common Greek font encoding definitions: diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/lgrenc.def b/Master/texmf-dist/tex/latex/greek-fontenc/lgrenc.def index 2abcce02342..9430bfd6e4d 100644 --- a/Master/texmf-dist/tex/latex/greek-fontenc/lgrenc.def +++ b/Master/texmf-dist/tex/latex/greek-fontenc/lgrenc.def @@ -54,6 +54,7 @@ % 0.11.2 2014-09-04 remove duplicate code. % 0.13 2015-08-04 Support for symbol variants. % 0.13.1 2015-12-07 Fix `rho with dasia bug` (Linus Romer). +% 0.13.3 2019-07-09 Drop error font declaration (cf. `ltxbugs 4399`_). % ====== ============ ======================================================== % % Usage @@ -94,7 +95,7 @@ % :: \ProvidesFile{lgrenc.def} -[2015/12/07 v0.13.1 LGR Greek font encoding definitions] +[2019/07/09 v0.13.3 LGR Greek font encoding definitions] % Copyright © 2010 Günter Milde % This file is part of the "greek-fontenc" package. % It may be distributed and/or modified under the @@ -117,7 +118,6 @@ \DeclareFontEncoding{LGR}{}{} \DeclareFontSubstitution{LGR}{cmr}{m}{n} -\DeclareErrorFont{LGR}{cmr}{m}{n}{10} % Text symbols % ~~~~~~~~~~~~ @@ -920,3 +920,6 @@ % .. _textalpha: textalpha.sty.html % .. _ucs: http://www.ctan.org/pkg/unicode % .. _xunicode: http://www.ctan.org/pkg/xunicode +% .. _ltxbugs 4399: +% https://www.latex-project.org/cgi-bin/ltxbugs2html?pr=latex%2F4399&search= +% diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty b/Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty index 4f657b4fb83..439e6c43dda 100644 --- a/Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty +++ b/Master/texmf-dist/tex/latex/greek-fontenc/textalpha.sty @@ -267,6 +267,10 @@ \DeclareTextCompositeCommand{\<}{LGR}{'}{\accdasiaoxia} \DeclareTextCompositeCommand{\<}{LGR}{`}{\accdasiavaria} \DeclareTextCompositeCommand{\<}{LGR}{~}{\accdasiaperispomeni} + % Hiatus feature (see greek-fontenc.def and babel-greek (greek.ldf)) + \DeclareTextCompositeCommand{\<}{LGR}{^^9f}{\LGR@hiatus} + \DeclareTextCompositeCommand{\>}{LGR}{^^9f}{\LGR@hiatus} + }{} \@ifl@aded{def}{greek-euenc}{ % XeTeX or LuaTeX with Unicode fonts |