babel-greek (3dec13)

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

4 files changed, 65 insertions, 62 deletions

diff --git a/Master/texmf-dist/tex/generic/babel-greek/athnum.sty b/Master/texmf-dist/tex/generic/babel-greek/athnum.sty
index f1869476be3..420deb58cba 100644
--- a/Master/texmf-dist/tex/generic/babel-greek/athnum.sty
+++ b/Master/texmf-dist/tex/generic/babel-greek/athnum.sty
@@ -29,7 +29,7 @@
 %% language and script via the Babel system (http://www.ctan.org/pkg/babel).
 %% 
 %% The list of derived (unpacked) files belonging to this work
-%% and covered by LPPL is defined by the unpacking script (greek.ins)
+%% and covered by LPPL is defined by the unpacking script (babel-greek.ins)
 %% which is part of the package.
 %% \CheckSum{125}
 %% This is file `athnum.dtx'
diff --git a/Master/texmf-dist/tex/generic/babel-greek/greek.ldf b/Master/texmf-dist/tex/generic/babel-greek/greek.ldf
index e399b8de2ef..cf87b52c22c 100644
--- a/Master/texmf-dist/tex/generic/babel-greek/greek.ldf
+++ b/Master/texmf-dist/tex/generic/babel-greek/greek.ldf
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% greek.dtx  (with options: `code')
+%% babel-greek.dtx  (with options: `code')
 %% This is a generated file.
 %% 
 %% Copyright 1989-2008 Apostolos Syropoulos, Johannes L. Braams,  Guenter Milde,
@@ -29,19 +29,16 @@
 %% language and script via the Babel system (http://www.ctan.org/pkg/babel).
 %% 
 %% The list of derived (unpacked) files belonging to this work
-%% and covered by LPPL is defined by the unpacking script (greek.ins)
+%% and covered by LPPL is defined by the unpacking script (babel-greek.ins)
 %% which is part of the package.
 \ProvidesLanguage{greek}
-        [2013/10/01 v1.7b Greek support for the babel system]
-%% File `greek.dtx'
-%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 -- 2005
-%%           by Johannes Braams, TeXniek
+        [2013/12/03 v1.8a Greek support for the babel system]
+%% File `babel-greek.dtx'
 %% Greek language Definition File
-%% Copyright (C) 1997, 2005
-%%           by Apostolos Syropoulos
-%%              Johannes Braams, TeXniek
-%% Please report errors to: G\"unter Milde <milde@users.sf.net>
+%% Copyright © 1997, 2005 Apostolos Syropoulos, Johannes Braams
+%% Copyright © 2013 Günter Milde
+%% Please report errors to: Günter Milde <milde@users.sf.net>
+
 \LdfInit\CurrentOption{captions\CurrentOption}
 \gdef\CurrentOption{greek}%
 \ifx\l@greek\@undefined
@@ -57,29 +54,39 @@
   \let\extraspolutonikogreek\extrasgreek
   \let\noextraspolutonikogreek\noextrasgreek
   }
-\ifdefined\if@bbl@greek@unicode
-  \PackageError{babel}{if@bbl@greek@unicode already defined.\MessageBreak
-    Please contact author of greek.ldf}
-  \relax
-\fi
-\newif\if@bbl@greek@unicode
-\ifdefined\luatexversion \@bbl@greek@unicodetrue \else
-\ifdefined\XeTeXrevision \@bbl@greek@unicodetrue \fi\fi
-\if@bbl@greek@unicode
-  % No font encoding switch required with Unicode fonts.
-  % Define dummy commands for |\textgreek| and |\greektext| (cf. below):
-  \let\greektext\relax
-  \let\textgreek\@firstofone
-\else
-  \@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
-     }
-   }{}
+\@ifl@aded{def}{eu1enc}{
+  \providecommand*{\greekfontencoding}{EU1}
+  \providecommand*{\bbl@greek@fontencdef}{greek-euenc}
+  \renewcommand*{\LastDeclaredEncoding}{EU1}
+}{}
+\@ifl@aded{def}{eu2enc}{
+  \providecommand*{\greekfontencoding}{EU2}
+  \providecommand*{\bbl@greek@fontencdef}{greek-euenc}
+  \renewcommand{\LastDeclaredEncoding}{EU2}
+}{}
+\providecommand*{\greekfontencoding}{LGR}
+\providecommand*{\bbl@greek@fontencdef}{lgrenc}
+\@ifl@aded{def}{\bbl@greek@fontencdef}{}{
+  \InputIfFileExists{\bbl@greek@fontencdef .def}{}{
+    \errhelp{I can't find the \bbl@greek@fontencdef .def file
+      for the Greek fonts}%
+    \errmessage{Font support for the Greek script missing.^^J
+      babel-greek can't typeset Greek.^^J
+      Install the "greek-fontenc" package^^J
+      or use XeTeX/LuaTeX with polyglossia.}%
+      \@@end
+  }
+}
+\ProvideTextCommandDefault{\greekscript}{%
+  \fontencoding{\greekfontencoding}\selectfont
+      \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}{lgrenc}{%
   \ProvideTextCommand{\textcopyright}{LGR}{\textlatin{\textcopyright}}
   \ProvideTextCommand{\textregistered}{LGR}{\textlatin{\textregistered}}
   \ProvideTextCommand{\texttrademark}{LGR}{\textlatin{\texttrademark}}
@@ -90,22 +97,17 @@
   \def\@roman#1{\expandafter\textlatin\expandafter{\romannumeral#1}}
   \def\@Roman#1{\expandafter\textlatin\expandafter{%
                 \expandafter\@slowromancap\romannumeral#1@}}
-  \DeclareTextCompositeCommand{\"}{LGR}{^^9F}{\accdialytika}
-  \DeclareTextCompositeCommand{\'}{LGR}{^^9F}{\LGR@hiatus}
-  \DeclareTextCompositeCommand{\`}{LGR}{^^9F}{\LGR@hiatus}
-  \DeclareTextCompositeCommand{\<}{LGR}{^^9F}{\LGR@hiatus}
-  \DeclareTextCompositeCommand{\>}{LGR}{^^9F}{\LGR@hiatus}
   \DeclareRobustCommand{\greektext}{%
     \fontencoding{LGR}\selectfont
     \def\encodingdefault{LGR}}
   \DeclareRobustCommand{\textgreek}[1]{\leavevmode{\greektext #1}}
   \def\outlfamily{\usefont{LGR}{cmro}{m}{n}}
   \DeclareTextFontCommand{\textol}{\outlfamily}
-\fi  % End of LGR fixes not required with XeTeX/LuaTeX.
+}{} % End of LGR fixes.
 \providehyphenmins{\CurrentOption}{\@ne\@ne}
 \addto\captionsgreek{%
-  \def\prefacename{\textPi\textrho\acctonos\textomicron\textlambda\textomicron
-    \textgamma\textomicron\textfinalsigma}%
+  \def\prefacename{\textPi\textrho\acctonos\textomicron\textlambda
+    \textomicron\textgamma\textomicron\textfinalsigma}%
   \def\refname{\textAlpha\textnu\textalpha
     \textphi\textomicron\textrho\acctonos\textepsilon\textfinalsigma}%
   \def\abstractname{\textPi\textepsilon\textrho\acctonos\textiota
@@ -204,8 +206,8 @@
       \acctonos\textiota\textomicron\textupsilon \or
     \>\textIota\textomicron\textupsilon\textlambda
       \acctonos\textiota\textomicron\textupsilon \or
-    \textAlpha\>\textupsilon\textgamma\textomicron\acctonos\textupsilon
-      \textsigma\texttau\textomicron\textupsilon \or
+    \textAlpha\>\textupsilon\textgamma\textomicron\acctonos
+      \textupsilon\textsigma\texttau\textomicron\textupsilon \or
     \textSigma\textepsilon\textpi\texttau\textepsilon\textmu\textbeta
       \textrho\acctonos\textiota\textomicron\textupsilon \or
     \>\textOmicron\textkappa\texttau\textomega\textbeta
@@ -220,12 +222,8 @@
   \expandafter\Greeknumeral\expandafter{\the\day}\space
   \gr@c@month \space
   \expandafter\Greeknumeral\expandafter{\the\year}}
-\if@bbl@greek@unicode
-  \relax
-\else
-  \addto\extrasgreek{\greektext}
-  \addto\noextrasgreek{\latintext}
-\fi
+\addto\extrasgreek{\greekscript}
+\addto\noextrasgreek{\latintext}
 \def\gr@ill@value#1{%
   \PackageWarningNoLine{babel}{Illegal value (#1) for greeknumeral}}
 \DeclareRobustCommand\anw@false{%
@@ -296,14 +294,15 @@
   \ifcase#1\or \textrho\or \textsigma\or \texttau\or \textupsilon\or
   \textphi\or \textchi\or \textpsi\or \textomega\or \textsampi\fi
   \gr@num@v}
-
-\if@bbl@greek@unicode
+\@ifl@aded{def}{greek-euenc}{
   \InputIfFileExists{xgreek-fixes.def}{}{\PackageWarningNoLine{babel}{%
-      Can't find the file "xgreek-fixes.def".\MessageBreak
-      For correct up/downcasing of Greek text,\MessageBreak
-      install the "polyglossia" package}%
-    }
-\else % 8-bit TeX
+    Can't find the file "xgreek-fixes.def".\MessageBreak
+    For correct up/down-casing of Greek text,\MessageBreak
+    install the "polyglossia" package}%
+  }
+  \addto\extraspolutonikogreek{} % prevent command missing error.
+}{}
+\@ifl@aded{def}{lgrenc}{%
   \begingroup
     \@ifundefined{active@char\string!}{}{\catcode`!=12\relax}
     \catcode`\~=12
@@ -335,10 +334,14 @@
     \initiate@active@char{~}%
     \declare@shorthand{greek}{~}{}}
   \lccode`\~=\@tempcnta
+  \DeclareTextCompositeCommand{\"}{LGR}{^^9F}{\accdialytika}
+  \DeclareTextCompositeCommand{\'}{LGR}{^^9F}{\LGR@hiatus}
+  \DeclareTextCompositeCommand{\`}{LGR}{^^9F}{\LGR@hiatus}
+  \DeclareTextCompositeCommand{\<}{LGR}{^^9F}{\LGR@hiatus}
+  \DeclareTextCompositeCommand{\>}{LGR}{^^9F}{\LGR@hiatus}
   \addto\extraspolutonikogreek{\languageshorthands{greek}}%
   \declare@shorthand{greek}{~}{\greek@tilde}
-\fi  % End of LGR-specific code not required with XeTeX/LuaTeX.
-\addto\extraspolutonikogreek{} % set up \extraspolutonikogreek for Xe/LuaTeX
+}{} % End of LGR-specific code.
 \providecommand*{\anwtonos}{\textdexiakeraia}
 \providecommand*{\katwtonos}{\textaristerikeraia}
 \providecommand*{\qoppa}{\textqoppa}
diff --git a/Master/texmf-dist/tex/generic/babel-greek/grmath.sty b/Master/texmf-dist/tex/generic/babel-greek/grmath.sty
index a30f81a1375..9a03a216ace 100644
--- a/Master/texmf-dist/tex/generic/babel-greek/grmath.sty
+++ b/Master/texmf-dist/tex/generic/babel-greek/grmath.sty
@@ -29,7 +29,7 @@
 %% language and script via the Babel system (http://www.ctan.org/pkg/babel).
 %% 
 %% The list of derived (unpacked) files belonging to this work
-%% and covered by LPPL is defined by the unpacking script (greek.ins)
+%% and covered by LPPL is defined by the unpacking script (babel-greek.ins)
 %% which is part of the package.
 %% \CheckSum{126}
 %% This is file `grmath.sty'
diff --git a/Master/texmf-dist/tex/generic/babel-greek/grsymb.sty b/Master/texmf-dist/tex/generic/babel-greek/grsymb.sty
index 2cd1647a99c..7873c38613c 100644
--- a/Master/texmf-dist/tex/generic/babel-greek/grsymb.sty
+++ b/Master/texmf-dist/tex/generic/babel-greek/grsymb.sty
@@ -29,7 +29,7 @@
 %% language and script via the Babel system (http://www.ctan.org/pkg/babel).
 %% 
 %% The list of derived (unpacked) files belonging to this work
-%% and covered by LPPL is defined by the unpacking script (greek.ins)
+%% and covered by LPPL is defined by the unpacking script (babel-greek.ins)
 %% which is part of the package.
 %% \CheckSum{55}
 %% This is file `grsymb.sty'