From 4e5ed8816b573edaebef454de0454b27fb4da604 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 1 Oct 2013 21:34:01 +0000 Subject: greek-fontenc (1oct13) git-svn-id: svn://tug.org/texlive/trunk@31809 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/greek-fontenc/alphabeta-euenc.def | 39 +------------ .../tex/latex/greek-fontenc/greek-euenc.def | 67 +++++----------------- 2 files changed, 17 insertions(+), 89 deletions(-) (limited to 'Master/texmf-dist/tex/latex/greek-fontenc') diff --git a/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta-euenc.def b/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta-euenc.def index 0c3bbe5507d..58a2447a80d 100644 --- a/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta-euenc.def +++ b/Master/texmf-dist/tex/latex/greek-fontenc/alphabeta-euenc.def @@ -18,6 +18,7 @@ % % ========== ===== ========================================================= % 2013-09-12 0.1 initial version +% 2013-10-01 0.1.1 remove clashing defs for legacy characters with oxia. % ========== ===== ========================================================= % % The alphabeta_ package re-defines the math macros for Greek letters to work @@ -171,34 +172,12 @@ \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\Omega}{Ὧ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\alpha}{ὰ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\alpha}{ά} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\epsilon}{ὲ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\epsilon}{έ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\eta}{ὴ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\eta}{ή} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\iota}{ὶ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\iota}{ί} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\omicron}{ὸ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\omicron}{ό} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\upsilon}{ὺ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\upsilon}{ύ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\omega}{ὼ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\omega}{ώ} - -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\alpha}{ὰ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\alpha}{ά} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\epsilon}{ὲ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\epsilon}{έ} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\eta}{ὴ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\eta}{ή} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\iota}{ὶ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\iota}{ί} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\omicron}{ὸ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\omicron}{ό} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\upsilon}{ὺ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\upsilon}{ύ} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\omega}{ὼ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\omega}{ώ} %% postfix ypogegrammeni cannot be second part of composite defs. % \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\alpha\ypogegrammeni}{ᾀ} @@ -263,9 +242,7 @@ \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\Alpha}{Ᾰ} \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\Alpha}{Ᾱ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Alpha}{Ὰ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Alpha}{Ά} \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Alpha}{Ὰ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Alpha}{Ά} % \DeclareTextCompositeCommand{\Alpha}{\LastDeclaredEncoding}{\prosgegrammeni}{ᾼ} % \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ῂ} @@ -275,13 +252,9 @@ \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\eta}{ῆ} % \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\eta\ypogegrammeni}{ῇ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Epsilon}{Ὲ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Epsilon}{Έ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Eta}{Ὴ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Eta}{Ή} \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Epsilon}{Ὲ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Epsilon}{Έ} \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Eta}{Ὴ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Eta}{Ή} % \DeclareTextCompositeCommand{\Eta}{\LastDeclaredEncoding}{\prosgegrammeni}{ῌ} @@ -295,9 +268,7 @@ \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\Iota}{Ῐ} \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\Iota}{Ῑ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Iota}{Ὶ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Iota}{Ί} \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Iota}{Ὶ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Iota}{Ί} \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\upsilon}{ῠ} \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\upsilon}{ῡ} @@ -311,9 +282,7 @@ \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\Upsilon}{Ῠ} \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\Upsilon}{Ῡ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Upsilon}{Ὺ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Upsilon}{Ύ} \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Upsilon}{Ὺ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Upsilon}{Ύ} \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\Rho}{Ῥ} % \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ῲ} @@ -323,17 +292,13 @@ \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\omega}{ῶ} % \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\omega\ypogegrammeni}{ῷ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Omicron}{Ὸ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Omicron}{Ό} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\Omega}{Ὼ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\Omega}{Ώ} \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Omicron}{Ὸ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Omicron}{Ό} \DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\Omega}{Ὼ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\Omega}{Ώ} % \DeclareTextCompositeCommand{\Omega}{\LastDeclaredEncoding}{\prosgegrammeni}{ῼ} % .. References % % .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt -% .. _alphabeta: http://www.ctan.org/pkg/lgrx +% .. _alphabeta: http://www.ctan.org/pkg/greek-fontenc 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 76c710e55cb..2df92567144 100644 --- a/Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def +++ b/Master/texmf-dist/tex/latex/greek-fontenc/greek-euenc.def @@ -23,6 +23,8 @@ % 2013-07-19 0.1.2 bugfix: Disable composite defs starting with char macro, % .. fix "hiatus" handling. % 2013-07-24 0.1.3 fix "input" path. +% 2013-10-01 0.1.4 remove clashing defs for legacy characters with oxia, +% .. fix upcasing of ``\finalsigma``. % ========== ===== ========================================================= % % Requires XeTeX or LuaTeX and a font with Greek characters. See @@ -194,8 +196,8 @@ \DeclareTextCommand{\textomicron}{\LastDeclaredEncoding}{ο} \DeclareTextCommand{\textpi}{\LastDeclaredEncoding}{π} \DeclareTextCommand{\textrho}{\LastDeclaredEncoding}{ρ} -\DeclareTextCommand{\textvarsigma}{\LastDeclaredEncoding}{ς} -\DeclareTextCommand{\textfinalsigma}{\LastDeclaredEncoding}{ς} +\DeclareTextCommand{\textvarsigma}{\LastDeclaredEncoding}{ς} % final sigma +\DeclareTextCommand{\textfinalsigma}{\LastDeclaredEncoding}{\textvarsigma} \DeclareTextCommand{\textsigma}{\LastDeclaredEncoding}{σ} \DeclareTextCommand{\texttau}{\LastDeclaredEncoding}{τ} \DeclareTextCommand{\textupsilon}{\LastDeclaredEncoding}{υ} @@ -212,17 +214,22 @@ \DeclareTextCommand{\textQoppa}{\LastDeclaredEncoding}{Ϙ} \DeclareTextCommand{\textqoppa}{\LastDeclaredEncoding}{ϙ} -\DeclareTextCommand{\textStigma}{\LastDeclaredEncoding}{Ϛ} % \Stigma -\DeclareTextCommand{\textstigma}{\LastDeclaredEncoding}{ϛ} % \stigma -\DeclareTextCommand{\textDigamma}{\LastDeclaredEncoding}{Ϝ} % \Digamma -\DeclareTextCommand{\textdigamma}{\LastDeclaredEncoding}{ϝ} % \ddigamma +\DeclareTextCommand{\textStigma}{\LastDeclaredEncoding}{Ϛ} +\DeclareTextCommand{\textstigma}{\LastDeclaredEncoding}{ϛ} +\DeclareTextCommand{\textDigamma}{\LastDeclaredEncoding}{Ϝ} +\DeclareTextCommand{\textdigamma}{\LastDeclaredEncoding}{ϝ} %03DE GREEK LETTER KOPPA % Ϟ \textKoppa \DeclareTextCommand{\textkoppa}{\LastDeclaredEncoding}{ϟ} % \koppa, \textqoppa [sic!] -\DeclareTextCommand{\textSampi}{\LastDeclaredEncoding}{Ϡ} % \Sampi -\DeclareTextCommand{\textsampi}{\LastDeclaredEncoding}{ϡ} % \sampi +\DeclareTextCommand{\textSampi}{\LastDeclaredEncoding}{Ϡ} +\DeclareTextCommand{\textsampi}{\LastDeclaredEncoding}{ϡ} % 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}{ἀ} @@ -333,34 +340,12 @@ \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\textOmega}{Ὧ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textalpha}{ὰ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textalpha}{ά} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textepsilon}{ὲ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textepsilon}{έ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\texteta}{ὴ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\texteta}{ή} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textiota}{ὶ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textiota}{ί} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textomicron}{ὸ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textomicron}{ό} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textupsilon}{ὺ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textupsilon}{ύ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textomega}{ὼ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textomega}{ώ} - -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textalpha}{ὰ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textalpha}{ά} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textepsilon}{ὲ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textepsilon}{έ} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\texteta}{ὴ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\texteta}{ή} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textiota}{ὶ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textiota}{ί} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textomicron}{ὸ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textomicron}{ό} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textupsilon}{ὺ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textupsilon}{ύ} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textomega}{ὼ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textomega}{ώ} %% postfix ypogegrammeni cannot be second part of composite defs. % \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textalpha\ypogegrammeni}{ᾀ} @@ -425,9 +410,6 @@ \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\textAlpha}{Ᾰ} \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\textAlpha}{Ᾱ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textAlpha}{Ὰ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textAlpha}{Ά} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textAlpha}{Ὰ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textAlpha}{Ά} % \DeclareTextCompositeCommand{\textAlpha}{\LastDeclaredEncoding}{\prosgegrammeni}{ᾼ} \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\textcompwordmark}{᾽} \DeclareTextCommand{\prosgegrammeni}{\LastDeclaredEncoding}{ι} @@ -443,13 +425,7 @@ \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\texteta}{ῆ} % \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\texteta\ypogegrammeni}{ῇ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textEpsilon}{Ὲ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textEpsilon}{Έ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textEta}{Ὴ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textEta}{Ή} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textEpsilon}{Ὲ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textEpsilon}{Έ} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textEta}{Ὴ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textEta}{Ή} % \DeclareTextCompositeCommand{\textEta}{\LastDeclaredEncoding}{\prosgegrammeni}{ῌ} \DeclareTextCompositeCommand{\accpsilivaria}{\LastDeclaredEncoding}{\textcompwordmark}{῍} \DeclareTextCompositeCommand{\accpsilioxia}{\LastDeclaredEncoding}{\textcompwordmark}{῎} @@ -465,9 +441,6 @@ \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\textIota}{Ῐ} \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\textIota}{Ῑ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textIota}{Ὶ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textIota}{Ί} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textIota}{Ὶ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textIota}{Ί} \DeclareTextCompositeCommand{\accdasiavaria}{\LastDeclaredEncoding}{\textcompwordmark}{῝} \DeclareTextCompositeCommand{\accdasiaoxia}{\LastDeclaredEncoding}{\textcompwordmark}{῞} \DeclareTextCompositeCommand{\accdasiaperispomeni}{\LastDeclaredEncoding}{\textcompwordmark}{῟} @@ -484,13 +457,9 @@ \DeclareTextCompositeCommand{\u}{\LastDeclaredEncoding}{\textUpsilon}{Ῠ} \DeclareTextCompositeCommand{\=}{\LastDeclaredEncoding}{\textUpsilon}{Ῡ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textUpsilon}{Ὺ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textUpsilon}{Ύ} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textUpsilon}{Ὺ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textUpsilon}{Ύ} \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textRho}{Ῥ} \DeclareTextCompositeCommand{\accdialytikavaria}{\LastDeclaredEncoding}{\textcompwordmark}{῭} \DeclareTextCompositeCommand{\accdialytikaoxia}{\LastDeclaredEncoding}{\textcompwordmark}{΅} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textcompwordmark}{`} % \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ῲ} % \DeclareTextCompositeCommand{\textomega}{\LastDeclaredEncoding}{\ypogegrammeni}{ῳ} @@ -499,13 +468,7 @@ \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textomega}{ῶ} % \DeclareTextCompositeCommand{\accperispomeni}{\LastDeclaredEncoding}{\textomega\ypogegrammeni}{ῷ} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textOmicron}{Ὸ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textOmicron}{Ό} \DeclareTextCompositeCommand{\`}{\LastDeclaredEncoding}{\textOmega}{Ὼ} -\DeclareTextCompositeCommand{\'}{\LastDeclaredEncoding}{\textOmega}{Ώ} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textOmicron}{Ὸ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textOmicron}{Ό} -\DeclareTextCompositeCommand{\accvaria}{\LastDeclaredEncoding}{\textOmega}{Ὼ} -\DeclareTextCompositeCommand{\acctonos}{\LastDeclaredEncoding}{\textOmega}{Ώ} % \DeclareTextCompositeCommand{\textOmega}{\LastDeclaredEncoding}{\prosgegrammeni}{ῼ} \DeclareTextCompositeCommand{\accoxia}{\LastDeclaredEncoding}{\textcompwordmark}{´} \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\textcompwordmark}{῾} -- cgit v1.2.3