babel-greek (5aug14)

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

1 files changed, 44 insertions, 16 deletions

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 75db933b4f0..fd837430b08 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex
+++ b/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex
@@ -2,11 +2,17 @@
 \usepackage[LGR,T1]{fontenc}
 
 % Xe/LuaTeX in 8-bit compatibility mode:
-% TODO: hyphenation in Greek text parts fails!
-\ifdefined \XeTeXrevision 
+% hyphenation in Greek text parts fails!
+% (would require the 8-bit, LGR-encoded patterns in the XeTeX ini and a
+% loader fix for luatex).
+
+% TODO: why does XeTeXinputencoding "bytes" no longer work with inputenc's
+% utf8 option?
+\ifdefined \XeTeXrevision
   \XeTeXinputencoding "bytes"
 \fi
-\ifdefined\luatexversion 
+
+\ifdefined\luatexversion
   \usepackage[utf8]{luainputenc}
 \else
   \usepackage[utf8]{inputenc}
@@ -21,9 +27,26 @@
 % \usepackage{kerkis}
 % \usepackage{gfsdidot}
 
+% Load the Babel package with Greek and English language definitions:
+%
+% Uncomment the desired language variant
+
+% Default: modern monotonic Greek
 \usepackage[greek,english]{babel}
+% Obsolete: used instead of `greek', kept for backwards compatibility:
+% \usepackage[polutonikogreek,english]{babel}
+
+% For backwards compatibility, you can also use 
+% \selectlanguage{polutonikogreek} instead of \selectlanguage{greek} etc.
+% if the (modern) polytonic Greek language variant is selected.
+
+% uncomment for  modern polytonic Greek
 % \languageattribute{greek}{polutoniko}
-\message{Latin encoding is \latinencoding}
+
+% uncomment for ancient Greek
+\languageattribute{greek}{ancient}
+
+% \message{Latin encoding is \latinencoding}
 
 \DeclareTextCommandDefault{\ensuregreek}{\textgreek}
 
@@ -46,7 +69,7 @@ The declaration \verb|\selectlanguage| switches between languages.
 \end{quote}
 
 The macro \verb|\foreignlanguage| sets its second argument in the specified
-language. This is intended for short text parts like 
+language. This is intended for short text parts like
 \foreignlanguage{greek}{Βιβλιοθήκη}.
 
 \section{Font Encoding}
@@ -86,13 +109,13 @@ To prevent Roman numerals being typeset in Greek letters we need to adopt
 the internal LaTeX commands. Note that this may cause errors when roman
 numerals are used in a situation where the macros need to be expanded:
 
-\makeatletter 
+\makeatletter
 Greek: \ensuregreek{
 \@roman{1}, \@roman{2}, \@roman{3}, \@roman{4}, \ldots, \@roman{1975}
 \@Roman{1}, \@Roman{2}, \@Roman{3}, \@Roman{4}, \ldots, \@Roman{1975}
 }
 
-Latin: 
+Latin:
 \@roman{1}, \@roman{2}, \@roman{3}, \@roman{4}, \ldots, \@roman{1975}
 \@Roman{1}, \@Roman{2}, \@Roman{3}, \@Roman{4}, \ldots, \@Roman{1975}
 \makeatother
@@ -108,14 +131,19 @@ 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 }}
+\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 diphtong) if
-placed on the first vowel of a diphtong 
-(\ensuregreek{\'ai, \'au, \'ei, \'>ai, \>'au, \>'ei}). 
+placed on the first vowel of a diphtong
+(\ensuregreek{\'ai, \'au, \'ei, \'>ai, \>'au, \>'ei}).
 A dialytika must be placed on the second vowel if they are dropped:
 (\ensuregreek{\MakeUppercase{\'ai, \'au, \'ei,  \'>ai, \>'au, \>'ei}}).
 
@@ -173,7 +201,7 @@ MakeLowercase:
 The lowercase of \ensuregreek{Σ} is the «auto-sigma» (\verb+\textautosigma+):
 \ensuregreek{ΣΣ $\mapsto$ \MakeLowercase{ΣΣ}}. Add a ZWNJ or use the
 \verb+\noboundary+ macro to prevent conversion to final sigma:
-\ensuregreek{\MakeLowercase{ΣΣ‌}}. The lowercase of GREEK LETTER STIGMA 
+\ensuregreek{\MakeLowercase{ΣΣ‌}}. The lowercase of GREEK LETTER STIGMA
 \ensuregreek{Ϛ} is \ensuregreek{\MakeLowercase{Ϛ}} not \verb|\textvarstigma|
 (\ensuregreek\textvarstigma).
 
@@ -199,7 +227,7 @@ Characters of the Greek extended Unicode block:
 ῀ ῁ ῂ ῃ ῄ   ῆ ῇ Ὲ Έ Ὴ Ή ῌ ῍ ῎ ῏ \\
 ῐ ῑ ῒ ΐ     ῖ ῗ Ῐ Ῑ Ὶ Ί   ῝ ῞ ῟ \\
 ῠ ῡ ῢ ΰ ῤ ῥ ῦ ῧ Ῠ Ῡ Ὺ Ύ Ῥ ῭ ΅ ` \\
-    ῲ ῳ ῴ   ῶ ῷ Ὸ Ό Ὼ Ώ ῼ ´ ῾   
+    ῲ ῳ ῴ   ῶ ῷ Ὸ Ό Ὼ Ώ ῼ ´ ῾
 \selectlanguage{english}
 
 MakeUppercase:
@@ -344,7 +372,7 @@ Some examples:
 
 Enumerated lists use Greek numerals in the second and fourth level:
 
-\selectlanguage{greek} 
+\selectlanguage{greek}
 \begin{enumerate}
   \item \textlatin{Item} 1
   \begin{enumerate}