babel-greek

git-svn-id: svn://tug.org/texlive/trunk@31625 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 100 insertions, 75 deletions

diff --git a/Master/texmf-dist/doc/generic/babel-greek/README b/Master/texmf-dist/doc/generic/babel-greek/README
index dbf7da703d8..71c2c2b1e7c 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/README
+++ b/Master/texmf-dist/doc/generic/babel-greek/README
@@ -36,6 +36,8 @@ News
 ..               input "xgreek-fixes.def" from polyglossia_ with Xe/LuaTeX.
 1.5a  2013-07-02 fix LaTeX bugs babel/3707, `babel/4303`_ and `babel/4305`_
 1.6   2013-07-19 Experimental support for XeTeX/LuaTeX.
+1.7   2013-09-09 CB-Fonts font definition files moved to CB-Fonts package.
+..               Do not auto-load euenc.def with XeTeX/LuaTeX.
 ===== ========== ===========================================================
                
 
@@ -45,19 +47,19 @@ News
 Requirements
 ------------
 
-Typesetting Greek texts requires a `font containing Greek glyphs`__.
+The "babel-greek" package requires the babel_ base package and parts of the
+greek-fontenc_ package. The greek-inputenc_ package is recommended when
+using 8-bit TeX engines.
 
-The "babel-greek" package requires the babel_ base package. `Greek text
-fonts`_ in the LGR encoding and the encoding definition file ``lgrenc.def``
-from the greek-fontenc_ package are required with 8-bit TeX engines.
+The language definition file makes use of the `e-TeX`_ extensions (present
+in all current TeX distributions).
 
-Use with XeTeX/LuaTeX requires ``greek-euenc.def`` from greek-fontenc_ for
-Greek LICR macros and ``xgreek-fixes.def`` from polyglossia_ for correct
-up/downcasing .
+Use with XeTeX/LuaTeX requires also ``xgreek-fixes.def`` from polyglossia_
+for correct up/downcasing.
 
-"Plain" TeX is currently not supported. Patches are welcome.
+Typesetting Greek texts requires `Greek text fonts`_.
 
-__ http://www.ctan.org/topic/font-greek
+Plain TeX is currently not supported. Patches are welcome.
 
 
 Installation
@@ -72,8 +74,8 @@ Otherwise, make sure LaTeX can find the required files:
 
 * Run ``tex`` or ``latex`` on the batch file ``greek.ins``.
 
-* Move all files ending in ``.def``, ``.fd``, ``.ldf``, or ``.sty``
-  into a directory searched by TeX.
+* Move all files ending in ``.ldf`` or ``.sty`` into a directory searched by
+  TeX.
 
 * To produce the documentation run the files ``usage.tex`` and all files
   ending in ``.dtx`` through LaTeX.
@@ -90,14 +92,24 @@ For polytonic greek, set the language attribute  "polutoniko"::
 
   \languageattribute{greek}{polutoniko}
 
+When compiling with XeTeX or LuaTeX, it is recommended to load Greek LICR
+macro definitions via the greek-fontenc_ package (``greek-fontenc.sty``,
+added 2013-09-10 in version 0.9.4)::
+
+  \usepackage{greek-fontenc}
+  \usepackage[greek]{babel}
+
 For details see `<usage.pdf>`_, `<greek.pdf>`_ and the babel_ documentation.
 Literal input of Greek characters is possible with the greek-inputenc_
-package and XeTeX/LuaTeX.
+package or with XeTeX or LuaTeX.
 
 
 Greek text fonts
 ----------------
 
