From aa5fef691c2f254a88de3a4159940c369455448f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 Mar 2020 22:23:08 +0000 Subject: babel-greek (23mar20) git-svn-id: svn://tug.org/texlive/trunk@54507 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/babel-greek/README | 1 + .../texmf-dist/doc/generic/babel-greek/README.html | 4 ++++ .../doc/generic/babel-greek/babel-greek.pdf | Bin 253662 -> 254869 bytes .../doc/generic/babel-greek/test-greek.pdf | Bin 233658 -> 233964 bytes .../doc/generic/babel-greek/test-greek.tex | 20 +++++++++++--------- .../doc/generic/babel-greek/test-unicode-greek.pdf | Bin 42911 -> 42751 bytes .../doc/generic/babel-greek/test-unicode-lgr.pdf | Bin 43798 -> 43607 bytes .../texmf-dist/doc/generic/babel-greek/usage.pdf | Bin 175483 -> 175483 bytes .../source/generic/babel-greek/babel-greek.dtx | 13 +++++++++---- .../texmf-dist/tex/generic/babel-greek/greek.ldf | 7 ++++--- 10 files changed, 29 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/generic/babel-greek/README b/Master/texmf-dist/doc/generic/babel-greek/README index 1dc2b61686b..d1f2f3eb1cc 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/README +++ b/Master/texmf-dist/doc/generic/babel-greek/README @@ -64,6 +64,7 @@ News 1.9h 2019-07-11 Move breathing composite commands to textalpha_. 1.9i 2020-02-28 Update test for Unicode fonts. Fix accent in ``\seename`` and ``\alsoname``. +1.9j 2020/03/17 Fix ampersand in math. ===== ============ ============================================================ diff --git a/Master/texmf-dist/doc/generic/babel-greek/README.html b/Master/texmf-dist/doc/generic/babel-greek/README.html index 481515c75b4..bcc2df90d59 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/README.html +++ b/Master/texmf-dist/doc/generic/babel-greek/README.html @@ -752,6 +752,10 @@ and fixed \latinencoding.

Update test for Unicode fonts. Fix accent in \seename and \alsoname.

+

1.9j

+

2020/03/17

+

Fix ampersand in math.

