summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/miama
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-06-18 22:28:12 +0000
committerKarl Berry <karl@freefriends.org>2019-06-18 22:28:12 +0000
commit6955eddf4398693df3b3dbedcc259b1fdb6ca759 (patch)
tree0c634c9eee9de2151fcb85a46a344e6771bcf248 /Master/texmf-dist/tex/latex/miama
parent06a2538be23d69fb4920da51395929b856898885 (diff)
miama (18jun19)
git-svn-id: svn://tug.org/texlive/trunk@51395 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/miama')
-rw-r--r--Master/texmf-dist/tex/latex/miama/lgrfmm.fd9
-rw-r--r--Master/texmf-dist/tex/latex/miama/miama.sty11
-rw-r--r--Master/texmf-dist/tex/latex/miama/ot1fmm.fd9
-rw-r--r--Master/texmf-dist/tex/latex/miama/qxfmm.fd9
-rw-r--r--Master/texmf-dist/tex/latex/miama/t1fmm.fd9
-rw-r--r--Master/texmf-dist/tex/latex/miama/t2afmm.fd9
-rw-r--r--Master/texmf-dist/tex/latex/miama/t2bfmm.fd9
-rw-r--r--Master/texmf-dist/tex/latex/miama/t2cfmm.fd9
-rw-r--r--Master/texmf-dist/tex/latex/miama/t5fmm.fd9
-rw-r--r--Master/texmf-dist/tex/latex/miama/x2fmm.fd9
10 files changed, 51 insertions, 41 deletions
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}{}