diff options
author | Karl Berry <karl@freefriends.org> | 2024-05-04 19:46:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-05-04 19:46:59 +0000 |
commit | bcdacb0db59e8df402d3b26ebfd82cbee0c9976c (patch) | |
tree | c134f4854c4a2c234d26d8815a312b01a1e5b35a /Master/texmf-dist | |
parent | 5c49536f219c05a5f99b96b555ff2e8aa0a6f7d1 (diff) |
mathgreeks (4may24)
git-svn-id: svn://tug.org/texlive/trunk@71171 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/mathgreeks/mathgreeks.pdf | bin | 1650679 -> 1716778 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/mathgreeks/mathgreeks.dtx | 109 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/mathgreeks/mathgreeks.ins | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/mathgreeks/mathgreeks.sty | 28 |
4 files changed, 81 insertions, 58 deletions
diff --git a/Master/texmf-dist/doc/latex/mathgreeks/mathgreeks.pdf b/Master/texmf-dist/doc/latex/mathgreeks/mathgreeks.pdf Binary files differindex 03ca96ca9da..284c293b56d 100644 --- a/Master/texmf-dist/doc/latex/mathgreeks/mathgreeks.pdf +++ b/Master/texmf-dist/doc/latex/mathgreeks/mathgreeks.pdf diff --git a/Master/texmf-dist/source/latex/mathgreeks/mathgreeks.dtx b/Master/texmf-dist/source/latex/mathgreeks/mathgreeks.dtx index 5cdb03dda10..e6df4bc3d1d 100644 --- a/Master/texmf-dist/source/latex/mathgreeks/mathgreeks.dtx +++ b/Master/texmf-dist/source/latex/mathgreeks/mathgreeks.dtx @@ -20,7 +20,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{mathgreeks} - [2024/04/30 v1.0 .dtx Math Greek letters] + [2024/05/04 v1.1 .dtx Math Greek letters] %</package> %<*driver> \documentclass[11pt]{article} @@ -29,12 +29,12 @@ \usepackage[english]{babel} \usepackage{doc} \usepackage{geometry} -\usepackage[savegreeks,otherfonts]{mathgreeks} +\usepackage[mathdesign=Charter,otherfonts]{mathgreeks} \usepackage{sectsty} \usepackage{xcolor} \usepackage{spacingtricks} \usepackage{metalogo} -%\usepackage{supertabular} +%\usepackage{supertabular} % incompatible with tabls \usepackage{tabls} \usepackage{multirow} \usepackage{ifluatex} @@ -74,7 +74,7 @@ %</driver> % \fi % -% \CheckSum{1060} +% \CheckSum{1061} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -93,6 +93,7 @@ % Right brace \} Tilde \~} % % \changes{v1.0}{2024/04/30}{Initial version} +% \changes{v1.1}{2024/05/04}{Adding the libsans option; a few changes in the doc} % % \GetFileInfo{mathgreeks.sty} % @@ -127,6 +128,7 @@ % with the option \mbox{\texttt{math-style=ISO}} provided % by the \textsf{unicode-math} package~\cite{UNIC}. % +% \pagebreak ^^A To get the same page breaking when compiling with pdfLaTeX % Furthermore there are several packages that provide the uppercase Greek letters % in italic and have also options to typeset the lowercase Greek % letters in upright shape. @@ -197,15 +199,19 @@ % cmbright \\ % \hline % \end{tabular} -% \end{center} % \caption{font options\label{table:font}} +% \end{center} % \end{table} +% +% \vspace{-1\baselineskip} % The \texttt{fontspec} and \texttt{unicode-math} options require loading % the corresponding packages, and these can only work when running through % \LuaLaTeX\ (or \XeLaTeX). -% The fontspec option allows for the use of most TrueType or OpenType -% fonts installed on your computer, -% those that have Greek letters. +% The \texttt{fontspec} option allows for the use of most TrueType or OpenType +% fonts installed on your computer, those that have Greek letters. +% Although the \textsf{unicode-math} package loads the \textsf{fontspec} package, +% the fonts usable with one of these options are not necessarily usable with the other; +% \texttt{fontspec} has a large number of possible values. % % When calling "\boldmath" (outside the math environment), you get the letters in bold face, % but the command "\mathbf" doesn't work here. @@ -213,7 +219,7 @@ % \bigskip % The second table below presents the shape options. If the shape option % is not specified, the italic shape is chosen by default, meaning that the commands -% "\alpha", "\beta", \ldots, "\Delta", "\Gamma"\ldots will produce the same result +% "\alpha", "\beta", \ldots, "\Delta", "\Gamma"\ldots\ will produce the same result % as the corresponding "\it"\meta{letter} commands. % % \begin{table}[h] @@ -230,10 +236,11 @@ % \texttt{style} & possible values: \texttt{TeX}, \texttt{ISO}, \texttt{upright} \\ % \hline % \end{tabular} -% \end{center} % \caption{shape options\label{table:shape}} +% \end{center} % \end{table} % +% \vspace{-1\baselineskip} % \begin{itemize} % \item Except for \texttt{style}, all these options are booleans. % \item The \texttt{Greekup} option est initialized to \texttt{true} (corresponding @@ -245,14 +252,17 @@ % activate \begin{center}\texttt{greekup=true,Greekup=false}.\end{center} % \end{itemize} % -% \smallskip +% \bigskip % The following list presents the additional options, which are also booleans: % \begin{description} % \item[\texttt{savegreeks}] Saves the letters corresponding to the original commands % "\alpha", "\beta"\ldots so that they remain accessible through the commands % "\backalpha", "\backbeta"\ldots % \item[\texttt{otherfonts}] Allows dynamic font switching (see next section) -% for later use of \texttt{lgrmath}, \texttt{fourier}, \texttt{libertinus} or \texttt{upgreek}. +% for later use of \texttt{lgrmath}, \texttt{fourier}, \texttt{libertinus} +% or \texttt{upgreek}. +% \item[\texttt{libsans}] This is a special option that works only with \texttt{libertinus} +% to produce a sanserif font. % \item[\texttt{lowercase}] This option is initialized to \texttt{true}; % \texttt{lowercase=false} allows keeping the original lowercase Greek letters % without redefining the commands "\alpha", "\beta"\ldots @@ -263,7 +273,7 @@ % % \subsection{Dynamic settings commands} % -% There are two command for dynamic settings: +% There are two commands for dynamic settings: % \begin{description} % \item[] "\setmathgreeks" % This command takes a mandatory parameter which is a list of @@ -282,9 +292,10 @@ % \texttt{enc}, \texttt{fam}, \texttt{series}, \texttt{shape}. % \end{center} % The \texttt{fontspec} and \texttt{unicode-math} options are identical -% to those in table~\ref{table:font}. -% The other previous font options (\texttt{lgrmath}, \texttt{mathdesign}, etc.)\@ -% are not usable in "\mathgreeksfont". +% to those in table~\ref{table:font}. In that case, the shape is set by "\setmathgreeks" +% (before or after). +% The other previous font options (\texttt{lgrmath}, \texttt{mathdesign}, +% \texttt{fourier}, etc.)\@ are not usable in "\mathgreeksfont". % However, these fonts can be obtained by specifying the encoding (option \texttt{enc}), % family (option \texttt{fam}), series and shape: the New Font Selection Scheme (NFSS). % The series defines the `boldness' and has a default value: \texttt{series=m} (medium). @@ -303,8 +314,8 @@ % Only the commands "\alpha", "\beta"\ldots will be redefined according to the % selected shape. % -% If you use the \texttt{fontspec} or \texttt{unicode-math} option, -% these second kind of options have no effect. +% When using the \texttt{fontspec} or \texttt{unicode-math} option, +% these NFSS options have no effect. % % Notice that the encoding obtained by the package font options is faster, moreover % the command "\boldmath" doesn't work anymore @@ -317,10 +328,10 @@ % \section{Examples} \label{examples} % \begin{description} % \item[] "\greektable" -% The examples in this section are obtained with the "\greektable" command. +% The following examples are produced with the "\greektable" command. % This command generates a table with two rows: the first contains the lowercase letters % obtained with "\alpha", \ldots, "\omega", and the second contains variants -% "\varepsilon", "\vartheta"\ldots of certain letters as well as the uppercase letters +% "\varepsilon", "\vartheta"\ldots\ of certain letters as well as the uppercase letters % obtained with "\Gamma", "\Delta", \ldots, "\Omega" % (for those who differ from their Latin equivalent). % \end{description} @@ -329,7 +340,8 @@ % % The \texttt{upgreek} option, as its name suggests, produces only upright letters, % and the \texttt{Euler} font does not have the variants "\varrho" and "\varsigma". -% The \texttt{Symbolsmallscale} font is identical to Symbol but reduced in size by 90\,\%. +% The \texttt{Symbolsmallscale} font is identical to Symbol but reduced in size by 90\,\%; +% \texttt{Symbol} and \texttt{Symbolsmallscale} have no bold version. % \texttt{mathdesign=Garamond} yields a virtual font % that may not always work. % @@ -338,7 +350,7 @@ % \newcommand*\doublerows[1]{\multirow{2}{\legendwidth}[-1.5ex]{\bfseries#1}} % \begin{center} -% \begin{tabular}{|l|@{}c@{}|c@{$\;$}c@{}c|} +% \begin{tabular}{|l|@{}c@{}|c@{$\;$}c@{\:}c|} % \hline % \makebox[\legendwidth][l]{\textbf{upgreek=...}} & \makebox[8.4cm]{Résult} % & \makebox[1cm]{enc} & \makebox[1cm]{fam} & shape \\ @@ -428,9 +440,9 @@ % & U & txmia & it \\ % \hline % \doublerows{libertinus} -% & \mathgreeksfont{enc=LS1,fam=libertinust1math} \greektable +% & \mathgreeksfont{enc=LS1,fam=libertinust1math} \greektable % & LS1 & * & it \\ -% & \mathgreeksfont{enc=LS1,fam=libertinust1math,shape=n} \greektable +% & \mathgreeksfont{enc=LS1,fam=libertinust1math,shape=n} \greektable % & LS1 & * & n \\ % \hline % \textbf{concrete} @@ -443,20 +455,23 @@ % \hline % \end{tabular} % \end{center} -% \emph{* The asterisk for the} \texttt{libertinus} \emph{value corresponds to the} -% \texttt{libertinust1math} \emph{family, a name too long to appear in this table.} +% \emph{* The asterisks for the} \textbf{libertinus} \emph{family corresponds to} +% \textnormal{`libertinust1math'} \emph{a name too long to appear in this table. +% Activating the} \texttt{libsans} \emph{package option yields a sanserif font.} % % \subsection{The \texttt{lgrmath} option} % -% The \texttt{lgrmath} option, inspired by the eponymous package developed by J.F. Burnol, +% The \texttt{lgrmath} option, inspired by the eponymous package of J.F. Burnol, % has a large number of possible values. We present here only a few. % The documentation of the \textsf{lgrmath} package~\cite{LGR} explains how -% to list and consult the fonts available on your distribution with the LGR encoding. +% to list the fonts available on your distribution with the LGR encoding. % One can also consult with profit the documentation of \textsf{cb-fonts}\cite{CB}, % the Greek fonts of Claudio Beccari. % % With the \texttt{lgrmath} option, the alternative commands for the variants % produce the same glyphs as those of the normal letters except for "\varsigma". +% However, the "\varsigma" $\varsigma$ often substitutes for the usual "\sigma" $\sigma$ +% when using dynamic font changes through "\mathgreeksfont" with \texttt{enc=LGR}. % % We have not presented here the third column previously indicating the values for % \texttt{enc}, \texttt{fam}, and \texttt{shape} because, for this entire section, @@ -482,13 +497,13 @@ % \hline % \lgrtbl{Alegreya-LF} % \lgrtbl{Cochineal-LF} +% \lgrtbl{LibertinusSerif-LF} % \lgrtbl{LibertinusSans-LF} % \lgrtbl{NotoSerif-LF} -% \lgrtbl{NotoSans-LF} % \lgrtbl{droidserif} % \lgrtbl{fcm} % \lgrtbl{gentium} -% \lgrtbl{llcmss} +% \lgrtbl{lmss} % \end{tabular} % \end{center} % @@ -497,8 +512,8 @@ % % Most TrueType or OpenType fonts can be used here. % ^^A Needs the \textsf{fontspec} package and must be run through \LuaLaTeX\ or \XeLaTeX. -% Some of the fonts below are not free, and some do not have the variants -% "\varepsilon"\ldots for example Arial, Times New Roman. +% Some of the fonts below are non free, and some do not have all the variants, +% for example Arial, Palatino Linotype, Times New Roman. % % \newcommand\fontspectbl[2][fontspec]{% % \doublerows{#2} @@ -596,14 +611,14 @@ % \bibitem{LIBG} \emph{The \textsf{libgreek} package}, Jean-François Burnol, % CTAN v1.1 2022/11/11. % \bibitem{LGR} \emph{The \textsf{lgrmath} package}, Jean-François B., CTAN, v1.0 2022/11/16. -% \bibitem{NTX} \emph{New TX font package}, Micahel Sharpe, CTAN, v1.735 2024/03/01. +% \bibitem{NTX} \emph{New TX font package}, Michael Sharpe, CTAN, v1.735 2024/03/01. % \bibitem{LIB} \emph{The LibertinusT1 Math Package}, Michael Sharpe, CTAN, % v2.0.4 2024/01/14. % \bibitem{CHEM} \emph{\textsf{chemgreek} -- Upright Greek letters in chemistry}, % Clemens Niederberger, CTAN, v1.1a 2020/01/16. % \end{raggedright} % \end{thebibliography} -%} +% } % % \section{Implementation} % @@ -640,6 +655,7 @@ \DeclareBoolOption{savegreeks} \DeclareBoolOption{otherfonts} +\DeclareBoolOption{libsans} \DeclareBoolOption[true]{lowercase} \DeclareBoolOption[true]{uppercase} @@ -678,6 +694,7 @@ \DeclareFontEncoding{LGR}{}{} \DeclareFontEncoding{FML}{}{} \DeclareFontSubstitution{FML}{futm}{m}{it} + \ifmathgreeks@libsans \libus@sansmathtrue\fi % taken up at encoding time \DeclareFontEncoding{LS1}{}{} \DeclareFontSubstitution{LS1}{libertinust1math}{m}{n} @@ -703,6 +720,7 @@ \DisableKeyvalOption[action=warning,package=mathgreeks]{mathgreeks}{txfonts} \DisableKeyvalOption[action=warning,package=mathgreeks]{mathgreeks}{savegreeks} \DisableKeyvalOption[action=warning,package=mathgreeks]{mathgreeks}{otherfonts} +\DisableKeyvalOption[action=warning,package=mathgreeks]{mathgreeks}{libsans} \DisableKeyvalOption[action=warning,package=mathgreeks]{mathgreeks}{lowercase} \DisableKeyvalOption[action=warning,package=mathgreeks]{mathgreeks}{uppercase} @@ -830,6 +848,7 @@ \SetSymbolFont{mgr@up}{bold}{U}{txmia}{bx}{it} \else\ifmathgreeks@libertinus + \ifmathgreeks@libsans \libus@sansmathtrue\fi \DeclareFontEncoding{LS1}{}{} \DeclareFontSubstitution{LS1}{libertinust1math}{m}{n} \DeclareSymbolFont{mgr@it}{LS1}{libertinust1math}{m}{it} @@ -878,16 +897,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%% MACROS %%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\setmathgreeks#1{\setkeys{mathgreeks}{#1}\unskip - \ifmathgreeks@upgreek - \mathgreeks@Greekuptrue - \mathgreeks@greekuptrue - \PackageWarning{mathgreeks}{Style is set to `upright' - \MessageBreak with the `upgreek' option} - \fi - \mgr@DefaultGreeks\ignorespaces -} - \def\re@DeclareMathSymbol#1#2#3#4{% from kpfonts, pxfonts, txfonts \let#1=\undefined @@ -899,7 +908,7 @@ \newcommand{\mgr@CodeGreek}[3]{% #1 = it or up \expandafter\re@DeclareMathSymbol\csname#1#2\endcsname% - {\mathalpha}{mgr@#1}{#3} + {\mathalpha}{mgr@#1}{#3} % perhaps \mathord is better } \newcommand{\mgr@UnicodeGreek}[3]{% @@ -1218,6 +1227,16 @@ %%%%%%%%%%%%%% Macros for changing font dynamically %%%%%%%%%%%%% +\def\setmathgreeks#1{\setkeys{mathgreeks}{#1}\unskip + \ifmathgreeks@upgreek + \mathgreeks@Greekuptrue + \mathgreeks@greekuptrue + \PackageWarning{mathgreeks}{Style is set to `upright' + \MessageBreak with the `upgreek' option} + \fi + \mgr@DefaultGreeks\ignorespaces +} + \newif\ifmgrfont@unicodemath \define@key{mgrfont}{unicode-math}[Latin Modern Math]{% \def\mgrfont@unicodemath{#1}\mgrfont@unicodemathtrue} diff --git a/Master/texmf-dist/source/latex/mathgreeks/mathgreeks.ins b/Master/texmf-dist/source/latex/mathgreeks/mathgreeks.ins index a1a8f6786b5..e7e74d94587 100644 --- a/Master/texmf-dist/source/latex/mathgreeks/mathgreeks.ins +++ b/Master/texmf-dist/source/latex/mathgreeks/mathgreeks.ins @@ -47,7 +47,7 @@ and version 1.3 or later is part of all distributions of LaTeX version \Msg{* *} \Msg{* To produce the documentation run the file *} \Msg{* mathgreeks.dtx through LuaLaTeX *} -\Msg{* (or LaTeX for a shorter version). *} +\Msg{* (or LaTeX for a shorter version of the doc). *} \Msg{* *} \Msg{* Happy TeXing! *} \Msg{* *} diff --git a/Master/texmf-dist/tex/latex/mathgreeks/mathgreeks.sty b/Master/texmf-dist/tex/latex/mathgreeks/mathgreeks.sty index d6eb89a64ee..15275e5c094 100644 --- a/Master/texmf-dist/tex/latex/mathgreeks/mathgreeks.sty +++ b/Master/texmf-dist/tex/latex/mathgreeks/mathgreeks.sty @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{mathgreeks} - [2024/04/30 v1.0 .dtx Math Greek letters] + [2024/05/04 v1.1 .dtx Math Greek letters] \RequirePackage{kvoptions} @@ -55,6 +55,7 @@ \DeclareBoolOption{savegreeks} \DeclareBoolOption{otherfonts} +\DeclareBoolOption{libsans} \DeclareBoolOption[true]{lowercase} \DeclareBoolOption[true]{uppercase} @@ -91,6 +92,7 @@ \DeclareFontEncoding{LGR}{}{} \DeclareFontEncoding{FML}{}{} \DeclareFontSubstitution{FML}{futm}{m}{it} + \ifmathgreeks@libsans \libus@sansmathtrue\fi % taken up at encoding time \DeclareFontEncoding{LS1}{}{} \DeclareFontSubstitution{LS1}{libertinust1math}{m}{n} @@ -116,6 +118,7 @@ \DisableKeyvalOption[action=warning,package=mathgreeks]{mathgreeks}{txfonts} \DisableKeyvalOption[action=warning,package=mathgreeks]{mathgreeks}{savegreeks} \DisableKeyvalOption[action=warning,package=mathgreeks]{mathgreeks}{otherfonts} +\DisableKeyvalOption[action=warning,package=mathgreeks]{mathgreeks}{libsans} \DisableKeyvalOption[action=warning,package=mathgreeks]{mathgreeks}{lowercase} \DisableKeyvalOption[action=warning,package=mathgreeks]{mathgreeks}{uppercase} @@ -242,6 +245,7 @@ \SetSymbolFont{mgr@up}{bold}{U}{txmia}{bx}{it} \else\ifmathgreeks@libertinus + \ifmathgreeks@libsans \libus@sansmathtrue\fi \DeclareFontEncoding{LS1}{}{} \DeclareFontSubstitution{LS1}{libertinust1math}{m}{n} \DeclareSymbolFont{mgr@it}{LS1}{libertinust1math}{m}{it} @@ -289,16 +293,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%% MACROS %%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\setmathgreeks#1{\setkeys{mathgreeks}{#1}\unskip - \ifmathgreeks@upgreek - \mathgreeks@Greekuptrue - \mathgreeks@greekuptrue - \PackageWarning{mathgreeks}{Style is set to `upright' - \MessageBreak with the `upgreek' option} - \fi - \mgr@DefaultGreeks\ignorespaces -} - \def\re@DeclareMathSymbol#1#2#3#4{% from kpfonts, pxfonts, txfonts \let#1=\undefined \DeclareMathSymbol{#1}{#2}{#3}{#4}} @@ -306,7 +300,7 @@ \newcommand{\mgr@CodeGreek}[3]{% #1 = it or up \expandafter\re@DeclareMathSymbol\csname#1#2\endcsname% - {\mathalpha}{mgr@#1}{#3} + {\mathalpha}{mgr@#1}{#3} % perhaps \mathord is better } \newcommand{\mgr@UnicodeGreek}[3]{% @@ -624,6 +618,16 @@ %%%%%%%%%%%%%% Macros for changing font dynamically %%%%%%%%%%%%% +\def\setmathgreeks#1{\setkeys{mathgreeks}{#1}\unskip + \ifmathgreeks@upgreek + \mathgreeks@Greekuptrue + \mathgreeks@greekuptrue + \PackageWarning{mathgreeks}{Style is set to `upright' + \MessageBreak with the `upgreek' option} + \fi + \mgr@DefaultGreeks\ignorespaces +} + \newif\ifmgrfont@unicodemath \define@key{mgrfont}{unicode-math}[Latin Modern Math]{% \def\mgrfont@unicodemath{#1}\mgrfont@unicodemathtrue} |