From 6955eddf4398693df3b3dbedcc259b1fdb6ca759 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 18 Jun 2019 22:28:12 +0000 Subject: miama (18jun19) git-svn-id: svn://tug.org/texlive/trunk@51395 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/miama/miama.pdf | Bin 358280 -> 385074 bytes Master/texmf-dist/source/fonts/miama/miama.dtx | 101 ++++++++++++++----------- Master/texmf-dist/tex/latex/miama/lgrfmm.fd | 9 ++- Master/texmf-dist/tex/latex/miama/miama.sty | 11 +-- Master/texmf-dist/tex/latex/miama/ot1fmm.fd | 9 ++- Master/texmf-dist/tex/latex/miama/qxfmm.fd | 9 ++- Master/texmf-dist/tex/latex/miama/t1fmm.fd | 9 ++- Master/texmf-dist/tex/latex/miama/t2afmm.fd | 9 ++- Master/texmf-dist/tex/latex/miama/t2bfmm.fd | 9 ++- Master/texmf-dist/tex/latex/miama/t2cfmm.fd | 9 ++- Master/texmf-dist/tex/latex/miama/t5fmm.fd | 9 ++- Master/texmf-dist/tex/latex/miama/x2fmm.fd | 9 ++- 12 files changed, 107 insertions(+), 86 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/fonts/miama/miama.pdf b/Master/texmf-dist/doc/fonts/miama/miama.pdf index 652e877d4f3..75949043f14 100644 Binary files a/Master/texmf-dist/doc/fonts/miama/miama.pdf and b/Master/texmf-dist/doc/fonts/miama/miama.pdf differ diff --git a/Master/texmf-dist/source/fonts/miama/miama.dtx b/Master/texmf-dist/source/fonts/miama/miama.dtx index a3dd6552368..b929bc3a30a 100644 --- a/Master/texmf-dist/source/fonts/miama/miama.dtx +++ b/Master/texmf-dist/source/fonts/miama/miama.dtx @@ -21,7 +21,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1994/06/01] %\ProvidesPackage{miama} -%[2016/02/19 v1.0 class to use the typeface Miama Nueva] +%[2019/06/18 v1.1 class to use the typeface Miama Nueva] %\ProvidesFile{t1fmm.fd} %\ProvidesFile{ot1fmm.fd} %\ProvidesFile{x2fmm.fd} @@ -134,6 +134,7 @@ %% Right brace \} Tilde \~} % % \changes{1.0}{2015/11/01}{initial version} +% \changes{1.1}{2019/06/18}{added a new option key scaled as alias for scale and therefore changed from kvoptions to xkeyval} % % \title{The \miama{Miama} Package} % \author{Linus Romer} @@ -155,7 +156,7 @@ % \vspace{1cm} % % \textsc{\large \LaTeX\ package for Miama Nueva}\\[1ex] -% {Linus Romer, \today{} --- 1.0} +% {Linus Romer, \today{} --- 1.1} % \end{center} % % \vspace{2cm} @@ -175,7 +176,7 @@ % % \section{Usage} % After the addition of \verb|\usepackage{miama}| to the preamble of your -% \LaTeX{} document, you may use \verb|\miama{sample text}| +% \LaTeX{} document, you may use either \verb|\miama{sample text}| or \verb|{\fmmfamily sample text}| % to produce a % \begin{center}\miama{sample text}.\end{center} % To be honest, you do not really need to load the package in your preamble @@ -212,7 +213,7 @@ % gdfkjlp\miama{gdfkjlp} % \end{center} % Hence, the \texttt{miama} package scales the font to $0.5$ by default. This value -% may be changed by e.g. \verb|\usepackage[scale=1]{miama}|. +% may be changed by e.g. \verb|\usepackage[scale=1]{miama}|. The key word \verb|scaled| may be used as alias for \verb|scale|. % % \section{Sample Texts} % The first article of the human rights in different languages. @@ -291,9 +292,10 @@ % % \begin{macrocode} %<*t1fmm> -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{T1}{fmm}{} % \end{macrocode} @@ -301,7 +303,7 @@ % We scale the font: % % \begin{macrocode} -\DeclareFontShape{T1}{fmm}{m}{n}{<-> \fmm@scale miama-t1}{} +\DeclareFontShape{T1}{fmm}{m}{n}{<-> \fmm@@scale miama-t1}{} % \end{macrocode} % % Other faces are silently substituted: @@ -319,12 +321,13 @@ % % \begin{macrocode} %<*ot1fmm> -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{OT1}{fmm}{} -\DeclareFontShape{OT1}{fmm}{m}{n}{<-> \fmm@scale miama-ot1}{} +\DeclareFontShape{OT1}{fmm}{m}{n}{<-> \fmm@@scale miama-ot1}{} \DeclareFontShape{OT1}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{OT1}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{OT1}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} @@ -337,12 +340,13 @@ % % \begin{macrocode} %<*x2fmm> -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{X2}{fmm}{} -\DeclareFontShape{X2}{fmm}{m}{n}{<-> \fmm@scale miama-x2}{} +\DeclareFontShape{X2}{fmm}{m}{n}{<-> \fmm@@scale miama-x2}{} \DeclareFontShape{X2}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{X2}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{X2}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} @@ -355,12 +359,13 @@ % % \begin{macrocode} %<*t2afmm> -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{T2A}{fmm}{} -\DeclareFontShape{T2A}{fmm}{m}{n}{<-> \fmm@scale miama-t2a}{} +\DeclareFontShape{T2A}{fmm}{m}{n}{<-> \fmm@@scale miama-t2a}{} \DeclareFontShape{T2A}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T2A}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T2A}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} @@ -373,12 +378,13 @@ % % \begin{macrocode} %<*t2bfmm> -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{T2B}{fmm}{} -\DeclareFontShape{T2B}{fmm}{m}{n}{<-> \fmm@scale miama-t2b}{} +\DeclareFontShape{T2B}{fmm}{m}{n}{<-> \fmm@@scale miama-t2b}{} \DeclareFontShape{T2B}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T2B}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T2B}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} @@ -391,12 +397,13 @@ % % \begin{macrocode} %<*t2cfmm> -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{T2C}{fmm}{} -\DeclareFontShape{T2C}{fmm}{m}{n}{<-> \fmm@scale miama-t2c}{} +\DeclareFontShape{T2C}{fmm}{m}{n}{<-> \fmm@@scale miama-t2c}{} \DeclareFontShape{T2C}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T2C}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T2C}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} @@ -409,12 +416,13 @@ % % \begin{macrocode} %<*t5fmm> -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{T5}{fmm}{} -\DeclareFontShape{T5}{fmm}{m}{n}{<-> \fmm@scale miama-t5}{} +\DeclareFontShape{T5}{fmm}{m}{n}{<-> \fmm@@scale miama-t5}{} \DeclareFontShape{T5}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T5}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T5}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} @@ -427,12 +435,13 @@ % % \begin{macrocode} %<*qxfmm> -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{QX}{fmm}{} -\DeclareFontShape{QX}{fmm}{m}{n}{<-> \fmm@scale miama-qx}{} +\DeclareFontShape{QX}{fmm}{m}{n}{<-> \fmm@@scale miama-qx}{} \DeclareFontShape{QX}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{QX}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{QX}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} @@ -445,12 +454,13 @@ % % \begin{macrocode} %<*lgrfmm> -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{LGR}{fmm}{} -\DeclareFontShape{LGR}{fmm}{m}{n}{<-> \fmm@scale miama-lgr}{} +\DeclareFontShape{LGR}{fmm}{m}{n}{<-> \fmm@@scale miama-lgr}{} \DeclareFontShape{LGR}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{LGR}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{LGR}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} @@ -460,13 +470,14 @@ % \end{macrocode} % % \subsection{The style file: \texttt{miama.sty}} -% The \verb|scale| option is being defined with a default of $0.5$. +% The \verb|scale| option (or \verb|scaled|) is being defined with a default of $0.5$. % \begin{macrocode} %<*package> -\RequirePackage{kvoptions} -\SetupKeyvalOptions{prefix=fmm@} -\DeclareStringOption[0.5]{scale} -\ProcessKeyvalOptions* +\newcommand*{\fmm@scale}{0.5} +\RequirePackage{xkeyval} +\DeclareOptionX{scaled}{\renewcommand*{\fmm@scale}{#1}} +\DeclareOptionX{scale}{\renewcommand*{\fmm@scale}{#1}} +\ProcessOptionsX\relax % \end{macrocode} % Two commands to make font changes easier: % \begin{macro}{\fmmfamily} diff --git a/Master/texmf-dist/tex/latex/miama/lgrfmm.fd b/Master/texmf-dist/tex/latex/miama/lgrfmm.fd index ab8510faf52..ca6e0066c72 100644 --- a/Master/texmf-dist/tex/latex/miama/lgrfmm.fd +++ b/Master/texmf-dist/tex/latex/miama/lgrfmm.fd @@ -23,12 +23,13 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{LGR}{fmm}{} -\DeclareFontShape{LGR}{fmm}{m}{n}{<-> \fmm@scale miama-lgr}{} +\DeclareFontShape{LGR}{fmm}{m}{n}{<-> \fmm@@scale miama-lgr}{} \DeclareFontShape{LGR}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{LGR}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{LGR}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} diff --git a/Master/texmf-dist/tex/latex/miama/miama.sty b/Master/texmf-dist/tex/latex/miama/miama.sty index a8c5b923d22..f63aa8dcf9b 100644 --- a/Master/texmf-dist/tex/latex/miama/miama.sty +++ b/Master/texmf-dist/tex/latex/miama/miama.sty @@ -10,7 +10,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/06/01] \ProvidesPackage{miama} -[2016/02/19 v1.0 class to use the typeface Miama Nueva] +[2019/06/18 v1.1 class to use the typeface Miama Nueva] %% \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 %% Lower-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 @@ -26,10 +26,11 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\RequirePackage{kvoptions} -\SetupKeyvalOptions{prefix=fmm@} -\DeclareStringOption[0.5]{scale} -\ProcessKeyvalOptions* +\newcommand*{\fmm@scale}{0.5} +\RequirePackage{xkeyval} +\DeclareOptionX{scaled}{\renewcommand*{\fmm@scale}{#1}} +\DeclareOptionX{scale}{\renewcommand*{\fmm@scale}{#1}} +\ProcessOptionsX\relax \DeclareRobustCommand\fmmfamily{% \not@math@alphabet\fmmfamily\relax \fontfamily{fmm}\selectfont} diff --git a/Master/texmf-dist/tex/latex/miama/ot1fmm.fd b/Master/texmf-dist/tex/latex/miama/ot1fmm.fd index 5a7876003f1..e88a5e44983 100644 --- a/Master/texmf-dist/tex/latex/miama/ot1fmm.fd +++ b/Master/texmf-dist/tex/latex/miama/ot1fmm.fd @@ -24,12 +24,13 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{OT1}{fmm}{} -\DeclareFontShape{OT1}{fmm}{m}{n}{<-> \fmm@scale miama-ot1}{} +\DeclareFontShape{OT1}{fmm}{m}{n}{<-> \fmm@@scale miama-ot1}{} \DeclareFontShape{OT1}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{OT1}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{OT1}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} diff --git a/Master/texmf-dist/tex/latex/miama/qxfmm.fd b/Master/texmf-dist/tex/latex/miama/qxfmm.fd index 5242bd4fc6e..6e856f977f3 100644 --- a/Master/texmf-dist/tex/latex/miama/qxfmm.fd +++ b/Master/texmf-dist/tex/latex/miama/qxfmm.fd @@ -25,12 +25,13 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{QX}{fmm}{} -\DeclareFontShape{QX}{fmm}{m}{n}{<-> \fmm@scale miama-qx}{} +\DeclareFontShape{QX}{fmm}{m}{n}{<-> \fmm@@scale miama-qx}{} \DeclareFontShape{QX}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{QX}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{QX}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} diff --git a/Master/texmf-dist/tex/latex/miama/t1fmm.fd b/Master/texmf-dist/tex/latex/miama/t1fmm.fd index 43c29686dc2..8ec74b4bc75 100644 --- a/Master/texmf-dist/tex/latex/miama/t1fmm.fd +++ b/Master/texmf-dist/tex/latex/miama/t1fmm.fd @@ -24,12 +24,13 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{T1}{fmm}{} -\DeclareFontShape{T1}{fmm}{m}{n}{<-> \fmm@scale miama-t1}{} +\DeclareFontShape{T1}{fmm}{m}{n}{<-> \fmm@@scale miama-t1}{} \DeclareFontShape{T1}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T1}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T1}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} diff --git a/Master/texmf-dist/tex/latex/miama/t2afmm.fd b/Master/texmf-dist/tex/latex/miama/t2afmm.fd index 1928e4d7ce1..dce21c3ff2b 100644 --- a/Master/texmf-dist/tex/latex/miama/t2afmm.fd +++ b/Master/texmf-dist/tex/latex/miama/t2afmm.fd @@ -24,12 +24,13 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{T2A}{fmm}{} -\DeclareFontShape{T2A}{fmm}{m}{n}{<-> \fmm@scale miama-t2a}{} +\DeclareFontShape{T2A}{fmm}{m}{n}{<-> \fmm@@scale miama-t2a}{} \DeclareFontShape{T2A}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T2A}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T2A}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} diff --git a/Master/texmf-dist/tex/latex/miama/t2bfmm.fd b/Master/texmf-dist/tex/latex/miama/t2bfmm.fd index e9360ae877f..8536dae6d1b 100644 --- a/Master/texmf-dist/tex/latex/miama/t2bfmm.fd +++ b/Master/texmf-dist/tex/latex/miama/t2bfmm.fd @@ -24,12 +24,13 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{T2B}{fmm}{} -\DeclareFontShape{T2B}{fmm}{m}{n}{<-> \fmm@scale miama-t2b}{} +\DeclareFontShape{T2B}{fmm}{m}{n}{<-> \fmm@@scale miama-t2b}{} \DeclareFontShape{T2B}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T2B}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T2B}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} diff --git a/Master/texmf-dist/tex/latex/miama/t2cfmm.fd b/Master/texmf-dist/tex/latex/miama/t2cfmm.fd index fe2cba79956..42a719f08f4 100644 --- a/Master/texmf-dist/tex/latex/miama/t2cfmm.fd +++ b/Master/texmf-dist/tex/latex/miama/t2cfmm.fd @@ -24,12 +24,13 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{T2C}{fmm}{} -\DeclareFontShape{T2C}{fmm}{m}{n}{<-> \fmm@scale miama-t2c}{} +\DeclareFontShape{T2C}{fmm}{m}{n}{<-> \fmm@@scale miama-t2c}{} \DeclareFontShape{T2C}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T2C}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T2C}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} diff --git a/Master/texmf-dist/tex/latex/miama/t5fmm.fd b/Master/texmf-dist/tex/latex/miama/t5fmm.fd index 847e179764a..75f36c717ca 100644 --- a/Master/texmf-dist/tex/latex/miama/t5fmm.fd +++ b/Master/texmf-dist/tex/latex/miama/t5fmm.fd @@ -24,12 +24,13 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{T5}{fmm}{} -\DeclareFontShape{T5}{fmm}{m}{n}{<-> \fmm@scale miama-t5}{} +\DeclareFontShape{T5}{fmm}{m}{n}{<-> \fmm@@scale miama-t5}{} \DeclareFontShape{T5}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T5}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{T5}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} diff --git a/Master/texmf-dist/tex/latex/miama/x2fmm.fd b/Master/texmf-dist/tex/latex/miama/x2fmm.fd index 11189203b02..99d9c7c44aa 100644 --- a/Master/texmf-dist/tex/latex/miama/x2fmm.fd +++ b/Master/texmf-dist/tex/latex/miama/x2fmm.fd @@ -24,12 +24,13 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\providecommand*\fmm@scale{} -\ifx\fmm@scale\@empty\else - \edef\fmm@scale{s*[\fmm@scale]}% +\expandafter\ifx\csname fmm@scale\endcsname\relax + \let\fmm@@scale\@empty +\else + \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}% \fi \DeclareFontFamily{X2}{fmm}{} -\DeclareFontShape{X2}{fmm}{m}{n}{<-> \fmm@scale miama-x2}{} +\DeclareFontShape{X2}{fmm}{m}{n}{<-> \fmm@@scale miama-x2}{} \DeclareFontShape{X2}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{} \DeclareFontShape{X2}{fmm}{m}{it}{<-> ssub * fmm/m/n}{} \DeclareFontShape{X2}{fmm}{b}{n}{<-> ssub * fmm/m/n}{} -- cgit v1.2.3