babel-greek (20jul13)

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

9 files changed, 108 insertions, 84 deletions

diff --git a/Master/texmf-dist/doc/generic/babel-greek/README b/Master/texmf-dist/doc/generic/babel-greek/README
index 95595d394a9..dbf7da703d8 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/README
+++ b/Master/texmf-dist/doc/generic/babel-greek/README
@@ -17,9 +17,8 @@ In 1997, Apostolos Syropoulos added support for the Greek language to the
 "babel" package.  The file ``greek.ldf`` provides options for monotonic
 (single-diacritic) and polytonic (multiple-diacritic) modes of writing.
 
-There is now partial support for Unicode-aware TeX engines (XeTeX/LuaTeX).
-However, users of the XeTeX and LuaTeX engines are advised to use the
-polyglossia_ package.
+There is now experimental support for Unicode-aware TeX engines
+(XeTeX/LuaTeX). 
 
 News
 ----
@@ -36,6 +35,7 @@ News
 ..               LGR font encoding not used with XeTeX/LuaTeX,
 ..               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.
 ===== ========== ===========================================================
                
 
@@ -51,10 +51,11 @@ 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.
 
-For correct up/downcasing with XeTeX/LuaTeX, the file ``xgreek-fixes.def``
-from polyglossia_ is required.
+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 .
 
-"plain" TeX is currently not supported. Patches are welcome.
+"Plain" TeX is currently not supported. Patches are welcome.
 
 __ http://www.ctan.org/topic/font-greek
 
diff --git a/Master/texmf-dist/doc/generic/babel-greek/README.html b/Master/texmf-dist/doc/generic/babel-greek/README.html
index d93e9690c73..2bec84b58b6 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/README.html
+++ b/Master/texmf-dist/doc/generic/babel-greek/README.html
@@ -32,9 +32,8 @@ Greek language and script via the <a class="reference external" href="http://www
 <p>In 1997, Apostolos Syropoulos added support for the Greek language to the
 “babel” package.  The file <tt class="literal">greek.ldf</tt> provides options for monotonic
 (single-diacritic) and polytonic (multiple-diacritic) modes of writing.</p>
-<p>There is now partial support for Unicode-aware TeX engines (XeTeX/LuaTeX).
-However, users of the XeTeX and LuaTeX engines are advised to use the
-<a class="reference external" href="http://www.ctan.org/pkg/polyglossia">polyglossia</a> package.</p>
+<p>There is now experimental support for Unicode-aware TeX engines
+(XeTeX/LuaTeX).</p>
 <div class="section" id="news">
 <h1>News</h1>
 <table class="borderless">
@@ -77,6 +76,10 @@ However, users of the XeTeX and LuaTeX engines are advised to use the
 <td><p>2013-07-02</p></td>
 <td><p>fix LaTeX bugs babel/3707, <a class="reference external" href="http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=babel/4303">babel/4303</a> and <a class="reference external" href="http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=babel/4305">babel/4305</a></p></td>
 </tr>
+<tr><td><p>1.6</p></td>
+<td><p>2013-07-19</p></td>
+<td><p>Experimental support for XeTeX/LuaTeX.</p></td>
+</tr>
 </tbody>
 </table>
 </div>
@@ -86,9 +89,10 @@ However, users of the XeTeX and LuaTeX engines are advised to use the
 <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>For correct up/downcasing with XeTeX/LuaTeX, the file <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> is required.</p>
-<p>“plain” TeX is currently not supported. Patches are welcome.</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>
 </div>
 <div class="section" id="installation">
 <h1>Installation</h1>
diff --git a/Master/texmf-dist/doc/generic/babel-greek/greek.pdf b/Master/texmf-dist/doc/generic/babel-greek/greek.pdf
index 5ea9214b5fb..2b304487a15 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 78126474e8c..ffa26e4ff22 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 df04786e3b3..d8cdfd406f7 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex
+++ b/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex
@@ -88,16 +88,16 @@ Enumerated lists:
 
 \selectlanguage{greek} 
 \begin{enumerate}