+A list of Greek text fonts for use with LaTeX is available at the CTAN
+http://www.ctan.org/topic/font-greek
+
 With the XeTeX or LuaTeX engines, the user should ensure that the choosen
 font contains the required glyphs (the default Latin Modern fonts miss
 them). Examples for suitable fonts are the CM-unicode_ or the `Linux
@@ -120,8 +132,8 @@ letters if LGR is the active font encoding (e.g. in documents or parts of
 documents given the `Babel` language ``greek`` or ``polutionikogreek``).
 This means that for every Latin-written word or acronym an explicite
 language-switch is required. This problem can only be solved via a
-font-encoding comprising Latin and Greek like the hypothetic T7 or Unicode
-(with XeTeX or LuaTeX).
+font-encoding comprising both Latin and Greek like the hypothetic T7 or
+Unicode (with XeTeX or LuaTeX).
 
 
 .. References
@@ -133,6 +145,7 @@ font-encoding comprising Latin and Greek like the hypothetic T7 or Unicode
 .. _CB Fonts: http://www.ctan.org/pkg/cbgreek-complete
 .. _CM-unicode: http://www.ctan.org/pkg/cm-unicode
 .. _Deja Vu: http://dejavu-fonts.org
+.. _e-TeX: http://www.tex.ac.uk/cgi-bin/texfaq2html?label=etex
 .. _grtimes: http://www.ctan.org/pkg/grtimes
 .. _greek-fontenc: http://www.ctan.org/pkg/greek-fontenc
 .. _greek-inputenc: http://www.ctan.org/pkg/greek-inputenc
diff --git a/Master/texmf-dist/doc/generic/babel-greek/README.html b/Master/texmf-dist/doc/generic/babel-greek/README.html
index 2bec84b58b6..7fc44cd48d7 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/README.html
+++ b/Master/texmf-dist/doc/generic/babel-greek/README.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.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>babel-greek</title>
 <meta name="copyright" content="© 1997 Apostolos Syropoulos, Claudio Beccari, Johannes Brahms, © 2013 Günter Milde" />
 <link rel="stylesheet" href="../../../../../Python/docutils-svn/docutils/docutils/writers/html4strict/html4css1.css" type="text/css" />
@@ -80,19 +80,30 @@ Greek language and script via the <a class="reference external" href="http://www
 <td><p>2013-07-19</p></td>
 <td><p>Experimental support for XeTeX/LuaTeX.</p></td>
 </tr>
+<tr><td><p>1.7</p></td>
+<td><p>2013-09-09</p></td>
+<td><p>CB-Fonts font definition files moved to CB-Fonts package.</p></td>
+</tr>
+<tr><td><!--  -->
+</td>
+<td>&nbsp;</td>
+<td><p>Do not auto-load euenc.def with XeTeX/LuaTeX. It is
+recommended to use the <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a> package.</p></td>
+</tr>
 </tbody>
 </table>
 </div>
 <div class="section" id="requirements">
 <h1>Requirements</h1>
-<p>Typesetting Greek texts requires a <a class="reference external" href="http://www.ctan.org/topic/font-greek">font containing Greek glyphs</a>.</p>
-<p>The “babel-greek” package requires the <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> base package. <a class="reference internal" href="#greek-text-fonts">Greek text
-fonts</a> in the LGR encoding and the encoding definition file <tt class="literal">lgrenc.def</tt>
-from the <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a> package are required with 8-bit TeX engines.</p>
-<p>Use with XeTeX/LuaTeX requires <tt class="literal"><span class="pre">greek-euenc.def</span></tt> from <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a> for
-Greek LICR macros and <tt class="literal"><span class="pre">xgreek-fixes.def</span></tt> from <a class="reference external" href="http://www.ctan.org/pkg/polyglossia">polyglossia</a> for correct
-up/downcasing .</p>
-<p>“Plain” TeX is currently not supported. Patches are welcome.</p>
+<p>The “babel-greek” package requires the <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> base package and parts of the
+<a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a> package. The <a class="reference external" href="http://www.ctan.org/pkg/greek-inputenc">greek-inputenc</a> package is recommended when
+using 8-bit TeX engines.</p>
+<p>The language definition file makes use of the <a class="reference external" href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=etex">e-TeX</a> extensions (present
+in all current TeX distributions).</p>
+<p>Use with XeTeX/LuaTeX requires also <tt class="literal"><span class="pre">xgreek-fixes.def</span></tt> from <a class="reference external" href="http://www.ctan.org/pkg/polyglossia">polyglossia</a>
+for correct up/downcasing.</p>
+<p>Typesetting Greek texts requires <a class="reference internal" href="#greek-text-fonts">Greek text fonts</a>.</p>
+<p>Plain TeX is currently not supported. Patches are welcome.</p>
 </div>
 <div class="section" id="installation">
 <h1>Installation</h1>
@@ -102,8 +113,8 @@ manager.</p>
 <ul class="simple">
 <li><p>Download and unpack <cite>babel-greek.zip</cite>.</p></li>
 <li><p>Run <tt class="literal">tex</tt> or <tt class="literal">latex</tt> on the batch file <tt class="literal">greek.ins</tt>.</p></li>
-<li><p>Move all files ending in <tt class="literal">.def</tt>, <tt class="literal">.fd</tt>, <tt class="literal">.ldf</tt>, or <tt class="literal">.sty</tt>
-into a directory searched by TeX.</p></li>
+<li><p>Move all files ending in <tt class="literal">.ldf</tt> or <tt class="literal">.sty</tt> into a directory searched by
+TeX.</p></li>
 <li><p>To produce the documentation run the files <tt class="literal">usage.tex</tt> and all files
 ending in <tt class="literal">.dtx</tt> through LaTeX.</p></li>
 </ul>
@@ -116,12 +127,20 @@ ending in <tt class="literal">.dtx</tt> through LaTeX.</p></li>
 <p>For polytonic greek, set the language attribute  “polutoniko”:</p>
 <pre class="literal-block">\languageattribute{greek}{polutoniko}
 </pre>
+<p>When compiling with XeTeX or LuaTeX, it is recommended to load Greek LICR
+macro definitions via the <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a> package (<tt class="literal"><span class="pre">greek-fontenc.sty</span></tt>,
+added 2013-09-10 in version 0.9.4):</p>
+<pre class="literal-block">\usepackage{greek-fontenc}
+\usepackage[greek]{babel}
+</pre>
 <p>For details see <a class="reference external" href="usage.pdf">usage.pdf</a>, <a class="reference external" href="greek.pdf">greek.pdf</a> and the <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> documentation.
 Literal input of Greek characters is possible with the <a class="reference external" href="http://www.ctan.org/pkg/greek-inputenc">greek-inputenc</a>
-package and XeTeX/LuaTeX.</p>
+package or with XeTeX or LuaTeX.</p>
 </div>
 <div class="section" id="greek-text-fonts">
 <h1>Greek text fonts</h1>
+<p>A list of Greek text fonts for use with LaTeX is available at the CTAN
+<a class="reference external" href="http://www.ctan.org/topic/font-greek">http://www.ctan.org/topic/font-greek</a></p>
 <p>With the XeTeX or LuaTeX engines, the user should ensure that the choosen
 font contains the required glyphs (the default Latin Modern fonts miss
 them). Examples for suitable fonts are the <a class="reference external" href="http://www.ctan.org/pkg/cm-unicode">CM-unicode</a> or the <a class="reference external" href="http://www.ctan.org/pkg/libertine">Linux
@@ -141,8 +160,8 @@ letters if LGR is the active font encoding (e.g. in documents or parts of
 documents given the <cite>Babel</cite> language <tt class="literal">greek</tt> or <tt class="literal">polutionikogreek</tt>).
 This means that for every Latin-written word or acronym an explicite
 language-switch is required. This problem can only be solved via a
-font-encoding comprising Latin and Greek like the hypothetic T7 or Unicode
-(with XeTeX or LuaTeX).</p>
+font-encoding comprising both Latin and Greek like the hypothetic T7 or
+Unicode (with XeTeX or LuaTeX).</p>
 <!-- References
 - - - - - - - - - - -->
 </div>
diff --git a/Master/texmf-dist/doc/generic/babel-greek/greek.pdf b/Master/texmf-dist/doc/generic/babel-greek/greek.pdf
index 2b304487a15..2542f2c91de 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/greek.pdf
+++ b/Master/texmf-dist/doc/generic/babel-greek/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
index ffa26e4ff22..3b799a4cbe8 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-greek.tex b/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex
index d8cdfd406f7..1e21d769f68 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex
+++ b/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex
@@ -347,8 +347,8 @@ Some examples:
 \Greeknumeral{1997},
 \Greeknumeral{2013},
 
-Enumerated lists use Greek numerals in the second and fourth level.
-
 \selectlanguage{english}
 
+Enumerated lists use Greek numerals in the second and fourth level.
+
 \end{document}
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
index b9e2c1373ec..d08951c57f2 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 c3a590c5dd9..9d830b937e4 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,24 +4,13 @@
 \usepackage{parskip}
 
 \usepackage{fontspec}
-\usepackage{libertineotf}
-
-
-% The definitions in ``greek-euenc.def`` are done for the
-% ``\LastDeclaredEncoding``
-%
-% Currently, fontspec (actually xunicode called by fontspec)
-% leaves ``\LastDeclaredEncoding`` at ``T3`` (tipa), because it inputs
-% ``t3enc.def``. Therefore, you need to re-declare the 
-% "Experimental Unicode" encoding:
-
-\ifdefined\XeTeXrevision
-  \usepackage[EU1]{fontenc}
-\fi
-\ifdefined\luatexversion
-  \usepackage[EU2]{fontenc}
-\fi
+% \usepackage{libertineotf}
+\setmainfont{Linux Libertine O}
+\setsansfont{Linux Biolinum O}
+% \setmainfont{DejaVu Serif}
 
+% Declare the font encoding and Greek LICR definitions:
+\usepackage{greek-fontenc}
 
 \usepackage[greek,english]{babel}
 \languageattribute{greek}{polutoniko}
@@ -39,18 +28,20 @@ defined in the file ``greek.ldf'' (source ``greek.dtx'').
 Typesetting Greek texts requires a font containing Greek letters. With the
 XeTeX or LuaTeX engines, the user should ensure that the choosen font
 contains the required glyphs (the default Latin Modern fonts miss them).
-Examples for suitable fonts are the ``Deja Vu'' or the ``Linux Libertine''
-OpenType fonts.
+Examples for suitable fonts are the ``Deja Vu'', ``Linux Libertine'', or
+``Free Serif'' OpenType fonts.
 
 \section{Language Switch}
 
 The declaration \verb|\selectlanguage| switches between languages.
 
-\selectlanguage{greek}
-Ὁ Σύλλογος Ἑλλήνων Φίλων τοῦ TeX, γνωστὸς καὶ ὡς
-«Ἕλληνες Φίλοι τοῦ \TeX» (ΕΦΤ γιὰ συντομία) ἀποτελεῖ τὴν ἐπίσημη Τοπικὴ Ὁμάδα
-τοῦ \TeX{} ἢ τὸ ἑλληνικὸ \TeX{} LUG (Local Users Group).
-\selectlanguage{english}
+
+\begin{quote}
+  \selectlanguage{greek}
+  Τί φήις;  ̔Ιδὼν ἐνθέδε παῖδ’ ἐλευθέραν
+  τὰς πλησίον Νύμφας στεφανοῦσαν, Σώστρατε,
+  ἐρῶν άπῆλθες εὐθύς;
+\end{quote}
 
 The macro \verb|\foreignlanguage| sets its second argument in the specified
 language. This is intended for short text parts like
@@ -61,16 +52,18 @@ language. This is intended for short text parts like
 In Greek text parts, the font encoding is automatically set to LGR if an
 8-bit TeX engine is used. With XeTeX or LuaTeX, the macros
 \verb|\greektext| and \verb|\textgreek| don't change the font encoding.
-Latin characters can be used also in Greek text parts.
-Input via the Latin transcription defined in LGR is not possible.%
+Latin characters can be used in Greek text parts,
+input via the Latin transcription defined in LGR is not possible.%
 \footnote{%
   The \emph{xunicode} package provides with the \texttt{tipa} emulation an
   example how this could be achieved if really required.
   }
 
-\greektext Φίλων τοῦ \textlatin{TeX} (ΕΦΤ) --
-\latintext Friends (\textgreek{F\'ilwn}) of TeX.
-
+\begin{quote}
+  \greektext Φίλων τοῦ \textlatin{TeX} (ΕΦΤ) --
+  \latintext Friends (\textgreek{F\'ilwn}) of TeX.%
+  \footnote{Compare the printout to the similar example in test-greek.pdf.}
+\end{quote}
 
 \section{MakeUppercase, MakeLowercase}
 
@@ -80,10 +73,9 @@ the left (instead of above) and drop them in uppercase, e.g.
 
 Tonos and dasia mark a \emph{hiatus} (break-up of a diphthong) if placed on
 the first vowel of a diphtong ((άι, άυ, έι, ἄι, ἄυ, ἔι). A dialytika must be
-placed on the second vowel if they are dropped:
-(\foreignlanguage{greek}{\MakeUppercase{άι, άυ, έι, ἄι, ἄυ, ἔι}}). This does
-not work (yet?) with Unicode literals. (See section «hiatus» below for a
-test with LICR macros.)
+placed on the second vowel if they are dropped. This does not work (yet?)
+with Unicode literals (\foreignlanguage{greek}{\MakeUppercase{άι, άυ, έι,
+ἄι, ἄυ, ἔι}}). (See section «hiatus» below for a test with LICR macros.)
 
 The following subsections test MakeUppercase and MakeLowercase with all
 characters defined in lgrenc.dfu:
@@ -112,8 +104,9 @@ MakeUppercase:
 Letters upcased, diacritics except dialytika dropped. OK.
 
 Ϡ (Sampi) $\mapsto$ \MakeUppercase{Ϡ} (Kappa) and
-ϡ (sampi) $\mapsto$ \MakeUppercase{ϡ} (Rho) seems a bug
-(in Xe/LuaTeX or xgreek?).
+ϡ (sampi) $\mapsto$ \MakeUppercase{ϡ} (Rho) is a bug
+in xgreek-fixes.def from the polyglossia package.
+% This is fixed in xgreek.sty and reported to the polyglossia author.
 
 MakeLowercase:
 
@@ -148,7 +141,7 @@ Characters of the Greek extended Unicode block:
 ῀ ῁ ῂ ῃ ῄ   ῆ ῇ Ὲ Έ Ὴ Ή ῌ ῍ ῎ ῏ \\
 ῐ ῑ ῒ ΐ     ῖ ῗ Ῐ Ῑ Ὶ Ί   ῝ ῞ ῟ \\
 ῠ ῡ ῢ ΰ ῤ ῥ ῦ ῧ Ῠ Ῡ Ὺ Ύ Ῥ ῭ ΅ ` \\
