miama (18jun19)

git-svn-id: svn://tug.org/texlive/trunk@51395 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 56 insertions, 45 deletions

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
 %<package>\NeedsTeXFormat{LaTeX2e}[1994/06/01]
 %<package>\ProvidesPackage{miama}
-%<package>[2016/02/19 v1.0 class to use the typeface Miama Nueva]
+%<package>[2019/06/18 v1.1 class to use the typeface Miama Nueva]
 %<t1fmm>\ProvidesFile{t1fmm.fd}
 %<ot1fmm>\ProvidesFile{ot1fmm.fd}
 %<x2fmm>\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}