diff options
author | Karl Berry <karl@freefriends.org> | 2013-07-20 21:50:33 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-07-20 21:50:33 +0000 |
commit | b0d37b9f4c223f42945de2b0bdb99df05192f20b (patch) | |
tree | 15c394703319f01b65a0fadc9ad1a91ad4448279 /Master/texmf-dist/source/generic | |
parent | ef65d213f07b8bb04b01bbcf63e65bc9437f821e (diff) |
babel-greek (20jul13)
git-svn-id: svn://tug.org/texlive/trunk@31249 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic')
-rw-r--r-- | Master/texmf-dist/source/generic/babel-greek/greek.dtx | 68 |
1 files changed, 41 insertions, 27 deletions
diff --git a/Master/texmf-dist/source/generic/babel-greek/greek.dtx b/Master/texmf-dist/source/generic/babel-greek/greek.dtx index b357379888d..3303ade20ed 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{1221} +% \CheckSum{1225} % % \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/07/02 v1.5a Greek support for the babel system] + [2013/07/19 v1.6 Greek support for the babel system] %\iffalse %% File `greek.dtx' %% Babel package for LaTeX version 2e @@ -96,6 +96,9 @@ % \changes{greek-1.5a}{2013/06/27}{``extraspolutonikogreek'' definition % was missing with Xe/LuaTeX. % Replaced non-printable literal character with ^^-notation.} +% \changes{greek-1.6}{2013/07/18}{fix \cs{@roman} and \cs{@Roman} +% redefinition (thanks to Enrico Gregorio and Claudio Beccari), +% load LICR macro definitions for Xe/LuaTeX.} % % \section{Babel support for the Greek language} % @@ -113,10 +116,12 @@ % % \DescribeMacro\greektext % \DescribeMacro\latintext +% With 8-bit LaTeX, Greek text fonts use a non-standard font encoding +% (LGR) that misses Latin letters. Latin characters in the source are +% instead interpreted as a transcription for Greek symbols. % The commands |\greektext| and |\latintext| can be used to switch % 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 @@ -307,7 +312,7 @@ % (see the `greek-fontenc' package http://www.ctan.org/pkg/greek-fontenc). % The |cb| fonts created by Claudio Beccari% % \footnote{Apostolos Syropoulos wishes to thank him for his -% patience, collaboration, comments and suggestions.} +% patience, collaboration, comments and suggestions.} % are a complete set of LGR encoded Greek text fonts matching % Computer Modern. % \changes{greek-1.2a}{1997/10/31}{filename \file{lgrenc.def} now @@ -323,6 +328,15 @@ % \begin{macrocode} \let\greektext\relax \let\textgreek\@firstofone + \ifdefined\accdasiaoxia % Accent Dasia-Oxia LICR + \relax %\message{Greek LICR definitions found} + \else + \InputIfFileExists{greek-euenc.def}{}{\PackageWarningNoLine{babel}{% + Can't find the file "greek-euenc.def".\MessageBreak + Greek LICR definitions missing:\MessageBreak + Auto-generated Babel strings will lead to errors} + } + \fi \else \InputIfFileExists{lgrenc.def}{}{% \errhelp{I can't find the lgrenc.def file for the Greek fonts}% @@ -363,19 +377,19 @@ % \changes{greek-1.3e}{1999/09/24}{\cs{@roman} and \cs{@Roman} need % \emph{not} be in \cs{extraspolutonikogreek} when they are already % in \cs{extrasgreek}} -% \changes{greek-1.5}{2013/06/15}{@roman and @Roman made TextCommands} +% \changes{greek-1.5}{2013/06/15}{\cs{@roman} and \cs{@Roman} as TextCommands +% (this extended the expansion problem to all languages!)} +% \changes{greek-1.6}{2013/07/19}{apply a patch by Enrico Gregorio. +% Thanks to Claudio Beccari for testing and reporting.} % To prevent roman numerals being typeset in greek letters we need % to adopt the internal \LaTeX\ commands |\@roman| and -% |\@Roman|. \textbf{The pre-1.5 definition caused errors where -% |\@roman| ends up in a situation where it needs to be expanded; -% Check whether problems persist with the AMS document classes!} +% |\@Roman|. \emph{Up to version 1.5, the definition caused errors where +% |\@roman| ends up in a situation where the argument needs to be expanded +% (e.g. Roman page numbers in the ToC).} % \begin{macrocode} - \let\latin@roman\@roman - \DeclareTextCommandDefault{\@roman}[1]{\latin@roman{#1}} - \DeclareTextCommand{\@roman}{LGR}[1]{\textlatin{\latin@roman{#1}}} - \let\latin@Roman\@Roman - \DeclareTextCommandDefault{\@Roman}[1]{\latin@Roman{#1}} - \DeclareTextCommand{\@Roman}{LGR}[1]{\textlatin{\latin@Roman{#1}}} + \def\@roman#1{\expandafter\textlatin\expandafter{\romannumeral#1}} + \def\@Roman#1{\expandafter\textlatin\expandafter{% + \expandafter\@slowromancap\romannumeral#1@}} % \end{macrocode} % \end{macro} % \end{macro} @@ -562,7 +576,7 @@ \textMu\textalpha\textrho\texttau\'\textiota\textomicron\textupsilon\or \textAlpha\textpi\textrho\textiota\textlambda\'\textiota% \textomicron\textupsilon\or - \textMu\textalpha\'\"\textiota\textomicron\textupsilon\or + \textMu\textalpha\'"\textiota\textomicron\textupsilon\or \textIota\textomicron\textupsilon\textnu\'\textiota% \textomicron\textupsilon\or \textIota\textomicron\textupsilon\textlambda\'\textiota% @@ -601,7 +615,7 @@ \textMu\textalpha\textrho\texttau\'\textiota\textomicron\textupsilon\or \>\textAlpha\textpi\textrho\textiota\textlambda% \'\textiota\textomicron\textupsilon\or - \textMu\textalpha\"\'\textiota\textomicron\textupsilon\or + \textMu\textalpha\"'\textiota\textomicron\textupsilon\or \>\textIota\textomicron\textupsilon\textnu% \'\textiota\textomicron\textupsilon\or \>\textIota\textomicron\textupsilon\textlambda% @@ -658,7 +672,7 @@ % (and nothing will be printed). % \begin{macrocode} \def\gr@ill@value#1{% - \PackageWarning{babel}{Illegal value (#1) for greeknumeral}} + \PackageWarningNoLine{babel}{Illegal value (#1) for greeknumeral}} % \end{macrocode} % \end{macro} % @@ -681,7 +695,7 @@ \DeclareRobustCommand\anw@false{% \DeclareRobustCommand\anw@print{}} \DeclareRobustCommand\anw@true{% - \DeclareRobustCommand\anw@print{\anwtonos}} + \DeclareRobustCommand\anw@print{\textdexiakeraia}} % \anwtonos \anw@true % \end{macrocode} % \end{macro} @@ -819,17 +833,17 @@ % when one is discarded because it's value is zero. % \begin{macrocode} \def\gr@num@iv#1{% - \ifnum#1=\z@\else\katwtonos\fi + \ifnum#1=\z@\else\textaristerikeraia\fi \ifcase#1\or \textalpha\or \textbeta\or \textgamma\or \textdelta\or \textepsilon\or \stigma\or \textzeta\or \texteta\or \texttheta\fi \gr@num@iii} \def\gr@num@v#1{% - \ifnum#1=\z@\else\katwtonos\fi + \ifnum#1=\z@\else\textaristerikeraia\fi \ifcase#1\or \textiota\or \textkappa\or \textlambda\or \textmu\or \textnu\or \textxi\or \textomicron\or \textpi\or \textqoppa\fi \gr@num@iv} \def\gr@num@vi#1{% - \katwtonos + \textaristerikeraia \ifcase#1\or \textrho\or \textsigma\or \texttau\or \textupsilon\or \textphi\or \textchi\or \textpsi\or \textomega\or \textsampi\fi \gr@num@v} @@ -848,10 +862,10 @@ % \pkg{xgreek} package by Apostolos Syropoulos. % \begin{macrocode} \if@bbl@greek@unicode - \InputIfFileExists{xgreek-fixes.def}{}{% - \PackageWarning{babel}{Can't find the file "xgreek-fixes.def".\MessageBreak - For correct up/downcasing of Greek text, - install the "polyglossia" package.}% + \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 % \end{macrocode} @@ -1001,8 +1015,8 @@ % such as the $\epsilon\upsilon\rho\omega$ symbol, etc. % \changes{greek-1.5}{2013/06/11}{change symbol macros to aliases} % \begin{macrocode} -\providecommand*{\anwtonos}{\textnumeralsigngreek} -\providecommand*{\katwtonos}{\textnumeralsignlowergreek} +\providecommand*{\anwtonos}{\textdexiakeraia} +\providecommand*{\katwtonos}{\textaristerikeraia} \providecommand*{\qoppa}{\textqoppa} \providecommand*{\stigma}{\textstigma} \providecommand*{\sampi}{\textsampi} |