From 756dd58cc713766a902cd97c5a255cbd3a9c74b9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 7 May 2022 20:37:47 +0000 Subject: begingreek (7may22) git-svn-id: svn://tug.org/texlive/trunk@63248 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/begingreek/README.txt | 2 +- .../texmf-dist/doc/latex/begingreek/begingreek.pdf | Bin 799479 -> 799776 bytes .../source/latex/begingreek/begingreek.dtx | 27 +++++++++++---------- .../texmf-dist/tex/latex/begingreek/begingreek.sty | 19 ++++++--------- 4 files changed, 23 insertions(+), 25 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/begingreek/README.txt b/Master/texmf-dist/doc/latex/begingreek/README.txt index b9264dedd42..c90d927860d 100644 --- a/Master/texmf-dist/doc/latex/begingreek/README.txt +++ b/Master/texmf-dist/doc/latex/begingreek/README.txt @@ -1,4 +1,4 @@ -Package: begingreek version 1.6 of 2022/05/06 +Package: begingreek version 1.7 of 2022/05/06 Copyright 2015-2022 Claudio Beccari Licence: LaTeX Project Public Licence LPPL v.1.3 (or later) diff --git a/Master/texmf-dist/doc/latex/begingreek/begingreek.pdf b/Master/texmf-dist/doc/latex/begingreek/begingreek.pdf index c7295a786dc..e51936d7f24 100644 Binary files a/Master/texmf-dist/doc/latex/begingreek/begingreek.pdf and b/Master/texmf-dist/doc/latex/begingreek/begingreek.pdf differ diff --git a/Master/texmf-dist/source/latex/begingreek/begingreek.dtx b/Master/texmf-dist/source/latex/begingreek/begingreek.dtx index c5a084de0df..86e3ae46fff 100644 --- a/Master/texmf-dist/source/latex/begingreek/begingreek.dtx +++ b/Master/texmf-dist/source/latex/begingreek/begingreek.dtx @@ -39,10 +39,10 @@ etc. %\fi % \iffalse %<*dtx> -\ProvidesFile{begingreek.dtx}[2022/05/06 v.1.6 Dedescribes environment greek] +\ProvidesFile{begingreek.dtx}[2022/05/06 v.1.7 Describes environment greek] % %\NeedsTeXFormat{LaTeX2e}[2018/01/01] -%\ProvidesPackage{begingreek}[2022/05/06 v.1.6 Defines environment greek] +%\ProvidesPackage{begingreek}[2022/05/06 v.1.7 Defines environment greek] % %<*driver> \documentclass{ltxdoc} @@ -78,7 +78,7 @@ etc. \end{document} % % \fi -%\CheckSum{86} +%\CheckSum{77} %\begin{multicols}{2}\tableofcontents\end{multicols} % % \begin{abstract} @@ -424,15 +424,21 @@ Type X to quit}{\@ehd} % we reset it to the default, either the overall default or the package % defined default (saved in |\greekfontfamily|) so we can proceed without % further problems. +% +% Let us define the message to be issued from the environment or the command if the |fd| file relative to the chosen font is not found and to select it or the default one: % \begin{macrocode} -\newenvironment{greek}[1][\greekfontfamily]{\begin{otherlanguage}{greek}% -\edef\Greekfontfamily{#1}% -\IfFileExists{lgr\Greekfontfamily.fd}{}% +\def\CBverifyandselectfont{\IfFileExists{lgr\Greekfontfamily.fd}{}% {\PackageWarning{begingreek}{\MessageBreak Font family lgr\Greekfontfamily.fd does not exist\MessageBreak Default fonts used\MessageBreak}% \def\Greekfontfamily{\greekfontfamily}}% -\fontfamily{\Greekfontfamily}\selectfont +\fontfamily{\Greekfontfamily}\selectfont} +% \end{macrocode} + +% \begin{macrocode} +\newenvironment{greek}[1][\greekfontfamily]{\begin{otherlanguage}{greek}% +\edef\Greekfontfamily{#1}% +\CBverifyandselectfont }{\end{otherlanguage}} % \end{macrocode} @@ -442,12 +448,7 @@ Type X to quit}{\@ehd} % \begin{macrocode} \newcommand*\greektxt[2][\greekfontfamily]{% \edef\Greekfontfamily{#1}% -\IfFileExists{lgr\Greekfontfamily.fd}{}% - {\PackageWarning{begingreek}{\MessageBreak - Font family lgr\Greekfontfamily.fd does not exist\MessageBreak - Default fonts used\MessageBreak}% -\def\Greekfontfamily{\greekfontfamily}}% -\fontfamily{\Greekfontfamily}\selectfont +\CBverifyandselectfont \foreignlanguage{greek}{#2}} % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/begingreek/begingreek.sty b/Master/texmf-dist/tex/latex/begingreek/begingreek.sty index 39df2a73b47..ab2001ed4e4 100644 --- a/Master/texmf-dist/tex/latex/begingreek/begingreek.sty +++ b/Master/texmf-dist/tex/latex/begingreek/begingreek.sty @@ -29,7 +29,7 @@ %% file or a modified version, except for a nominal charge for copying %% etc. \NeedsTeXFormat{LaTeX2e}[2018/01/01] -\ProvidesPackage{begingreek}[2022/05/06 v.1.6 Defines environment greek] +\ProvidesPackage{begingreek}[2022/05/06 v.1.7 Defines environment greek] \usepackage{iftex} \unless\ifPDFTeX @@ -67,24 +67,21 @@ Type X to quit}{\@ehd} } \ProcessOptions\relax -\newenvironment{greek}[1][\greekfontfamily]{\begin{otherlanguage}{greek}% -\edef\Greekfontfamily{#1}% -\IfFileExists{lgr\Greekfontfamily.fd}{}% +\def\CBverifyandselectfont{\IfFileExists{lgr\Greekfontfamily.fd}{}% {\PackageWarning{begingreek}{\MessageBreak Font family lgr\Greekfontfamily.fd does not exist\MessageBreak Default fonts used\MessageBreak}% \def\Greekfontfamily{\greekfontfamily}}% -\fontfamily{\Greekfontfamily}\selectfont +\fontfamily{\Greekfontfamily}\selectfont} + +\newenvironment{greek}[1][\greekfontfamily]{\begin{otherlanguage}{greek}% +\edef\Greekfontfamily{#1}% +\CBverifyandselectfont }{\end{otherlanguage}} \newcommand*\greektxt[2][\greekfontfamily]{% \edef\Greekfontfamily{#1}% -\IfFileExists{lgr\Greekfontfamily.fd}{}% - {\PackageWarning{begingreek}{\MessageBreak - Font family lgr\Greekfontfamily.fd does not exist\MessageBreak - Default fonts used\MessageBreak}% -\def\Greekfontfamily{\greekfontfamily}}% -\fontfamily{\Greekfontfamily}\selectfont +\CBverifyandselectfont \foreignlanguage{greek}{#2}} -- cgit v1.2.3