From 6ec2f6e46845654e2cc02c1e4e9b9fc8b6cae860 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 28 Feb 2020 22:28:16 +0000 Subject: babel-greek (28feb20) git-svn-id: svn://tug.org/texlive/trunk@53959 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/babel-greek/README | 4 +- .../texmf-dist/doc/generic/babel-greek/README.html | 251 ++++++++++++--------- .../doc/generic/babel-greek/babel-greek.pdf | Bin 254908 -> 253662 bytes .../doc/generic/babel-greek/test-greek.pdf | Bin 234442 -> 233658 bytes .../doc/generic/babel-greek/test-unicode-greek.pdf | Bin 43050 -> 42911 bytes .../doc/generic/babel-greek/test-unicode-greek.tex | 17 +- .../doc/generic/babel-greek/test-unicode-lgr.pdf | Bin 43380 -> 43798 bytes .../texmf-dist/doc/generic/babel-greek/usage.pdf | Bin 176226 -> 175483 bytes .../texmf-dist/source/generic/babel-greek/Makefile | 104 +++++++++ .../source/generic/babel-greek/babel-greek.dtx | 35 ++- .../texmf-dist/tex/generic/babel-greek/greek.ldf | 29 +-- 11 files changed, 286 insertions(+), 154 deletions(-) create mode 100644 Master/texmf-dist/source/generic/babel-greek/Makefile diff --git a/Master/texmf-dist/doc/generic/babel-greek/README b/Master/texmf-dist/doc/generic/babel-greek/README index 86678690a9f..1dc2b61686b 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/README +++ b/Master/texmf-dist/doc/generic/babel-greek/README @@ -61,7 +61,9 @@ News (new in fontspec v2.5a). 1.9g 2016-09-07 Babel 3.9i deprecated ``\textlatin`` and fixed ``\latinencoding``. -1.9.h 2019-07-11 Move breathing composite commands to textalpha_. +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``. ===== ============ ============================================================ diff --git a/Master/texmf-dist/doc/generic/babel-greek/README.html b/Master/texmf-dist/doc/generic/babel-greek/README.html index 5eb279899ed..481515c75b4 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/README.html +++ b/Master/texmf-dist/doc/generic/babel-greek/README.html @@ -2,7 +2,7 @@ - + babel-greek @@ -42,10 +42,10 @@ h1.title, p.subtitle { text-align: center; } -p.admonition-title, p.topic-title, p.sidebar-title, p.rubric, +p.admonition-title, p.system-message-title { font-weight: bold; } @@ -103,7 +103,7 @@ dl.simple > dd, dl.compact > dd { } /* Table of Contents */ -div.topic.contents { margin: 0; } +div.topic.contents { margin: 0.5em 0; } div.topic.contents ul { list-style-type: none; padding-left: 1.5em; @@ -162,7 +162,7 @@ pre.address { font: inherit; } dd.authors > p { margin: 0; } /* Option Lists */ -dl.option-list { margin-left: 40px; } +dl.option-list { margin-left: 1.5em; } dl.option-list > dt { font-weight: normal; } span.option { white-space: nowrap; } @@ -192,45 +192,54 @@ div.line-block div.line-block { /* Figures, Images, and Tables */ .figure.align-left, +figure.align-left, img.align-left, object.align-left, table.align-left { margin-right: auto; } .figure.align-center, +figure.align-center, img.align-center, -object.align-center { - margin-left: auto; - margin-right: auto; - display: block; -} +object.align-center, table.align-center { margin-left: auto; margin-right: auto; } .figure.align-right, +figure.align-right, img.align-right, object.align-right, table.align-right { margin-left: auto; } +.figure.align-center, .figure.align-right, +figure.align-center, figure.align-right, +img.align-center, img.align-right, +object.align-center, object.align-right { + display: block; +} /* reset inner alignment in figures and tables */ -/* div.align-left, div.align-center, div.align-right, */ -table.align-left, table.align-center, table.align-right -{ text-align: inherit } +.figure.align-left, .figure.align-right, +figure.align-left, figure.align-right, +table.align-left, table.align-center, table.align-right { + text-align: inherit; +} /* Admonitions and System Messages */ div.admonition, div.system-message, -div.sidebar{ - margin: 40px; +aside.sidebar { + margin: 1em 1.5em; border: medium outset; + padding-top: 0.5em; + padding-bottom: 0.5em; padding-right: 1em; padding-left: 1em; } /* Sidebar */ -div.sidebar { +aside.sidebar { width: 30%; max-width: 26em; float: right; @@ -245,7 +254,7 @@ pre.doctest-block, pre.math, pre.code { margin-left: 1.5em; - margin-right: 1.5em + margin-right: 1.5em; } pre.code .ln { color: gray; } /* line numbers */ @@ -271,14 +280,23 @@ table.borderless td, table.borderless th { padding-right: 0.5em /* separate table cells */ } +/* Document Header and Footer */ +header { border-bottom: 1px solid black; } +footer { border-top: 1px solid black; } + +/* new HTML5 block elements: set display for older browsers */ +header, section, footer, aside, nav, main, article, figure { + display: block; +} + -
+

