babel-greek (13sep13)

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

8 files changed, 42 insertions, 38 deletions

diff --git a/Master/texmf-dist/doc/generic/babel-greek/README b/Master/texmf-dist/doc/generic/babel-greek/README
index 71c2c2b1e7c..0ea11d538dc 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/README
+++ b/Master/texmf-dist/doc/generic/babel-greek/README
@@ -18,7 +18,7 @@ In 1997, Apostolos Syropoulos added support for the Greek language to the
 (single-diacritic) and polytonic (multiple-diacritic) modes of writing.
 
 There is now experimental support for Unicode-aware TeX engines
-(XeTeX/LuaTeX). 
+(XeTeX/LuaTeX).
 
 News
 ----
@@ -34,15 +34,17 @@ News
 ..               LICR macros in string definitions,
 ..               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.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.
+1.7a  2013-09-13 Fix bug `babel/4360`_: spurious ``\fi``.
 ===== ========== ===========================================================
-               
+
 
 .. _babel/4303: http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=babel/4303
 .. _babel/4305: http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=babel/4305
+.. _babel/4360: http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=babel/4360
 
 Requirements
 ------------
@@ -67,7 +69,7 @@ Installation
 
 If possible, get this package from your distribution using its installation
 manager.
-  
+
 Otherwise, make sure LaTeX can find the required files:
 
 * Download and unpack `babel-greek.zip`.
@@ -138,7 +140,7 @@ Unicode (with XeTeX or LuaTeX).
 
 .. References
    ----------
-  
+
 .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
 .. _babel: http://www.ctan.org/pkg/babel
 .. _fontspec: http://www.ctan.org/pkg/fontspec
diff --git a/Master/texmf-dist/doc/generic/babel-greek/README.html b/Master/texmf-dist/doc/generic/babel-greek/README.html
index 7fc44cd48d7..2a95c1c28f2 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/README.html
+++ b/Master/texmf-dist/doc/generic/babel-greek/README.html
@@ -74,7 +74,7 @@ Greek language and script via the <a class="reference external" href="http://www
 </tr>
 <tr><td><p>1.5a</p></td>
 <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>
+<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>
@@ -87,8 +87,11 @@ Greek language and script via the <a class="reference external" href="http://www
 <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>
+<td><p>Do not auto-load euenc.def with XeTeX/LuaTeX.</p></td>
+</tr>
+<tr><td><p>1.7a</p></td>
+<td><p>2013-09-13</p></td>
+<td><p>Fix <a class="reference external" href="http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=babel/4360">babel/4360</a>: spurious <tt class="literal">\fi</tt></p></td>
 </tr>
 </tbody>
 </table>
diff --git a/Master/texmf-dist/doc/generic/babel-greek/greek.pdf b/Master/texmf-dist/doc/generic/babel-greek/greek.pdf
index 2542f2c91de..32b4b17e172 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 3b799a4cbe8..da14200f713 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
index d08951c57f2..853553a3a8c 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 9d830b937e4..9cad388bf16 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
@@ -10,7 +10,7 @@
 % \setmainfont{DejaVu Serif}
 
 % Declare the font encoding and Greek LICR definitions:
-\usepackage{greek-fontenc}
+\usepackage{textalpha}[2013/09/11]
 
 \usepackage[greek,english]{babel}
 \languageattribute{greek}{polutoniko}
@@ -190,13 +190,13 @@ MakeLowercase:
 \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.
+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 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, ...).
+Until automatically done by \emph{euenc} for EU1 and EU2 font encodings, the
+recommended way to load Greek LICR definitions is via the \emph{textalpha}
+or \emph{alphabeta} packages provided with \emph{greek-fontenc} since
+version~0.10.
 
 \subsection{Hiatus}
 
@@ -219,7 +219,6 @@ m\acctonos\textalpha\textiota να $\mapsto$
 \MakeUppercase{\>\textalpha\textupsilon πνία}.
 \selectlanguage{english}
 
-
 \subsection{Captions}
 
 \selectlanguage{greek}
@@ -329,7 +328,4 @@ Enumerated lists use Greek characters/numerals in the second and fourth level.
 \selectlanguage{english}
 
 
-
-\selectlanguage{english}
-
 \end{document}