-    ῲ ῳ ῴ   ῶ ῷ Ὸ Ό Ὼ Ώ ῼ ´ ῾   
+    ῲ ῳ ῴ   ῶ ῷ Ὸ Ό Ὼ Ώ ῼ ´ ῾
 \selectlanguage{english}
 
 MakeUppercase:
@@ -213,14 +206,14 @@ The «hiatus» feature works with macro input:
 % from teubner: άυλος/ΑΫΛΟΣ
 \acctonos\textalpha\textupsilon λος $\mapsto$
 \MakeUppercase{\acctonos\textalpha\textupsilon λος},
-\>'\textalpha\textupsilon λος $\mapsto$ 
+\>'\textalpha\textupsilon λος $\mapsto$
 \MakeUppercase{\>'\textalpha\textupsilon λος},
 % from http://diacritics.typo.cz/index.php?id=69  μάινα -> ΜΑΪΝΑ
-m\acctonos\textalpha\textiota να $\mapsto$ 
+m\acctonos\textalpha\textiota να $\mapsto$
 \MakeUppercase{m\acctonos\textalpha\textiota να},
 % from  http://de.wikipedia.org/wiki/Neugriechische_Orthographie#Das_Trema
 % κέικ, ἀυπνία/αϋπνία
-\textkappa\acctonos\textepsilon\textiota\textkappa $\mapsto$ 
+\textkappa\acctonos\textepsilon\textiota\textkappa $\mapsto$
 \MakeUppercase{\textkappa\acctonos\textepsilon\textiota\textkappa},
 \>\textalpha\textupsilon πνία $\mapsto$
 \MakeUppercase{\>\textalpha\textupsilon πνία}.
@@ -320,16 +313,16 @@ Enumerated lists use Greek characters/numerals in the second and fourth level.
 
 \selectlanguage{greek}
 \begin{enumerate}
-  \item $\leftarrow$ 1
+  \item item 1
   \begin{enumerate}
-    \item $\leftarrow$ 1.1
+    \item item 1.1
     \begin{enumerate}
-      \item $\leftarrow$ 1.1.1
+      \item item 1.1.1
        \begin{enumerate}
-         \item $\leftarrow$ 1.1.1.1
-         \item $\leftarrow$ 1.1.1.2
+         \item item 1.1.1.1
+         \item item 1.1.1.2
        \end{enumerate}
-      \item $\leftarrow$ 1.1.2
+      \item item 1.1.2
     \end{enumerate}
   \end{enumerate}
 \end{enumerate}