+ diff --git a/Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf b/Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf index cba57427b79..e0e0e741cd1 100644 Binary files a/Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf and b/Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf differ 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 0751ed7c9f9..c4526611d89 100644 Binary files a/Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf and b/Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf 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 5498dfc96bd..4e5618cf87b 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex +++ b/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex @@ -101,7 +101,7 @@ argument using this encoding. Switching to a font encoding supporting the Greek script is possible without switching the Babel language using the declarations \verb|\greekscript| (no switch if the current encoding supports Greek script (e.g. the Unicode font -encodings EU1, EU2)) or \verb|\greektext| (always switch to LGR) and the +encoding TU)) or \verb|\greektext| (always switch to LGR) and the corresponding macros \verb|\ensuregreek| or \verb|\textgreek|. These commands do not start a new paragraph: @@ -109,28 +109,30 @@ commands do not start a new paragraph: \latintext Friends (\ensuregreek{F\'ilwn}) of TeX. \texttt{greek.ldf} has some workarounds, so that macros relying on Latin -characters in the ``right'' positions keep working. We test, that these +characters in standard positions keep working. We test, that these definitions do not overwrite the selection of pre-composed characters for -``copyright'' and ``registered trade mark'' by ``textcomp'' (try copy and +``copyright'' and ``registered trade mark'' by \emph{textcomp} (try copy and paste from the PDF output): -Greek (LGR): \ensuregreek{Α \& Ω, \textcopyright{} \textregistered{} -\texttrademark{}, © ® ™ } \\ -Latin: A \& O. +Latin: A \& O, © ® ™ \\ +Greek (LGR): \ensuregreek{Α \textampersand{} Ω, +\textcopyright{} \textregistered{} \texttrademark{}, \& © ® ™ }. + +The ampersand should also work in mathematical mode: $ 1 \& 2 $ 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 -Greek: \ensuregreek{ +Latin: \@roman{1}, \@roman{2}, \@roman{3}, \@roman{4}, \ldots, \@roman{1975} \@Roman{1}, \@Roman{2}, \@Roman{3}, \@Roman{4}, \ldots, \@Roman{1975} -} -Latin: +Greek: \ensuregreek{ \@roman{1}, \@roman{2}, \@roman{3}, \@roman{4}, \ldots, \@roman{1975} \@Roman{1}, \@Roman{2}, \@Roman{3}, \@Roman{4}, \ldots, \@Roman{1975} +} \makeatother \section{MakeUppercase, MakeLowercase} 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 4a0204a05c0..7033176e1af 100644 Binary files a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf and b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf differ diff --git a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf index cdbfbb0feee..532e132c786 100644 Binary files a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf and b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf differ diff --git a/Master/texmf-dist/doc/generic/babel-greek/usage.pdf b/Master/texmf-dist/doc/generic/babel-greek/usage.pdf index 769d3ddb3a9..67c6fa3699d 100644 Binary files a/Master/texmf-dist/doc/generic/babel-greek/usage.pdf and b/Master/texmf-dist/doc/generic/babel-greek/usage.pdf differ diff --git a/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx b/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx index 38d9a23d508..09490979613 100644 --- a/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx +++ b/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx @@ -26,7 +26,7 @@ % and covered by LPPL is defined by the unpacking script (babel-greek.ins) % which is part of the package. % \fi -% \CheckSum{1543} +% \CheckSum{1550} % % \iffalse % Tell the \LaTeX\ system who we are and write an entry on the @@ -37,7 +37,7 @@ %\ProvidesLanguage{greek} %\fi %\ProvidesFile{babel-greek.dtx} - [2020/02/27 v1.9i Greek support for the babel system] + [2020/03/17 v1.9j Greek support for the babel system] %\iffalse %% File `babel-greek.dtx' %% Greek language Definition File @@ -127,6 +127,7 @@ % to textalpha.} % \changes{babel-greek-1.9i}{2020/02/28}{Update test for Unicode fonts. % Fix accent in seename and alsoname.} +% \changes{babel-greek-1.9j}{2020/03/17}{Fix ampersand in math.} % % \title{Babel support for the Greek language} % \author{Apostolos Syropoulos, Günter Milde} @@ -527,6 +528,8 @@ % We redefine a few commands in the LGR encoding to work around problems % because LGR is no \emph{standard text encoding} but has Greek letters in % the places of Latin ones. +% The ampersand must work in text and math mode. We provide the text +% command |\textampersand| and re-define |\&| to use it in text mode. % \changes{greekfdd-2.2c}{1999/04/05}{Fixed typos, \cs{textrademark} % misses a `t', \cs{copyright} should be \cs{textcopyright}} % \changes{greekfdd-2.2d}{1999/04/25}{removed redefinition of \cs{\&}} @@ -536,14 +539,16 @@ % \changes{greek-1.5}{2013/05/27}{enable use of "textcomp" characters % for "textcopyright" and "textregistered" macros} % \changes{greek-1.5}{2013/06/15}{\textbackslash & made TextCommand} +% \changes{babel-greek-1.9j}{2020/03/17}{Fix ampersand in math.} % % \begin{macrocode} \ProvideTextCommand{\textcopyright}{LGR}{\ensureascii{\textcopyright}} \ProvideTextCommand{\textregistered}{LGR}{\ensureascii{\textregistered}} \ProvideTextCommand{\texttrademark}{LGR}{\ensureascii{\texttrademark}} \let\ltx@amp\& - \DeclareTextCommandDefault{\&}{\ltx@amp} - \DeclareTextCommand{\&}{LGR}{\ensureascii{\ltx@amp}} + \ProvideTextCommandDefault{\textampersand}{\ltx@amp} + \ProvideTextCommand{\textampersand}{LGR}{\ensureascii{\ltx@amp}} + \DeclareRobustCommand{\&}{\ifmmode\ltx@amp\else\textampersand\fi} \ProvideTextCommand{\SS}{LGR}{\ensureascii{\SS}} % \end{macrocode} % diff --git a/Master/texmf-dist/tex/generic/babel-greek/greek.ldf b/Master/texmf-dist/tex/generic/babel-greek/greek.ldf index 3ae9d4934e0..eac039c0b4b 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 (babel-greek.ins) %% which is part of the package. \ProvidesLanguage{greek} - [2020/02/27 v1.9i Greek support for the babel system] + [2020/03/17 v1.9j Greek support for the babel system] %% File `babel-greek.dtx' %% Greek language Definition File %% Copyright © 1997, 2005 Apostolos Syropoulos, Johannes Braams @@ -100,8 +100,9 @@ \ProvideTextCommand{\textregistered}{LGR}{\ensureascii{\textregistered}} \ProvideTextCommand{\texttrademark}{LGR}{\ensureascii{\texttrademark}} \let\ltx@amp\& - \DeclareTextCommandDefault{\&}{\ltx@amp} - \DeclareTextCommand{\&}{LGR}{\ensureascii{\ltx@amp}} + \ProvideTextCommandDefault{\textampersand}{\ltx@amp} + \ProvideTextCommand{\textampersand}{LGR}{\ensureascii{\ltx@amp}} + \DeclareRobustCommand{\&}{\ifmmode\ltx@amp\else\textampersand\fi} \ProvideTextCommand{\SS}{LGR}{\ensureascii{\SS}} \def\@roman#1{\expandafter\ensureascii\expandafter{\romannumeral#1}} \def\@Roman#1{\expandafter\ensureascii\expandafter{% -- cgit v1.2.3