-  \item $\leftarrow$ 1
+  \item \textlatin{Item} 1
   \begin{enumerate}
-    \item $\leftarrow$ 1.1
+    \item \textlatin{Item} 1.1
     \begin{enumerate}
-      \item $\leftarrow$ 1.1.1
+      \item \textlatin{Item} 1.1.1
        \begin{enumerate}
-         \item $\leftarrow$ 1.1.1.1
-         \item $\leftarrow$ 1.1.1.2
+         \item \textlatin{Item} 1.1.1.1
+         \item \textlatin{Item} 1.1.1.2
        \end{enumerate}
-      \item $\leftarrow$ 1.1.2
+      \item \textlatin{Item} 1.1.2
     \end{enumerate}
   \end{enumerate}
 \end{enumerate}
@@ -347,6 +347,7 @@ Some examples:
 \Greeknumeral{1997},
 \Greeknumeral{2013},
 
+Enumerated lists use Greek numerals in the second and fourth level.
 
 \selectlanguage{english}
 
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 e59cc4c4249..b9e2c1373ec 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 212e3f7b6d7..c3a590c5dd9 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
@@ -2,21 +2,35 @@
 % \usepackage{textcomp}
 \usepackage{hyperref,bookmark}
 \usepackage{parskip}
-\usepackage{booktabs}
 
 \usepackage{fontspec}
-% xunicode extension with Greek LICR definitions:
-\usepackage{xunicode-greek}
-
 \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[greek,english]{babel}
-% \languageattribute{greek}{polutoniko}
+\languageattribute{greek}{polutoniko}
 
 \DeclareTextCommandDefault{\ensuregreek}{\textgreek}
 
 \begin{document}
 
+
 \section*{Greek support for Babel with XeTeX/LuaTeX}
 
 The babel option ``greek'' activates the support for the Greek language
@@ -28,7 +42,6 @@ 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.
 
-
 \section{Language Switch}
 
 The declaration \verb|\selectlanguage| switches between languages.
@@ -49,71 +62,28 @@ 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.
+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.
 
 
-Enumerated lists use Greek characters/numerals in the second and fourth level.
-This requires support for Greek LICR macros in XeTeX/LuaTeX (currently
-provided by package xunicode-greek).
-
-\selectlanguage{greek}
-\begin{enumerate}
-  \item $\leftarrow$ 1
-  \begin{enumerate}
-    \item $\leftarrow$ 1.1
-    \begin{enumerate}
-      \item $\leftarrow$ 1.1.1
-       \begin{enumerate}
-         \item $\leftarrow$ 1.1.1.1
-         \item $\leftarrow$ 1.1.1.2
-       \end{enumerate}
-      \item $\leftarrow$ 1.1.2
-    \end{enumerate}
-  \end{enumerate}
-\end{enumerate}
-\selectlanguage{english}
-
-
-
 \section{MakeUppercase, MakeLowercase}
 
 Capital Greek letters have diacritics (except the dialytika and sub-iota) to
 the left (instead of above) and drop them in uppercase, e.g.
 \ensuregreek{μαΐστρος $\mapsto$ \MakeUppercase{μαΐστρος}}.
 
