diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/README | 16 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/README.html | 69 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf | bin | 256033 -> 255378 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf | bin | 233000 -> 234747 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf | bin | 42893 -> 43041 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.tex | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-greek/usage.pdf | bin | 176230 -> 176226 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx | 40 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-greek/greek.ldf | 21 |
9 files changed, 81 insertions, 76 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-greek/README b/Master/texmf-dist/doc/generic/babel-greek/README index 5907774f79e..654af305dba 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/README +++ b/Master/texmf-dist/doc/generic/babel-greek/README @@ -51,7 +51,7 @@ News .. Use named macros instead of non-standard short macros for psili and dasia in the string definitions. 1.9c 2014-10-21 Fix dummy hyphenation language names (patch Ulrike Fischer). -1.9d 2015-09-04 Remove `grsymb` (macros for Greek symbols). +1.9d 2015-09-04 Remove `grsymb` (macros for Greek symbols). This package is outdated and obsoleted by greek-fontenc_ (reported by Claudio Beccari). .. Unicode uc/lc corrections now in greek-fontenc @@ -59,6 +59,8 @@ News 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). +1.9g 2016-09-07 Babel 3.9i deprecated ``\textlatin`` + and fixed ``\latinencoding``. ===== ============ ============================================================ @@ -120,7 +122,7 @@ Otherwise, make sure LaTeX can find the required files: Usage ----- -Pass the "greek" option to babel:: +Use the "greek" document option or pass the "greek" option to babel:: \usepackage[greek]{babel} @@ -134,7 +136,7 @@ or :: \usepackage[greek.polutoniko,english]{babel} Similarly, the attribute "ancient" selects the ancient Greek language -variant. +variant. For details see `<babel-greek.pdf>`_ and the babel_ documentation. @@ -178,9 +180,9 @@ LGR Latin Transliteration ------------------------- The LGR font encoding allows input of Greek characters via an ASCII -transliteration. This enables simple input with a Latin keyboard. -Characters with diacritics are selected by ligature definitions in the -font (see `<usage.pdf>`_). +transliteration. This enables simple input with a Latin keyboard. Characters +with diacritics may be selected with accent macros (cf. greek-fontenc_) or +via the ligature definitions in the font (see `<usage.pdf>`_). The following ASCII characters are converted to Greek symbols: @@ -198,7 +200,7 @@ tonos ``'`` ά semicolon ``;`` · varia \` ὰ question mark ``?`` ; perispomeni ``~`` ᾶ left apostrophe \` \` ‘ dasia ``<`` ἁ right apostrophe ``''`` ’ -psili ``>`` ἀ left quotation mark ``((`` » +psili ``>`` ἀ left quotation mark ``((`` « ypogegrammeni ``|`` ᾳ right quotation mark ``))`` » dialytika ``"`` ϊ zero width non-joiner v ================= ===== == ====================== ======== ==== diff --git a/Master/texmf-dist/doc/generic/babel-greek/README.html b/Master/texmf-dist/doc/generic/babel-greek/README.html index 6f56f9dd890..62380be9f74 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/README.html +++ b/Master/texmf-dist/doc/generic/babel-greek/README.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta charset="utf-8"/> <meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> <title>babel-greek</title> <style type="text/css"> @@ -9,7 +9,7 @@ /* Minimal style sheet for the HTML output of Docutils. */ /* */ /* :Author: Günter Milde, based on html4css1.css by David Goodger */ -/* :Id: $Id: minimal.css 7916 2015-09-11 15:20:14Z milde $ */ +/* :Id: $Id: minimal.css 7952 2016-07-26 18:15:59Z milde $ */ /* :Copyright: © 2015 Günter Milde. */ /* :License: Released under the terms of the `2-Clause BSD license`_, */ /* in short: */ @@ -28,10 +28,13 @@ /* .. _CSS2.1: http://www.w3.org/TR/CSS2 */ /* .. _validates: http://jigsaw.w3.org/css-validator/validator$link */ -/* Figure/table alignment */ -.align-left { text-align: left; } -.align-right { text-align: right; } -.align-center { clear: both; text-align: center;} +/* alignment of text and inline objects inside block objects*/ +.align-left { text-align: left; } +.align-right { text-align: right; } +.align-center { clear: both; text-align: center; } +.align-top { vertical-align: top; } +.align-middle { vertical-align: middle; } +.align-bottom { vertical-align: bottom; } /* titles */ h1.title, p.subtitle { @@ -184,28 +187,34 @@ div.line-block div.line-block { margin-left: 40px; } -/* Images and Figures */ -img.align-left, +/* Figures, Images, and Tables */ .figure.align-left, -object.align-left { - display: block; +img.align-left, +object.align-left, +table.align-left { margin-right: auto; } -img.align-center, .figure.align-center, +img.align-center, object.align-center { + margin-left: auto; + margin-right: auto; display: block; +} +table.align-center { margin-left: auto; margin-right: auto; } -img.align-right, .figure.align-right, -object.align-right { - display: block; +img.align-right, +object.align-right, +table.align-right { margin-left: auto; } -/* reset inner alignment in figures */ -div.align-right { text-align: inherit } +/* reset inner alignment in figures and tables */ +div.align-left, div.align-center, div.align-right, +table.align-left, table.align-center, table.align-right +{ text-align: inherit } /* Admonitions and System Messages */ div.admonition, @@ -265,7 +274,7 @@ table.borderless td, table.borderless th { /* Rules for easy reading and pre-defined style variants. */ /* */ /* :Author: Günter Milde, based on html4css1.css by David Goodger */ -/* :Id: $Id: plain.css 7893 2015-05-11 15:38:58Z milde $ */ +/* :Id: $Id: plain.css 7952 2016-07-26 18:15:59Z milde $ */ /* :Copyright: © 2015 Günter Milde. */ /* :License: Released under the terms of the `2-Clause BSD license`_, */ /* in short: */ @@ -416,6 +425,8 @@ div.topic p.attribution { /* th { vertical-align: bottom; } */ +table tr { text-align: left; } + /* "booktabs" style (no vertical lines) */ table.booktabs { border: 0; @@ -428,7 +439,6 @@ table.booktabs * { } table.booktabs th { border-bottom: thin solid; - text-align: left; } /* numbered tables (counter defined in div.document) */ @@ -458,16 +468,20 @@ dl.footnote { /* ~~~~~~~~~~~~~ */ /* Images and Figures */ -img.align-left, + +/* let content flow to the side of aligned images and figures */ .figure.align-left, +img.align-left, object.align-left { + display: block; clear: left; float: left; margin-right: 1em } -img.align-right, .figure.align-right, +img.align-right, object.align-right { + display: block; clear: right; float: right; margin-left: 1em @@ -694,6 +708,11 @@ This package is outdated and obsoleted by <a class="reference external" href="ht <td><p>Support for standard Unicode text font encoding “TU” (new in fontspec v2.5a).</p></td> </tr> +<tr><td><p>1.9g</p></td> +<td><p>2016-09-07</p></td> +<td><p>Babel 3.9i deprecated <span class="docutils literal">\textlatin</span> +and fixed <span class="docutils literal">\latinencoding</span>.</p></td> +</tr> </tbody> </table> </div> @@ -747,7 +766,7 @@ ending in <span class="docutils literal">.dtx</span> through LaTeX.</p></li> </div> <div class="section" id="usage"> <h1>Usage</h1> -<p>Pass the “greek” option to babel:</p> +<p>Use the “greek” document option or pass the “greek” option to babel:</p> <pre class="literal-block">\usepackage[greek]{babel}</pre> <p>For polytonic Greek, set the language attribute “polutoniko”:</p> <pre class="literal-block">\usepackage[greek]{babel} @@ -789,9 +808,9 @@ is facilitated by the <a class="reference external" href="http://www.ctan.org/pk <div class="section" id="lgr-latin-transliteration"> <h1>LGR Latin Transliteration</h1> <p>The LGR font encoding allows input of Greek characters via an ASCII -transliteration. This enables simple input with a Latin keyboard. -Characters with diacritics are selected by ligature definitions in the -font (see <a class="reference external" href="usage.pdf">usage.pdf</a>).</p> +transliteration. This enables simple input with a Latin keyboard. Characters +with diacritics may be selected with accent macros (cf. <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a>) or +via the ligature definitions in the font (see <a class="reference external" href="usage.pdf">usage.pdf</a>).</p> <p>The following ASCII characters are converted to Greek symbols:</p> <table> <colgroup> @@ -972,7 +991,7 @@ font (see <a class="reference external" href="usage.pdf">usage.pdf</a>).</p> <td><p>ἀ</p></td> <td><p>left quotation mark</p></td> <td><p><span class="docutils literal">((</span></p></td> -<td><p>»</p></td> +<td><p>«</p></td> </tr> <tr><td><p>ypogegrammeni</p></td> <td><p><span class="docutils literal">|</span></p></td> diff --git a/Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf b/Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf Binary files differindex 2ef63c5d539..2ae4820af0c 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf +++ b/Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf diff --git a/Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf b/Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf Binary files differindex bd91e24c29a..1c6cfa22b63 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf +++ b/Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf 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 aecfed535f6..c3d7d5a395a 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 c18a2ae54f2..b794be139b6 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 @@ -24,7 +24,7 @@ \title{Greek support for Babel with XeTeX/LuaTeX} \author{Günter Milde} -\date{2016/02/04} +\date{2016/09/07} \maketitle The babel option «greek» activates the support for the Greek language @@ -61,9 +61,8 @@ 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{babel-greek} adds a test for the -Unicode text encodings (TU, EU1, EU2). At this point, the «latinencoding» +\verb|\textlatin| to switch to the TU, EU1, EU2, T1 or OT1 font encoding or +typeset the argument using this encoding. At this point, the «latinencoding» is \latinencoding. Every language switch from \texttt{greek} calls the \verb|\noextrasgreek| @@ -100,8 +99,8 @@ 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 ορα - +«Τ\'ι φ\'ηις;», «\`<ορα = \accdasiavaria{ο}ρα». + \subsection{Captions} diff --git a/Master/texmf-dist/doc/generic/babel-greek/usage.pdf b/Master/texmf-dist/doc/generic/babel-greek/usage.pdf Binary files differindex 2b65c328544..8aa912ea169 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/usage.pdf +++ b/Master/texmf-dist/doc/generic/babel-greek/usage.pdf 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 2380ceee43c..07907f3b464 100644 --- a/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx +++ b/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx @@ -26,7 +26,7 @@ % and covered by LPPL is defined by the unpacking script (babel-greek.ins) % which is part of the package. % \fi -% \CheckSum{1557} +% \CheckSum{1558} % % \iffalse % Tell the \LaTeX\ system who we are and write an entry on the @@ -37,7 +37,7 @@ %<code>\ProvidesLanguage{greek} %\fi %\ProvidesFile{babel-greek.dtx} - [2016/02/04 v1.9f Greek support for the babel system] + [2016/09/07 v1.9g Greek support for the babel system] %\iffalse %% File `babel-greek.dtx' %% Greek language Definition File @@ -121,6 +121,8 @@ % (patch by Enrico Gregorio).} % \changes{babel-greek-1.9f}{2016/02/04}{Support for standard % Unicode text encoding ``TU'' (new in fontspec v2.5a).} +% \changes{babel-greek-1.9g}{2016/09/07}{Babel 3.9i deprecated textlatin +% and fixed latinencoding.} % % \title{Babel support for the Greek language} % \author{Apostolos Syropoulos, Günter Milde} @@ -271,7 +273,7 @@ % \DescribeMacro\latintext % |\latintext| (defined by the Babel % core) can be used to switch back to an encoding supporting the Latin -% script. +% script (deprecated since Babel 3.9i from March 2014). % % \DescribeMacro\ensuregreek % \DescribeMacro\textgreek @@ -281,7 +283,8 @@ % font encoding if required, |\textgreek| always uses the LGR font % encoding. % \DescribeMacro\textlatin -% The Babel core defines a corresponding |\textlatin| macro. +% The Babel core defines a corresponding |\textlatin| macro +% (deprecated in favour of |\ensureascii| in Babel 3.9i from March 2014). % % \section{Greek numbering} % @@ -518,19 +521,6 @@ \leavevmode{\greekscript #1}} % \end{macrocode} % \end{macro} -% \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 -% 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} % % \subsection{Fixes for the LGR font encoding} % @@ -552,13 +542,13 @@ % \changes{greek-1.5}{2013/06/15}{\textbackslash & made TextCommand} % % \begin{macrocode} - \ProvideTextCommand{\textcopyright}{LGR}{\textlatin{\textcopyright}} - \ProvideTextCommand{\textregistered}{LGR}{\textlatin{\textregistered}} - \ProvideTextCommand{\texttrademark}{LGR}{\textlatin{\texttrademark}} + \ProvideTextCommand{\textcopyright}{LGR}{\ensureascii{\textcopyright}} + \ProvideTextCommand{\textregistered}{LGR}{\ensureascii{\textregistered}} + \ProvideTextCommand{\texttrademark}{LGR}{\ensureascii{\texttrademark}} \let\ltx@amp\& \DeclareTextCommandDefault{\&}{\ltx@amp} - \DeclareTextCommand{\&}{LGR}{\textlatin{\ltx@amp}} - \ProvideTextCommand{\SS}{LGR}{\textlatin{\SS}} + \DeclareTextCommand{\&}{LGR}{\ensureascii{\ltx@amp}} + \ProvideTextCommand{\SS}{LGR}{\ensureascii{\SS}} % \end{macrocode} % % \begin{macro}{\greek@roman} @@ -581,8 +571,8 @@ % |\@roman| ends up in a situation where the argument needs to be expanded % (e.g. Roman page numbers in the ToC).} % \begin{macrocode} - \def\@roman#1{\expandafter\textlatin\expandafter{\romannumeral#1}} - \def\@Roman#1{\expandafter\textlatin\expandafter{% + \def\@roman#1{\expandafter\ensureascii\expandafter{\romannumeral#1}} + \def\@Roman#1{\expandafter\ensureascii\expandafter{% \expandafter\@slowromancap\romannumeral#1@}} % \end{macrocode} % \end{macro} @@ -894,7 +884,7 @@ % \begin{macrocode} \addto\extrasgreek{\greekscript} \addto\noextrasgreek{\latintext} -% \addto\noextrasgreek{\RestoreFontEncoding} +% \addto\noextrasgreek{\RestoreFontEncoding} % TODO define \RestoreFontEncoding % \end{macrocode} % % \begin{macro}{\gr@ill@value} diff --git a/Master/texmf-dist/tex/generic/babel-greek/greek.ldf b/Master/texmf-dist/tex/generic/babel-greek/greek.ldf index 072d170c06d..2fe02b3a613 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} - [2016/02/04 v1.9f Greek support for the babel system] + [2016/09/07 v1.9g Greek support for the babel system] %% File `babel-greek.dtx' %% Greek language Definition File %% Copyright © 1997, 2005 Apostolos Syropoulos, Johannes Braams @@ -104,21 +104,16 @@ \def\encodingdefault{\greekfontencoding}} \ProvideTextCommandDefault{\ensuregreek}[1]{% \leavevmode{\greekscript #1}} -\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}} - \ProvideTextCommand{\textregistered}{LGR}{\textlatin{\textregistered}} - \ProvideTextCommand{\texttrademark}{LGR}{\textlatin{\texttrademark}} + \ProvideTextCommand{\textcopyright}{LGR}{\ensureascii{\textcopyright}} + \ProvideTextCommand{\textregistered}{LGR}{\ensureascii{\textregistered}} + \ProvideTextCommand{\texttrademark}{LGR}{\ensureascii{\texttrademark}} \let\ltx@amp\& \DeclareTextCommandDefault{\&}{\ltx@amp} - \DeclareTextCommand{\&}{LGR}{\textlatin{\ltx@amp}} - \ProvideTextCommand{\SS}{LGR}{\textlatin{\SS}} - \def\@roman#1{\expandafter\textlatin\expandafter{\romannumeral#1}} - \def\@Roman#1{\expandafter\textlatin\expandafter{% + \DeclareTextCommand{\&}{LGR}{\ensureascii{\ltx@amp}} + \ProvideTextCommand{\SS}{LGR}{\ensureascii{\SS}} + \def\@roman#1{\expandafter\ensureascii\expandafter{\romannumeral#1}} + \def\@Roman#1{\expandafter\ensureascii\expandafter{% \expandafter\@slowromancap\romannumeral#1@}} \DeclareRobustCommand{\greektext}{% \fontencoding{LGR}\selectfont |