babel-greek

Babel support for the Greek language and script

@@ -573,7 +607,7 @@ version 1.3 of this license or any later version.

-

Abstract

+

Abstract

Babel-greek is a contributed package providing support for the Greek language and script via the Babel system.

The file greek.ldf provides options for the monotonic @@ -582,7 +616,7 @@ orthography of the Greek language.

Since 2013-07-19, babel-greek supports also Unicode-aware TeX engines (XeTeX/LuaTeX).

-
+

News

@@ -709,14 +743,19 @@ This package is outdated and obsoleted by \textlatin and fixed \latinencoding.

-
+ + + + +

1.9.h

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.

-
-
+ +

Files

babel-greek.ins; babel-greek.pdf
@@ -741,16 +780,16 @@ and fixed \latinencoding.

Description of the LGR Latin transliteration.

-
-
+ +

Requirements

The “babel-greek” package requires the babel base package and font definition files from the greek-fontenc package. The greek-inputenc package is recommended when using 8-bit TeX engines.

Typesetting Greek texts requires Greek text fonts.

Plain TeX is currently not supported. Patches are welcome.

-
-
+ +

Installation

If possible, get this package from your distribution using its installation manager.

@@ -775,8 +814,8 @@ of these files you want to keep.

This is done by docstrip. Try texdoc docstrip for details.

-
-
+ +

Usage

Use the “greek” document option or pass the “greek” option to babel:

\usepackage[greek]{babel}
@@ -801,8 +840,8 @@ file, not the console output!

greek-inputenc package or with XeTeX or LuaTeX) or the LGR Latin transliteration. See usage.pdf and the example files provided with greek-fontenc.

-
-
+ +

Greek text fonts

A list of Greek text fonts for use with LaTeX is available at the CTAN http://www.ctan.org/topic/font-greek