-% Upcased letters with diacritics keep the dialytika. This is implemented for
-% all input variants of diacritics with dialytika. (Babel has ``composite
-% command'' definitions to ensure this also works for accent characters
-% "upcased" to the charcter No 159.)
-
-% \foreignlanguage{greek}{\"i \"'i \"`i \"~i \'"i \`"i \~"i
-% 			\"u \"\'u \"\`u \"\~u
-% $\mapsto$ \MakeUppercase{\"i \"'i \"`i \"~i \'"i \`"i \~"i
-% 			\"u \"\'u \"\`u \"\~u }}
-
-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 XeTeX/LuaTeX.
-
-% \selectlanguage{greek}
-% % 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}
-% \selectlanguage{english}
-
-There are several alternative styles for the capitalized sub-iota.
+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.)
 
 The following subsections test MakeUppercase and MakeLowercase with all
 characters defined in lgrenc.dfu:
@@ -224,13 +194,38 @@ MakeLowercase:
 \MakeLowercase{     ῲ ῳ ῴ   ῶ ῷ Ὸ Ό Ὼ Ώ ῼ ´ ῾   }
 \selectlanguage{english}
 
-\section{Babel Strings}
+\section{LICR Macros}
 
 Babel defines macros for several autogenerated strings so that they may
 appear in the choosen language. babel-greek uses LICR macross in order to
 let the string macros work independent of the font encoding.
 
-This requires support for Greek LICR macros in XeTeX/LuaTeX.
+If the (experimental) file \texttt{greek-euenc.def} from the package
+\emph{greek-fontenc} exists, it is used to define LICR macros for Greek
+symbols (\textalpha{} ... \textOmega) and diacritics (\"\textiota,
+\"'\textiota, \>\textEta, ...).
+
+\subsection{Hiatus}
+
+The «hiatus» feature works with macro input:
+
+\selectlanguage{greek}
+% from teubner: άυλος/ΑΫΛΟΣ
+\acctonos\textalpha\textupsilon λος $\mapsto$
+\MakeUppercase{\acctonos\textalpha\textupsilon λος},
+\>'\textalpha\textupsilon λος $\mapsto$ 
+\MakeUppercase{\>'\textalpha\textupsilon λος},
+% from http://diacritics.typo.cz/index.php?id=69  μάινα -> ΜΑΪΝΑ
+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$ 
+\MakeUppercase{\textkappa\acctonos\textepsilon\textiota\textkappa},
+\>\textalpha\textupsilon πνία $\mapsto$
+\MakeUppercase{\>\textalpha\textupsilon πνία}.
+\selectlanguage{english}
+
 
 \subsection{Captions}
 
@@ -321,6 +316,27 @@ Some examples:
 \Greeknumeral{2013},
 
 
+Enumerated lists use Greek characters/numerals in the second and fourth level.
+
+\selectlanguage{greek}
+\begin{enumerate}
+  \item $\leftarrow$ 1
+  \begin{enumerate}
+    \item $\leftarrow$ 1.1
+    \begin{enumerate}
+      \item $\leftarrow$ 1.1.1
+       \begin{enumerate}
+         \item $\leftarrow$ 1.1.1.1
+         \item $\leftarrow$ 1.1.1.2
+       \end{enumerate}
+      \item $\leftarrow$ 1.1.2
+    \end{enumerate}
+  \end{enumerate}
+\end{enumerate}
+\selectlanguage{english}
+
+
+
 \selectlanguage{english}
 
 \end{document}
diff --git a/Master/texmf-dist/doc/generic/babel-greek/usage.pdf b/Master/texmf-dist/doc/generic/babel-greek/usage.pdf
index 2695cdfc7b5..0c4e0d954c9 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/doc/generic/babel-greek/usage.tex b/Master/texmf-dist/doc/generic/babel-greek/usage.tex
index c3c4bde820d..57edc7f78a5 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/usage.tex
+++ b/Master/texmf-dist/doc/generic/babel-greek/usage.tex
@@ -33,7 +33,7 @@
 \newcommand{\sg}{\selectlanguage{greek}}
 \newcommand{\sa}{\selectlanguage{american}}
 \begin{document}
-%\show\extrasgreek
+\show\extrasgreek
 %\show\extraspolutonikogreek
 \selectlanguage{american}
 
@@ -59,9 +59,11 @@ labels in second and fourth level enumerations are lowercase
 and uppercase Greek numerals correspondingly.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Typing Greek Text}
-\TeX\ understands only the basic ASCII characters, so it is not possible
-to enter directly Greek letters.\footnote{Literal input of Greek characters
-is possible with the greek-inputenc LaTeX package.}
+By default, \TeX\ understands only 7-bit ASCII characters, so it is not
+possible to enter directly Greek letters.%
+\footnote{Literal input of Greek characters
+is possible with XeTeX, LuaTeX, or the greek-inputenc LaTeX package.
+G. Milde, 2013/07/19}
 Instead, someone enters Latin letters
 which are mapped to their Greek ``counterparts'' by \TeX. The following
 table shows the transliteration employed: