summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-02 22:49:59 +0000
committerKarl Berry <karl@freefriends.org>2013-07-02 22:49:59 +0000
commit667cbedb1aa2a1d10b705b300571225628baebd6 (patch)
tree45550abc430eaa48af95e079bd61ad48d73d8760
parent74eab85d64cec0e1252bb24e518e38287955a722 (diff)
c2l babel-greek (2jul13)
git-svn-id: svn://tug.org/texlive/trunk@31073 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/babel-greek/README4
-rw-r--r--Master/texmf-dist/doc/generic/babel-greek/README.html4
-rw-r--r--Master/texmf-dist/doc/generic/babel-greek/test-greek.pdfbin187861 -> 188965 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel-greek/test-greek.tex21
-rw-r--r--Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdfbin47917 -> 54074 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.tex60
-rw-r--r--Master/texmf-dist/source/generic/babel-greek/greek.dtx73
-rw-r--r--Master/texmf-dist/tex/generic/babel-greek/greek.ldf13
8 files changed, 129 insertions, 46 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-greek/README b/Master/texmf-dist/doc/generic/babel-greek/README
index ee2b1a991f7..95595d394a9 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/README
+++ b/Master/texmf-dist/doc/generic/babel-greek/README
@@ -35,9 +35,13 @@ 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`_
===== ========== ===========================================================
+.. _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
+
Requirements
------------
diff --git a/Master/texmf-dist/doc/generic/babel-greek/README.html b/Master/texmf-dist/doc/generic/babel-greek/README.html
index 680be11a675..d93e9690c73 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/README.html
+++ b/Master/texmf-dist/doc/generic/babel-greek/README.html
@@ -73,6 +73,10 @@ However, users of the XeTeX and LuaTeX engines are advised to use the
<td>&nbsp;</td>
<td><p>input “xgreek-fixes.def” from <a class="reference external" href="http://www.ctan.org/pkg/polyglossia">polyglossia</a> with Xe/LuaTeX.</p></td>
</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>
+</tr>
</tbody>
</table>
</div>
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 1acf4b34c40..78126474e8c 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf
+++ b/Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf
Binary files differ
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 fff605eb988..df04786e3b3 100644
--- a/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex
+++ b/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex
@@ -188,6 +188,27 @@ The lowercase of \ensuregreek{Σ} is the «auto-sigma» (\verb+\textautosigma+):
\subsection{Greek extended}
+Characters of the Greek extended Unicode block:
+
+\selectlanguage{greek}
+ἀ ἁ ἂ ἃ ἄ ἅ ἆ ἇ Ἀ Ἁ Ἂ Ἃ Ἄ Ἅ Ἆ Ἇ \\
+ἐ ἑ ἒ ἓ ἔ ἕ Ἐ Ἑ Ἒ Ἓ Ἔ Ἕ \\
+ἠ ἡ ἢ ἣ ἤ ἥ ἦ ἧ Ἠ Ἡ Ἢ Ἣ Ἤ Ἥ Ἦ Ἧ \\
+ἰ ἱ ἲ ἳ ἴ ἵ ἶ ἷ Ἰ Ἱ Ἲ Ἳ Ἴ Ἵ Ἶ Ἷ \\
+ὀ ὁ ὂ ὃ ὄ ὅ Ὀ Ὁ Ὂ Ὃ Ὄ Ὅ \\
+ὐ ὑ ὒ ὓ ὔ ὕ ὖ ὗ Ὑ Ὓ Ὕ Ὗ \\
+ὠ ὡ ὢ ὣ ὤ ὥ ὦ ὧ Ὠ Ὡ Ὢ Ὣ Ὤ Ὥ Ὦ Ὧ \\
+ὰ ά ὲ έ ὴ ή ὶ ί ὸ ό ὺ ύ ὼ ώ \\
+ᾀ ᾁ ᾂ ᾃ ᾄ ᾅ ᾆ ᾇ ᾈ ᾉ ᾊ ᾋ ᾌ ᾍ ᾎ ᾏ \\
+ᾐ ᾑ ᾒ ᾓ ᾔ ᾕ ᾖ ᾗ ᾘ ᾙ ᾚ ᾛ ᾜ ᾝ ᾞ ᾟ \\
+ᾠ ᾡ ᾢ ᾣ ᾤ ᾥ ᾦ ᾧ ᾨ ᾩ ᾪ ᾫ ᾬ ᾭ ᾮ ᾯ \\
+ᾰ ᾱ ᾲ ᾳ ᾴ ᾶ ᾷ Ᾰ Ᾱ Ὰ Ά ᾼ ᾽ ι ᾿ \\
+῀ ῁ ῂ ῃ ῄ ῆ ῇ Ὲ Έ Ὴ Ή ῌ ῍ ῎ ῏ \\
+ῐ ῑ ῒ ΐ ῖ ῗ Ῐ Ῑ Ὶ Ί ῝ ῞ ῟ \\
+ῠ ῡ ῢ ΰ ῤ ῥ ῦ ῧ Ῠ Ῡ Ὺ Ύ Ῥ ῭ ΅ ` \\
+ ῲ ῳ ῴ ῶ ῷ Ὸ Ό Ὼ Ώ ῼ ´ ῾
+\selectlanguage{english}
+
MakeUppercase:
\selectlanguage{greek}
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 5975a681d1b..e59cc4c4249 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
Binary files differ
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 d667027a112..212e3f7b6d7 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
@@ -5,6 +5,9 @@
\usepackage{booktabs}
\usepackage{fontspec}
+% xunicode extension with Greek LICR definitions:
+\usepackage{xunicode-greek}
+
\usepackage{libertineotf}
\usepackage[greek,english]{babel}
@@ -54,22 +57,22 @@ Input via the Latin transcription defined in LGR is not possible.
Enumerated lists use Greek characters/numerals in the second and fourth level.
This requires support for Greek LICR macros in XeTeX/LuaTeX (currently
-missing).
+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}
+ \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}
@@ -149,14 +152,35 @@ MakeLowercase:
\MakeLowercase{\greekandcoptic}
\end{quote}
-The lowercase of Σ is σ (GREEK SMALL LETTER SIGMA, with LGR, it is
-\verb|\textautosigma|). The lowercase of GREEK LETTER STIGMA Ϛ is
-\MakeLowercase{Ϛ}.
+The lowercase of Σ is σ (GREEK SMALL LETTER SIGMA).\footnote{%
+With LGR, it is \texttt{\textbackslash textautosigma}.}
+The lowercase of Ϛ (GREEK LETTER STIGMA) is \MakeLowercase{Ϛ}.
% \newpage
\subsection{Greek extended}
+Characters of the Greek extended Unicode block:
+
+\selectlanguage{greek}
+ἀ ἁ ἂ ἃ ἄ ἅ ἆ ἇ Ἀ Ἁ Ἂ Ἃ Ἄ Ἅ Ἆ Ἇ \\
+ἐ ἑ ἒ ἓ ἔ ἕ Ἐ Ἑ Ἒ Ἓ Ἔ Ἕ \\
+ἠ ἡ ἢ ἣ ἤ ἥ ἦ ἧ Ἠ Ἡ Ἢ Ἣ Ἤ Ἥ Ἦ Ἧ \\
+ἰ ἱ ἲ ἳ ἴ ἵ ἶ ἷ Ἰ Ἱ Ἲ Ἳ Ἴ Ἵ Ἶ Ἷ \\
+ὀ ὁ ὂ ὃ ὄ ὅ Ὀ Ὁ Ὂ Ὃ Ὄ Ὅ \\
+ὐ ὑ ὒ ὓ ὔ ὕ ὖ ὗ Ὑ Ὓ Ὕ Ὗ \\
+ὠ ὡ ὢ ὣ ὤ ὥ ὦ ὧ Ὠ Ὡ Ὢ Ὣ Ὤ Ὥ Ὦ Ὧ \\
+ὰ ά ὲ έ ὴ ή ὶ ί ὸ ό ὺ ύ ὼ ώ \\
+ᾀ ᾁ ᾂ ᾃ ᾄ ᾅ ᾆ ᾇ ᾈ ᾉ ᾊ ᾋ ᾌ ᾍ ᾎ ᾏ \\
+ᾐ ᾑ ᾒ ᾓ ᾔ ᾕ ᾖ ᾗ ᾘ ᾙ ᾚ ᾛ ᾜ ᾝ ᾞ ᾟ \\
+ᾠ ᾡ ᾢ ᾣ ᾤ ᾥ ᾦ ᾧ ᾨ ᾩ ᾪ ᾫ ᾬ ᾭ ᾮ ᾯ \\
+ᾰ ᾱ ᾲ ᾳ ᾴ ᾶ ᾷ Ᾰ Ᾱ Ὰ Ά ᾼ ᾽ ι ᾿ \\
+῀ ῁ ῂ ῃ ῄ ῆ ῇ Ὲ Έ Ὴ Ή ῌ ῍ ῎ ῏ \\
+ῐ ῑ ῒ ΐ ῖ ῗ Ῐ Ῑ Ὶ Ί ῝ ῞ ῟ \\
+ῠ ῡ ῢ ΰ ῤ ῥ ῦ ῧ Ῠ Ῡ Ὺ Ύ Ῥ ῭ ΅ ` \\
+ ῲ ῳ ῴ ῶ ῷ Ὸ Ό Ὼ Ώ ῼ ´ ῾
+\selectlanguage{english}
+
MakeUppercase:
\selectlanguage{greek}
@@ -206,11 +230,7 @@ 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 (currently
-missing).
-
-\end{document}
-
+This requires support for Greek LICR macros in XeTeX/LuaTeX.
\subsection{Captions}
diff --git a/Master/texmf-dist/source/generic/babel-greek/greek.dtx b/Master/texmf-dist/source/generic/babel-greek/greek.dtx
index 95910561258..b357379888d 100644
--- a/Master/texmf-dist/source/generic/babel-greek/greek.dtx
+++ b/Master/texmf-dist/source/generic/babel-greek/greek.dtx
@@ -25,7 +25,7 @@
% and covered by LPPL is defined by the unpacking script (greek.ins)
% which is part of the package.
% \fi
-% \CheckSum{1218}
+% \CheckSum{1221}
%
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -36,7 +36,7 @@
%<code>\ProvidesLanguage{greek}
%\fi
%\ProvidesFile{greek.dtx}
- [2013/06/21 v1.5 Greek support for the babel system]
+ [2013/07/02 v1.5a Greek support for the babel system]
%\iffalse
%% File `greek.dtx'
%% Babel package for LaTeX version 2e
@@ -93,6 +93,9 @@
% extrasgreek/noextrasgreek definitions,
% LICR macros in string definitions,
% LGR font encoding not used with XeTeX/LuaTeX.}
+% \changes{greek-1.5a}{2013/06/27}{``extraspolutonikogreek'' definition
+% was missing with Xe/LuaTeX.
+% Replaced non-printable literal character with ^^-notation.}
%
% \section{Babel support for the Greek language}
%
@@ -105,21 +108,20 @@
% enhance the support for typesetting greek texts.} defines all the
% language definition macros for the Greek language, i.e.,
% as it used today with only one accent, and the attribute
-% $\pi o\lambda\upsilon\tau o\nu\kappa\acute{o}$ (``Polutoniko'')
-% for typesetting greek text with all accents. This separation
-% arose out of the need to simplify things, for only very few
-% people will be really interested to typeset polytonic Greek
-% text.
+% \Lopt{polutoniko} for typesetting greek text with all accents
+% (classical and polytonic Greek).
%
% \DescribeMacro\greektext
% \DescribeMacro\latintext
% The commands |\greektext| and |\latintext| can be used to switch
-% to greek or latin fonts. These are declarations.
+% to Greek or Latin font encodings but do not change the active language.
+% These are declarations.
%
% \DescribeMacro\textgreek
% \DescribeMacro\textlatin
% The commands |\textgreek| and |\textlatin| both take one argument
% which is then typeset using the requested font encoding.
+%
% \DescribeMacro\textol
% The command |\greekol| switches to the greek outline font family,
% while the command |\textol| typests a short text in outline font.
@@ -127,10 +129,38 @@
% added text commands |\stigma|, |\qoppa|, |\sampi|, |\ddigamma|,
% |\Digamma|, |\euro|, |\permill|, and |\vardigamma|.
%
-% \subsection{Typing conventions}
-%
-% The file \file{usage.pdf} explains the several input conventions
-% for Greek.
+% \subsection{Usage}
+%
+% To activate Greek support with babel, specify the option
+% \Lopt{greek}, either as global option or as option to the
+% \pkg{babel} package. Remember, that the \emph{last} language
+% option determines the document language, e.g.
+% \begin{verbatim}
+% \usepackage[greek,english]{babel}\end{verbatim}
+% activates support for Greek in an English document while
+% \begin{verbatim}
+% \usepackage[english,greek]{babel}
+% \languageattribute{greek}{polutoniko}\end{verbatim}
+% sets the document language to Greek with ``polytonic''
+% spelling of auto-generated strings.
+%
+% For backwards compatibility, ``polytonic'' spelling can also be
+% selected via the dummy language \Lopt{polutonikogreek}. In this
+% case, the language name \Lopt{polutonikogreek} must also be
+% used for language switches with |\selectlanguage| or
+% |\foreignlanguage|. However, it is not possible to use
+% both options, \Lopt{greek} and \Lopt{polutonikogreek} in one document.
+%
+% \subsubsection{Input of Greek text}
+%
+% There are several alternatives for input of Greek text.
+% The required package \pkg{greek-fontenc} defines
+% \emph{LaTeX internal character representation} (LICR) macros
+% for Greek letters and text symbols.
+% With the packages \pkg{inputenc} and \pkg{greek-inputenc},
+% Greek characters can be input using the utf-8, iso-8859-7,
+% or macgreek encoding. The file \file{usage.pdf} explains a Latin
+% transliteration defined by the LGR font encoding.
%
% \subsection{Greek numbering}
%
@@ -361,12 +391,14 @@
% \changes{greek-1.4}{2013/05/17}{Add TextCompositeCommands for
% ``uppercase diacritics''.}
% \changes{greek-1.5}{2013/05/27}{Bugfix: @hiatus->LGR@hiatus}
+% \changes{greek-1.5a}{2013/07/02}{Replaced non-printable literal character
+% with ^^-notation (thanks to Heiko Oberdiek for the hint).}
% \begin{macrocode}
- \DeclareTextCompositeCommand{\"}{LGR}{}{\accdialytika}
- \DeclareTextCompositeCommand{\'}{LGR}{}{\LGR@hiatus}
- \DeclareTextCompositeCommand{\`}{LGR}{}{\LGR@hiatus}
- \DeclareTextCompositeCommand{\<}{LGR}{}{\LGR@hiatus}
- \DeclareTextCompositeCommand{\>}{LGR}{}{\LGR@hiatus}
+ \DeclareTextCompositeCommand{\"}{LGR}{^^9F}{\accdialytika}
+ \DeclareTextCompositeCommand{\'}{LGR}{^^9F}{\LGR@hiatus}
+ \DeclareTextCompositeCommand{\`}{LGR}{^^9F}{\LGR@hiatus}
+ \DeclareTextCompositeCommand{\<}{LGR}{^^9F}{\LGR@hiatus}
+ \DeclareTextCompositeCommand{\>}{LGR}{^^9F}{\LGR@hiatus}
% \end{macrocode}
%
% Now we define two commands that offer the possibility to switch
@@ -945,17 +977,18 @@
% We can also make the tilde character itself expand to a tilde with
% category code 12 to make the typing of texts easier.
% \changes{greek-1.1b}{1997/03/06}{Made tilde expand to a tilde with
-% \cs{catcode 12}}
+% \cs{catcode 12}.}
+% \changes{greek-1.5a}{2013/06/27}{provide ``extraspolutonikogreek'' also
+% for Xe/LuaTeX.}
% \begin{macrocode}
\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{macrocode}
% \end{macro}
% \end{macro}
%
-%
-%
% \changes{greek-1.1c}{1997/03/10}{Added a couple of symbols, needed
% for \cs{greeknumeral}}
% \changes{greek-1.1e}{1997/10/12}{Most symbols are removed and are
diff --git a/Master/texmf-dist/tex/generic/babel-greek/greek.ldf b/Master/texmf-dist/tex/generic/babel-greek/greek.ldf
index 7ade8596776..f3040716c06 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/06/21 v1.5 Greek support for the babel system]
+ [2013/07/02 v1.5a Greek support for the babel system]
%% File `greek.dtx'
%% Babel package for LaTeX version 2e
%% Copyright (C) 1989 -- 2005
@@ -90,11 +90,11 @@
\let\latin@Roman\@Roman
\DeclareTextCommandDefault{\@Roman}[1]{\latin@Roman{#1}}
\DeclareTextCommand{\@Roman}{LGR}[1]{\textlatin{\latin@Roman{#1}}}
- \DeclareTextCompositeCommand{\"}{LGR}{}{\accdialytika}
- \DeclareTextCompositeCommand{\'}{LGR}{}{\LGR@hiatus}
- \DeclareTextCompositeCommand{\`}{LGR}{}{\LGR@hiatus}
- \DeclareTextCompositeCommand{\<}{LGR}{}{\LGR@hiatus}
- \DeclareTextCompositeCommand{\>}{LGR}{}{\LGR@hiatus}
+ \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}}
@@ -334,6 +334,7 @@
\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
\providecommand*{\anwtonos}{\textnumeralsigngreek}
\providecommand*{\katwtonos}{\textnumeralsignlowergreek}
\providecommand*{\qoppa}{\textqoppa}