diff --git a/Master/texmf-dist/source/generic/babel-greek/greek.dtx b/Master/texmf-dist/source/generic/babel-greek/greek.dtx
index ad4cb130d84..ddf0fac5177 100644
--- a/Master/texmf-dist/source/generic/babel-greek/greek.dtx
+++ b/Master/texmf-dist/source/generic/babel-greek/greek.dtx
@@ -36,7 +36,7 @@
 %<code>\ProvidesLanguage{greek}
 %\fi
 %\ProvidesFile{greek.dtx}
-        [2013/09/09 v1.7 Greek support for the babel system]
+        [2013/09/13 v1.7a Greek support for the babel system]
 %\iffalse
 %% File `greek.dtx'
 %% Babel package for LaTeX version 2e
@@ -100,7 +100,8 @@
 %    redefinition (thanks to Enrico Gregorio and Claudio Beccari),
 %    load LICR macro definitions for Xe/LuaTeX.}
 % \changes{greek-1.7}{2013/09/09}{Do not load euenc.def with XeTeX/LuaTeX.
-%    Users should load greek-fontenc instead.}
+%    Prevent re-loading lgrenc.def.}
+% \changes{greek-1.7a}{2013/09/13}{bugfix: remove spurious ``fi''.}
 %
 %  \section{Babel support for the Greek language}
 %
@@ -332,15 +333,16 @@
 %    \begin{macrocode}
   \let\greektext\relax
   \let\textgreek\@firstofone
-  \fi
 \else
-  \InputIfFileExists{lgrenc.def}{}{%
-    \errhelp{I can't find the lgrenc.def file for the Greek fonts}%
-    \errmessage{Since I do not know the LGR font encoding^^J
-      I can't typeset Greek with 8-bit TeX.^^J
-      Please install the "greek-fontenc" package or use XeTeX/LuaTeX.}%
-      \@@end
-   }
+  \@ifundefined{ver@lgrenc.def}{
+    \InputIfFileExists{lgrenc.def}{}{%
+      \errhelp{I can't find the lgrenc.def file for the Greek fonts}%
+      \errmessage{Since I do not know the LGR font encoding^^J
+        I can't typeset Greek with 8-bit TeX.^^J
+        Please install the "greek-fontenc" package or use XeTeX/LuaTeX.}%
+        \@@end
+     }
+   }{}
 %    \end{macrocode}
 %
 %    We redefine a few commands in the LGR encoding
diff --git a/Master/texmf-dist/tex/generic/babel-greek/greek.ldf b/Master/texmf-dist/tex/generic/babel-greek/greek.ldf
index d58d34e0822..6c0f020b09a 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 (greek.ins)
 %% which is part of the package.
 \ProvidesLanguage{greek}
-        [2013/09/09 v1.7 Greek support for the babel system]
+        [2013/09/13 v1.7a Greek support for the babel system]
 %% File `greek.dtx'
 %% Babel package for LaTeX version 2e
 %% Copyright (C) 1989 -- 2005
@@ -70,15 +70,16 @@
   % Define dummy commands for |\textgreek| and |\greektext| (cf. below):
   \let\greektext\relax
   \let\textgreek\@firstofone
-  \fi
 \else
-  \InputIfFileExists{lgrenc.def}{}{%
-    \errhelp{I can't find the lgrenc.def file for the Greek fonts}%
-    \errmessage{Since I do not know the LGR font encoding^^J
-      I can't typeset Greek with 8-bit TeX.^^J
-      Please install the "greek-fontenc" package or use XeTeX/LuaTeX.}%
-      \@@end
-   }
+  \@ifundefined{ver@lgrenc.def}{
+    \InputIfFileExists{lgrenc.def}{}{%
+      \errhelp{I can't find the lgrenc.def file for the Greek fonts}%
+      \errmessage{Since I do not know the LGR font encoding^^J
+        I can't typeset Greek with 8-bit TeX.^^J
+        Please install the "greek-fontenc" package or use XeTeX/LuaTeX.}%
+        \@@end
+     }
+   }{}
   \ProvideTextCommand{\textcopyright}{LGR}{\textlatin{\textcopyright}}
   \ProvideTextCommand{\textregistered}{LGR}{\textlatin{\textregistered}}
   \ProvideTextCommand{\texttrademark}{LGR}{\textlatin{\texttrademark}}