@@ -816,8 +855,8 @@ that support Greek (e.g. grtimes (Greek Times), Kerkis (matching URW Bookman), and the GFS font collection. Setup of these fonts as Greek variant to matching Latin fonts is facilitated by the substitutefont package.

-
-
+ +

LGR Latin Transliteration

The LGR font encoding allows input of Greek characters via an ASCII transliteration. This enables simple input with a Latin keyboard. Characters @@ -1030,7 +1069,7 @@ font-encoding comprising both Latin and Greek like the hypothetical T7 or Unicode (with XeTeX or LuaTeX).

-
-
+ + 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 d877d86834e..cba57427b79 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 ac09a44166c..0751ed7c9f9 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-unicode-greek.pdf b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf index b243fcc3ed5..4a0204a05c0 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-greek.tex b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.tex index b794be139b6..77afdcb8725 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 @@ -32,9 +32,9 @@ defined in the file «greek.ldf» (source «greek.dtx»). Typesetting Greek texts requires a font containing Greek letters. With the XeTeX or LuaTeX engines, the user must ensure that the selected font -contains the required glyphs (the default Latin Modern fonts miss them). -Examples for suitable fonts are the «Deja Vu», «Linux Libertine», or -«Free Serif» OpenType fonts. +contains the required glyphs (the default Latin Modern fonts miss most of +them). Examples for suitable fonts are the «Deja Vu», «Linux Libertine», +or «Free Serif» OpenType fonts. \section{Language Switch} @@ -55,9 +55,9 @@ specified as first argument. This is intended for short text parts like Every language switch to \texttt{greek} calls the \verb|\extrasgreek| command which in turn calls \verb|\greekscript| to ensure a Greek-supporting -font encoding (LGR, TU, EU1, or EU2). Under XeTeX/LuaTeX the font encoding -normally just remains Unicode (TU, EU1, or EU2). For customization, you can -add to or redefine the \verb|\extrasgreek| command. +font encoding (LGR, TU, EU1, or EU2). Under Xe/LuaTeX the font encoding +normally just remains Unicode (TU). For customization, you can add to or +redefine the \verb|\extrasgreek| command. The LGR font encoding does not support Latin characters. Therefore, the Babel core defines the declaration \verb|\latintext| and the command @@ -70,7 +70,7 @@ command which in turn calls \verb|\latintext|.\\ For customization, you can add to or redefine the \verb|\noextrasgreek| command. -With the Unicode font encodings TU, EU1 (XeTeX), or EU2 (LuaTeX), +With the Unicode font encoding TU, EU1, or EU2, Latin characters can be used in Greek text parts and input via the «LGR Latin transcription» is not possible.% \footnote{% @@ -88,7 +88,8 @@ input via the «LGR Latin transcription» is not possible.% \section{LICR Macros} Babel defines macros for several autogenerated strings so that they may -appear in the choosen language. \emph{babel-greek} uses LICR macros in +appear in the choosen language. \emph{babel-greek} uses LICR% +\footnote{LaTeX internal character representation} macros in order to let the string macros work independent of the font encoding. If \emph{fontspec} is loaded, \emph{babel-greek} loads Greek LICR 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 fb7ebe0ecca..cdbfbb0feee 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 946f41514ce..769d3ddb3a9 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/Makefile b/Master/texmf-dist/source/generic/babel-greek/Makefile new file mode 100644 index 00000000000..af860da050d --- /dev/null +++ b/Master/texmf-dist/source/generic/babel-greek/Makefile @@ -0,0 +1,104 @@ +# This Makefile updates the source and documentation for the +# babel-greek LateX package +# +# © 2019 Günter Milde +# +# SRCDIR (and the other variables) can be easily modified as parameters +# while calling `make', e.g. +# +# make install SRCDIR=~/texmf/tex/latex/ + +# Global variables +# ================= + +# for installation into a users local texmf tree +DESTDIR = ~/texmf/tex/latex/greek/babel-greek +DOCDIR = ~/texmf/doc/latex/greek/babel-greek + +CHDIR = cd +COPY = cp -u +SH = sh + +# programs +PYLIT = pylit # text <-> source converter for literal programming +RST2HTML = rst2html5 # text -> HTML converter, see docutils.sf.net +RUBBER = rubber -f # wrapper around `latex`, run until references resolved +LATEX = pdflatex -interaction batchmode # suppress logging to terminal + +# LaTeX source files +# ================== + +.PHONY: all + +all: greek.ldf athnum.sty grmath.sty + +greek.ldf: babel-greek.dtx + tex babel-greek.ins + +athnum.sty: athnum.dtx + tex babel-greek.ins + +grmath.sty: athnum.dtx + tex babel-greek.ins + +# Documentation +# ============= + +.PHONY: doc html pdf + +doc: html pdf + +html: README.html + +README.html: README + $(RST2HTML) README README.html + + +pdf: babel-greek.pdf athnum.pdf grmath.pdf usage.pdf\ + test-greek.pdf test-unicode-greek.pdf test-unicode-lgr.pdf + +babel-greek.pdf: babel-greek.dtx + $(RUBBER) --pdf babel-greek.dtx + +athnum.pdf: athnum.dtx + $(RUBBER) --pdf athnum.dtx + +grmath.pdf: grmath.dtx + $(RUBBER) --pdf grmath.dtx + +usage.pdf: usage.tex greek.ldf + $(RUBBER) --pdf usage.tex + +test-greek.pdf: test-greek.tex greek.ldf + $(RUBBER) --pdf test-greek.tex + +test-unicode-greek.pdf: test-unicode-greek.tex greek.ldf + $(RUBBER) -m xelatex test-unicode-greek.tex + +test-unicode-lgr.pdf: test-unicode-lgr.tex greek.ldf + $(RUBBER) -m xelatex test-unicode-lgr.tex + + +# Installation +# ============= + +install: all + $(COPY) *.ldf $(DESTDIR) + #$(COPY) *.sty $(DESTDIR) + +install-doc: doc + $(COPY) README $(DOCDIR) + $(COPY) *.html $(DOCDIR) + $(COPY) *.dtx $(DOCDIR) + $(COPY) *.ins $(DOCDIR) + $(COPY) *.tex $(DOCDIR) + $(COPY) *.pdf $(DOCDIR) + $(COPY) Makefile $(DOCDIR) + +# Cleanup +# ======= + +.PHONY: clean + +clean: + rm -f *.aux *.log *.toc *~ 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 677eb4d4802..38d9a23d508 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{1552} +% \CheckSum{1543} % % \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} - [2016/09/07 v1.9h Greek support for the babel system] + [2020/02/27 v1.9i Greek support for the babel system] %\iffalse %% File `babel-greek.dtx' %% Greek language Definition File @@ -125,6 +125,8 @@ % and fixed latinencoding.} % \changes{babel-greek-1.9h}{2019/07/11}{Move breathing composite commands % to textalpha.} +% \changes{babel-greek-1.9i}{2020/02/28}{Update test for Unicode fonts. +% Fix accent in seename and alsoname.} % % \title{Babel support for the Greek language} % \author{Apostolos Syropoulos, Günter Milde} @@ -463,29 +465,21 @@ % \changes{greek-1.8}{2013/11/30}{Check for EU1/EU2 font encoding % instead of engine} % \changes{babel-greek-1.9f}{2016/02/04}{Check also for TU font encoding.} +% \changes{babel-greek-1.9i}{2020/02/27}{Update check for Unicode fonts.} % % \DescribeMacro\greekfontencoding % We test for available font encodings and set |\greekfontencoding| % and the internal macro |\bbl@greek@fontencdef| with the name of the % font definition file with Greek LICR macros. The fallback is LGR. % \begin{macrocode} -\@ifl@aded{def}{tuenc}{ - \providecommand*{\greekfontencoding}{TU} +\ifdefined \UTFencname % set by "fontspec.sty" + \providecommand*{\greekfontencoding}{\UTFencname} % TU, EU1, or EU2 \providecommand*{\bbl@greek@fontencdef}{greek-euenc} - \renewcommand*{\LastDeclaredEncoding}{TU} -}{} -\@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} + \renewcommand*{\LastDeclaredEncoding}{\UTFencname} +\else + \providecommand*{\greekfontencoding}{LGR} + \providecommand*{\bbl@greek@fontencdef}{lgrenc} +\fi % \end{macrocode} % Ensure that the Greek LICR macros are available: % \begin{macrocode} @@ -647,6 +641,7 @@ % \changes{greek-1.3h}{2000/09/20}{Added \cs{glossaryname}} % \changes{greek-1.3i}{2000/10/02}{The final sigma in all names appears % as `s' instead of `c'.} +% \changes{babel-greek-1.9i}{2020/02/27}{Fix accent in seename and alsoname.} % \begin{macrocode} \addto\captionsgreek{% \def\prefacename{\textPi\textrho\acctonos\textomicron\textlambda @@ -765,8 +760,8 @@ \textomicron\acctonos\textiota\texteta\textsigma\textiota\textvarsigma}% \def\headtoname{\textPi\textrho\accvaria\textomicron\textvarsigma}% \def\pagename{\textSigma\textepsilon\textlambda\accvaria\textiota\textvarsigma}% - \def\seename{\accdasiavaria\textomicron\textrho\textalpha}% - \def\alsoname{\accdasiavaria\textomicron\textrho\textalpha{} \accdasia\textomega\textsigma + \def\seename{\accdasiaoxia\textomicron\textrho\textalpha}% + \def\alsoname{\accdasiaoxia\textomicron\textrho\textalpha{} \accdasia\textomega\textsigma \textalpha\acctonos\textupsilon\texttau\textomega\textvarsigma}% \def\proofname{\accpsili\textAlpha\textpi\acctonos\textomicron\textdelta\textepsilon \textiota\textxi\textiota\textvarsigma}% diff --git a/Master/texmf-dist/tex/generic/babel-greek/greek.ldf b/Master/texmf-dist/tex/generic/babel-greek/greek.ldf index dc03fdb3475..3ae9d4934e0 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} - [2016/09/07 v1.9h Greek support for the babel system] + [2020/02/27 v1.9i Greek support for the babel system] %% File `babel-greek.dtx' %% Greek language Definition File %% Copyright © 1997, 2005 Apostolos Syropoulos, Johannes Braams @@ -71,23 +71,14 @@ \let\captionsgreek\captionsancientgreek \let\gr@month\gr@c@month % (modern) polytonic month names } -\@ifl@aded{def}{tuenc}{ - \providecommand*{\greekfontencoding}{TU} +\ifdefined \UTFencname % set by "fontspec.sty" + \providecommand*{\greekfontencoding}{\UTFencname} % TU, EU1, or EU2 \providecommand*{\bbl@greek@fontencdef}{greek-euenc} - \renewcommand*{\LastDeclaredEncoding}{TU} -}{} -\@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} + \renewcommand*{\LastDeclaredEncoding}{\UTFencname} +\else + \providecommand*{\greekfontencoding}{LGR} + \providecommand*{\bbl@greek@fontencdef}{lgrenc} +\fi \@ifl@aded{def}{\bbl@greek@fontencdef}{}{ \InputIfFileExists{\bbl@greek@fontencdef .def}{}{ \errhelp{I can't find the \bbl@greek@fontencdef .def file @@ -214,8 +205,8 @@ \textomicron\acctonos\textiota\texteta\textsigma\textiota\textvarsigma}% \def\headtoname{\textPi\textrho\accvaria\textomicron\textvarsigma}% \def\pagename{\textSigma\textepsilon\textlambda\accvaria\textiota\textvarsigma}% - \def\seename{\accdasiavaria\textomicron\textrho\textalpha}% - \def\alsoname{\accdasiavaria\textomicron\textrho\textalpha{} \accdasia\textomega\textsigma + \def\seename{\accdasiaoxia\textomicron\textrho\textalpha}% + \def\alsoname{\accdasiaoxia\textomicron\textrho\textalpha{} \accdasia\textomega\textsigma \textalpha\acctonos\textupsilon\texttau\textomega\textvarsigma}% \def\proofname{\accpsili\textAlpha\textpi\acctonos\textomicron\textdelta\textepsilon \textiota\textxi\textiota\textvarsigma}% -- cgit v1.2.3