diff options
| author | Karl Berry <karl@freefriends.org> | 2014-12-29 23:24:17 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2014-12-29 23:24:17 +0000 |
| commit | 9a0f0d057b7f36dcc8f060ed5efdcdf0408ad201 (patch) | |
| tree | fc17e9fd17d0395d4b5b7b6b0a77803cf38824d1 /Master/texmf-dist/doc/latex | |
| parent | e8520f340f5558c580fc5f6cc601cc4361ad5970 (diff) | |
greek-fontenc (25dec14)
git-svn-id: svn://tug.org/texlive/trunk@35920 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex')
19 files changed, 467 insertions, 315 deletions
diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/README b/Master/texmf-dist/doc/latex/greek-fontenc/README index 84b1a4e8b2d..784744d2720 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/README +++ b/Master/texmf-dist/doc/latex/greek-fontenc/README @@ -4,7 +4,7 @@ Greek font encoding definition files ************************************ :Author: Günter Milde -:Date: 2014-09-04 +:Date: 2014-12-25 :Copyright: © 2013 Günter Milde <milde@users.sf.net> :Licence: This work may be distributed and/or modified under the conditions of the `LaTeX Project Public License`_, either @@ -30,25 +30,30 @@ News .. class:: borderless -========== ====== ========================================================== -2013-07-03 0.9 greek-fontenc.def_ "outsourced" from lgrxenc.def +====== =========== ========================================================== +0.9 2013-07-03 greek-fontenc.def_ "outsourced" from lgrxenc.def .. experimental files xunicode-greek.sty and greek-euenc.def_: LICRs for XeTeX/LuaTeX. -2013-07-18 0.9.1 bugfix: wrong breathings psilioxia -> dasiaoxia. -2013-07-19 0.9.2 bugfix: Disable composite defs starting with char macro, +0.9.1 2013-07-18 Bugfix: wrong breathings psilioxia -> dasiaoxia. +0.9.2 2013-07-19 Bugfix: Disable composite defs starting with char macro, .. fix "hiatus" handling. -2013-07-24 0.9.3 fix "input" path in xunicode-greek and greek-euenc.def. -2013-09-10 0.9.4 greek-fontenc.sty: Greek text font encoding setup package, +0.9.3 2013-07-24 Fix "input" path in xunicode-greek and greek-euenc.def. +0.9.4 2013-09-10 greek-fontenc.sty: Greek text font encoding setup package, .. remove xunicode-greek.sty. -2013-09-13 0.10 textalpha.sty_ and alphabeta.sty_ moved here from lgrx and +0.10 2013-09-13 textalpha.sty_ and alphabeta.sty_ moved here from lgrx and updated to work with XeTeX/LuaTeX. .. greek-fontenc.sty removed (obsoleted by textalpha.sty). -2013-10-01 0.10.1 bugfix in greek-euenc.def_ and alphabeta-euenc.def_. -2013-11-28 0.11 compatibility with Xe/LuaTeX in 8-bit mode, +0.10.1 2013-10-01 Bugfix in greek-euenc.def_ and alphabeta-euenc.def_. +0.11 2013-11-28 Compatibility with Xe/LuaTeX in 8-bit mode, .. ``\greekscript`` TextCommand. -2013-12-01 0.11.1 fix identification of ``greek-euenc.def``. -2014-09-04 0.11.2 documentation update, remove duplicate code. -========== ====== ========================================================== +0.11.1 2013-12-01 Fix identification of ``greek-euenc.def``. +0.11.2 2014-09-04 Documentation update, remove duplicate code. +0.12 2014-12-25 Fix auxiliary macro names in `textalpha`. +.. Conservative naming: move definition of ``\<`` and ``\>`` + from ``greek-fontenc.def`` to ``textalpha.sty`` + (Bugreport David Kastrup). + Documentation update. +====== =========== ========================================================== TeX files @@ -153,7 +158,7 @@ provided by this package/bundle, e.g.: * Use the ``greek`` option with Babel_ (requires babel-greek_):: - \usepackage[greek]{babel} + \usepackage[greek]{babel} * Declare LGR via fontenc_. For example, specify T1 (8-bit Latin) as default font encoding and LGR for Greek with :: @@ -309,12 +314,14 @@ Proposals Contra: - Less consistent. - - ``text`` prefix marks a macro as confined to text mode. + - ``text`` prefix marks a macro as confined to text (as opposed to math) + mode. Conclusion: - To avoid name clashes, this package uses the ``text`` prefix - for symbols. Aliases (short forms, compatibility defs, etc.) can be - defined in packages. + To avoid name clashes, the font encoding definition files use the + ``text`` prefix for symbols. Aliases (short forms, compatibility defs, + etc.) can be defined locally or in additional packages (see + alphabeta.sty_, `babel-greek`_, or teubner_) How to name *accent macros*? @@ -333,7 +340,7 @@ How to name *accent macros*? ``text`` prefix). * Use a common prefix ``\textaccent...``, ``\accent...``, - or just ``\acc...`` (cf ``\@tabacckludge``)? + or just ``\acc...`` (cf. ``\@tabacckludge``)? Currently, `greek-fontenc` uses for diacritics: @@ -343,6 +350,7 @@ Currently, `greek-fontenc` uses for diacritics: risc of name clashes. - For the end-user "symbol macros" (``\~ \' \` \" \< \>``) are provided. + (The non-standard macros ``\<`` and ``\>`` only with textalpha.sty_.) References @@ -410,5 +418,6 @@ as-is). .. _lgrx: http://www.ctan.org/pkg/lgrx .. _libertine: http://www.ctan.org/pkg/libertine-legacy .. _substitutefont: http://www.ctan.org/pkg/substitutefont +.. _teubner: http://www.ctan.org/pkg/teubner .. _ucs: http://www.ctan.org/pkg/unicode .. _xunicode: http://www.ctan.org/pkg/xunicode diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/README.html b/Master/texmf-dist/doc/latex/greek-fontenc/README.html index a2c8db86289..dffe4bdd3b5 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/README.html +++ b/Master/texmf-dist/doc/latex/greek-fontenc/README.html @@ -3,10 +3,10 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> <title>greek-fontenc</title> <meta name="author" content="Günter Milde" /> -<meta name="date" content="2014-09-04" /> +<meta name="date" content="2014-12-25" /> <meta name="copyright" content="© 2013 Günter Milde <milde@users.sf.net>" /> <style type="text/css"> @@ -724,7 +724,7 @@ div.hint, div.important, div.note, div.tip, div.warning { <dt class="author">Author</dt> <dd class="author">Günter Milde</dd> <dt class="date">Date</dt> -<dd class="date">2014-09-04</dd> +<dd class="date">2014-12-25</dd> <dt class="copyright">Copyright</dt> <dd class="copyright">© 2013 Günter Milde <<a class="reference external" href="mailto:milde@users.sf.net">milde@users.sf.net</a>></dd> <dt>Licence</dt> @@ -754,13 +754,13 @@ punctuation may change in future versions.</p> <h1>News</h1> <table class="borderless"> <colgroup> -<col width="14%" /> <col width="8%" /> -<col width="78%" /> +<col width="15%" /> +<col width="77%" /> </colgroup> <tbody> -<tr><td><p>2013-07-03</p></td> -<td><p>0.9</p></td> +<tr><td><p>0.9</p></td> +<td><p>2013-07-03</p></td> <td><p><a class="reference external" href="greek-fontenc.def">greek-fontenc.def</a> “outsourced” from lgrxenc.def</p></td> </tr> <tr><td><!-- --> @@ -769,25 +769,25 @@ punctuation may change in future versions.</p> <td><p>experimental files xunicode-greek.sty and <a class="reference external" href="greek-euenc.def">greek-euenc.def</a>: LICRs for XeTeX/LuaTeX.</p></td> </tr> -<tr><td><p>2013-07-18</p></td> -<td><p>0.9.1</p></td> -<td><p>bugfix: wrong breathings psilioxia -> dasiaoxia.</p></td> +<tr><td><p>0.9.1</p></td> +<td><p>2013-07-18</p></td> +<td><p>Bugfix: wrong breathings psilioxia -> dasiaoxia.</p></td> </tr> -<tr><td><p>2013-07-19</p></td> -<td><p>0.9.2</p></td> -<td><p>bugfix: Disable composite defs starting with char macro,</p></td> +<tr><td><p>0.9.2</p></td> +<td><p>2013-07-19</p></td> +<td><p>Bugfix: Disable composite defs starting with char macro,</p></td> </tr> <tr><td><!-- --> </td> <td> </td> <td><p>fix “hiatus” handling.</p></td> </tr> -<tr><td><p>2013-07-24</p></td> -<td><p>0.9.3</p></td> -<td><p>fix “input” path in xunicode-greek and greek-euenc.def.</p></td> +<tr><td><p>0.9.3</p></td> +<td><p>2013-07-24</p></td> +<td><p>Fix “input” path in xunicode-greek and greek-euenc.def.</p></td> </tr> -<tr><td><p>2013-09-10</p></td> -<td><p>0.9.4</p></td> +<tr><td><p>0.9.4</p></td> +<td><p>2013-09-10</p></td> <td><p>greek-fontenc.sty: Greek text font encoding setup package,</p></td> </tr> <tr><td><!-- --> @@ -795,8 +795,8 @@ punctuation may change in future versions.</p> <td> </td> <td><p>remove xunicode-greek.sty.</p></td> </tr> -<tr><td><p>2013-09-13</p></td> -<td><p>0.10</p></td> +<tr><td><p>0.10</p></td> +<td><p>2013-09-13</p></td> <td><p><a class="reference external" href="textalpha.sty">textalpha.sty</a> and <a class="reference external" href="alphabeta.sty">alphabeta.sty</a> moved here from lgrx and updated to work with XeTeX/LuaTeX.</p></td> </tr> @@ -805,26 +805,38 @@ updated to work with XeTeX/LuaTeX.</p></td> <td> </td> <td><p>greek-fontenc.sty removed (obsoleted by textalpha.sty).</p></td> </tr> -<tr><td><p>2013-10-01</p></td> -<td><p>0.10.1</p></td> -<td><p>bugfix in <a class="reference external" href="greek-euenc.def">greek-euenc.def</a> and <a class="reference external" href="alphabeta-euenc.def">alphabeta-euenc.def</a>.</p></td> +<tr><td><p>0.10.1</p></td> +<td><p>2013-10-01</p></td> +<td><p>Bugfix in <a class="reference external" href="greek-euenc.def">greek-euenc.def</a> and <a class="reference external" href="alphabeta-euenc.def">alphabeta-euenc.def</a>.</p></td> </tr> -<tr><td><p>2013-11-28</p></td> -<td><p>0.11</p></td> -<td><p>compatibility with Xe/LuaTeX in 8-bit mode,</p></td> +<tr><td><p>0.11</p></td> +<td><p>2013-11-28</p></td> +<td><p>Compatibility with Xe/LuaTeX in 8-bit mode,</p></td> </tr> <tr><td><!-- --> </td> <td> </td> <td><p><tt class="literal">\greekscript</tt> TextCommand.</p></td> </tr> -<tr><td><p>2013-12-01</p></td> -<td><p>0.11.1</p></td> -<td><p>fix identification of <tt class="literal"><span class="pre">greek-euenc.def</span></tt>.</p></td> +<tr><td><p>0.11.1</p></td> +<td><p>2013-12-01</p></td> +<td><p>Fix identification of <tt class="literal"><span class="pre">greek-euenc.def</span></tt>.</p></td> </tr> -<tr><td><p>2014-09-04</p></td> -<td><p>0.11.2</p></td> -<td><p>documentation update, remove duplicate code.</p></td> +<tr><td><p>0.11.2</p></td> +<td><p>2014-09-04</p></td> +<td><p>Documentation update, remove duplicate code.</p></td> +</tr> +<tr><td><p>0.12</p></td> +<td><p>2014-12-25</p></td> +<td><p>Fix auxiliary macro names in <cite>textalpha</cite>.</p></td> +</tr> +<tr><td><!-- --> +</td> +<td> </td> +<td><p>Conservative naming: move definition of <tt class="literal">\<</tt> and <tt class="literal">\></tt> +from <tt class="literal"><span class="pre">greek-fontenc.def</span></tt> to <tt class="literal">textalpha.sty</tt> +(Bugreport David Kastrup). +Documentation update.</p></td> </tr> </tbody> </table> @@ -1079,13 +1091,15 @@ without the <tt class="literal">text</tt>-prefix, especially for letters,</p> <dt>Contra:</dt> <dd><ul class="simple"> <li><p>Less consistent.</p></li> -<li><p><tt class="literal">text</tt> prefix marks a macro as confined to text mode.</p></li> +<li><p><tt class="literal">text</tt> prefix marks a macro as confined to text (as opposed to math) +mode.</p></li> </ul> </dd> <dt>Conclusion:</dt> -<dd><p>To avoid name clashes, this package uses the <tt class="literal">text</tt> prefix -for symbols. Aliases (short forms, compatibility defs, etc.) can be -defined in packages.</p> +<dd><p>To avoid name clashes, the font encoding definition files use the +<tt class="literal">text</tt> prefix for symbols. Aliases (short forms, compatibility defs, +etc.) can be defined locally or in additional packages (see +<a class="reference external" href="alphabeta.sty">alphabeta.sty</a>, <a class="reference external" href="http://www.ctan.org/pkg/babel-greek">babel-greek</a>, or <a class="reference external" href="http://www.ctan.org/pkg/teubner">teubner</a>)</p> </dd> </dl> </li> @@ -1104,14 +1118,15 @@ defined in packages.</p> <li><p>textcomp (ts1enc.def) defines <tt class="literal"><span class="pre">\capital...</span></tt> accents (i.e. without <tt class="literal">text</tt> prefix).</p></li> <li><p>Use a common prefix <tt class="literal"><span class="pre">\textaccent...</span></tt>, <tt class="literal"><span class="pre">\accent...</span></tt>, -or just <tt class="literal"><span class="pre">\acc...</span></tt> (cf <tt class="literal">\@tabacckludge</tt>)?</p></li> +or just <tt class="literal"><span class="pre">\acc...</span></tt> (cf. <tt class="literal">\@tabacckludge</tt>)?</p></li> </ul> <p>Currently, <cite>greek-fontenc</cite> uses for diacritics:</p> <ul class="simple"> <li><p>Greek names like in Unicode, and ucsencs.def</p></li> <li><p>The prefix “acc” to distinguish the macros as <cite>TextAaccent</cite> and reduce the risc of name clashes.</p></li> -<li><p>For the end-user “symbol macros” (<tt class="literal">\~ \' \` \" \< \></tt>) are provided.</p></li> +<li><p>For the end-user “symbol macros” (<tt class="literal">\~ \' \` \" \< \></tt>) are provided. +(The non-standard macros <tt class="literal">\<</tt> and <tt class="literal">\></tt> only with <a class="reference external" href="textalpha.sty">textalpha.sty</a>.)</p></li> </ul> </div> <div class="section" id="references"> diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-doc.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-doc.pdf Binary files differindex 272d2dc10d9..2395f5248f2 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-doc.pdf +++ b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-doc.pdf diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-euenc.def.html b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-euenc.def.html index 2f45b04d498..569d66dd99c 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-euenc.def.html +++ b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta-euenc.def.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> <title>alphabeta-euenc.def</title> <meta name="copyright" content="© 2013 Günter Milde" /> <style type="text/css"> diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta.sty.html b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta.sty.html index 4cf4d8c22c1..7016c24694a 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta.sty.html +++ b/Master/texmf-dist/doc/latex/greek-fontenc/alphabeta.sty.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> <title>alphabeta: Greek symbols in text and math</title> <meta name="copyright" content="© 2010 Günter Milde" /> <style type="text/css"> diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.pdf Binary files differindex 9cb463008a2..6a8b12701de 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.pdf +++ b/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.pdf diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.tex b/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.tex index e05f24b38d4..4a6f89d0787 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.tex +++ b/Master/texmf-dist/doc/latex/greek-fontenc/diacritics.tex @@ -20,7 +20,7 @@ % Load encoding definitions (after font package) \usepackage[LGR,T1]{fontenc} -% \usepackage{greek-fontenc} +\usepackage{textalpha} \usepackage{listings} \lstset{basicstyle=\ttfamily} @@ -47,17 +47,28 @@ \section*{Greek diacritics with standard accent macros} -The font encoding definition file \texttt{lgrxenc.def} defines -LICR macros for all non-ASCII characters in the LGR font encoding. - -Diacritics can be input using an extension of the standard macro -commands with composite diacritics input as -backslash followed by the LGR transliteration.% +The font encoding definition file \texttt{lgrenc.def} defines LICR macros +for all non-ASCII characters in the LGR font encoding. Greek accent macros +have names starting with \verb|\acc| followed by the Greek accent name as +used in the Unicode standard (e.g. \verb|\acctonos|). The standard symbol +accents \verb|\' \` \~| behave according to Greek typography if used in the +LGR font encoding. + +The \emph{textalpha} or \emph{alphabeta} packages define the symbol macros +\verb|\<| and \verb|\>| as alias for the breathings (Dasia and Psili). With +this, all diacritics can be input as backslash followed +by the LGR transliteration. % \footnote{This makes it easy to follow the advise in \emph{teubner-doc}: ``typeset your paper with the regular accent vowel ligatures and [{\ldots}] substitute them in the final revision with the accented vowel macros only in those instances where the lack of kerning is disturbing''.} +\footnote{The definition of the macros + \texttt{\textbackslash<} and \texttt{\textbackslash>} was moved + from the font definition file \texttt{greek-fontenc.def} to + \texttt{textalpha.sty} in order to avoid clashes with local + definitions of this macros in documents using the LGR font + encoding via \emph{fontenc} or \emph{babel}.} The example in greek-usage.pdf: % @@ -73,7 +84,7 @@ can be input as S\'wstrate, \>er\~wn \'ap\~hljec e\>uj\'uc? \end{lstlisting} % -Improvements: +Improvements over the ligature-based approach in LGR: % \begin{itemize} @@ -130,9 +141,10 @@ Improvements: \end{itemize} \selectlanguage{british} Composite diacritics can be specified as -backslash + LGR transliteration or combined accent macros, +named macro, backslash + LGR transliteration, or combined accent macros, e.\,g. \textgreek{\~>a} can be written as \begin{quote} + \verb+\accpsiliperispomeni{a}+, \verb+\~>a+, \verb+\>~a+, \verb+\~\>{a}+, or \verb+\~\>a+. \end{quote} diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc-doc.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc-doc.pdf Binary files differindex df9057a8148..a8c5d5fc1f5 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc-doc.pdf +++ b/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc-doc.pdf diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc-doc.tex b/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc-doc.tex index 9d6ea77936a..99a728573f2 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc-doc.tex +++ b/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc-doc.tex @@ -7,7 +7,7 @@ % It is possible to use 8-bit Greek text fonts in the LGR TeX font encoding % also with XeTeX/LuaTeX, if the »fontenc« package is loaded before -% »fontspec«: +% »fontspec« and »textalpha«: \usepackage[LGR]{fontenc} % Unicode font setup: @@ -17,7 +17,7 @@ % \usepackage{libertineotf} \setmainfont{Linux Libertine O} \setsansfont{Linux Biolinum O} -% \setmainfont{FreeSerif}% +% \setmainfont{FreeSerif}% % \setmainfont{Droid Sans} % Declare the font encoding and Greek LICR definitions: @@ -41,9 +41,10 @@ if the font encoding is set to one of the Unicode font encodings EU1 or EU2 (usually via the \href{http://www.ctan.org/pkg/fontspec}{fontspec} package for font setup with LuaTeX and XeTeX). -With the XeTeX or LuaTeX engines, the user should ensure that the selected +With the XeTeX or LuaTeX engines, the user must ensure that the selected font contains Greek glyphs (the default Latin Modern fonts have only capital -Greek letters). Examples for suitable fonts are the “Deja Vu” or the +Greek letters) --- there are no warnings for missing glyphs but empty spaces +in the output document. Examples for suitable fonts are the “Deja Vu” or the “Linux Libertine” OpenType fonts. See the source of this document \url{greek-euenc-doc.tex} for a setup and @@ -51,7 +52,7 @@ usage example. \section{LICR input} -LICR macros are a verbose but failsafe 7-bit ASCII encoding that works +LICR macros are a verbose but fail-safe 7-bit ASCII encoding that works unaltered under both, 8-bit TeX and XeTeX/LuaTeX. Use cases are macro definitions and generated text. @@ -75,12 +76,10 @@ using LICR macros: \textepsilon\>\textupsilon\texttheta\'\textupsilon\textfinalsigma\texterotimatiko{} \end{quote} - \subsection{Greek alphabet} Greek letters via LICR macros: - \textAlpha{} \textBeta{} \textGamma{} \textDelta{} \textEpsilon{} \textZeta{} \textEta{} \textTheta{} \textIota{} \textKappa{} \textLambda{} \textMu{} \textNu{} \textXi{} \textOmicron{} \textPi{} @@ -103,7 +102,8 @@ glyph if it ends a word: In the Latin transcription defined by the 8-bit LGR font encoding, the letter `s' stands for \verb|\textautosigma| which automatically chooses the -glyph according to the position. This is not implemented for Unicode fonts. +glyph according to the position. This macro/feature is not implemented for +Unicode fonts. \subsection{Additional Greek symbols} @@ -115,7 +115,7 @@ glyph according to the position. This is not implemented for Unicode fonts. % \textvarstigma{} textvarstigma \\ % no separate Unicode character \textStigma{} textStigma (Sigma-Tau-Ligature in CB-fonts)% \footnote{the name “stigma” originally applied to a medieval sigma-tau - ligature, whose shape was confusably similar to the cursive + ligature, whose shape was confusingly similar to the cursive digamma} \\ % Ϛ \textsampi{} textsampi \\ % ϡ \textSampi{} textSampi \\ % Ϡ @@ -125,11 +125,11 @@ glyph according to the position. This is not implemented for Unicode fonts. \textdexiakeraia{} textdexiakeraia \\ % ʹ \textaristerikeraia{} textaristerikeraia \\ % ͵ -Mathematical notation uses variant shapes for pi, kappa, rho, theta, and phi -as additional symbols. These variations have no syntactic meaning in Greek -text and are not given separate code-points in the LGR text encoding. Some -text fonts use the variant shapes in place of the “regular” ones as a -stylistic choice. +Mathematical notation uses variant shapes for pi, rho, theta, epsilon, phi, +beta, kappa, and Theta as additional symbols. These variations have no +syntactic meaning in Greek text and are not given separate code-points in +the LGR text encoding. Some text fonts use the variant shapes in place of +the “regular” ones as a stylistic choice. TeX's concept of “standard” vs. “variant” symbols does not map to the distinction between “Greek Letter ...” vs. “Greek Symbol ...” in the @@ -137,36 +137,37 @@ Unicode standard: \begin{tabular}{cccc} \hline -math symbol & Unicode “letter” & var math symbol & Unicode “symbol” \\ +\multicolumn{2}{c}{TeX math} & \multicolumn{2}{c}{Unicode} \\ +symbol & var symbol & “letter” & “symbol” \\ \hline -$\pi$ & π & $\varpi$ & ϖ \\ -$\rho$ & ρ & $\varrho$ & ϱ \\ -$\theta$ & θ & $\vartheta$ & ϑ \\ +$\pi$ & $\varpi$ & π & ϖ \\ +$\rho$ & $\varrho$ & ρ & ϱ \\ +$\theta$ & $\vartheta$ & θ & ϑ \\ \hline -$\epsilon$ & ε & $\varepsilon$ & ϵ \\ -$\phi$ & φ & $\varphi$ & ϕ \\ +$\epsilon$ & $\varepsilon$ & ε & ϵ \\ +$\phi$ & $\varphi$ & φ & ϕ \\ \hline -$\beta$ & β & \emph{missing} & ϐ \\ -$\kappa$ & κ & \emph{missing} & ϰ \\ -$\Theta$ & Θ & \emph{missing} & ϴ \\ +$\beta$ & \emph{missing} & β & ϐ \\ +$\kappa$ & \emph{missing} & κ & ϰ \\ +$\Theta$ & \emph{missing} & Θ & ϴ \\ \hline \end{tabular} \subsection{Diacritics} -Greek diacritcs can be input by named macro or symbol macro. Named macros +Greek diacritics can be input by named macro or symbol macro. Named macros are defined in xunicode-greek.sty for \verb|\LastDeclaredEncoding| (here \LastDeclaredEncoding). -\acctonos\textalpha \'\textalpha{} \acctonos x\'x -\accvaria\textalpha \`\textalpha{} \accvaria x\`x -\accdialytika\textiota \"\textiota{} \accdialytika x\"x -\accperispomeni\textalpha \~\textalpha{} \accperispomeni x\~x -\accpsili\textalpha \>\textalpha{} \accpsili x\>x -\accdasia\textalpha \<\textalpha{} \accdasia x\<x +\acctonos\textalpha \'\textalpha{} \acctonos x \'x +\accvaria\textalpha \`\textalpha{} \accvaria x \`x +\accdialytika\textiota \"\textiota{} \accdialytika x \"x +\accperispomeni\textalpha \~\textalpha{} \accperispomeni x \~x +\accpsili\textalpha \>\textalpha{} \accpsili x \>x +\accdasia\textalpha \<\textalpha{} \accdasia x \<x -There are currently no defintions for accent macros combined with literal -unicode characters. Combining diacritical characters are used in the output. +There are currently no definitions for accent macros combined with literal +Unicode characters. Combining diacritical characters are used in the output. \acctonos α \'α \accvaria α \`α @@ -180,8 +181,6 @@ precomposed characters. As proof of concept, this document defines a composite command for alpha with psili and perispomeni. Compare \<~α with \>~α. - - Composite commands for combined diacritics are defined in “greek-fontenc.def”, also for the \verb|\LastDeclaredEncoding|. There are composite definitions for all precomposed characters, the fallback @@ -211,7 +210,6 @@ definition uses combining characters: Problems: Composite diacritics with breathings overlap when set using two combining characters (in the tested fonts). - Upcasing with \verb|\MakeUppercase| drops diacritics (except dialytika and sub-iota): @@ -233,7 +231,6 @@ dialytika and sub-iota): \accpsiliperispomeni\textiota \~>\textiota{} \accpsiliperispomeni x \~>x } - However, when the tonos, varia, and perispomeni accents are input using the symbol macros (\verb|\' \` \~|), they behave like standard accents with XeTeX/LuaTeX. If these accents should be dropped by MakeUppercase, they must @@ -245,7 +242,6 @@ be input as named macro: \accperispomeni\textalpha \~\textalpha{} \accperispomeni x\~x } - The sub-iota is input after the base letter. Ligature definitions in the 8-bit LGR fonts ensure that precomposed characters are used. This does not work with Unicode fonts:\footnote{% @@ -254,7 +250,7 @@ characters are used. This does not work with Unicode fonts:\footnote{% character. A capital letter + combining ypogegrammeni results in GREEK CAPITAL LETTER ... WITH [.. AND] PROSGEGRAMMENI). This indicates that the combining \emph{ypogegrammeni} should also be used together with - captial base letters.} + capital base letters.} \textalpha\ypogegrammeni{} x\ypogegrammeni{} \textAlpha\prosgegrammeni{} X\prosgegrammeni, @@ -383,7 +379,7 @@ Characters from the Greek Extended Unicode block are only partially supported, accented characters with sub-iota currently use a combining prosgegrammeni or ypogegrammeni character. -For comparision, the LICR macro is followed by the corresponding literal +For comparison, the LICR macro is followed by the corresponding literal Unicode character: \>\textalpha ἀ @@ -662,10 +658,12 @@ defines the \verb|\textgreek| command for this purpose: \section{Latin transcription} The \verb|\textgreek| macro and LGR encoded fonts can also be used for the -input of Greek letters via the \emph{Latin transcription} provided by this -font encoding, e.g. «logos» becomes «\textgreek{logos}» -and «\verb|\>aupn\'ia|» -becomes «\textgreek{\>aupn\'ia}» (capitalized +input of Greek letters via the \emph{Latin transcription} provided by the LGR +font encoding% +\footnote{see \emph{The LaTeX font guide} [fntguide.pdf] for details about +font encodings.}, +e.g. «logos» becomes «\textgreek{logos}» and «\verb|\>aupn\'ia|» becomes +«\textgreek{\>aupn\'ia}» (capitalised «\textgreek{\MakeUppercase{\>aupn\'ia}}»). For details of the Latin transliteration see the teubner package or the file usage.pdf from the babel-greek package. @@ -675,12 +673,11 @@ running in 8-bit compatibility mode because of the incompatibility between Xe/LuaTeX and the inputenc package. LICR macros work in both, Unicode font encoding and LGR: compare -\>\textIota\textalpha\textnu\textomicron\textupsilon\textalpha -\textrho\acctonos\textiota\textomicron\textupsilon{} (Unicode font set up -via fontspec) vs. + \>\textIota\textalpha\textnu\textomicron\textupsilon\textalpha + \textrho\acctonos\textiota\textomicron\textupsilon{} +(Unicode font set up via fontspec) vs. \textgreek{\>\textIota\textalpha\textnu\textomicron\textupsilon\textalpha \textrho\acctonos\textiota\textomicron\textupsilon} -(LGR-encoded 8-bit font set up via NFSS commands, see \emph{The LaTeX font -guide} [fntguide.pdf]). +(LGR-encoded 8-bit font set up via NFSS commands). \end{document} diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc.def.html b/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc.def.html index 32b95f9ea61..e63aee31dc8 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc.def.html +++ b/Master/texmf-dist/doc/latex/greek-fontenc/greek-euenc.def.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> <title>greek-euenc.def</title> <meta name="copyright" content="© 2013 Günter Milde" /> <style type="text/css"> @@ -728,7 +728,7 @@ version 1.3 of this license or any later version.</p> </dd> <dt>Identification</dt> <dd><pre class="literal-block">\ProvidesFile{greek-euenc.def} -[2014/09/08 0.11.2 Greek LICRs for XeTeX and LuaTeX] +[2014/12/12 0.12 Greek LICRs for XeTeX and LuaTeX] </pre> </dd> </dl> @@ -741,47 +741,41 @@ Extends <a class="reference external" href="http://www.ctan.org/pkg/euenc">euenc <dt>History:</dt> <dd><table class="borderless"> <colgroup> -<col width="14%" /> <col width="8%" /> +<col width="14%" /> <col width="78%" /> </colgroup> <tbody> -<tr><td><p>2013-07-16</p></td> -<td><p>0.1</p></td> +<tr><td><p>0.1</p></td> +<td><p>2013-07-16</p></td> <td><p>initial version</p></td> </tr> -<tr><td><p>2013-07-18</p></td> -<td><p>0.1.1</p></td> +<tr><td><p>0.1.1</p></td> +<td><p>2013-07-18</p></td> <td><p>bugfix: wrong breathings psilioxia -> dasiaoxia</p></td> </tr> -<tr><td><p>2013-07-19</p></td> -<td><p>0.1.2</p></td> -<td><p>bugfix: Disable composite defs starting with char macro,</p></td> -</tr> -<tr><td><!-- --> -</td> -<td> </td> -<td><p>fix “hiatus” handling.</p></td> +<tr><td><p>0.1.2</p></td> +<td><p>2013-07-19 +..</p></td> +<td><p>bugfix: Disable composite defs starting with char macro, +fix “hiatus” handling.</p></td> </tr> -<tr><td><p>2013-07-24</p></td> -<td><p>0.1.3</p></td> +<tr><td><p>0.1.3</p></td> +<td><p>2013-07-24</p></td> <td><p>fix “input” path.</p></td> </tr> -<tr><td><p>2013-10-01</p></td> -<td><p>0.1.4</p></td> -<td><p>remove clashing defs for legacy characters with oxia,</p></td> +<tr><td><p>0.1.4</p></td> +<td><p>2013-10-01 +..</p></td> +<td><p>remove clashing defs for legacy characters with oxia, +fix upcasing of <tt class="literal">\finalsigma</tt>.</p></td> </tr> -<tr><td><!-- --> -</td> -<td> </td> -<td><p>fix upcasing of <tt class="literal">\finalsigma</tt>.</p></td> -</tr> -<tr><td><p>2013-12-01</p></td> -<td><p>0.11.1</p></td> +<tr><td><p>0.11.1</p></td> +<td><p>2013-12-01</p></td> <td><p>fix identification.</p></td> </tr> -<tr><td><p>2014-09-08</p></td> -<td><p>0.11.2</p></td> +<tr><td><p>0.11.2</p></td> +<td><p>2014-09-08</p></td> <td><p><tt class="literal">\textKoppa</tt> macro</p></td> </tr> <tr><td><!-- --> @@ -789,6 +783,10 @@ Extends <a class="reference external" href="http://www.ctan.org/pkg/euenc">euenc <td> </td> <td><p>(Capital Koppa is not defined in LGR but Unicode).</p></td> </tr> +<tr><td><p>0.12</p></td> +<td><p>2014-12-12</p></td> +<td><p>Remove symbol macros for breathing accents.</p></td> +</tr> </tbody> </table> </dd> @@ -830,8 +828,8 @@ conventions and in the definition of composite commands.</p></li> COMBINING COMMA ABOVE)</p> <pre class="literal-block">\DeclareTextCommand{\accpsili}{\LastDeclaredEncoding}[1]{#1\char"0313 } % ψιλή spiritus lenis (smooth breathing) \DeclareTextCommand{\accdasia}{\LastDeclaredEncoding}[1]{#1\char"0314 } % δασεῖα spiritus asper (rough breathing) -\DeclareTextCommand{\>}{\LastDeclaredEncoding}{\accpsili} -\DeclareTextCommand{\<}{\LastDeclaredEncoding}{\accdasia} +% \DeclareTextCommand{\>}{\LastDeclaredEncoding}{\accpsili} +% \DeclareTextCommand{\<}{\LastDeclaredEncoding}{\accdasia} </pre> <p>Sub-iota:</p> <p><tt class="literal">\ypogegrammeni</tt> is a postfix accent (ligature in LGR)</p> diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/greek-fontenc.def.html b/Master/texmf-dist/doc/latex/greek-fontenc/greek-fontenc.def.html index cd0a05898eb..18d03593ced 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/greek-fontenc.def.html +++ b/Master/texmf-dist/doc/latex/greek-fontenc/greek-fontenc.def.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> <title>greek-fontenc.def</title> <meta name="copyright" content="© 2013 Günter Milde" /> <style type="text/css"> @@ -728,7 +728,7 @@ version 1.3 of this license or any later version.</p> </dd> <dt>Identification</dt> <dd><pre class="literal-block">\ProvidesFile{greek-fontenc.def} -[2013/11/28 v0.11 Common Greek font encoding definitions] +[2014/12/12 v0.12 Common Greek font encoding definitions] </pre> </dd> </dl> @@ -758,6 +758,10 @@ font encodings providing Greek characters.</p> <td><p>2013-11-28</p></td> <td><p><tt class="literal">\greekscript</tt> TextCommand</p></td> </tr> +<tr><td><p>0.12</p></td> +<td><p>2014-12-12</p></td> +<td><p>Remove symbol macros for breathing accents.</p></td> +</tr> </tbody> </table> </dd> @@ -809,8 +813,18 @@ without the need for additional <a class="reference internal" href="#uclclist">u \DeclareTextCommand{\acckoronis}{\LastDeclaredEncoding}{\accpsili} </pre> <p>Symbol macros for the breathings:</p> -<pre class="literal-block">\DeclareTextCommand{\<}{\LastDeclaredEncoding}{\accdasia} -\DeclareTextCommand{\>}{\LastDeclaredEncoding}{\accpsili} +<p>Moved to <tt class="literal">textalpha.sty</tt> to avoid clashes with local definitions +of <tt class="literal">\<</tt> and <tt class="literal">\></tt> in documents using LGR or babel-greek. +(Bugreport David Kastrup). If you want to use the short macros without +loading <cite>textalpha</cite>, you can define them in the document preamble like</p> +<pre class="code latex literal-block"><span class="keyword">\DeclareTextCommand</span><span class="name builtin">{</span><span class="keyword">\<</span><span class="name builtin">}{</span>LGR<span class="name builtin">}{</span><span class="keyword">\accdasia</span><span class="name builtin">}</span> +<span class="keyword">\DeclareTextCommand</span><span class="name builtin">{</span><span class="keyword">\></span><span class="name builtin">}{</span>LGR<span class="name builtin">}{</span><span class="keyword">\accpsili</span><span class="name builtin">}</span> +<span class="keyword">\DeclareTextCompositeCommand</span><span class="name builtin">{</span><span class="keyword">\></span><span class="name builtin">}{</span>LGR<span class="name builtin">}{</span>'<span class="name builtin">}{</span><span class="keyword">\accpsilioxia</span><span class="name builtin">}</span> +<span class="keyword">\DeclareTextCompositeCommand</span><span class="name builtin">{</span><span class="keyword">\></span><span class="name builtin">}{</span>LGR<span class="name builtin">}{</span>`<span class="name builtin">}{</span><span class="keyword">\accpsilivaria</span><span class="name builtin">}</span> +<span class="keyword">\DeclareTextCompositeCommand</span><span class="name builtin">{</span><span class="keyword">\></span><span class="name builtin">}{</span>LGR<span class="name builtin">}{</span>~<span class="name builtin">}{</span><span class="keyword">\accpsiliperispomeni</span><span class="name builtin">}</span> +<span class="keyword">\DeclareTextCompositeCommand</span><span class="name builtin">{</span><span class="keyword">\<</span><span class="name builtin">}{</span>LGR<span class="name builtin">}{</span>'<span class="name builtin">}{</span><span class="keyword">\accdasiaoxia</span><span class="name builtin">}</span> +<span class="keyword">\DeclareTextCompositeCommand</span><span class="name builtin">{</span><span class="keyword">\<</span><span class="name builtin">}{</span>LGR<span class="name builtin">}{</span>`<span class="name builtin">}{</span><span class="keyword">\accdasiavaria</span><span class="name builtin">}</span> +<span class="keyword">\DeclareTextCompositeCommand</span><span class="name builtin">{</span><span class="keyword">\<</span><span class="name builtin">}{</span>LGR<span class="name builtin">}{</span>~<span class="name builtin">}{</span><span class="keyword">\accdasiaperispomeni</span><span class="name builtin">}</span> </pre> <p>TODO: do we also want alternative symbols for the breathings (cf. X compose table, LCI encoding)?</p> @@ -827,8 +841,8 @@ table, LCI encoding)?</p> <p>Composite accents can be input as sequence of simple diacritics (in arbitrary order) via named macro, symbol macro and “transcription characters”, e.g. one of</p> -<pre class="code latex literal-block"><span class="keyword">\accdialytica</span><span class="keyword">\accvaria</span><span class="keyword">\textalpha</span>, -<span class="keyword">\"</span><span class="keyword">\'</span><span class="keyword">\textalpha</span>, +<pre class="code latex literal-block"><span class="keyword">\accdialytica\accvaria\textalpha</span>, +<span class="keyword">\"\'\textalpha</span>, <span class="keyword">\"</span>'<span class="keyword">\textalpha</span>, or <span class="keyword">\'</span>"<span class="keyword">\textalpha</span>. </pre> @@ -909,27 +923,21 @@ composite definitions starting with standard macros are requried:</p> \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\acctonos}{\accpsilioxia} \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\'}{\accpsilioxia} \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{'}{\accpsilioxia} -\DeclareTextCompositeCommand{\>}{\LastDeclaredEncoding}{'}{\accpsilioxia} \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\accvaria}{\accpsilivaria} \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\`}{\accpsilivaria} \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{`}{\accpsilivaria} -\DeclareTextCompositeCommand{\>}{\LastDeclaredEncoding}{`}{\accpsilivaria} \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\accperispomeni}{\accpsiliperispomeni} \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{\~}{\accpsiliperispomeni} \DeclareTextCompositeCommand{\accpsili}{\LastDeclaredEncoding}{~}{\accpsiliperispomeni} -\DeclareTextCompositeCommand{\>}{\LastDeclaredEncoding}{~}{\accpsiliperispomeni} \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\acctonos}{\accdasiaoxia} \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\'}{\accdasiaoxia} \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{'}{\accdasiaoxia} -\DeclareTextCompositeCommand{\<}{\LastDeclaredEncoding}{'}{\accdasiaoxia} \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\accvaria}{\accdasiavaria} \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\`}{\accdasiavaria} \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{`}{\accdasiavaria} -\DeclareTextCompositeCommand{\<}{\LastDeclaredEncoding}{`}{\accdasiavaria} \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\accperispomeni}{\accdasiaperispomeni} \DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\~}{\accdasiaperispomeni} -\DeclareTextCompositeCommand{\<}{\LastDeclaredEncoding}{~}{\accdasiaperispomeni} </pre> </div> <div class="section" id="uppercase"> diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/greekhyperref.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/greekhyperref.pdf Binary files differindex da9f4ad1a21..3fa16a7d2fa 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/greekhyperref.pdf +++ b/Master/texmf-dist/doc/latex/greek-fontenc/greekhyperref.pdf diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/greekhyperref.tex b/Master/texmf-dist/doc/latex/greek-fontenc/greekhyperref.tex index c15d8df5b77..ed3c8b5cb34 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/greekhyperref.tex +++ b/Master/texmf-dist/doc/latex/greek-fontenc/greekhyperref.tex @@ -4,12 +4,13 @@ \usepackage[LGR,T1]{fontenc} \usepackage{lmodern} +\usepackage[unicode,colorlinks=true,linkcolor=blue]{hyperref} +\usepackage{bookmark} + \usepackage[greek,english]{babel} \usepackage{alphabeta} \usepackage[utf8]{inputenc} -\usepackage[unicode,colorlinks=true,linkcolor=blue]{hyperref} -\usepackage{bookmark} % \pagestyle{headings} @@ -65,7 +66,7 @@ from the `lgrx` package for details an workarounds. \section{LGR + Macros: \foreignlanguage{greek}{ \textlambda\textomicron\textgamma\textomicron\textvarsigma{}}} - + LICR-macro input works also if the font encoding is LGR. \section{% @@ -98,7 +99,7 @@ LGR font encoding as literal Unicode characters. \subsection{῀῁ῂῃῄῆῇῈΈῊΉῌ῍῎῏ ῐῑῒΐῖῗῘῙῚΊ῝῞῟} \subsection{ῠῡῢΰῤῥῦῧῨῩῪΎῬ῭΅` ῲῳῴῶῷῸΌῺΏῼ´῾} -\section{non-standard and combined diacritics: +\section{non-standard and combined diacritics: \ensuregreek{\>\textalpha \'"\textalpha}} Currently, there is no hyperref support for LICR input with non-standard diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.pdf Binary files differindex eea0f4a340c..32a151675c0 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.pdf +++ b/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.pdf diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.tex b/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.tex index 724bbef72db..6e19e30039c 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.tex +++ b/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc-test.tex @@ -17,8 +17,26 @@ \usepackage{parskip} \usepackage{textcomp} + \usepackage[LGR,T1]{fontenc} +% Shortcut accent macros \< and \>: +% +% The Symbol macros for the breathings were +% moved to ``textalpha.sty`` to avoid clashes with possible local +% definitions of these macros. +% +% Local definition and setup: +\DeclareTextCommand{\<}{LGR}{\accdasia} +\DeclareTextCommand{\>}{LGR}{\accpsili} +\DeclareTextCompositeCommand{\>}{LGR}{'}{\accpsilioxia} +\DeclareTextCompositeCommand{\>}{LGR}{`}{\accpsilivaria} +\DeclareTextCompositeCommand{\>}{LGR}{~}{\accpsiliperispomeni} +\DeclareTextCompositeCommand{\<}{LGR}{'}{\accdasiaoxia} +\DeclareTextCompositeCommand{\<}{LGR}{`}{\accdasiavaria} +\DeclareTextCompositeCommand{\<}{LGR}{~}{\accdasiaperispomeni} + + % With XeTeX/LuaTeX, use Unicode for Latin script: \ifdefined\luatexversion \usepackage{fontspec}\else \ifdefined\XeTeXrevision \usepackage{fontspec}\else @@ -39,7 +57,6 @@ \newcommand{\LGR}{\fontencoding{LGR}\selectfont} \newcommand{\Latin}{\fontencoding{\encodingdefault}\selectfont} - \begin{document} \title{Test LGR font encoding definitions} @@ -55,7 +72,7 @@ The example from \texttt{usage.tex} in \emph{babel-greek} input using the LICR macros: \begin{quote} - \LGR + \LGR \textTau\'\textiota{} \textphi\'\texteta\textiota\textfinalsigma\texterotimatiko{} \<\textIota\textdelta\`\textomega\textnu{} @@ -100,7 +117,12 @@ LGR: \textvisiblespace{} \Latin (Per-mille symbol is missing in LGR.) -Quotes: +Quotes:\footnote{% + Single quotes need special attention to prevent conversion to accents. + Test the input conventions: + \LGR \textquoteleft{}a\textquoteright{} ``a'' \``a\'' \`\`a\'\' + \Latin but not \LGR `a' 'e' "i"\Latin +} % \Latin \guillemotleft{}a\guillemotright{} \LGR \guillemotleft{}a\guillemotright{}, @@ -110,24 +132,17 @@ Quotes: % \Latin \textquotedblleft{}a\textquotedblright{} \LGR \textquotedblleft{}a\textquotedblright{} -\Latin (double quotes wrong with Kerkis fonts), - -\begin{quote} - Single quotes need special attention to prevent conversion to accents. - Test the input conventions: - \LGR \textquoteleft{}a\textquoteright{} ``a'' \``a\'' \`\`a\'\' - \Latin but not \LGR `a' 'e' "i"\Latin +\Latin (double quotes wrong with Kerkis fonts) - Single guillemots and base-quotes +Single guillemots and base-quotes (\guilsinglleft{}a\guilsinglright{} \quotedblbase{}a\textquotedblright{} \quotesinglbase{}a\textquoteright{}) are missing in LGR. -\end{quote} Ligature break up: AY fi \LGR AU "i $\mapsto$ -\Latin A\textcompwordmark{}Y f\textcompwordmark i -\LGR A\textcompwordmark{}U "\textcompwordmark i +\Latin A\textcompwordmark Y f\textcompwordmark i +\LGR A\textcompwordmark U "\textcompwordmark i \Latin Spacing accent chars: @@ -155,7 +170,8 @@ Ligature break up: AY fi \LGR AU "i $\mapsto$ \Latin Symbols for SI-units: \Latin 5\,\textmu{}m, 5\,k\textohm{}; -\LGR 5\,\textmu{}{\Latin m}, 5\,{\Latin k}\textohm{} +\LGR 5\,\textmu{}{\Latin m}, 5\,{\Latin k}\textohm +\Latin ; but never italic: 5\,$\mu$m \Latin Letter schwa and Euro symbol: % \textschwa (needs e.g. T3) \LGR \textschwa{}, \texteuro{} @@ -186,113 +202,122 @@ LGR (with textcomp): Greek letters via Latin transcription and LICR macros: -\LGR -\MakeUppercase{a b g d e z h j i k l m n x o p r s t u f q y w} - -a b g d e z h j i k l m n x o p r sv t u f q y w - -\textAlpha{} \textBeta{} \textGamma{} \textDelta{} \textEpsilon{} -\textZeta{} \textEta{} \textTheta{} \textIota{} \textKappa{} -\textLambda{} \textMu{} \textNu{} \textXi{} \textOmicron{} \textPi{} -\textRho{} \textSigma{} \textTau{} \textUpsilon{} \textPhi{} -\textChi{} \textPsi{} \textOmega{} - -\textalpha{} \textbeta{} \textgamma{} \textdelta{} \textepsilon{} -\textzeta{} \texteta{} \texttheta{} \textiota{} \textkappa{} -\textlambda{} \textmu{} \textnu{} \textxi{} \textomicron{} \textpi{} -\textrho{} \textsigma{} \texttau{} \textupsilon{} -\textphi{} \textchi{} \textpsi{} \textomega{} +\begin{quote} + \LGR + \MakeUppercase{a b g d e z h j i k l m n x o p r s t u f q y w} + + a b g d e z h j i k l m n x o p r sv t u f q y w + + \textAlpha{} \textBeta{} \textGamma{} \textDelta{} \textEpsilon{} + \textZeta{} \textEta{} \textTheta{} \textIota{} \textKappa{} + \textLambda{} \textMu{} \textNu{} \textXi{} \textOmicron{} \textPi{} + \textRho{} \textSigma{} \textTau{} \textUpsilon{} \textPhi{} + \textChi{} \textPsi{} \textOmega{} + + \textalpha{} \textbeta{} \textgamma{} \textdelta{} \textepsilon{} + \textzeta{} \texteta{} \texttheta{} \textiota{} \textkappa{} + \textlambda{} \textmu{} \textnu{} \textxi{} \textomicron{} \textpi{} + \textrho{} \textsigma{} \texttau{} \textupsilon{} + \textphi{} \textchi{} \textpsi{} \textomega{} +\end{quote} -\Latin The small sigma is set with a different -glyph if it ends a word: +The small sigma is set with a different glyph if it ends a word: -\LGR \textsigma{} \Latin textsigma \\ -\LGR \textfinalsigma{} \Latin textfinalsigma or textvarsigma +\begin{quote} + \LGR \textsigma{} \Latin textsigma \\ + \LGR \textfinalsigma{} \Latin textfinalsigma or textvarsigma +\end{quote} In the Latin transcription, the letter `s' stands for \verb|\textautosigma| which automatically chooses the glyph according to the position. \subsection{Additional Greek symbols} -\LGR \textkoppa{} \Latin textkoppa \\ % ϟ -\LGR \textqoppa{} \Latin textqoppa (archaic koppa) \\ % ϙ -\LGR \textQoppa{} \Latin textQoppa (archaic Koppa) \\ % Ϙ -\LGR \textstigma{} \Latin textstigma \\ % ϛ -\LGR \textvarstigma{} \Latin textvarstigma \\ % no separate Unicode character -\LGR \textStigma{} \Latin textStigma (Sigma-Tau-Ligature in CB-fonts)% -\footnote{the name ``stigma'' originally applied to a medieval sigma-tau - ligature, whose shape was confusably similar to the cursive - digamma} \\ % Ϛ -\LGR \textsampi{} \Latin textsampi \\ % ϡ -\LGR \textSampi{} \Latin textSampi \\ % Ϡ -\LGR \textdigamma{} \Latin textdigamma \\ % ϝ (\digamma used by amsmath!) -\LGR \textDigamma{} \Latin textDigamma \\ % Ϝ -% numeral signs: http://en.wikipedia.org/wiki/Greek_numerals -\LGR \textnumeralsigngreek{} \Latin textnumeralsigngreek (Dexia keraia) \\ % ʹ -\LGR \textnumeralsignlowergreek{} \Latin textnumeralsignlowergreek - (Aristeri keraia)\\ % ͵ - -\Latin Mathematical notation sometimes uses variant shapes for pi ($\varpi$), +\begin{quote} + \LGR \textkoppa{} \Latin textkoppa \\ % ϟ + \LGR \textqoppa{} \Latin textqoppa (archaic koppa) \\ % ϙ + \LGR \textQoppa{} \Latin textQoppa (archaic Koppa) \\ % Ϙ + \LGR \textstigma{} \Latin textstigma \\ % ϛ + \LGR \textvarstigma{} \Latin textvarstigma \\ % no separate Unicode character + \LGR \textStigma{} \Latin textStigma (Sigma-Tau-Ligature in CB-fonts)% + \footnote{the name ``stigma'' originally applied to a medieval sigma-tau + ligature, whose shape was confusingly similar to the cursive + digamma} \\ % Ϛ + \LGR \textsampi{} \Latin textsampi \\ % ϡ + \LGR \textSampi{} \Latin textSampi \\ % Ϡ + \LGR \textdigamma{} \Latin textdigamma \\ % ϝ (\digamma used by amsmath!) + \LGR \textDigamma{} \Latin textDigamma \\ % Ϝ + % numeral signs: http://en.wikipedia.org/wiki/Greek_numerals + \LGR \textnumeralsigngreek{} \Latin textnumeralsigngreek (Dexia keraia) \\ % ʹ + \LGR \textnumeralsignlowergreek{} \Latin textnumeralsignlowergreek + (Aristeri keraia)\\ % ͵ +\end{quote} + +Mathematical notation sometimes uses variant shapes for pi ($\varpi$), kappa (\emph{no TeX symbol available}), rho ($\varrho$), and theta ($\vartheta$). These variations have no syntactic meaning in Greek text and are not given code-points in the LGR encoding. Some Greek text fonts use -variant shapes in place of the ``regular'' ones. +the variant shapes in place of the ``regular'' ones. \section{Diacritics} Capital Greek letters have Greek diacritics (except the dialytika) to the left (instead of above) and drop them in UPPERCASE. This is implemented for all combinations for which a pre-composed Unicode character exists (but not, -e.g., \LGR \~A\Latin). +for, e.g.,\LGR \~W \Latin). % When a word is written entirely in capital letters, diacritics are % never used; the word Ἢ (or), is an exception to this rule because of % the need to distinguish it from the nominative feminine article Η. Different conventions exist for the treatment of the sub-iota with uppercase -letters. The CB-Fonts use a capital Iota ``index''. - -LaTeX standard accents (Latin, Greek, Greek Capitals) -$\mapsto$ UPPERCASE +letters. The CB-Fonts use a capital Iota ``index'' (\LGR A|, H|, W|\Latin). -\`{a} \'{a} \~{a} \"{a} \^{a} \={a} \H{a} \.{a} \r{a} \u{a} \v{a} -\b{a} \c{a} \d{a} \k{a} -$\mapsto$ \MakeUppercase{% -\`{a} \'{a} \~{a} \"{a} \^{a} \={a} \H{a} \.{a} \r{a} \u{a} \v{a} -\b{a} \c{a} \d{a} \k{a} -} +LaTeX standard accents +(Latin, Greek, Greek Capitals $\mapsto$ UPPERCASE) -\LGR -\`{a} \'{a} \~{a} \"{a} \^{a} \={a} \H{a} \.{a} \r{a} \u{a} \v{a} -\b{a} \c{a} \d{a} -$\mapsto$ \MakeUppercase{% -\`{a} \'{a} \~{a} \"{a} \^{a} \={a} \H{a} \.{a} \r{a} \u{a} \v{a} -\b{a} \c{a} \d{a} -} - -\`{A} \'{A} \~{A} \"{A} \^{A} \={A} \H{A} \.{A} \r{A} \u{A} \v{A} -\b{A} \c{A} \d{A} -$\mapsto$ \MakeUppercase{% -\`{A} \'{A} \~{A} \"{A} \^{A} \={A} \H{A} \.{A} \r{A} \u{A} \v{A} -\b{A} \c{A} \d{A} -} +\begin{quote} + \`{a} \'{a} \~{a} \"{a} \^{a} \={a} \H{a} \.{a} \r{a} \u{a} \v{a} + \b{a} \c{a} \d{a} \k{a} + $\mapsto$ \MakeUppercase{% + \`{a} \'{a} \~{a} \"{a} \^{a} \={a} \H{a} \.{a} \r{a} \u{a} \v{a} + \b{a} \c{a} \d{a} \k{a} + } + + \LGR + \`{a} \'{a} \~{a} \"{a} \^{a} \={a} \H{a} \.{a} \r{a} \u{a} \v{a} + \b{a} \c{a} \d{a} + $\mapsto$ \MakeUppercase{% + \`{a} \'{a} \~{a} \"{a} \^{a} \={a} \H{a} \.{a} \r{a} \u{a} \v{a} + \b{a} \c{a} \d{a} + } + + \`{A}\'{A}\~{A}\"{A} \^{A}\={A}\H{A}\.{A}\r{A}\u{A}\v{A} + \b{A} \c{A} \d{A} + $\mapsto$ \MakeUppercase{% + \`{A}\'{A}\~{A}\"{A} \^{A}\={A}\H{A}\.{A}\r{A}\u{A}\v{A} + \b{A} \c{A} \d{A} + } +\end{quote} \Latin The comma-below (\verb|\k|) is not defined in LGR. Additional Greek diacritics -\LGR -\<{a} \>{e} \<\`{i} \'"i \`"i \~"i \`\>{h} \'<{o} \'>{o} \~\<{u} \~\>{w} -$\mapsto$ \MakeUppercase{% -\<{a} \>{e} \<\`{i} \'"i \`"i \~"i \`\>{h} \'<{o} \'>{o} \~\<{u} \~\>{w} -} - -% The dialytika is not used on Initial letters ("'I \"`I \~"I) -\<{A} \>{E} \<\`{I} \'"I \"`I \~"I \`\>{H} \'<{O} \'>{O} \~\<{U} \~\>{W} -$\mapsto$ \MakeUppercase{% -\<{A} \>{E} \<\`{I} \'"I \"`I \~"I \`\>{H} \'<{O} \'>{O} \~\<{U} \~\>{W} -} +\begin{quote} + \LGR + \<{a} \>{e} \<\`{i} \'"i \`"i \~"i \`\>{h} \'<{o} \'>{o} \~\<{u} \~\>{w} + $\mapsto$ \MakeUppercase{% + \<{a} \>{e} \<\`{i} \'"i \`"i \~"i \`\>{h} \'<{o} \'>{o} \~\<{u} \~\>{w} + } + + % The dialytika is not used on Initial letters ("'I \"`I \~"I) + \<{A} \>{E} \<\`{I} \'"I \"`I \~"I \`\>{H} \'<{O} \'>{O} \~\<{U} \~\>{W} + $\mapsto$ \MakeUppercase{% + \<{A} \>{E} \<\`{I} \'"I \"`I \~"I \`\>{H} \'<{O} \'>{O} \~\<{U} \~\>{W} + } +\end{quote} \Latin Input variants and their conversion with MakeUppercase:% @@ -308,7 +333,7 @@ $\mapsto$ \MakeUppercase{% \MakeUppercase{ \~>a \>\~a \~\>{a}, \~<a \<\~a \<~a \~\<a \~<a, \>\~{h} \~>h \>~h \>\~h \~>h \~>h|, \~<h \<\~h, -\>\~i \~>i, \~<i \<\~i, \~"i \"\~i \"~i,\\ +\>\~i \~>i, \~<i \<\~i, \~"i \"\~i \\ % for \"~i, see below \>\~u \~>u, \~<u \<\~u, \~"u \"\~u, \>w, \<w, \>\~w \~>w, \~<w \<\~w. } @@ -329,57 +354,85 @@ $\mapsto$ \MakeUppercase{% \end{quote} -\Latin The tilde character can be used in combined accents. +The tilde character can be used in combined accents. However, in documents not defining the Babel language \emph{greek} or \emph{polutonikogreek}, it will produce a no-break space if converted with \verb|\MakeUppercase|: +\begin{quote} + \LGR \"~i \<~i \"~u \<~u \`>u $\mapsto$ + \LGR \MakeUppercase{\"~i \<~i \"~u \<~u \`>u} +\end{quote} +Use the tilde-accent macro: +\LGR \"\~i \~"u $\mapsto$ \MakeUppercase{\"\~i \~"u}. + +\Latin +Accents input via the Latin transliteration are not dropped with +MakeUppercase, unless Babel is loaded and the current language is Greek +(because the required local re-definitions of the \texttt{uccode} are done in +\texttt{greek.ldf} from the \emph{babel-greek} package). + +\begin{quote} \LGR + ', ", `, >, <, | $\mapsto$ \MakeUppercase{', ", `, >, <, |} +\end{quote} -\LGR \"~i \<~i \"~u \<~u \`>u $\mapsto$ -\LGR \MakeUppercase{\"~i \<~i \"~u \<~u \`>u} -\\ -\Latin Use the tilde-accent macro: -\LGR "\~i \~"u $\mapsto$ \MakeUppercase{\"\~i \~"u}. \Latin Accent macros can start with \verb|\a| instead of \verb|\| when the short form is redefined, e.\,g. inside a \emph{tabbing} environment. -This also works for the new-defined Dasia and Psili shortcuts: -\LGR \a<\textalpha{} \a>\textomega. +This also works for the locally defined Dasia and Psili shortcuts \verb|\<| +and \verb|\>|: +\begin{quote} + \begin{tabbing} + COL1\quad \= COL2\quad \= COL3\quad \= COL4\quad \\ + COL1 \> \> COL3 \\ + Viele \> Gr\a"u\ss e \> \LGR \a<\textalpha{} \> \LGR \a>\textomega + \end{tabbing} +\end{quote} + \Latin Combinations with named accents: \LGR \accdasia'a \accdasia`a \accdasia\~a. \Latin The dialytika must be kept in UPPERCASE, e.\,g. -% from http://diacritics.typo.cz/index.php?id=70 μαΐστρος -> ΜΑΪΣΤΡΟΣ. -\LGR ma\"'istros $\mapsto$ \MakeUppercase{ma\"'istros} -\Latin or % from teubner εὐζωΐα -> ΕΥΖΩΪΑ. -\LGR e\>uzw\'"ia $\mapsto$ \MakeUppercase{e\>uzw\'"ia}. -\Latin This is implemented for all input variants of diacritics with +\begin{quote} + % from http://diacritics.typo.cz/index.php?id=70 μαΐστρος -> ΜΑΪΣΤΡΟΣ. + \LGR ma\"'istros $\mapsto$ \MakeUppercase{ma\"'istros} + \Latin or % from teubner εὐζωΐα -> ΕΥΖΩΪΑ. + \LGR e\>uzw\'"ia $\mapsto$ \MakeUppercase{e\>uzw\'"ia}. +\end{quote} + +This is implemented for all input variants of diacritics with dialytika: -\LGR \"i \"'i \"`i \"\~i \"u \"'u \"`u \"\~u $\mapsto$ -\MakeUppercase{\"i \"'i \"`i \"\~i \"u \"'u \"`u \"\~u}, +\begin{quote} + \LGR \"i \"'i \"`i \"\~i \"u \"'u \"`u \"\~u $\mapsto$ + \MakeUppercase{\"i \"'i \"`i \"\~i \"u \"'u \"`u \"\~u}, +\end{quote} -\Latin Tonos and dasia mark a \emph{hiatus} (break-up of a diphthong) if placed on the first vowel of a diphthong ({\LGR \'ai, \'au, \'ei}). A dialytika must be placed on the second vowel if they are dropped: \LGR (\MakeUppercase{\'ai, \'au, \'ei}). -% from teubner: άυλος/ΑΫΛΟΣ -\'aulos $\mapsto$ \MakeUppercase{\'aulos}, -\>'aulos $\mapsto$ \MakeUppercase{\>'aulos}, -% from http://diacritics.typo.cz/index.php?id=69 μάινα -> ΜΑΪΝΑ -m\'aina $\mapsto$ \MakeUppercase{m\'aina}, -% from http://de.wikipedia.org/wiki/Neugriechische_Orthographie#Das_Trema -% κέικ, ἀυπνία/αϋπνία -k\'eik, $\mapsto$ \MakeUppercase{k\'eik} -\>aupn\'ia $\mapsto$ \MakeUppercase{\>aupn\'ia} +\begin{quote} + % from teubner: άυλος/ΑΫΛΟΣ + \'aulos $\mapsto$ \MakeUppercase{\'aulos}, + \>'aulos $\mapsto$ \MakeUppercase{\>'aulos}, + % from http://diacritics.typo.cz/index.php?id=69 μάινα -> ΜΑΪΝΑ + m\'aina $\mapsto$ \MakeUppercase{m\'aina}, + % from http://de.wikipedia.org/wiki/Neugriechische_Orthographie#Das_Trema + % κέικ, ἀυπνία/αϋπνία + k\'eik, $\mapsto$ \MakeUppercase{k\'eik} + \>aupn\'ia $\mapsto$ \MakeUppercase{\>aupn\'ia} +\end{quote} + +\newpage \Latin Test the auto-hiatus feature for side-effects: -\LGR \MakeUppercase{\'a b}: \Latin keep space after A. +\LGR \MakeUppercase{\'a b} (\Latin must keep space after A). +Kerning (see the input): \LGR \newcommand\md{\textcompwordmark} \newcommand\MU{\MakeUppercase} diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc.def.html b/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc.def.html index bbc0853f5d7..d43e9ac74ed 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc.def.html +++ b/Master/texmf-dist/doc/latex/greek-fontenc/lgrenc.def.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> <title>lgrenc.def</title> <meta name="copyright" content="© 2010, 2014 Günter Milde" /> <style type="text/css"> @@ -897,7 +897,7 @@ package.</p> <td><p>add composite commands for single quotation marks.</p></td> </tr> <tr><td><p>0.11.2</p></td> -<td><p>unpublished</p></td> +<td><p>2014-09-04</p></td> <td><p>remove duplicate code.</p></td> </tr> </tbody> @@ -939,7 +939,7 @@ anyway.</p> <div class="section" id="identification"> <h2><a class="toc-backref" href="#id6">Identification</a></h2> <pre class="literal-block">\ProvidesFile{lgrenc.def} -[2013/12/02 v0.11.2 LGR Greek font encoding definitions] +[2014/09/04 v0.11.2 LGR Greek font encoding definitions] % Copyright © 2010 Günter Milde % This file is part of the "greek-fontenc" package. % It may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-doc.pdf b/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-doc.pdf Binary files differindex 0b65e3ab77f..48fc781285f 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-doc.pdf +++ b/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-doc.pdf diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-doc.tex b/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-doc.tex index 79b2a42768a..17780a33524 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-doc.tex +++ b/Master/texmf-dist/doc/latex/greek-fontenc/textalpha-doc.tex @@ -7,10 +7,10 @@ \usepackage[LGR,T1]{fontenc} % UTF8 input encoding for pdfTeX or Xe/LuaTeX in 8-bit compatibility mode: -\ifdefined \XeTeXrevision +\ifdefined \XeTeXrevision \XeTeXinputencoding "bytes" \fi -\ifdefined \luatexversion +\ifdefined \luatexversion \usepackage[utf8]{luainputenc} \else \usepackage[utf8]{inputenc} @@ -34,7 +34,7 @@ symbol (like \textPsi{} or \textmu{}) or a \textlambda\textomicron\textgamma\textomicron\textvarsigma{} in non-Greek text as well as ISO-conforming formulas with upright constants (like \textpi): $A = \mbox{\textpi} r^2$ vs. $A = \pi r^2$. Input is possible via -LICR macros (\verb|\textalpha| \ldots \verb|\textOmega|) or (with +LICR macros (\verb|\textalpha| \ldots \verb|\textOmega|) or (with \emph{\href{http://www.ctan.org/pkg/greek-inputenc}{greek-inputenc}} and the utf8 option or XeTeX/LuaTeX) Unicode literals. @@ -42,7 +42,6 @@ See the source of this document \url{textalpha-doc.tex} for a setup and usage example and the literate source of the package \href{textalpha.sty.html}{textalpha.sty} for the implementation. - \section{Greek alphabet} Greek letters via Latin transcription in LGR font encoding: @@ -88,15 +87,16 @@ Archaic Greek letters and Greek punctuation \textvarstigma \end{quote} + Diacritics \begin{quote} Symbol macros:% - \footnote{Composite diacritics require wrapping in + \footnote{Composite diacritics require wrapping in \texttt{\textbackslash ensuregreek}.} \"{} \'{} \`{} \~{} \<{} \>{} \u{} \={} \ensuregreek{\"~{} \"'{} \"`{} \<~{} \<`{} \<'{} \>~{} \>'{} \>`{}} - + Named macros: \accdialytika{} \acctonos{} @@ -106,7 +106,7 @@ Diacritics \accpsili{} \ypogegrammeni{} \prosgegrammeni{} - % + % \accdialytikaperispomeni{} \accdialytikatonos{} \accdialytikavaria{} @@ -120,24 +120,37 @@ Diacritics \accinvertedbrevebelow{} % == \textsubarch{} \accbrevebelow{} - + +\end{quote} + +Accent macros can start with \verb|\a| instead of \verb|\| when the +short form is redefined, e.\,g. inside a \emph{tabbing} environment. +This also works for the new-defined Dasia and Psili shortcuts: +\begin{quote} + \begin{tabbing} + COL1\quad \= COL2\quad \= COL3\quad \= COL4\quad \\ + COL1 \> \> COL3 \\ + Viele \> Gr\a"u\ss e + \> \greekscript \a<\textalpha{} + \> \greekscript \a>\textomega + \end{tabbing} \end{quote} -\pagebreak{} + +% \pagebreak{} \section{Greek Unicode characters in non-Greek text} With the \emph{textalpha} package and input encoding \texttt{utf8}, Greek -Unicode characters can be used in text with any font encoding. +Unicode characters can be used in text with any font encoding. See Tables +\ref{tab:greek-and-coptic} and \ref{tab:greek-extended}. Kerning is preserved if the font encoding is LGR. This holds also for pre-composed accented characters: \ensuregreek{AΫA}. -All characters of the Greek and Coptic Unicode Block present in LGR via -literal Unicode input in T1 font encoding -(legend: * glyph missing in LGR): - +\begin{table}[tbp] + \centering \begin{tabular}{rrrrrrrrrrrrrrrrr} \toprule & 0 & 1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 & 9 & A & B & C & D & E & F\\ @@ -153,10 +166,14 @@ literal Unicode input in T1 font encoding 3F0 & * & * & * & * & * & * & * & * & * & * & * & * & * & * & * & *\\ \bottomrule \end{tabular} +\caption{Greek and Coptic Unicode Block, input as literal Unicode + characters in T1 font encoding (legend: * glyph missing in LGR).} +\label{tab:greek-and-coptic} +\end{table} -All characters of the Greek Extended Unicode Block via literal Unicode -input in T1 font encoding: +\begin{table}[tbp] + \centering \begin{tabular}{rrrrrrrrrrrrrrrrr} \toprule & 0 & 1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 & 9 & A & B & C & D & E & F\\ @@ -179,7 +196,10 @@ input in T1 font encoding: 1FF0 & & & ῲ & ῳ & ῴ & & ῶ & ῷ & Ὸ & Ό & Ὼ & Ώ & ῼ & ´ & ῾ & \\ \bottomrule \end{tabular} - +\caption{Greek Extended Unicode Block, input as literal Unicode +characters in T1 font encoding.} +\label{tab:greek-extended} +\end{table} Combined Diacritics work ᾅ, diacritics (except diaeresis) are dropped with MakeUppercase (μαΐστρος $\mapsto$ \MakeUppercase{μαΐστρος}). @@ -247,10 +267,9 @@ all-caps: % This fails if the active font encoding is not LGR: \ensuregreek{\'\textAlpha} (LGR) vs. \'\textAlpha (T1). -To overcome this, the \verb|\ensuregreek| macro is used in composite Unicode +Therefore, named accent macros are used in composite Unicode character definitions: \ensuregreek{Ά} (LGR) = Ά (T1). - The dialytika marks a \emph{hiatus} (break-up of a diphthong). It must be present in UPPERCASE even where it is redundant in lowercase (the hiatus can also be marked by an accent on the first character of a diphthong). The diff --git a/Master/texmf-dist/doc/latex/greek-fontenc/textalpha.sty.html b/Master/texmf-dist/doc/latex/greek-fontenc/textalpha.sty.html index 2816c35c620..c5fe6c0384c 100644 --- a/Master/texmf-dist/doc/latex/greek-fontenc/textalpha.sty.html +++ b/Master/texmf-dist/doc/latex/greek-fontenc/textalpha.sty.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> <title>textalpha.sty</title> <meta name="copyright" content="© 2010 Günter Milde" /> <style type="text/css"> @@ -729,7 +729,7 @@ version 1.3 of this license or any later version.</p> <dt>Identification</dt> <dd><pre class="literal-block">\NeedsTeXFormat{LaTeX2e} \ProvidesPackage{textalpha} -[2013/11/28 v0.11 macros for Greek letters in text] +[2014/12/12 v0.12 macros for Greek letters in text] </pre> </dd> </dl> @@ -779,7 +779,12 @@ confusion with the <a class="reference external" href="http://www.ctan.org/pkg/t </tr> <tr><td><p>2013-11-28</p></td> <td><p>0.11</p></td> -<td><p>Compatibility with Xe/LuaTeX in 8-bit mode.</p></td> +<td><p>compatibility with Xe/LuaTeX in 8-bit mode.</p></td> +</tr> +<tr><td><p>2014-12-12</p></td> +<td><p>0.12</p></td> +<td><p>fix auxiliary macro names, +define symbol macros for breathing accents.</p></td> </tr> </tbody> </table> @@ -903,16 +908,48 @@ details).</p> {} </pre> </div> +<div class="section" id="symbol-macros-for-breathings"> +<h3>Symbol macros for breathings</h3> +<p>In the Latin transcription provided by LGR, breathing accents (Dasia and +Psili) are input as < and >. We provide the corresponding NFSS macro accents +(moved here from <a class="reference external" href="greek-fontenc.def.html">greek-fontenc.def</a>).</p> +<p>As Xe/LuaTeX may use LGR in combination with EU1 or EU2, we define the +macros for both, LGR and Unicode font encodings (if they are defined):</p> +<pre class="literal-block">\@ifl@aded{def}{lgrenc}{ + \DeclareTextCommand{\<}{LGR}{\accdasia} + \DeclareTextCommand{\>}{LGR}{\accpsili} + % Composite accents starting with the new-defined shortcuts: + \DeclareTextCompositeCommand{\>}{LGR}{'}{\accpsilioxia} + \DeclareTextCompositeCommand{\>}{LGR}{`}{\accpsilivaria} + \DeclareTextCompositeCommand{\>}{LGR}{~}{\accpsiliperispomeni} + \DeclareTextCompositeCommand{\<}{LGR}{'}{\accdasiaoxia} + \DeclareTextCompositeCommand{\<}{LGR}{`}{\accdasiavaria} + \DeclareTextCompositeCommand{\<}{LGR}{~}{\accdasiaperispomeni} +}{} + +\@ifl@aded{def}{greek-euenc}{ % XeTeX (EU1) or LuaTeX (EU2) + \DeclareTextCommand{\<}{\LastDeclaredEncoding}{\accdasia} + \DeclareTextCommand{\>}{\LastDeclaredEncoding}{\accpsili} + % Composite accents starting with the new-defined shortcuts: + \DeclareTextCompositeCommand{\>}{\LastDeclaredEncoding}{'}{\accpsilioxia} + \DeclareTextCompositeCommand{\>}{\LastDeclaredEncoding}{`}{\accpsilivaria} + \DeclareTextCompositeCommand{\>}{\LastDeclaredEncoding}{~}{\accpsiliperispomeni} + \DeclareTextCompositeCommand{\<}{\LastDeclaredEncoding}{'}{\accdasiaoxia} + \DeclareTextCompositeCommand{\<}{\LastDeclaredEncoding}{`}{\accdasiavaria} + \DeclareTextCompositeCommand{\<}{\LastDeclaredEncoding}{~}{\accdasiaperispomeni} +}{} +</pre> +</div> </div> <div class="section" id="default-declarations"> <h2>Default declarations</h2> <p>The following definitions ensure that the Greek LICR macros can be used anywhere in the document also with 8-bit TeX by declaring LGR as their -default font encoding. Abort here, if another Greek-supporting -font encoding is used instead of LGR:</p> +default font encoding. Abort here, if the LGR font encoding is not defined:</p> <pre class="literal-block">\@ifl@aded{def}{lgrenc} - {\renewcommand{\LastDeclaredEncoding}{LGR}} - {\expandafter\endinput} % "return" + {} +% else return: + {\expandafter\endinput} </pre> <div class="section" id="greekscript-ensuregreek"> <h3>greekscript, ensuregreek</h3> @@ -1046,8 +1083,6 @@ also for cases like <tt class="literal"><span class="pre">\ensuregreek{\'A}U</sp \DeclareTextAccentDefault{\accvaria}{LGR} \DeclareTextAccentDefault{\accperispomeni}{LGR} \DeclareTextAccentDefault{\accdialytika}{LGR} -\DeclareTextAccentDefault{\<}{LGR} -\DeclareTextAccentDefault{\>}{LGR} % \DeclareTextAccentDefault{\accdasiaoxia}{LGR} \DeclareTextAccentDefault{\accdasiavaria}{LGR} @@ -1059,6 +1094,10 @@ also for cases like <tt class="literal"><span class="pre">\ensuregreek{\'A}U</sp \DeclareTextAccentDefault{\accdialytikavaria}{LGR} \DeclareTextAccentDefault{\accdialytikaperispomeni}{LGR} </pre> +<p>Symbol macros for the breathings:</p> +<pre class="literal-block">\DeclareTextAccentDefault{\<}{LGR} +\DeclareTextAccentDefault{\>}{LGR} +</pre> <p>Postfix accents:</p> <pre class="literal-block">\DeclareTextSymbolDefault{\ypogegrammeni}{LGR} % "small" sub-iota \DeclareTextSymbolDefault{\prosgegrammeni}{LGR} % "capital" sub-iota @@ -1071,9 +1110,10 @@ also for cases like <tt class="literal"><span class="pre">\ensuregreek{\'A}U</sp </div> <div class="section" id="auxiliary-macros"> <h3>Auxiliary macros</h3> -<p><tt class="literal">\MakeUppercase</tt> requires two internal commands:</p> -<pre class="literal-block">\DeclareTextAccentDefault{\LGR@hiatus}{LGR} -\DeclareTextAccentDefault{\LGR@Dialytika}{LGR} +<p><tt class="literal">\MakeUppercase</tt> requires three internal commands:</p> +<pre class="literal-block">\DeclareTextAccentDefault{\LGR@accdropped}{LGR} +\DeclareTextAccentDefault{\LGR@accDialytika}{LGR} +\DeclareTextAccentDefault{\LGR@hiatus}{LGR} </pre> <!-- References - - - - - - - - - - --> |