summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/greek-fontenc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-19 22:19:49 +0000
committerKarl Berry <karl@freefriends.org>2013-07-19 22:19:49 +0000
commit536700e391efb5dd8aca4d91282cb83e34fd977a (patch)
tree893d7c3498c13dc628023b8d890128b012354bf1 /Master/texmf-dist/tex/latex/greek-fontenc
parent52d7bea1b66ddb8d5674a0bafa2ace2476eac166 (diff)
greek-fontenc (19jul13)
git-svn-id: svn://tug.org/texlive/trunk@31240 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/greek-fontenc')
-rw-r--r--Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def37
-rw-r--r--Master/texmf-dist/tex/latex/greek-fontenc/xunicode-greek.sty20
2 files changed, 30 insertions, 27 deletions
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 0ffb794ce24..8e4673e7be7 100644
--- a/Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def
+++ b/Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def
@@ -9,9 +9,9 @@
% ::
\ProvidesFile{greek-euenc}
-[2013/07/18 0.1.1 Greek LICRs for XeTeX and LuaTeX]
+[2013/07/19 0.1.2 Greek LICRs for XeTeX and LuaTeX]
-% Experimental support for Greek LICR macros with XeTeX and LuaTeX.
+% Experimental support for Greek LICR macros with XeTeX and LuaTeX.
% Based on `lgrenc.def` and `lgrenc.dfu`.
%
% Changelog:
@@ -20,6 +20,8 @@
% ========== ===== =========================================================
% 2013-07-16 0.1 initial version
% 2013-07-18 0.1.1 bugfix: wrong breathings psilioxia -> dasiaoxia
+% 2013-07-19 0.1.2 bugfix: Disable composite defs starting with char macro,
+% .. fix "hiatus" handling.
% ========== ===== =========================================================
%
% Requires XeTeX or LuaTeX and a font with Greek characters. See
@@ -29,7 +31,7 @@
% `xunicode.sty` defines several commands for the declaration of UTF
% characters, composites and accents. These are (sparsely) documented in the
% source. Unfortunately, they do not work seamless with the standard NFSS
-% commands described in the fntguide.
+% commands described in the fntguide.
%
% This file sets up LaTeX Internal Character Representaction (LICR) macros
% based on standard LaTeX commands. It should work independed of `xunicode`.
@@ -70,7 +72,7 @@
% \DeclareTextCommand{#1}{#2}[1]{##1\char"#3 }%
% }
% \DeclareTextAccentCombined{\accypogegrammeni}{\LastDeclaredEncoding}{0837}
-
+
% Sub-iota:
%
% ``\ypogegrammeni`` is a postfix accent (ligature in LGR) ::
@@ -414,7 +416,7 @@
\DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\textalpha}{ᾰ}
\DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\textalpha}{ᾱ}
% \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾲ}
-\DeclareTextCompositeCommand{\textalpha}{\LastDeclaredEncoding}{\ypogegrammeni}{ᾳ}
+% \DeclareTextCompositeCommand{\textalpha}{\LastDeclaredEncoding}{\ypogegrammeni}{ᾳ}
% \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾴ}
\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\textalpha}{ᾶ}
\DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textalpha}{ᾶ}
@@ -425,7 +427,7 @@
\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textAlpha}{Ά}
\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textAlpha}{Ὰ}
\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textAlpha}{Ά}
-\DeclareTextCompositeCommand{\textAlpha}{\LastDeclaredEncoding}{\prosgegrammeni}{ᾼ}
+% \DeclareTextCompositeCommand{\textAlpha}{\LastDeclaredEncoding}{\prosgegrammeni}{ᾼ}
\DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textcompwordmark}{᾽}
\DeclareTextCommand{\prosgegrammeni}{\LastDeclaredEncoding}{ι}
\DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textcompwordmark}{᾿}
@@ -434,7 +436,7 @@
\DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textcompwordmark}{῀}
\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\LastDeclaredEncoding}{\textcompwordmark}{῁}
% \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ῂ}
-\DeclareTextCompositeCommand{\texteta}{\LastDeclaredEncoding}{\ypogegrammeni}{ῃ}
+% \DeclareTextCompositeCommand{\texteta}{\LastDeclaredEncoding}{\ypogegrammeni}{ῃ}
% \DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ῄ}
\DeclareTextCompositeCommand{\~}{\LastDeclaredEncoding}{\texteta}{ῆ}
\DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\texteta}{ῆ}
@@ -447,7 +449,7 @@
\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textEpsilon}{Έ}
\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textEta}{Ὴ}
\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textEta}{Ή}
-\DeclareTextCompositeCommand{\textEta}{\LastDeclaredEncoding}{\prosgegrammeni}{ῌ}
+% \DeclareTextCompositeCommand{\textEta}{\LastDeclaredEncoding}{\prosgegrammeni}{ῌ}
\DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\textcompwordmark}{῍}
\DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\textcompwordmark}{῎}
\DeclareTextCompositeCommand{\accpsiliperispomeni}{\LastDeclaredEncoding}{\textcompwordmark}{῏}
@@ -503,7 +505,7 @@
\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textOmicron}{Ό}
\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textOmega}{Ὼ}
\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textOmega}{Ώ}
-\DeclareTextCompositeCommand{\textOmega}{\LastDeclaredEncoding}{\prosgegrammeni}{ῼ}
+% \DeclareTextCompositeCommand{\textOmega}{\LastDeclaredEncoding}{\prosgegrammeni}{ῼ}
\DeclareTextCompositeCommand{\accoxia}{\LastDeclaredEncoding}{\textcompwordmark}{´}
\DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textcompwordmark}{῾}
@@ -547,20 +549,21 @@
% Look ahead and place a diaeresis on Ι or Υ
% (copied from lgrenc.def and changed Latin transcription to Unicode literals)::
+
\DeclareTextCommand{\LGR@A@hiatus}{\LastDeclaredEncoding}{%
- \LGR@ifnextchar{Ι}{A\"}{%
- \LGR@ifnextchar{Υ}{A\"}{%
- \LGR@ifnextchar{\textIota}{A\"}{%
- \LGR@ifnextchar{\textUpsilon}{A\"}{A}%
+ \LGR@ifnextchar{Ι}{\textAlpha\"}{%
+ \LGR@ifnextchar{Υ}{\textAlpha\"}{%
+ \LGR@ifnextchar{\textIota}{\textAlpha\"}{%
+ \LGR@ifnextchar{\textUpsilon}{\textAlpha\"}{\textAlpha}%
}%
}%
}%
}
\DeclareTextCommand{\LGR@E@hiatus}{\LastDeclaredEncoding}{%
- \LGR@ifnextchar{Ι}{E\"}{%
- \LGR@ifnextchar{Υ}{E\"}{%
- \LGR@ifnextchar{\textIota}{E\"}{%
- \LGR@ifnextchar{\textUpsilon}{E\"}{E}%
+ \LGR@ifnextchar{Ι}{\textEpsilon\"}{%
+ \LGR@ifnextchar{Υ}{\textEpsilon\"}{%
+ \LGR@ifnextchar{\textIota}{\textEpsilon\"}{%
+ \LGR@ifnextchar{\textUpsilon}{\textEpsilon\"}{\textEpsilon}%
}%
}%
}%
diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/xunicode-greek.sty b/Master/texmf-dist/tex/latex/greek-fontenc/xunicode-greek.sty
index bca6106c7bc..f35e8dc8f55 100644
--- a/Master/texmf-dist/tex/latex/greek-fontenc/xunicode-greek.sty
+++ b/Master/texmf-dist/tex/latex/greek-fontenc/xunicode-greek.sty
@@ -132,8 +132,8 @@
% 0371 GREEK SMALL LETTER HETA % ͱ
% 0372 GREEK CAPITAL LETTER ARCHAIC SAMPI % Ͳ
% 0373 GREEK SMALL LETTER ARCHAIC SAMPI % Ͳ
-\DeclareUTFcharacter[\LastDeclaredEncoding]{x0374}{\textnumeralsigngreek} % ʹ \anwtonos, \textdexiakeraia
-\DeclareUTFcharacter[\LastDeclaredEncoding]{x0375}{\textnumeralsignlowergreek} % ͵ \katwtonos, \textaristerikeraia,
+\DeclareUTFcharacter[\LastDeclaredEncoding]{x0374}{\textdexiakeraia} % ʹ
+\DeclareUTFcharacter[\LastDeclaredEncoding]{x0375}{\textaristerikeraia} % ͵
% 0376 GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA % Ͷ
% 0377 GREEK SMALL LETTER PAMPHYLIAN DIGAMMA % ͷ
@@ -562,19 +562,19 @@
% (copied from lgrenc.def and changed Latin transcription to Unicode literals)::
\DeclareTextCommand{\LGR@A@hiatus}{\LastDeclaredEncoding}{%
- \LGR@ifnextchar{Ι}{A\"}{%
- \LGR@ifnextchar{Υ}{A\"}{%
- \LGR@ifnextchar{\textIota}{A\"}{%
- \LGR@ifnextchar{\textUpsilon}{A\"}{A}%
+ \LGR@ifnextchar{Ι}{\textAlpha\"}{%
+ \LGR@ifnextchar{Υ}{\textAlpha\"}{%
+ \LGR@ifnextchar{\textIota}{\textAlpha\"}{%
+ \LGR@ifnextchar{\textUpsilon}{\textAlpha\"}{\textAlpha}%
}%
}%
}%
}
\DeclareTextCommand{\LGR@E@hiatus}{\LastDeclaredEncoding}{%
- \LGR@ifnextchar{Ι}{E\"}{%
- \LGR@ifnextchar{Υ}{E\"}{%
- \LGR@ifnextchar{\textIota}{E\"}{%
- \LGR@ifnextchar{\textUpsilon}{E\"}{E}%
+ \LGR@ifnextchar{Ι}{\textEpsilon\"}{%
+ \LGR@ifnextchar{Υ}{\textEpsilon\"}{%
+ \LGR@ifnextchar{\textIota}{\textEpsilon\"}{%
+ \LGR@ifnextchar{\textUpsilon}{\textEpsilon\"}{\textEpsilon}%
}%
}%
}%