diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/README.html | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/grsymb.pdf | bin | 118809 -> 0 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf | bin | 42138 -> 42893 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.tex | 32 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf | bin | 43428 -> 37842 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.tex | 18 | ||||
| -rw-r--r-- | Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx | 15 | ||||
| -rw-r--r-- | Master/texmf-dist/source/generic/babel-greek/grsymb.dtx | 131 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-greek/greek.ldf | 8 |
10 files changed, 53 insertions, 158 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-greek/README b/Master/texmf-dist/doc/generic/babel-greek/README index 3f27710f468..5907774f79e 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/README +++ b/Master/texmf-dist/doc/generic/babel-greek/README @@ -57,6 +57,8 @@ News .. Unicode uc/lc corrections now in greek-fontenc (polyglossia's ``xgreek-fixes.def`` has bugs). 1.9e 2015-11-27 Fix bug in lccode-setting loop (patch by Enrico Gregorio). +1.9f 2016-02-04 Support for standard Unicode text font encoding "TU" + (new in fontspec v2.5a). ===== ============ ============================================================ diff --git a/Master/texmf-dist/doc/generic/babel-greek/README.html b/Master/texmf-dist/doc/generic/babel-greek/README.html index c8fc8e3fa99..6f56f9dd890 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/README.html +++ b/Master/texmf-dist/doc/generic/babel-greek/README.html @@ -689,6 +689,11 @@ This package is outdated and obsoleted by <a class="reference external" href="ht <td><p>2015-11-27</p></td> <td><p>Fix bug in lccode-setting loop (patch by Enrico Gregorio).</p></td> </tr> +<tr><td><p>1.9f</p></td> +<td><p>2016-02-04</p></td> +<td><p>Support for standard Unicode text font encoding “TU” +(new in fontspec v2.5a).</p></td> +</tr> </tbody> </table> </div> diff --git a/Master/texmf-dist/doc/generic/babel-greek/grsymb.pdf b/Master/texmf-dist/doc/generic/babel-greek/grsymb.pdf Binary files differdeleted file mode 100644 index 8a5340135c4..00000000000 --- a/Master/texmf-dist/doc/generic/babel-greek/grsymb.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf Binary files differindex 86d8132386c..aecfed535f6 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf +++ b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf diff --git a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.tex b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.tex index 05bfd5e740e..c18a2ae54f2 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.tex +++ b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.tex @@ -4,7 +4,7 @@ \usepackage{bookmark} \usepackage{parskip} -\usepackage{fontspec} +\usepackage[tuenc]{fontspec} \setmainfont{Linux Libertine O} \setsansfont{Linux Biolinum O} % \setmainfont{DejaVu Serif} @@ -24,7 +24,7 @@ \title{Greek support for Babel with XeTeX/LuaTeX} \author{Günter Milde} -\date{2014/09/02} +\date{2016/02/04} \maketitle The babel option «greek» activates the support for the Greek language @@ -55,21 +55,23 @@ specified as first argument. This is intended for short text parts like Every language switch to \texttt{greek} calls the \verb|\extrasgreek| command which in turn calls \verb|\greekscript| to ensure a Greek-supporting -font encoding (LGR, EU1, or EU2). Under XeTeX/LuaTeX the font encoding -normally just remains Unicode (EU1 or EU2). (For customization, you can add -to or redefine the \verb|\extrasgreek| command.) +font encoding (LGR, TU, EU1, or EU2). Under XeTeX/LuaTeX the font encoding +normally just remains Unicode (TU, EU1, or EU2). For customization, you can +add to or redefine the \verb|\extrasgreek| command. The LGR font encoding does not support Latin characters. Therefore, the Babel core defines the declaration \verb|\latintext| and the command \verb|\textlatin| to switch to the T1 or OT1 font encoding or typeset the -argument using this encoding. \texttt{greek-fontenc} adds a test for EU1 and -EU2. At this point, the «latinencoding» is \latinencoding. +argument using this encoding. \texttt{babel-greek} adds a test for the +Unicode text encodings (TU, EU1, EU2). At this point, the «latinencoding» +is \latinencoding. Every language switch from \texttt{greek} calls the \verb|\noextrasgreek| -command which in turn calls \verb|\latintext|. (For customization, you can -add to or redefine the \verb|\noextrasgreek| command.) +command which in turn calls \verb|\latintext|.\\ +For customization, you can +add to or redefine the \verb|\noextrasgreek| command. -With the Unicode font encodings EU1 (XeTeX) or EU2 (LuaTeX), +With the Unicode font encodings TU, EU1 (XeTeX), or EU2 (LuaTeX), Latin characters can be used in Greek text parts and input via the «LGR Latin transcription» is not possible.% \footnote{% @@ -90,15 +92,16 @@ Babel defines macros for several autogenerated strings so that they may appear in the choosen language. \emph{babel-greek} uses LICR macros in order to let the string macros work independent of the font encoding. -If \texttt{fontspec} is loaded before babel, babel-greek loads Greek LICR -for EU1 or EU2 from the file \texttt{greek-euenc.def} provided with +If \emph{fontspec} is loaded, \emph{babel-greek} loads Greek LICR +definitions for the Unicode font encoding (TU, EU1 or EU2) from the file +\texttt{greek-euenc.def} provided with \href{http://www.ctan.org/pkg/greek-fontenc}{greek-fontenc} since version~0.10. With this setup, it is also possible to use accent macros instead of pre-composed Unicode characters for letters with diacritics: -«Τ\'ι φ\'ηις;», «\`<ορα». - +«Τ\'ι φ\'ηις;», «\`<ορα». \accdasiavaria ορα + \subsection{Captions} @@ -239,6 +242,7 @@ Enumerated lists use Greek characters/numerals in the second and fourth level: This may be problematic with fonts that only partially support Greek and miss the numeral signs (dexiakeraia and aristerikeraia). + You may redefine the commands \verb+\textdexiakeraia+ and \verb+\textaristerikeraia+ to some substitute characters. Or, if you prefer the ``normal'' enumeration, write in the preamble after diff --git a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf Binary files differindex 4b8a0a840e3..0430906a939 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf +++ b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf diff --git a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.tex b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.tex index 405851c10df..af3502c071c 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.tex +++ b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.tex @@ -7,7 +7,7 @@ \usepackage[LGR]{fontenc} % Set up Latin Modern OpenType unicode font -\usepackage{fontspec} +\usepackage[tuenc]{fontspec} \usepackage[greek,english]{babel} % \languageattribute{greek}{polutoniko} @@ -40,8 +40,8 @@ for short Greek quotes or as a last ressort. \section{Language Switch} -The declaration \verb|\selectlanguage| switches between languages. -With XeTeX/LuaTeX and LGR, Unicode input is not possible. Instead, use the +The declaration \verb|\selectlanguage| switches between languages. With +XeTeX or LuaTeX and LGR, Unicode input is not possible. Instead, use the Latin transliteration or LICR macros: \begin{quote} @@ -58,19 +58,19 @@ language. This is intended for short text parts like \section{Font Encoding} Switching to a font encoding supporting the Greek script is possible without -switching the Babel language using the declarations \verb|\greekscript| or +switching the text language using the declarations \verb|\greekscript| or \verb|\greektext| (always LGR) and the macros \verb|\ensuregreek| or \verb|\textgreek|. These commands do not start a new paragraph. The Babel core defines the declaration \verb|\latintext| and the command \verb|\textlatin| to switch to the T1 or OT1 font encoding or typeset the -argument using this encoding. \texttt{greek.ldf} adds a test for EU1 and -EU2, if the TeX engine is XeTeX or LuaTeX. Here, \verb|\latinencoding| was +argument using this encoding. \texttt{greek.ldf} adds a test for the Unicode +font encodings TU, EU1, and EU2. Here, \verb|\latinencoding| is \latinencoding. -With XeTeX or LuaTeX, the macros \verb|\greektext| and \verb|\textgreek| -are only defined, if the LGR font encoding is loaded via the -\texttt{fontenc} package (see test-unicode-lgr.tex). +With Unicode fonts, the macros \verb|\greektext| and \verb|\textgreek| are +only defined, if the LGR font encoding is loaded via the \texttt{fontenc} +package (see test-unicode-lgr.tex). % don't change the font encoding. With LGR, Latin characters in Greek text parts are typeset as Greek characters diff --git a/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx b/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx index 8352d9ecbe1..2380ceee43c 100644 --- a/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx +++ b/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx @@ -37,7 +37,7 @@ %<code>\ProvidesLanguage{greek} %\fi %\ProvidesFile{babel-greek.dtx} - [2015/09/04 v1.9e Greek support for the babel system] + [2016/02/04 v1.9f Greek support for the babel system] %\iffalse %% File `babel-greek.dtx' %% Greek language Definition File @@ -119,6 +119,8 @@ % in greek-euenc.def (the polyglossia version has bugs).} % \changes{babel-greek-1.9e}{2015/11/27}{Fix bug in lccode-setting loop % (patch by Enrico Gregorio).} +% \changes{babel-greek-1.9f}{2016/02/04}{Support for standard +% Unicode text encoding ``TU'' (new in fontspec v2.5a).} % % \title{Babel support for the Greek language} % \author{Apostolos Syropoulos, Günter Milde} @@ -455,12 +457,18 @@ % (too complicated to get it right).} % \changes{greek-1.8}{2013/11/30}{Check for EU1/EU2 font encoding % instead of engine} +% \changes{babel-greek-1.9f}{2016/02/04}{Check also for TU font encoding.} % % \DescribeMacro\greekfontencoding % We test for available font encodings and set |\greekfontencoding| % and the internal macro |\bbl@greek@fontencdef| with the name of the % font definition file with Greek LICR macros. The fallback is LGR. % \begin{macrocode} +\@ifl@aded{def}{tuenc}{ + \providecommand*{\greekfontencoding}{TU} + \providecommand*{\bbl@greek@fontencdef}{greek-euenc} + \renewcommand*{\LastDeclaredEncoding}{TU} +}{} \@ifl@aded{def}{eu1enc}{ \providecommand*{\greekfontencoding}{EU1} \providecommand*{\bbl@greek@fontencdef}{greek-euenc} @@ -513,12 +521,13 @@ % \begin{macro}{\latinencoding} % The babel core defines the macro |\latinencoding| and sets it to either % OT1 or (if available) T1. We extend the choice with the Unicode encodings -% EU1 and EU2 so that |\latintext| under XeTeX/LuaTeX does not prevent the -% use of Unicode fonts. +% TU, EU1 and EU2 so that |\latintext| under XeTeX/LuaTeX does not prevent +% the use of Unicode fonts. % \begin{macrocode} \AtBeginDocument{% \@ifl@aded{def}{eu1enc}{\xdef\latinencoding{EU1}}{}% XeTeX \@ifl@aded{def}{eu2enc}{\xdef\latinencoding{EU2}}{}% LuaTeX + \@ifl@aded{def}{tuenc}{\xdef\latinencoding{TU}}{}% fontspec >= 2.5a } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/generic/babel-greek/grsymb.dtx b/Master/texmf-dist/source/generic/babel-greek/grsymb.dtx deleted file mode 100644 index 189ca4afe5c..00000000000 --- a/Master/texmf-dist/source/generic/babel-greek/grsymb.dtx +++ /dev/null @@ -1,131 +0,0 @@ -% \iffalse meta-comment -% -% Copyright 1989-2008 Johannes L. Braams and any individual authors -% listed elsewhere in this file. All rights reserved. -% -% This file is part of the Babel system. -% -------------------------------------- -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX -% version 2003/12/01 or later. -% -% This work has the LPPL maintenance status "maintained". -% -% The Current Maintainer of this work is Johannes Braams. -% -% The list of all files belonging to the Babel system is -% given in the file `manifest.bbl. See also `legal.bbl' for additional -% information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with -% extension .ins) which are part of the distribution. -% \fi -%% \CheckSum{55} -% -%\iffalse -% -%% This is file `grsymb.sty' -%% (c) 1997-2005 Apostolos Syropoulos. -%% All rights reserved. -% You are allowed to modify this file as long the initial copyright notice -% appears in the modified file. -% -% Please report errors or suggestions for improvement to -% -% Apostolos Syropoulos -% 366, 28th October Str. -% GR-671 00 Xanthi, GREECE -% -% apostolo at platon.ee.duth.gr or apostolo at obelix.ee.duth.gr -% -%\fi -%\iffalse -% \begin{macrocode} -%<*driver> -\documentclass{ltxdoc} -\GetFileInfo{grsymb.drv} -\begin{document} - \DocInput{grsymb.dtx} -\end{document} -%</driver> -% \end{macrocode} -%\fi -% -% \title{Greek Symbols} -% \author{Apostolos Syropoulos\\ -% 366, 28th October Str.\\ -% GR-671 00 Xanthi, HELLAS\\ -% E-mail: \texttt{apostolo@platon.ee.duth.gr}} -% \date{1997/09/21} -% \maketitle -% -% \MakeShortVerb{|} -% \section{Introduction} -% -% There are certain symbols which were in use in ancient Greece and which -% are of use to scholars even today. These symbols are various forms of -% qoppa and stigma, and the letter digamma. These special symbols are -% provided by the \texttt{cb} fonts which are now the official fonts for -% the \texttt{greek} option of the \texttt{babel} package. Moreover, these -% fonts provide a few more symbols such as a symbol for Euro, etc. The `tao' -% symbol although is not a greek symbol, survives mainly for reasons of -% compatibility. This little package provides access commands for these -% symbols. The package can be used only in conjunction with the |greek| -% option of the |babel| package. -% -% \StopEventually -% -% \section{The Implementation} -% -% First comes the identification part. -% -% \begin{macrocode} -%<*package> -\ProvidesPackage{grsymb}[1997/09/21\space v1.0] -\typeout{Package: `grsymb' v1.0\space <1997/09/21> (A. Syropoulos)} -% \end{macrocode} -% -% Next we check to see if the |babel| package is loaded with at least -% the |greek| option. In case it isn't, we opt to produce an error message. -% \begin{macrocode} -\@ifpackagewith{babel}{greek}{}{% - \PackageError{grsymb}{% - `greek' option of the `babel'\MessageBreak - package hasn't been loaded}{% - The commands provided by this package\MessageBreak - are specially designed for greek language\MessageBreak - typesetting with the `babel' package. Load\MessageBreak - it with at least the `greek' option.}\relax - } -% \end{macrocode} -% Now, we proceed with the definitions of the various symbols. Please note -% that |\ddigamma| is intensionally spelled erroneously, in order to avoid -% conflicts with the command |\digamma| that is defined by the package -% |amssymb|. Although the tao symbol is not a greek symbol, it is included -% mainly for reasons of compatibility. -% \begin{macrocode} -\DeclareTextCommand{\Digamma}{LGR}{\char"C3\relax} -\DeclareTextCommand{\ddigamma}{LGR}{\char"93\relax} -\DeclareTextCommand{\tao}{LGR}{\char"01\relax} -\DeclareTextCommand{\Qoppa}{LGR}{\char"14\relax} -\DeclareTextCommand{\varqoppa}{LGR}{\char"13\relax} -\DeclareTextCommand{\Sampi}{LGR}{\char"1A\relax} -\DeclareTextCommand{\vardigamma}{LGR}{\char"07\relax} -\DeclareTextCommand{\Stigma}{LGR}{\char"08\relax} -\DeclareTextCommand{\VarQoppa}{LGR}{\char"15\relax} -\DeclareTextCommand{\euro}{LGR}{\char"18\relax} -\DeclareTextCommand{\permill}{LGR}{\char"19\relax} -%</package> -% \end{macrocode} -% -% \section*{Dedication} -% I would like to dedicate this piece of work to my son -% \begin{center}Demetrios-Georgios.\end{center} -% \Finale -\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/generic/babel-greek/greek.ldf b/Master/texmf-dist/tex/generic/babel-greek/greek.ldf index 0a2d8cda18f..072d170c06d 100644 --- a/Master/texmf-dist/tex/generic/babel-greek/greek.ldf +++ b/Master/texmf-dist/tex/generic/babel-greek/greek.ldf @@ -32,7 +32,7 @@ %% and covered by LPPL is defined by the unpacking script (babel-greek.ins) %% which is part of the package. \ProvidesLanguage{greek} - [2015/09/04 v1.9e Greek support for the babel system] + [2016/02/04 v1.9f Greek support for the babel system] %% File `babel-greek.dtx' %% Greek language Definition File %% Copyright © 1997, 2005 Apostolos Syropoulos, Johannes Braams @@ -71,6 +71,11 @@ \let\captionsgreek\captionsancientgreek \let\gr@month\gr@c@month % (modern) polytonic month names } +\@ifl@aded{def}{tuenc}{ + \providecommand*{\greekfontencoding}{TU} + \providecommand*{\bbl@greek@fontencdef}{greek-euenc} + \renewcommand*{\LastDeclaredEncoding}{TU} +}{} \@ifl@aded{def}{eu1enc}{ \providecommand*{\greekfontencoding}{EU1} \providecommand*{\bbl@greek@fontencdef}{greek-euenc} @@ -102,6 +107,7 @@ \AtBeginDocument{% \@ifl@aded{def}{eu1enc}{\xdef\latinencoding{EU1}}{}% XeTeX \@ifl@aded{def}{eu2enc}{\xdef\latinencoding{EU2}}{}% LuaTeX + \@ifl@aded{def}{tuenc}{\xdef\latinencoding{TU}}{}% fontspec >= 2.5a } \@ifl@aded{def}{lgrenc}{% \ProvideTextCommand{\textcopyright}{LGR}{\textlatin{\textcopyright}} |