summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lgrx/lgrxenc.def
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/lgrx/lgrxenc.def')
-rw-r--r--Master/texmf-dist/tex/latex/lgrx/lgrxenc.def1310
1 files changed, 722 insertions, 588 deletions
diff --git a/Master/texmf-dist/tex/latex/lgrx/lgrxenc.def b/Master/texmf-dist/tex/latex/lgrx/lgrxenc.def
index 0ca8547a3c4..c703c638380 100644
--- a/Master/texmf-dist/tex/latex/lgrx/lgrxenc.def
+++ b/Master/texmf-dist/tex/latex/lgrx/lgrxenc.def
@@ -10,16 +10,16 @@
% version 1.3 of this license or any later version.
%
% :Abstract: The LGR font encoding is the de-facto standard for Greek
-% typesetting with LaTeX. However, the encoding definition
-% file that ships with babel misses many of the definitions
-% common since the advent of the NFSS (see fntguide_ "Encodings").
+% typesetting with LaTeX. However, the encoding definition file
+% that ships with babel misses many of the definitions common
+% since the introduction of the NFSS (see fntguide_ "Encodings").
%
% This file provides a comprehensive set of macros to
% typeset Greek with LGR encoded fonts. It works for both,
% monotonic and polytonic Greek, independent of the `babel`
% package.
%
-% This package is part of the lgrx_ bundle.
+% This package is part of the lgrx_ bundle.
%
% .. contents::
%
@@ -42,12 +42,14 @@
% 0.5.1 2012-05-08 upload to CTAN
% 0.6 2012-06-29 ``\TextGreek`` wrapper command (used in lgrenc.dfu),
% aliases for ``puenc.def`` compatibility
+% 0.6.1 2013-02-12 ``\@uclclist`` entries for `PU` aliases
+% 0.7 unreleased documentation update, new accent macros names
% ===== ============ ====================================================
%
% Usage
% -----
%
-% To prevent confusion with Babel_'s rudimentary ``lgrenc.def``, this file is
+% To prevent confusion with Babel_'s ``lgrenc.def``, this file is
% named ``lgrxenc.def``. Load it by calling fontenc_ with the ``LGRx`` option
% or indirectly via the textalpha_ or alphabeta_ packages.
%
@@ -66,8 +68,8 @@
% ``\usepackage[LGRx,T1,LGR]{fontenc}``
%
%
-% Macro names
-% -----------
+% LICR macro names
+% ----------------
%
% The fntguide_ (section 6.4 Naming conventions) recommends:
%
@@ -77,81 +79,114 @@
% ``\math`` followed by the glyph name, for example
% ``\mathonequarter`` or ``\mathsterling``.
%
-% Open questions:
+% The `Adobe Glyph List For New Fonts`_ has names for many glyphs in the
+% `Greek and Coptic` Unicode block, but not for `Greek extended`.
+% The `Adobe Glyph List`_ (for existing fonts) lists additional glyph names
+% used in older fonts.
+%
+% Proposals
+% ~~~~~~~~~
%
-% * Can we omit the ``text`` prefix for macros that are already
-% established in short form (e.g. via babel's ``greek.ldf``) and do
-% not have a math counterpart?
+% * If there exists a math-mode macro for a symbol, form the corresponding text
+% macro by prepending ``text``?
%
-% Pro:
-% + Simpler.
+% Example:
+% The glyph name for the GREEK SMALL LETTER FINAL SIGMA is ``sigma1``,
+% the corresponding math-macro is ``\varsigma``. The text symbol could be
+% made available as ``\textvarsigma``.
+%
+% Problems:
+% ``\varepsilon`` and ``\varphi`` math macros map to characters named
+% "GREEK SMALL **LETTER** ...", while ``\\vartheta``, ``\\varkappa``,
+% ``\\varrho``, and ``\\varpi`` math macros map to "GREEK ... **SYMBOL**"
+% Unicode characters.
+%
+% In Greek text, these variants are interchangeable. The LGR font encoding
+% does not contain slots for "symbol" glyph variants. In some Greek fonts,
+% GREEK SMALL LETTERS use glyph variants resembling the corresponding
+% GREEK SYMBOL Unicode character's reference glyph.
+%
+% * Derive macro names from Unicode names?
+%
+% The `Unicode names list`_ provides standardized descriptive names for all
+% Unicode characters that use only capital letters of the Latin alphabet.
+% While not suited for direct use in a LICR macros, they can be either
+%
+% a) used as inspiration for new LICR macro names or
%
-% + Ease of use (less typing, better readability of source text).
+% b) converted to LICR macro names via a defined set of transformation rules.
%
-% + Backwards compatible (many established macro names).
+% Example:
+% ``\textfinalsigma`` or just ``\finalsigma`` as a more descriptive name
+% for GREEK SMALL LETTER FINAL SIGMA derived via the rules:
%
-% + There are examples of encoding-specific macros
-% without the ``text``-prefix, especially for letters:
+% * drop "LETTER" if the name remains unique,
+% * drop "GREEK" if the name remains unique,
+% * use capitalized name for capital letters, lowercase for "SMALL" letters
+% and drop "SMALL",
+% * concatenate
%
-% * ``\AE \DH \DJ \L \NG \OE \O \SS \TH \ae \dh \dj \guillemotleft``
-% ``\guillemotright \guilsinglleft \guilsinglright \i \j \l \ng``
-% ``\oe \o \quotedblbase \quotesinglbase \ss \th``
-% in `T1` and `OT1`,
-% * ``\CYR*`` and ``\cyr*`` in `T2*`
-% * ``\heb*`` or no prefix in `HE8`
-% * short descriptive names in the arabic part of `PU`
-% (``puarenc.def``) (but e.g. ``\textkoppagreek`` in
-% ``puenc.def``)
+% * Omit the "text" prefix for macros that do not have a math counterpart?
%
-% + ``text`` prefix does **not** mark a macro as
+% Pro:
+% + Simpler,
+%
+% + ease of use (less typing, better readability of source text),
+%
+% + many established text macro names without "text",
%
-% * encoding-specific
-% * inserting a glyph
+% + there are examples of encoding-specific macros
+% without the ``text``-prefix, especially for letters,
%
-% as there are e.g. font-changing macros (``\textbf``, ``\textit``)
-% and encoding-changing macros (``\textgreek``, ``\textcyr``).
+% :T1: ``\AE \DH \DJ \L \NG \OE \O \SS \TH \ae \dh \dj \guillemotleft``
+% ``\guillemotright \guilsinglleft \guilsinglright \i \j \l \ng``
+% ``\oe \o \quotedblbase \quotesinglbase \ss \th`` (also in OT1)
+% :T2*: ``\CYR*`` and ``\cyr*``
+% :HE8: ``\heb*`` or no prefix
+% :PU: short descriptive names in the arabic part (``puarenc.def``)
%
+% + ``text`` prefix does **not** mark a macro as encoding-specific or
+% "inserting a glyph". There are e.g. font-changing macros (``\textbf``,
+% ``\textit``) and encoding-changing macros (``\textgreek``,
+% ``\textcyr``).
%
% Contra:
% - Less consistent.
%
-% - ``text`` prefix marks a macro as confined to text mode
+% - ``text`` prefix marks a macro as confined to text mode.
%
-% - Short forms can be defined in a package.
%
-% * How to name *accent macros* (``\DeclareTextAccent`` definitions)?
+% How to name *accent macros*?
+% ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
%
-% - Should ``\texttonos`` be an accent macro or a spacing character?
+% * standard accent macros (``\DeclareTextAccent`` definitions in
+% ``latex/base/...``) are one-symbol macros (``\' \" ... \u \v ...``) .
%
-% - How about a common prefix ``\accent...`` or postfix ``\...Accent``?
+% * tipa.sty and ucs use the "text" prefix also for accents.
%
+% However, the `Adobe Glyph List For New Fonts`_ maps, e.g., "tonos" and
+% "dieresistonos" to 0384 GREEK TONOS and 0385 GREEK DIALYTIKA TONOS, hence
+% `\texttonos` and `\textdiaresistonos` should denote these spacing
+% characters.
%
-% * How about glyph names with numbers and dots?
+% * textcomp (ts1enc.def) defines ``\capital...`` accents (i.e. without
+% ``text`` prefix).
%
-% - Adobe recommends ``uni`` (or ``u``) + Unicode number for all
-% Unicode characters without established name.
+% * Use a common prefix ``\accent...`` or postfix ``\...accent``,
+% or short ``\acc...``?
%
-% While it is *possible* to apply this scheme to TeX macros, it is
-% hardly advisable: ``\koppa`` is far better readable than
-% ``\csname uni03DF\endcsname``.
+% Currently, `lgrx` uses for diacritics_:
%
-% * If there exists a math-mode macro for a symbol, the corresponding text
-% macro should be formed by prepending ``text``.
+% - Greek names like in Unicode, and ucsencs.def
%
-% Example: The glyph name for the final sigma is ``sigma1``, but the
-% corresponding math-macro is ``\varsigma``. IMO, the text symbol
-% should be available as ``\textvarsigma`` and not
-% ``\csname textsigma1\endcsname``.
+% - The prefix "acc" to distinguish the macros as `TextAaccent` and reduce the
+% risc of name clashes (cf ``\@tabacckludge``).
%
-% Could this become a general rule?
-%
-% Problems:
-% * ``\varepsilon`` and ``\varphi`` math macros map to "GREEK SMALL
-% LETTER \*", while others map to "GREEK * SYMBOL" Unicode chars.
+% - For the end-user "symbol macros" (``\~ \' \` \" \< \>``) are provided.
%
%
-% The `Adobe Glyph List For New Fonts`_ has names for many glyphs in the
-% `Greek and Coptic` Unicode block, but not for `Greek extended`.
+% References
+% ~~~~~~~~~~
%
% An alternative, more complete set of short mnemonic character names is
% the `XML Entity Definitions for Characters`_ W3C Recommendation from
@@ -164,14 +199,8 @@
% A full set of ``\text*`` symbol macros is defined in ``ucsencs.def``
% from the ucs_ package.
%
-% Using the names from ``puenc.def`` ensures that the hyperref_ package
-% will do the right conversion to a PDF-string
-% (see `<greek-part-of-puenc.def>`_).
-%
-% For accent macros, this file uses Greek names like in Unicode and
-% ucsencs.def (without ``text`` prefix). Accent macro names are Capitalized or
-% CamelCase, as they are intended for use in packages or classes. For the
-% end-user "symbol macros" (``\~ \' \` \" \< \>``) are provided.
+% Aliases from ``puenc.def`` ensure that the hyperref_ package can
+% convert Greek symbols to a PDF-string.
%
%
% Implementation
@@ -198,8 +227,7 @@
% ::
\ProvidesFile{lgrxenc.def}
- [2012/07/03 v0.6 %
- comprehensive LGR Greek Font Encoding definitions]
+[2013/05/03 v0.7 comprehensive LGR Greek Font Encoding definitions]
% Base setup
@@ -212,13 +240,14 @@
\DeclareFontSubstitution{LGR}{cmr}{m}{n}
\DeclareErrorFont{LGR}{cmr}{m}{n}{10}
-% The ``\TextGreek`` command can be used to ensure that its argument is set in
+% The ``\ensuregreek`` command can be used to ensure that its argument is set in
% a font encoding with support for Greek. If the font encoding is already LGR,
% kerning between adjacent command calls (e.g.
-% ``\TextGreek{A}\TextGreek{\Upsilon}``) is preserved. This allows wrapping of
+% ``\ensuregreek{A}\ensuregreek{\Upsilon}``) is preserved. This allows wrapping of
% compound Unicode character definitions. ::
-\DeclareTextCommand{\TextGreek}{LGR}[1]{#1}
+\DeclareTextCommand{\ensuregreek}{LGR}[1]{#1}
+\DeclareTextCommand{\TextGreek}{LGR}[1]{#1} % backwards compatibility
% Text symbols
@@ -230,11 +259,11 @@
% Greek letters are accessible by the Latin transcription, but the mapping is
% specific to the LGR font encoding.
%
-% The ``\text*`` macros provide a way to access the symbols in any font
-% encoding supporting Greek independent of the specific font encoding.
-% Alternative Greek font encodings are LGI (ibycus_) and PU (`PDF Unicode`
-% used by hyperref_ for PDF metadata). The `textalpha.sty` package makes these
-% macros available in any font encoding.
+% The LICR macros provide a way to access the symbols independent of the
+% specific font encoding, in any font encoding supporting Greek. Alternative
+% Greek font encodings are LGI (ibycus_) and PU (`PDF Unicode` used by
+% hyperref_ for PDF metadata). The textalpha_ package makes these macros
+% available independent of the current font encoding.
% ::
\DeclareTextSymbol{\textAlpha}{LGR}{65}
@@ -281,6 +310,7 @@
\DeclareTextSymbol{\textrho}{LGR}{114}
\DeclareTextCommand{\textsigma}{LGR}{s\noboundary} % σ
\DeclareTextSymbol{\textvarsigma}{LGR}{99} % ς final sigma
+\DeclareTextSymbol{\textfinalsigma}{LGR}{99} % ς final sigma
\DeclareTextSymbol{\textautosigma}{LGR}{115} % σ (ς at end of word)
\DeclareTextSymbol{\texttau}{LGR}{116}
\DeclareTextSymbol{\textupsilon}{LGR}{117}
@@ -315,56 +345,55 @@
% '''''''''''''''
% Names after babel_'s ``greek.ldf``, teubner_ and hyperref_'s puenc.def::
-\DeclareTextSymbol{\stigma}{LGR}{6} % ϛ (greek.df, teubner)
-\DeclareTextSymbol{\textstigmagreek}{LGR}{6} % ϛ (puenc.def)
+\DeclareTextSymbol{\stigma}{LGR}{6} % ϛ (greek.ldf, teubner)
\DeclareTextSymbol{\varstigma}{LGR}{7} % stigma variant (CB.enc, teubner)
-% \DeclareTextSymbol{\vardigamma}{LGR}{7} % digamma variant (greek.ldf)
\DeclareTextSymbol{\koppa}{LGR}{18} % ϟ (greek small letter koppa)
-\DeclareTextSymbol{\textkoppagreek}{LGR}{18} % ϟ (puenc.def)
\DeclareTextSymbol{\qoppa}{LGR}{19} % ϙ (archaic koppa)
\DeclareTextSymbol{\Qoppa}{LGR}{21} % Ϙ (archaic Koppa)
-\DeclareTextSymbol{\Stigma}{LGR}{22} % ϹΤ ligature (teubner)
-\DeclareTextSymbol{\textStigmagreek}{LGR}{22} % ϹΤ ligature (puenc.def)
-% \DeclareTextSymbol{\Stigma}{LGR}{??} % Ϛ
+\DeclareTextSymbol{\Stigma}{LGR}{22} % Ϛ (teubner) in some fonts ϹΤ ligature
\DeclareTextSymbol{\Sampi}{LGR}{23} % Ϡ
-\DeclareTextSymbol{\textSampigreek}{LGR}{23} % Ϡ (puenc.def)
\DeclareTextSymbol{\sampi}{LGR}{27} % ϡ
-\DeclareTextSymbol{\textsampigreek}{LGR}{27} % ϡ (puend.def)
\DeclareTextSymbol{\anoteleia}{LGR}{38} % ·
+\DeclareTextSymbol{\textanoteleia}{LGR}{38} % ·
\DeclareTextSymbol{\erotimatiko}{LGR}{63} % ;
% \digamma used by amsmath for math-macro:
-\DeclareTextSymbol{\ddigamma}{LGR}{147} % ϝ (greek.ldf)
-\DeclareTextSymbol{\Digamma}{LGR}{195} % Ϝ (greek.ldf)
-\DeclareTextSymbol{\textdigamma}{LGR}{147} % ϝ with "text" prefix
-\DeclareTextSymbol{\textDigamma}{LGR}{195} % Ϝ with "text" prefix
-\DeclareTextSymbol{\textdigammagreek}{LGR}{147} % ϝ (puenc.def)
-\DeclareTextSymbol{\textDigammagreek}{LGR}{195} % Ϝ (puenc.def)
+\DeclareTextSymbol{\textdigamma}{LGR}{147} % ϝ (uni-3.def (ucs))
+\DeclareTextSymbol{\textDigamma}{LGR}{195} % Ϝ (uni-3.def (ucs))
+
+% Compatibility aliases (defined via `TextCommand` so that up/downcasing works
+% without the need for additional uclclist entries::
+
+\DeclareTextCommand{\vardigamma}{LGR}{\varstigma} % greek.ldf
+\DeclareTextCommand{\textSampigreek}{LGR}{\Sampi} % puenc.def
+\DeclareTextCommand{\textsampigreek}{LGR}{\sampi} % puenc.def
+\DeclareTextCommand{\textstigmagreek}{LGR}{\stigma} % puenc.def
+\DeclareTextCommand{\textkoppagreek}{LGR}{\koppa} % puenc.def
+\DeclareTextCommand{\textStigmagreek}{LGR}{\Stigma} % puenc.def
+\DeclareTextCommand{\ddigamma}{LGR}{\textdigamma} % greek.ldf
+\DeclareTextCommand{\textdigammagreek}{LGR}{\textdigamma} % puenc.def
+\DeclareTextCommand{\Digamma}{LGR}{\textDigamma} % greek.ldf
+\DeclareTextCommand{\textDigammagreek}{LGR}{\textDigamma} % puenc.def
-% numeral signs
+% Numeral signs
% '''''''''''''
% See also http://en.wikipedia.org/wiki/Greek_numerals
%
-% Names from babel_ and teubner_::
+% Names from babel_, teubner_, and hyperref_'s puenc.def::
-\DeclareTextSymbol{\anwtonos}{LGR}{254} % ʹ (Dexia keraia)
-\DeclareTextSymbol{\katwtonos}{LGR}{255} % ͵ (Aristeri keraia)
-
-% alias names for compatibility with hyperref's puenc.def::
-
-\DeclareTextSymbol{\textnumeralsigngreek}{LGR}{254}
-\DeclareTextSymbol{\textnumeralsignlowergreek}{LGR}{255}
+\DeclareTextSymbol{\anwtonos}{LGR}{254} % ʹ (Dexia keraia)
+\DeclareTextSymbol{\textnumeralsigngreek}{LGR}{254} % ʹ (puenc.def)
+\DeclareTextSymbol{\katwtonos}{LGR}{255} % ͵ (Aristeri keraia)
+\DeclareTextSymbol{\textnumeralsignlowergreek}{LGR}{255} % ͵ (puenc.def)
% Other
% """""
%
-% Characters that also exist in other font encodings
-%
-% * Define them for LGR if there is a matching glyph,
-% so that they work if LGR is the only chosen font encoding.
+% Characters that also exist in other font encodings:
%
-% * Use established macro names that match with other ``*enc.def`` files and
+% * define them for LGR if there is a matching glyph,
+% * use established macro names that match with other ``*enc.def`` files and
% ``textcomp.sty``.
%
% ::
@@ -388,7 +417,7 @@
\ProvideTextCommand{\textasciiacute}{LGR}{\char39\textcompwordmark} % '
\ProvideTextCommand{\textasciigrave}{LGR}{\char96\textcompwordmark} % `
\DeclareTextCommand{\textasciitilde}{LGR}{\char126\textcompwordmark} % ~
-% \DeclareTextSymbol{\textohm}{LGR}{87} % Ω (Ohm sign ≠ Omega)
+\DeclareTextSymbol{\textohm}{LGR}{87} % Ω (Ohm sign -> Omega)
\DeclareTextSymbol{\texteuro}{LGR}{24} % € \euro in greek.ldf
\DeclareTextSymbol{\textpercent}{LGR}{37} % %
\DeclareTextSymbol{\textperthousand}{LGR}{25} % ‰ \permille in greek.ldf
@@ -396,13 +425,26 @@
% T3
\DeclareTextSymbol{\textschwa}{LGR}{26} % ə
+% Not implemented
+% """""""""""""""
+%
+% The characters at position 16 and 17 are used in the ``\nexus`` macro
+% of the teubner_ package to form an extensible, hat-like bracket. In
+% ``CB.enc``, they are mapped to
+%
+% 16--MODIFIER LETTER LOW ACUTE ACCENT
+% 17--MODIFIER LETTER LOW GRAVE ACCENT
+%
+% but according to the documentation of Werner Lemberg's `babel patch`_,
+% they rather represent the left and right part of U+23E0 TOP TORTOISE
+% SHELL BRACKET.
+%
% Babel's ``lgrenc.def`` has some definitions to prevent surprises with
% macros that expect a Latin script. These definitions are problematic
-% in the font-encoding definition file as they
+% in a font-encoding definition file as they
%
% * require ``\textlatin`` which is defined in ``babel.def``,
-%
-% * overwrite TS1 symbols set as default by ``textcomp.sty``.
+% * prevent use of TS1 symbols set as default by ``textcomp.sty``.
%
% ::
@@ -411,328 +453,402 @@
%\ProvideTextCommand{\texttrademark}{LGR}{\textsuperscript{\textlatin{TM}}}
%\ProvideTextCommand{\SS}{LGR}{\textlatin{SS}}
-% How about::
-
-%\ProvideTextCommand{\SS}{LGR}{\UseTextSymbol{T1}{\SS}}
-%\ProvideTextCommand{\textcopyright}{LGR}{{\UseTextSymbol{T1}{\textcopyright}}}
-% ...?
-
+% They may be moved to ``greek.ldf`` one day (with a caveat for textcomp/TS1).
+%
+%
% Diacritics
% ~~~~~~~~~~
%
-% Based on the teubner_ package by Claudio Beccari and the `babel
-% patch`_ by Werner Lemberg but with composite diacritic definitions
-% (iterative diacritics).
+% This section defines `named macros`_ for Greek diacritics and standard
+% `symbol macros`_ as alias for simple diacritics. Convenient input
+% conventions for `composite diacritics`_ are defined as `composite
+% definitions`_.
%
% Advantages:
%
-% * get accented characters without resorting to the
-% ligature mechanism (allows proper kerning, cf. teubner-doc_).
-% * reduced probability of incompatibilities (compared to teubner_
-% diacritic macros).
% * input convention similar to LGR input encodings (just prepend a ``\``).
%
-% simple diacritics
-% """""""""""""""""
+% * Access pre-composed characters without resorting to the
+% ligature mechanism (allows proper kerning, cf. teubner-doc_).
+%
+% * Named macros can be used to ensure a font encoding supporting Greek is
+% used. However, substitution with pre-composed characters works only for
+% the active font encoding (cf. textalpha_). Named accent macros can also be
+% used instead of the ``\@tabacckludge`` by to-LaTeX converters to ensure
+% working also inside the tabbing environment.
+%
+% * Named macros are required for upcasing according to Greek typesetting
+% conventions (cf. `UPPERCASE`_ below) and for composite diacritics.
%
-% Define Greek diacritics as named macros with shortcut alias.
%
-% Direct defining of ``\<`` and ``\>`` fails with
-% ```! Missing $ inserted.'`` (clash with math definitions).
-% Also, we need aliases for proper upcasing (cf. `UPPERCASE`_ below). ::
+% Named macros
+% """"""""""""
+%
+% Definitions are based on the teubner_ package by Claudio Beccari, the ucs_
+% package, and the `babel patch`_ by Werner Lemberg. Names are derived from
+% the Unicode name with the prefix "acc" (cf. `How to name accent macros?`_
+% above) resulting in reduced probability of incompatibilities compared to the
+% two-letter teubner_ diacritic macros.
+%
+% Simple Greek diacritics::
-\DeclareTextAccent{\Dasia}{LGR}{60} % δασεῖα spiritus asper (rough breathing)
-\DeclareTextAccent{\Psili}{LGR}{62} % ψιλή spiritus lenis (smooth breathing)
-\DeclareTextAccent{\Tonos}{LGR}{39} % τόνος/ὀξεῖα tonos/oxia (acute)
-\DeclareTextAccent{\Varia}{LGR}{96} % βαρεῖα (grave)
-\DeclareTextAccent{\Perispomeni}{LGR}{126} % περισπωμένη (circonflex/tilde)
-\DeclareTextAccent{\Dialytika}{LGR}{34} % διαλυτικά (diaeresis/trema)
+\DeclareTextAccent{\accdialytika}{LGR}{34} % διαλυτικά (diaeresis/trema)
+\DeclareTextAccent{\acctonos}{LGR}{39} % τόνος/ὀξεῖα tonos/oxia (acute)
+\DeclareTextAccent{\accdasia}{LGR}{60} % δασεῖα spiritus asper (rough breathing)
+\DeclareTextAccent{\accpsili}{LGR}{62} % ψιλή spiritus lenis (smooth breathing)
+\DeclareTextAccent{\accvaria}{LGR}{96} % βαρεῖα (grave)
+\DeclareTextAccent{\accperispomeni}{LGR}{126} % περισπωμένη (circonflex/tilde)
-\DeclareTextCommand{\<}{LGR}{\Dasia}
-\DeclareTextCommand{\>}{LGR}{\Psili}
-\DeclareTextCommand{\'}{LGR}{\Tonos}
-\DeclareTextCommand{\`}{LGR}{\Varia}
-\DeclareTextCommand{\~}{LGR}{\Perispomeni}
-\DeclareTextCommand{\"}{LGR}{\Dialytika}
+% The sub-iota is input after the base character. In LGR fonts, ligatures are
+% defined for pre-composed characters, the postfix ligature does not interfere
+% with kerning::
-% These are not required as the postfix ligature
-% does not interfere with kerning::
+\DeclareTextSymbol{\prosgegrammeni}{LGR}{8} % ι "capital" sub-iota
+\DeclareTextSymbol{\ypogegrammeni}{LGR}{124} % ͺ "small" sub-iota
-\DeclareTextSymbol{\Ypogegrammeni}{LGR}{124} % "small" sub-iota
-\DeclareTextSymbol{\Prosgegrammeni}{LGR}{8} % "capital" sub-iota
+% Composite diacritics::
-% for critical editions or classical Greek::
+% Teubner name
+\DeclareTextAccent{\accdialytikaperispomeni}{LGR}{32} % Cd
+\DeclareTextAccent{\accdialytikatonos}{LGR}{35} % Ad
+\DeclareTextAccent{\accdialytikavaria}{LGR}{36} % Gd
-\DeclareTextAccent{\lowbreve}{LGR}{20} % low breve
-\DeclareTextAccent{\u}{LGR}{30} % breve
-\DeclareTextAccent{\=}{LGR}{31} % macron
+\DeclareTextAccent{\accdasiaperispomeni}{LGR}{64} % Cr
+\DeclareTextAccent{\accdasiavaria}{LGR}{67} % Gr
+\DeclareTextAccent{\accdasiaoxia}{LGR}{86} % Ar
-% The characters at position 16 and 17 are used in the ``\nexus`` macro
-% of the teubner_ package to form an extensible, hat-like bracket. In
-% ``CB.enc``, they are mapped to
-%
-% 16--MODIFIER LETTER LOW ACUTE ACCENT
-% 17--MODIFIER LETTER LOW GRAVE ACCENT
+\DeclareTextAccent{\accpsiliperispomeni}{LGR}{92} % Cs
+\DeclareTextAccent{\accpsilioxia}{LGR}{94} % As
+\DeclareTextAccent{\accpsilivaria}{LGR}{95} % Gs
+
+% For classical Greek and linguistics, the LGR font encoding contains a number
+% of additional diacritic symbols::
+
+\DeclareTextAccent{\subinvertedbreve}{LGR}{1} % INVERTED BREVE BELOW
+\DeclareTextAccent{\textsubarch}{LGR}{1} % (tipa)
+\DeclareTextAccent{\subbreve}{LGR}{20} % BREVE BELOW
+\DeclareTextAccent{\u}{LGR}{30} % BREVE
+\DeclareTextAccent{\=}{LGR}{31} % MACRON
+
+
+% Aliases
+% """""""
%
-% but according to the documentation of Werner Lemberg's `babel patch`_,
-% they rather represent the left and right part of U+23E0 TOP TORTOISE
-% SHELL BRACKET.
+% _`Symbol macros`::
+
+\DeclareTextCommand{\"}{LGR}{\accdialytika}
+\DeclareTextCommand{\'}{LGR}{\acctonos}
+\DeclareTextCommand{\`}{LGR}{\accvaria}
+\DeclareTextCommand{\~}{LGR}{\accperispomeni}
+\DeclareTextCommand{\<}{LGR}{\accdasia}
+\DeclareTextCommand{\>}{LGR}{\accpsili}
+
+% TODO: do we also want alternative symbols for the breathings (cf. X compose
+% table, LCI encoding)? ::
+
+%\DeclareTextCommand{\(}{LGR}{\accdasia}
+%\DeclareTextCommand{\)}{LGR}{\accpsili}
+
+% Two Unicode names for one character::
+
+\DeclareTextCommand{\accoxia}{LGR}{\acctonos}
+\DeclareTextCommand{\acckoronis}{LGR}{\accpsili}
+
+% Backwards compatibility with LGRx versions < 0.7::
+
+\DeclareTextCommand{\Ypogegrammeni}{LGR}{\ypogegrammeni}
+\DeclareTextCommand{\Prosgegrammeni}{LGR}{\prosgegrammeni}
+
+\DeclareTextCommand{\lowbreve}{LGR}{\brevebelow}
+\DeclareTextCommand{\Dasia}{LGR}{\accdasia}
+\DeclareTextCommand{\Psili}{LGR}{\accpsili}
+\DeclareTextCommand{\Tonos}{LGR}{\acctonos}
+\DeclareTextCommand{\Varia}{LGR}{\accvaria}
+\DeclareTextCommand{\Perispomeni}{LGR}{\accperispomeni}
+\DeclareTextCommand{\Dialytika}{LGR}{\accdialytika}
+
+\DeclareTextCommand{\DialytikaPerispomeni}{LGR}{\accdialytikaperispomeni}
+\DeclareTextCommand{\DialytikaTonos}{LGR}{\accdialytikatonos}
+\DeclareTextCommand{\DialytikaVaria}{LGR}{\accdialytikavaria}
+\DeclareTextCommand{\DasiaPerispomeni}{LGR}{\accdasiaperispomeni}
+\DeclareTextCommand{\DasiaVaria}{LGR}{\accdasiavaria}
+\DeclareTextCommand{\DasiaOxia}{LGR}{\accdasiaoxia}
+\DeclareTextCommand{\PsiliPerispomeni}{LGR}{\accpsiliperispomeni}
+\DeclareTextCommand{\PsiliOxia}{LGR}{\accpsilioxia}
+\DeclareTextCommand{\PsiliVaria}{LGR}{\accpsilivaria}
+
+
+% Composite definitions
+% ~~~~~~~~~~~~~~~~~~~~~
%
+% Composite diacritics
+% """"""""""""""""""""
%
-% composite diacritics
+% Composite accents can be input as sequence of simple diacritics (in
+% arbitrary order) via named macro, symbol macro and "transcription
+% characters", e.g. ``\accdialytica\accvaria\textalpha``, ``\"\'\textalpha``,
+% ``\"'\textalpha``, or ``\'"\textalpha``.
+%
+% Separate definitions for the supported variants of the second input token
+% are required as composition is based on the non-expanded input
+
+% The composition with simple "transcription characters" must also be defined
+% for the symbol macros, otherwise it fails with ``\Makeuppercase``)::
+
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\acctonos}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\'}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{'}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\"}{LGR}{'}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\accvaria}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\`}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{`}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\"}{LGR}{`}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\accperispomeni}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\~}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{~}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\"}{LGR}{~}{\accdialytikaperispomeni}
+
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\accdialytika}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\"}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{"}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\'}{LGR}{"}{\accdialytikatonos}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\accdasia}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\<}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{<}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\'}{LGR}{<}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\accpsili}{\accpsilioxia}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\>}{\accpsilioxia}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{>}{\accpsilioxia}
+\DeclareTextCompositeCommand{\'}{LGR}{>}{\accpsilioxia}
+
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\accdialytika}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\"}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{"}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\`}{LGR}{"}{\accdialytikavaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\accdasia}{\accdasiavaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\<}{\accdasiavaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{<}{\accdasiavaria}
+\DeclareTextCompositeCommand{\`}{LGR}{<}{\accdasiavaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\accpsili}{\accpsilivaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\>}{\accpsilivaria}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{>}{\accpsilivaria}
+\DeclareTextCompositeCommand{\`}{LGR}{>}{\accpsilivaria}
+
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{\accdialytika}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{\"}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{"}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\~}{LGR}{"}{\accdialytikaperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{\accdasia}{\accdasiaperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{\<}{\accdasiaperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{<}{\accdasiaperispomeni}
+\DeclareTextCompositeCommand{\~}{LGR}{<}{\accdasiaperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{\accpsili}{\accpsiliperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{\>}{\accpsiliperispomeni}
+\DeclareTextCompositeCommand{\accperispomeni}{LGR}{>}{\accpsiliperispomeni}
+\DeclareTextCompositeCommand{\~}{LGR}{>}{\accpsiliperispomeni}
+
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\acctonos}{\accpsilioxia}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\'}{\accpsilioxia}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{'}{\accpsilioxia}
+\DeclareTextCompositeCommand{\>}{LGR}{'}{\accpsilioxia}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\accvaria}{\accpsilivaria}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\`}{\accpsilivaria}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{`}{\accpsilivaria}
+\DeclareTextCompositeCommand{\>}{LGR}{`}{\accpsilivaria}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\accperispomeni}{\accpsiliperispomeni}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\~}{\accpsiliperispomeni}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{~}{\accpsiliperispomeni}
+\DeclareTextCompositeCommand{\>}{LGR}{~}{\accpsiliperispomeni}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\acctonos}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\'}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{'}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\<}{LGR}{'}{\accdasiaoxia}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\accvaria}{\accdasiavaria}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\`}{\accdasiavaria}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{`}{\accdasiavaria}
+\DeclareTextCompositeCommand{\<}{LGR}{`}{\accdasiavaria}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\accperispomeni}{\accdasiaperispomeni}
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\~}{\accdasiaperispomeni}
+\DeclareTextCompositeCommand{\<}{LGR}{~}{\accdasiaperispomeni}
+
+
+% Pre-composed letters
% """"""""""""""""""""
+% Small letters with diacritics
+% '''''''''''''''''''''''''''''
%
-% Definitions::
-
-% Unicode Name Teubner name
-\DeclareTextAccent{\DasiaOxia}{LGR}{86} % Ar
-\DeclareTextAccent{\DasiaVaria}{LGR}{67} % Gr
-\DeclareTextAccent{\DasiaPerispomeni}{LGR}{64} % Cr
-
-\DeclareTextAccent{\PsiliOxia}{LGR}{94} % As
-\DeclareTextAccent{\PsiliVaria}{LGR}{95} % Gs
-\DeclareTextAccent{\PsiliPerispomeni}{LGR}{92} % Cs
-
-\DeclareTextAccent{\DialytikaTonos}{LGR}{35} % Ad, tonos/oxia
-\DeclareTextAccent{\DialytikaVaria}{LGR}{36} % Gd
-\DeclareTextAccent{\DialytikaPerispomeni}{LGR}{32} % Cd
-
-% Composition from simple diacritics
-% (the composition with simple "transcription characters" is done for
-% the shortcut marcros, otherwise it fails with ``\Makeuppercase``)::
-
-\DeclareTextCompositeCommand{\Dialytika}{LGR}{\Tonos}{\DialytikaTonos}
-\DeclareTextCompositeCommand{\"}{LGR}{'}{\DialytikaTonos}
-\DeclareTextCompositeCommand{\"}{LGR}{\'}{\DialytikaTonos}
-\DeclareTextCompositeCommand{\Dialytika}{LGR}{\Varia}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\"}{LGR}{`}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\"}{LGR}{\`}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\Dialytika}{LGR}{\Perispomeni}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\"}{LGR}{~}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\"}{LGR}{\~}{\DialytikaPerispomeni}
-
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Dialytika}{\DialytikaTonos}
-\DeclareTextCompositeCommand{\'}{LGR}{"}{\DialytikaTonos}
-\DeclareTextCompositeCommand{\'}{LGR}{\"}{\DialytikaTonos}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Dasia}{\DasiaOxia}
-\DeclareTextCompositeCommand{\'}{LGR}{<}{\DasiaOxia}
-\DeclareTextCompositeCommand{\'}{LGR}{\<}{\DasiaOxia}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\Psili}{\PsiliOxia}
-\DeclareTextCompositeCommand{\'}{LGR}{>}{\PsiliOxia}
-\DeclareTextCompositeCommand{\'}{LGR}{\>}{\PsiliOxia}
-
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Dialytika}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\`}{LGR}{"}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\`}{LGR}{\"}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Dasia}{\DasiaVaria}
-\DeclareTextCompositeCommand{\`}{LGR}{<}{\DasiaVaria}
-\DeclareTextCompositeCommand{\`}{LGR}{\<}{\DasiaVaria}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\Psili}{\PsiliVaria}
-\DeclareTextCompositeCommand{\`}{LGR}{>}{\PsiliVaria}
-\DeclareTextCompositeCommand{\`}{LGR}{\>}{\PsiliVaria}
-
-\DeclareTextCompositeCommand{\Perispomeni}{LGR}{\Dialytika}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\~}{LGR}{"}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\~}{LGR}{\"}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\Perispomeni}{LGR}{\Dasia}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\~}{LGR}{<}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\~}{LGR}{\<}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\Perispomeni}{LGR}{\Psili}{\PsiliPerispomeni}
-\DeclareTextCompositeCommand{\~}{LGR}{>}{\PsiliPerispomeni}
-\DeclareTextCompositeCommand{\~}{LGR}{\>}{\PsiliPerispomeni}
-
-\DeclareTextCompositeCommand{\Psili}{LGR}{\Tonos}{\PsiliOxia}
-\DeclareTextCompositeCommand{\>}{LGR}{'}{\PsiliOxia}
-\DeclareTextCompositeCommand{\>}{LGR}{\'}{\PsiliOxia}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\Varia}{\PsiliVaria}
-\DeclareTextCompositeCommand{\>}{LGR}{`}{\PsiliVaria}
-\DeclareTextCompositeCommand{\>}{LGR}{\`}{\PsiliVaria}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\Perispomeni}{\PsiliPerispomeni}
-\DeclareTextCompositeCommand{\>}{LGR}{~}{\PsiliPerispomeni}
-\DeclareTextCompositeCommand{\>}{LGR}{\~}{\PsiliPerispomeni}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Tonos}{\DasiaOxia}
-\DeclareTextCompositeCommand{\<}{LGR}{'}{\DasiaOxia}
-\DeclareTextCompositeCommand{\<}{LGR}{\'}{\DasiaOxia}
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Varia}{\DasiaVaria}
-\DeclareTextCompositeCommand{\<}{LGR}{`}{\DasiaVaria}
-\DeclareTextCompositeCommand{\<}{LGR}{\`}{\DasiaVaria}
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\Perispomeni}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\<}{LGR}{~}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\<}{LGR}{\~}{\DasiaPerispomeni}
-
-% Pre-composed letters with diacritics
% (from teubner_ with changed names of the composite accents)::
-\DeclareTextComposite{\Varia}{LGR}{a}{128}
-\DeclareTextComposite{\Dasia}{LGR}{a}{129}
-\DeclareTextComposite{\Psili}{LGR}{a}{130}
-\DeclareTextComposite{\DasiaVaria}{LGR}{a}{131}
-\DeclareTextComposite{\Tonos}{LGR}{a}{136}
-\DeclareTextComposite{\DasiaOxia}{LGR}{a}{137}
-\DeclareTextComposite{\PsiliOxia}{LGR}{a}{138}
-\DeclareTextComposite{\PsiliVaria}{LGR}{a}{139}
-\DeclareTextComposite{\Perispomeni}{LGR}{a}{144}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{a}{145}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{a}{146}
-\DeclareTextComposite{\Varia}{LGR}{h}{152}
-\DeclareTextComposite{\Dasia}{LGR}{h}{153}
-\DeclareTextComposite{\Psili}{LGR}{h}{154}
-\DeclareTextComposite{\Tonos}{LGR}{h}{160}
-\DeclareTextComposite{\DasiaOxia}{LGR}{h}{161}
-\DeclareTextComposite{\PsiliOxia}{LGR}{h}{162}
-\DeclareTextComposite{\DasiaVaria}{LGR}{h}{163}
-\DeclareTextComposite{\Perispomeni}{LGR}{h}{168}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{h}{169}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{h}{170}
-\DeclareTextComposite{\PsiliVaria}{LGR}{h}{171}
-\DeclareTextComposite{\Varia}{LGR}{w}{176}
-\DeclareTextComposite{\Dasia}{LGR}{w}{177}
-\DeclareTextComposite{\Psili}{LGR}{w}{178}
-\DeclareTextComposite{\DasiaVaria}{LGR}{w}{179}
-\DeclareTextComposite{\Tonos}{LGR}{w}{184}
-\DeclareTextComposite{\DasiaOxia}{LGR}{w}{185}
-\DeclareTextComposite{\PsiliOxia}{LGR}{w}{186}
-\DeclareTextComposite{\PsiliVaria}{LGR}{w}{187}
-\DeclareTextComposite{\Perispomeni}{LGR}{w}{192}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{w}{193}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{w}{194}
-\DeclareTextComposite{\Varia}{LGR}{i}{200}
-\DeclareTextComposite{\Dasia}{LGR}{i}{201}
-\DeclareTextComposite{\Psili}{LGR}{i}{202}
-\DeclareTextComposite{\DasiaVaria}{LGR}{i}{203}
-\DeclareTextComposite{\Tonos}{LGR}{i}{208}
-\DeclareTextComposite{\DasiaOxia}{LGR}{i}{209}
-\DeclareTextComposite{\PsiliOxia}{LGR}{i}{210}
-\DeclareTextComposite{\PsiliVaria}{LGR}{i}{211}
-\DeclareTextComposite{\Perispomeni}{LGR}{i}{216}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{i}{217}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{i}{218}
-\DeclareTextComposite{\Dialytika}{LGR}{i}{240}
-\DeclareTextComposite{\DialytikaVaria}{LGR}{i}{241}
-\DeclareTextComposite{\DialytikaTonos}{LGR}{i}{242}
-\DeclareTextComposite{\DialytikaPerispomeni}{LGR}{i}{243}
-\DeclareTextComposite{\Varia}{LGR}{u}{204}
-\DeclareTextComposite{\Dasia}{LGR}{u}{205}
-\DeclareTextComposite{\Psili}{LGR}{u}{206}
-\DeclareTextComposite{\DasiaVaria}{LGR}{u}{207}
-\DeclareTextComposite{\Tonos}{LGR}{u}{212}
-\DeclareTextComposite{\DasiaOxia}{LGR}{u}{213}
-\DeclareTextComposite{\PsiliOxia}{LGR}{u}{214}
-\DeclareTextComposite{\PsiliVaria}{LGR}{u}{215}
-\DeclareTextComposite{\Perispomeni}{LGR}{u}{220}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{u}{221}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{u}{222}
-\DeclareTextComposite{\Dialytika}{LGR}{u}{244}
-\DeclareTextComposite{\DialytikaVaria}{LGR}{u}{245}
-\DeclareTextComposite{\DialytikaTonos}{LGR}{u}{246}
-\DeclareTextComposite{\DialytikaPerispomeni}{LGR}{u}{247}
-\DeclareTextComposite{\Varia}{LGR}{e}{224}
-\DeclareTextComposite{\Dasia}{LGR}{e}{225}
-\DeclareTextComposite{\Psili}{LGR}{e}{226}
-\DeclareTextComposite{\DasiaVaria}{LGR}{e}{227}
-\DeclareTextComposite{\Tonos}{LGR}{e}{232}
-\DeclareTextComposite{\DasiaOxia}{LGR}{e}{233}
-\DeclareTextComposite{\PsiliOxia}{LGR}{e}{234}
-\DeclareTextComposite{\PsiliVaria}{LGR}{e}{235}
-\DeclareTextComposite{\Varia}{LGR}{o}{228}
-\DeclareTextComposite{\Dasia}{LGR}{o}{229}
-\DeclareTextComposite{\Psili}{LGR}{o}{230}
-\DeclareTextComposite{\DasiaVaria}{LGR}{o}{231}
-\DeclareTextComposite{\Tonos}{LGR}{o}{236}
-\DeclareTextComposite{\DasiaOxia}{LGR}{o}{237}
-\DeclareTextComposite{\PsiliOxia}{LGR}{o}{238}
-\DeclareTextComposite{\PsiliVaria}{LGR}{o}{239}
-\DeclareTextComposite{\Dasia}{LGR}{r}{251}
-\DeclareTextComposite{\Psili}{LGR}{r}{252}
-
-% Do the same for the ``\text*`` macros::
-
-\DeclareTextComposite{\Varia}{LGR}{\textalpha}{128}
-\DeclareTextComposite{\Dasia}{LGR}{\textalpha}{129}
-\DeclareTextComposite{\Psili}{LGR}{\textalpha}{130}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\textalpha}{131}
-\DeclareTextComposite{\Tonos}{LGR}{\textalpha}{136}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\textalpha}{137}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\textalpha}{138}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\textalpha}{139}
-\DeclareTextComposite{\Perispomeni}{LGR}{\textalpha}{144}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\textalpha}{145}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\textalpha}{146}
-\DeclareTextComposite{\Varia}{LGR}{\texteta}{152}
-\DeclareTextComposite{\Dasia}{LGR}{\texteta}{153}
-\DeclareTextComposite{\Psili}{LGR}{\texteta}{154}
-\DeclareTextComposite{\Tonos}{LGR}{\texteta}{160}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\texteta}{161}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\texteta}{162}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\texteta}{163}
-\DeclareTextComposite{\Perispomeni}{LGR}{\texteta}{168}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\texteta}{169}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\texteta}{170}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\texteta}{171}
-\DeclareTextComposite{\Varia}{LGR}{\textomega}{176}
-\DeclareTextComposite{\Dasia}{LGR}{\textomega}{177}
-\DeclareTextComposite{\Psili}{LGR}{\textomega}{178}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\textomega}{179}
-\DeclareTextComposite{\Tonos}{LGR}{\textomega}{184}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\textomega}{185}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\textomega}{186}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\textomega}{187}
-\DeclareTextComposite{\Perispomeni}{LGR}{\textomega}{192}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\textomega}{193}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\textomega}{194}
-\DeclareTextComposite{\Varia}{LGR}{\textiota}{200}
-\DeclareTextComposite{\Dasia}{LGR}{\textiota}{201}
-\DeclareTextComposite{\Psili}{LGR}{\textiota}{202}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\textiota}{203}
-\DeclareTextComposite{\Tonos}{LGR}{\textiota}{208}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\textiota}{209}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\textiota}{210}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\textiota}{211}
-\DeclareTextComposite{\Perispomeni}{LGR}{\textiota}{216}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\textiota}{217}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\textiota}{218}
-\DeclareTextComposite{\Dialytika}{LGR}{\textiota}{240}
-\DeclareTextComposite{\DialytikaVaria}{LGR}{\textiota}{241}
-\DeclareTextComposite{\DialytikaTonos}{LGR}{\textiota}{242}
-\DeclareTextComposite{\DialytikaPerispomeni}{LGR}{\textiota}{243}
-\DeclareTextComposite{\Varia}{LGR}{\textupsilon}{204}
-\DeclareTextComposite{\Dasia}{LGR}{\textupsilon}{205}
-\DeclareTextComposite{\Psili}{LGR}{\textupsilon}{206}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\textupsilon}{207}
-\DeclareTextComposite{\Tonos}{LGR}{\textupsilon}{212}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\textupsilon}{213}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\textupsilon}{214}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\textupsilon}{215}
-\DeclareTextComposite{\Perispomeni}{LGR}{\textupsilon}{220}
-\DeclareTextComposite{\DasiaPerispomeni}{LGR}{\textupsilon}{221}
-\DeclareTextComposite{\PsiliPerispomeni}{LGR}{\textupsilon}{222}
-\DeclareTextComposite{\Dialytika}{LGR}{\textupsilon}{244}
-\DeclareTextComposite{\DialytikaVaria}{LGR}{\textupsilon}{245}
-\DeclareTextComposite{\DialytikaTonos}{LGR}{\textupsilon}{246}
-\DeclareTextComposite{\DialytikaPerispomeni}{LGR}{\textupsilon}{247}
-\DeclareTextComposite{\Varia}{LGR}{\textepsilon}{224}
-\DeclareTextComposite{\Dasia}{LGR}{\textepsilon}{225}
-\DeclareTextComposite{\Psili}{LGR}{\textepsilon}{226}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\textepsilon}{227}
-\DeclareTextComposite{\Tonos}{LGR}{\textepsilon}{232}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\textepsilon}{233}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\textepsilon}{234}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\textepsilon}{235}
-\DeclareTextComposite{\Varia}{LGR}{\textomicron}{228}
-\DeclareTextComposite{\Dasia}{LGR}{\textomicron}{229}
-\DeclareTextComposite{\Psili}{LGR}{\textomicron}{230}
-\DeclareTextComposite{\DasiaVaria}{LGR}{\textomicron}{231}
-\DeclareTextComposite{\Tonos}{LGR}{\textomicron}{236}
-\DeclareTextComposite{\DasiaOxia}{LGR}{\textomicron}{237}
-\DeclareTextComposite{\PsiliOxia}{LGR}{\textomicron}{238}
-\DeclareTextComposite{\PsiliVaria}{LGR}{\textomicron}{239}
-\DeclareTextComposite{\Dasia}{LGR}{r}{251}
-\DeclareTextComposite{\Psili}{LGR}{r}{252}
-
-
-% Capital letters
-% ~~~~~~~~~~~~~~~
+\DeclareTextComposite{\accvaria}{LGR}{a}{128}
+\DeclareTextComposite{\accdasia}{LGR}{a}{129}
+\DeclareTextComposite{\accpsili}{LGR}{a}{130}
+\DeclareTextComposite{\accdasiavaria}{LGR}{a}{131}
+\DeclareTextComposite{\acctonos}{LGR}{a}{136}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{a}{137}
+\DeclareTextComposite{\accpsilioxia}{LGR}{a}{138}
+\DeclareTextComposite{\accpsilivaria}{LGR}{a}{139}
+\DeclareTextComposite{\accperispomeni}{LGR}{a}{144}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{a}{145}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{a}{146}
+\DeclareTextComposite{\accvaria}{LGR}{h}{152}
+\DeclareTextComposite{\accdasia}{LGR}{h}{153}
+\DeclareTextComposite{\accpsili}{LGR}{h}{154}
+\DeclareTextComposite{\acctonos}{LGR}{h}{160}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{h}{161}
+\DeclareTextComposite{\accpsilioxia}{LGR}{h}{162}
+\DeclareTextComposite{\accdasiavaria}{LGR}{h}{163}
+\DeclareTextComposite{\accperispomeni}{LGR}{h}{168}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{h}{169}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{h}{170}
+\DeclareTextComposite{\accpsilivaria}{LGR}{h}{171}
+\DeclareTextComposite{\accvaria}{LGR}{w}{176}
+\DeclareTextComposite{\accdasia}{LGR}{w}{177}
+\DeclareTextComposite{\accpsili}{LGR}{w}{178}
+\DeclareTextComposite{\accdasiavaria}{LGR}{w}{179}
+\DeclareTextComposite{\acctonos}{LGR}{w}{184}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{w}{185}
+\DeclareTextComposite{\accpsilioxia}{LGR}{w}{186}
+\DeclareTextComposite{\accpsilivaria}{LGR}{w}{187}
+\DeclareTextComposite{\accperispomeni}{LGR}{w}{192}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{w}{193}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{w}{194}
+\DeclareTextComposite{\accvaria}{LGR}{i}{200}
+\DeclareTextComposite{\accdasia}{LGR}{i}{201}
+\DeclareTextComposite{\accpsili}{LGR}{i}{202}
+\DeclareTextComposite{\accdasiavaria}{LGR}{i}{203}
+\DeclareTextComposite{\acctonos}{LGR}{i}{208}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{i}{209}
+\DeclareTextComposite{\accpsilioxia}{LGR}{i}{210}
+\DeclareTextComposite{\accpsilivaria}{LGR}{i}{211}
+\DeclareTextComposite{\accperispomeni}{LGR}{i}{216}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{i}{217}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{i}{218}
+\DeclareTextComposite{\accdialytika}{LGR}{i}{240}
+\DeclareTextComposite{\accdialytikavaria}{LGR}{i}{241}
+\DeclareTextComposite{\accdialytikatonos}{LGR}{i}{242}
+\DeclareTextComposite{\accdialytikaperispomeni}{LGR}{i}{243}
+\DeclareTextComposite{\accvaria}{LGR}{u}{204}
+\DeclareTextComposite{\accdasia}{LGR}{u}{205}
+\DeclareTextComposite{\accpsili}{LGR}{u}{206}
+\DeclareTextComposite{\accdasiavaria}{LGR}{u}{207}
+\DeclareTextComposite{\acctonos}{LGR}{u}{212}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{u}{213}
+\DeclareTextComposite{\accpsilioxia}{LGR}{u}{214}
+\DeclareTextComposite{\accpsilivaria}{LGR}{u}{215}
+\DeclareTextComposite{\accperispomeni}{LGR}{u}{220}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{u}{221}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{u}{222}
+\DeclareTextComposite{\accdialytika}{LGR}{u}{244}
+\DeclareTextComposite{\accdialytikavaria}{LGR}{u}{245}
+\DeclareTextComposite{\accdialytikatonos}{LGR}{u}{246}
+\DeclareTextComposite{\accdialytikaperispomeni}{LGR}{u}{247}
+\DeclareTextComposite{\accvaria}{LGR}{e}{224}
+\DeclareTextComposite{\accdasia}{LGR}{e}{225}
+\DeclareTextComposite{\accpsili}{LGR}{e}{226}
+\DeclareTextComposite{\accdasiavaria}{LGR}{e}{227}
+\DeclareTextComposite{\acctonos}{LGR}{e}{232}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{e}{233}
+\DeclareTextComposite{\accpsilioxia}{LGR}{e}{234}
+\DeclareTextComposite{\accpsilivaria}{LGR}{e}{235}
+\DeclareTextComposite{\accvaria}{LGR}{o}{228}
+\DeclareTextComposite{\accdasia}{LGR}{o}{229}
+\DeclareTextComposite{\accpsili}{LGR}{o}{230}
+\DeclareTextComposite{\accdasiavaria}{LGR}{o}{231}
+\DeclareTextComposite{\acctonos}{LGR}{o}{236}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{o}{237}
+\DeclareTextComposite{\accpsilioxia}{LGR}{o}{238}
+\DeclareTextComposite{\accpsilivaria}{LGR}{o}{239}
+\DeclareTextComposite{\accdasia}{LGR}{r}{251}
+\DeclareTextComposite{\accpsili}{LGR}{r}{252}
+
+% Pre-composed letters with diacritics + LICR macros::
+
+\DeclareTextComposite{\accvaria}{LGR}{\textalpha}{128}
+\DeclareTextComposite{\accdasia}{LGR}{\textalpha}{129}
+\DeclareTextComposite{\accpsili}{LGR}{\textalpha}{130}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\textalpha}{131}
+\DeclareTextComposite{\acctonos}{LGR}{\textalpha}{136}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\textalpha}{137}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\textalpha}{138}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\textalpha}{139}
+\DeclareTextComposite{\accperispomeni}{LGR}{\textalpha}{144}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\textalpha}{145}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\textalpha}{146}
+\DeclareTextComposite{\accvaria}{LGR}{\texteta}{152}
+\DeclareTextComposite{\accdasia}{LGR}{\texteta}{153}
+\DeclareTextComposite{\accpsili}{LGR}{\texteta}{154}
+\DeclareTextComposite{\acctonos}{LGR}{\texteta}{160}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\texteta}{161}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\texteta}{162}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\texteta}{163}
+\DeclareTextComposite{\accperispomeni}{LGR}{\texteta}{168}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\texteta}{169}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\texteta}{170}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\texteta}{171}
+\DeclareTextComposite{\accvaria}{LGR}{\textomega}{176}
+\DeclareTextComposite{\accdasia}{LGR}{\textomega}{177}
+\DeclareTextComposite{\accpsili}{LGR}{\textomega}{178}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\textomega}{179}
+\DeclareTextComposite{\acctonos}{LGR}{\textomega}{184}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\textomega}{185}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\textomega}{186}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\textomega}{187}
+\DeclareTextComposite{\accperispomeni}{LGR}{\textomega}{192}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\textomega}{193}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\textomega}{194}
+\DeclareTextComposite{\accvaria}{LGR}{\textiota}{200}
+\DeclareTextComposite{\accdasia}{LGR}{\textiota}{201}
+\DeclareTextComposite{\accpsili}{LGR}{\textiota}{202}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\textiota}{203}
+\DeclareTextComposite{\acctonos}{LGR}{\textiota}{208}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\textiota}{209}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\textiota}{210}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\textiota}{211}
+\DeclareTextComposite{\accperispomeni}{LGR}{\textiota}{216}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\textiota}{217}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\textiota}{218}
+\DeclareTextComposite{\accdialytika}{LGR}{\textiota}{240}
+\DeclareTextComposite{\accdialytikavaria}{LGR}{\textiota}{241}
+\DeclareTextComposite{\accdialytikatonos}{LGR}{\textiota}{242}
+\DeclareTextComposite{\accdialytikaperispomeni}{LGR}{\textiota}{243}
+\DeclareTextComposite{\accvaria}{LGR}{\textupsilon}{204}
+\DeclareTextComposite{\accdasia}{LGR}{\textupsilon}{205}
+\DeclareTextComposite{\accpsili}{LGR}{\textupsilon}{206}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\textupsilon}{207}
+\DeclareTextComposite{\acctonos}{LGR}{\textupsilon}{212}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\textupsilon}{213}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\textupsilon}{214}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\textupsilon}{215}
+\DeclareTextComposite{\accperispomeni}{LGR}{\textupsilon}{220}
+\DeclareTextComposite{\accdasiaperispomeni}{LGR}{\textupsilon}{221}
+\DeclareTextComposite{\accpsiliperispomeni}{LGR}{\textupsilon}{222}
+\DeclareTextComposite{\accdialytika}{LGR}{\textupsilon}{244}
+\DeclareTextComposite{\accdialytikavaria}{LGR}{\textupsilon}{245}
+\DeclareTextComposite{\accdialytikatonos}{LGR}{\textupsilon}{246}
+\DeclareTextComposite{\accdialytikaperispomeni}{LGR}{\textupsilon}{247}
+\DeclareTextComposite{\accvaria}{LGR}{\textepsilon}{224}
+\DeclareTextComposite{\accdasia}{LGR}{\textepsilon}{225}
+\DeclareTextComposite{\accpsili}{LGR}{\textepsilon}{226}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\textepsilon}{227}
+\DeclareTextComposite{\acctonos}{LGR}{\textepsilon}{232}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\textepsilon}{233}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\textepsilon}{234}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\textepsilon}{235}
+\DeclareTextComposite{\accvaria}{LGR}{\textomicron}{228}
+\DeclareTextComposite{\accdasia}{LGR}{\textomicron}{229}
+\DeclareTextComposite{\accpsili}{LGR}{\textomicron}{230}
+\DeclareTextComposite{\accdasiavaria}{LGR}{\textomicron}{231}
+\DeclareTextComposite{\acctonos}{LGR}{\textomicron}{236}
+\DeclareTextComposite{\accdasiaoxia}{LGR}{\textomicron}{237}
+\DeclareTextComposite{\accpsilioxia}{LGR}{\textomicron}{238}
+\DeclareTextComposite{\accpsilivaria}{LGR}{\textomicron}{239}
+\DeclareTextComposite{\accdasia}{LGR}{r}{251}
+\DeclareTextComposite{\accpsili}{LGR}{r}{252}
+
+
+% Capital letters with diacritics
+% '''''''''''''''''''''''''''''''
%
% In Greek, diacritics are omitted in all-uppercase words, but kept as part
% of an uppercase initial (written before rather than above the letter).
@@ -742,160 +858,158 @@
%
% -- http://en.wikipedia.org/wiki/Capitalization
%
-% Title Case
-% """"""""""
-%
-% Place diacritics before instead of above::
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{A}{<A}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{A}{<`A}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{A}{<'A}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{A}{<\char126A}
-\DeclareTextCompositeCommand{\Psili}{LGR}{A}{>A}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{A}{>`A}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{A}{>'A}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{A}{>\char126A}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{A}{'A}
-\DeclareTextCompositeCommand{\Varia}{LGR}{A}{`A}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{E}{<E}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{E}{<'E}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{E}{<`E}
-\DeclareTextCompositeCommand{\Psili}{LGR}{E}{>E}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{E}{>'E}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{E}{>`E}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{E}{'E}
-\DeclareTextCompositeCommand{\Varia}{LGR}{E}{`E}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{H}{<H}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{H}{<`H}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{H}{<'H}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{H}{<\char126H}
-\DeclareTextCompositeCommand{\Psili}{LGR}{H}{>H}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{H}{>`H}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{H}{>'H}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{H}{>\char126H}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{H}{'H}
-\DeclareTextCompositeCommand{\Varia}{LGR}{H}{`H}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{I}{<I}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{I}{<`I}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{I}{<'I}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{I}{<\char126I}
-\DeclareTextCompositeCommand{\Psili}{LGR}{I}{>I}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{I}{>`I}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{I}{>'I}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{I}{>\char126I}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{I}{'I}
-\DeclareTextCompositeCommand{\Varia}{LGR}{I}{`I}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{O}{<O}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{O}{<`O}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{O}{<'O}
-\DeclareTextCompositeCommand{\Psili}{LGR}{O}{>O}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{O}{>`O}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{O}{>'O}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{O}{'O}
-\DeclareTextCompositeCommand{\Varia}{LGR}{O}{`O}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{U}{<U}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{U}{<`U}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{U}{<'U}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{U}{<\char126U}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{U}{'U}
-\DeclareTextCompositeCommand{\Varia}{LGR}{U}{`U}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{W}{<W}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{W}{<`W}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{W}{<'W}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{W}{<\char126W}
-\DeclareTextCompositeCommand{\Psili}{LGR}{W}{>W}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{W}{>`W}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{W}{>'W}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{W}{>\char126W}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{W}{'W}
-\DeclareTextCompositeCommand{\Varia}{LGR}{W}{`W}
+% In Title Case, place diacritics before instead of above the base character::
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{A}{<A}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{A}{<`A}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{A}{<'A}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{A}{<\char126A}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{A}{>A}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{A}{>`A}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{A}{>'A}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{A}{>\char126A}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{A}{'A}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{A}{`A}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{E}{<E}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{E}{<'E}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{E}{<`E}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{E}{>E}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{E}{>'E}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{E}{>`E}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{E}{'E}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{E}{`E}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{H}{<H}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{H}{<`H}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{H}{<'H}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{H}{<\char126H}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{H}{>H}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{H}{>`H}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{H}{>'H}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{H}{>\char126H}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{H}{'H}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{H}{`H}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{I}{<I}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{I}{<`I}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{I}{<'I}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{I}{<\char126I}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{I}{>I}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{I}{>`I}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{I}{>'I}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{I}{>\char126I}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{I}{'I}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{I}{`I}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{O}{<O}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{O}{<`O}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{O}{<'O}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{O}{>O}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{O}{>`O}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{O}{>'O}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{O}{'O}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{O}{`O}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{U}{<U}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{U}{<`U}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{U}{<'U}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{U}{<\char126U}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{U}{'U}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{U}{`U}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{W}{<W}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{W}{<`W}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{W}{<'W}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{W}{<\char126W}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{W}{>W}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{W}{>`W}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{W}{>'W}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{W}{>\char126W}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{W}{'W}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{W}{`W}
% Except for the dialytika::
-\DeclareTextComposite{\Dialytika}{LGR}{I}{219}
-\DeclareTextComposite{\Dialytika}{LGR}{U}{223}
-
-% Do the same for the ``\text*`` macros::
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textAlpha}{<A}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textAlpha}{<`A}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textAlpha}{<'A}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\textAlpha}{<\char126A}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\textAlpha}{>A}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\textAlpha}{>`A}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\textAlpha}{>'A}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{\textAlpha}{>\char126A}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textAlpha}{'A}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textAlpha}{`A}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textEpsilon}{<E}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textEpsilon}{<'E}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textEpsilon}{<`E}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\textEpsilon}{>E}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\textEpsilon}{>'E}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\textEpsilon}{>`E}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textEpsilon}{'E}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textEpsilon}{`E}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textEta}{<H}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textEta}{<`H}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textEta}{<'H}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\textEta}{<\char126H}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\textEta}{>H}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\textEta}{>`H}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\textEta}{>'H}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{\textEta}{>\char126H}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textEta}{'H}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textEta}{`H}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textIota}{<I}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textIota}{<`I}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textIota}{<'I}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\textIota}{<\char126I}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\textIota}{>I}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\textIota}{>`I}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\textIota}{>'I}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{\textIota}{>\char126I}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textIota}{'I}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textIota}{`I}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textOmicron}{<O}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textOmicron}{<`O}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textOmicron}{<'O}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\textOmicron}{>O}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\textOmicron}{>`O}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\textOmicron}{>'O}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textOmicron}{'O}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textOmicron}{`O}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textUpsilon}{<U}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textUpsilon}{<`U}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textUpsilon}{<'U}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\textUpsilon}{<\char126U}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textUpsilon}{'U}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textUpsilon}{`U}
-
-\DeclareTextCompositeCommand{\Dasia}{LGR}{\textOmega}{<W}
-\DeclareTextCompositeCommand{\DasiaVaria}{LGR}{\textOmega}{<`W}
-\DeclareTextCompositeCommand{\DasiaOxia}{LGR}{\textOmega}{<'W}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{LGR}{\textOmega}{<\char126W}
-\DeclareTextCompositeCommand{\Psili}{LGR}{\textOmega}{>W}
-\DeclareTextCompositeCommand{\PsiliVaria}{LGR}{\textOmega}{>`W}
-\DeclareTextCompositeCommand{\PsiliOxia}{LGR}{\textOmega}{>'W}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{LGR}{\textOmega}{>\char126W}
-\DeclareTextCompositeCommand{\Tonos}{LGR}{\textOmega}{'W}
-\DeclareTextCompositeCommand{\Varia}{LGR}{\textOmega}{`W}
+\DeclareTextComposite{\accdialytika}{LGR}{I}{219}
+\DeclareTextComposite{\accdialytika}{LGR}{U}{223}
+
+% Do the same for the LICR macros::
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textAlpha}{<A}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textAlpha}{<`A}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textAlpha}{<'A}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\textAlpha}{<\char126A}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\textAlpha}{>A}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\textAlpha}{>`A}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\textAlpha}{>'A}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\textAlpha}{>\char126A}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textAlpha}{'A}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textAlpha}{`A}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textEpsilon}{<E}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textEpsilon}{<'E}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textEpsilon}{<`E}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\textEpsilon}{>E}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\textEpsilon}{>'E}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\textEpsilon}{>`E}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textEpsilon}{'E}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textEpsilon}{`E}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textEta}{<H}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textEta}{<`H}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textEta}{<'H}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\textEta}{<\char126H}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\textEta}{>H}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\textEta}{>`H}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\textEta}{>'H}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\textEta}{>\char126H}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textEta}{'H}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textEta}{`H}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textIota}{<I}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textIota}{<`I}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textIota}{<'I}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\textIota}{<\char126I}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\textIota}{>I}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\textIota}{>`I}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\textIota}{>'I}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\textIota}{>\char126I}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textIota}{'I}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textIota}{`I}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textOmicron}{<O}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textOmicron}{<`O}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textOmicron}{<'O}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\textOmicron}{>O}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\textOmicron}{>`O}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\textOmicron}{>'O}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textOmicron}{'O}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textOmicron}{`O}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textUpsilon}{<U}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textUpsilon}{<`U}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textUpsilon}{<'U}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\textUpsilon}{<\char126U}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textUpsilon}{'U}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textUpsilon}{`U}
+
+\DeclareTextCompositeCommand{\accdasia}{LGR}{\textOmega}{<W}
+\DeclareTextCompositeCommand{\accdasiavaria}{LGR}{\textOmega}{<`W}
+\DeclareTextCompositeCommand{\accdasiaoxia}{LGR}{\textOmega}{<'W}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{LGR}{\textOmega}{<\char126W}
+\DeclareTextCompositeCommand{\accpsili}{LGR}{\textOmega}{>W}
+\DeclareTextCompositeCommand{\accpsilivaria}{LGR}{\textOmega}{>`W}
+\DeclareTextCompositeCommand{\accpsilioxia}{LGR}{\textOmega}{>'W}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{LGR}{\textOmega}{>\char126W}
+\DeclareTextCompositeCommand{\acctonos}{LGR}{\textOmega}{'W}
+\DeclareTextCompositeCommand{\accvaria}{LGR}{\textOmega}{`W}
% Except for the dialytika::
-\DeclareTextComposite{\Dialytika}{LGR}{\textIota}{219}
-\DeclareTextComposite{\Dialytika}{LGR}{\textUpsilon}{223}
+\DeclareTextComposite{\accdialytika}{LGR}{\textIota}{219}
+\DeclareTextComposite{\accdialytika}{LGR}{\textUpsilon}{223}
+
% UPPERCASE
% ~~~~~~~~~
@@ -912,21 +1026,21 @@
\expandafter\def\expandafter\@uclclist\expandafter{%
\@uclclist
- \Dasia\do@nothing
- \DasiaOxia\@hiatus
- \DasiaVaria\do@nothing
- \DasiaPerispomeni\do@nothing
- \Psili\@hiatus
- \PsiliOxia\@hiatus
- \PsiliVaria\@hiatus
- \PsiliPerispomeni\do@nothing
- \Tonos\@hiatus
- \Varia\do@nothing
- \DialytikaTonos\up@Dialytika
- \DialytikaVaria\up@Dialytika
- \DialytikaPerispomeni\up@Dialytika
- \Perispomeni\do@nothing
- \Ypogegrammeni\Prosgegrammeni
+ \accdasia\acc@invisible
+ \accdasiaoxia\@hiatus
+ \accdasiavaria\acc@invisible
+ \accdasiaperispomeni\acc@invisible
+ \accpsili\@hiatus
+ \accpsilioxia\@hiatus
+ \accpsilivaria\@hiatus
+ \accpsiliperispomeni\acc@invisible
+ \acctonos\@hiatus
+ \accvaria\acc@invisible
+ \accdialytikatonos\acc@Dialytika
+ \accdialytikavaria\acc@Dialytika
+ \accdialytikaperispomeni\acc@Dialytika
+ \accperispomeni\acc@invisible
+ \ypogegrammeni\prosgegrammeni
%
\textalpha \textAlpha
\textbeta \textBeta
@@ -959,7 +1073,7 @@
\varstigma \Stigma
\stigma \Stigma
\sampi \Sampi
- \ddigamma \Digamma
+ \textdigamma \textDigamma
}
% Substitution macros
@@ -969,31 +1083,48 @@
% '''''''''''''''
% ::
-\DeclareTextCommand{\do@nothing}{LGR}[1]{#1}
+\DeclareTextCommand{\acc@invisible}{LGR}[1]{#1}
% (The argument processing ensures that kerning is preserved)
%
% Keep dialytika.
% '''''''''''''''
%
-% Define an alias so that downcasing with ``\MakeLowercase`` does not
+% Define a dummy alias so that downcasing with ``\MakeLowercase`` does not
% convert a simple dialytika to a composite accent::
-\DeclareTextCommand{\up@Dialytika}{LGR}{\Dialytika}
+\DeclareTextCommand{\acc@Dialytika}{LGR}{\accdialytika}
+
+\DeclareTextCompositeCommand{\accdialytika}{LGR}{\@hiatus}{\accdialytika}
+% .. TODO: MakeUppercase with ``\"'`` fails if the language is "greek".
+% How can we specify a composite command with character ``"9F``,
+% the uccode of ``'``?
+%
+% % \DeclareTextCompositeCommand{\acc@Dialytika}{LGR}{"9F}{\accdialytika}
+% % \DeclareTextAccent{\acc@Dialytika}{LGR}{34} % upcase Dialytika
+% % \DeclareTextCompositeCommand{\acc@Dialytika}{LGR}{\@hiatus}{\accdialytika}
+% % \DeclareTextCompositeCommand{\acc@Dialytika}{LGR}{'}{\accdialytika}
+%
% Mark hiatus
% '''''''''''
%
-% Tonos and dasia mark a hiatus (break-up of a diphtong) if placed on the
+% Tonos and dasia mark a hiatus if placed on the
% first vowel of a diphthong (ΑΙ, ΑΥ, ΕΙ). A dialytika must be placed on the
% second vowel if they are dropped (άυλος → ΑΫΛΟΣ, μάινα → ΜΑΪΝΑ, κέικ → ΚΕΪΚ,
% ἀυπνία → ΑΫΠΝΙΑ)::
\DeclareTextCommand{\@hiatus}{LGR}[1]{#1}
+\DeclareTextCompositeCommand{\@hiatus}{LGR}{>}{\@hiatus}
+\DeclareTextCompositeCommand{\@hiatus}{LGR}{<}{\acc@invisible}
\DeclareTextCompositeCommand{\@hiatus}{LGR}{A}{\A@hiatus}
\DeclareTextCompositeCommand{\@hiatus}{LGR}{\textAlpha}{\A@hiatus}
\DeclareTextCompositeCommand{\@hiatus}{LGR}{E}{\E@hiatus}
\DeclareTextCompositeCommand{\@hiatus}{LGR}{\textEpsilon}{\E@hiatus}
+% What does the \@hiatus command "see" if an unicode literal follows?
+% \DeclareTextCompositeCommand{\@hiatus}{LGR}{\symbol{"ce}}{bluff}
+% \DeclareTextCompositeCommand{\@hiatus}{LGR}{"cf}{blaff}
+% \DeclareTextCompositeCommand{\@hiatus}{LGR}{ι}{blaff}
% Look ahead and place a diaeresis on Ι or Υ::
@@ -1062,23 +1193,26 @@
% .. References
% ----------
%
-% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
-% .. _lgrx: http://mirror.ctan.org/help/Catalogue/entries/lgrx.html
-% .. _textalpha: textalpha.sty.html
-% .. _alphabeta: alphabeta.sty.html
-% .. _Babel: http://mirror.ctan.org/help/Catalogue/entries/babel.html
-% .. _ibycus: http://mirror.ctan.org/help/Catalogue/entries/ibycus-babel.html
-% .. _libertine: http://mirror.ctan.org/help/Catalogue/entries/libertine-legacy.html
-% .. _hyperref: http://mirror.ctan.org/help/Catalogue/entries/hyperref.html
-% .. _fontenc: http://mirror.ctan.org/help/Catalogue/entries/fontenc.html
% .. _Adobe Glyph List For New Fonts:
-% http://www.adobe.com/devnet/opentype/archives/aglfn.txt
-% .. _athnum: http://mirror.ctan.org/help/Catalogue/entries/athnum.html
-% .. _fntguide: http://mirror.ctan.org/macros/latex/doc/fntguide.pdf
+% http://www.adobe.com/devnet-archive/opentype/archives/aglfn.txt
+% .. _Adobe Glyph List:
+% http://partners.adobe.com/public/developer/en/opentype/glyphlist.txt
+% .. _alphabeta: alphabeta.sty.html
+% .. _athnum: http://www.ctan.org/pkg/athnum
+% .. _Babel: http://www.ctan.org/pkg/babel
% .. _babel patch: http://www.eutypon.gr/eutypon/pdf/e2008-20/e20-a03.pdf
-% .. _teubner: http://mirror.ctan.org/help/Catalogue/entries/teubner.html
+% .. _fntguide: http://mirror.ctan.org/macros/latex/doc/fntguide.pdf
+% .. _fontenc: http://www.ctan.org/pkg/fontenc
+% .. _hyperref: http://www.ctan.org/pkg/hyperref
+% .. _ibycus: http://www.ctan.org/pkg/ibycus-babel
+% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
+% .. _lgrx: http://www.ctan.org/pkg/lgrx
+% .. _libertine: http://www.ctan.org/pkg/libertine-legacy
+% .. _teubner: http://www.ctan.org/pkg/teubner
% .. _teubner-doc:
-% http://mirror.ctan.org/macros/latex/contrib/teubner/teubner-doc.pdf
-% .. _ucs: http://mirror.ctan.org/help/Catalogue/entries/unicode.html
+% http://mirror.ctan.org/macros/latex/contrib/teubner/teubner-doc.pdf
+% .. _textalpha: textalpha.sty.html
+% .. _ucs: http://www.ctan.org/pkg/unicode
+% .. _Unicode names list: http://www.unicode.org/Public/UNIDATA/NamesList.txt
% .. _XML Entity Definitions for Characters:
-% http://www.w3.org/TR/xml-entity-names/
+% http://www.w3.org/TR/xml-entity-names/