rosario (21jul19)

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

1 files changed, 18 insertions, 21 deletions

diff --git a/Master/texmf-dist/source/fonts/rosario/Rosario.dtx b/Master/texmf-dist/source/fonts/rosario/Rosario.dtx
index 5ed8c00786e..cb33fb3ce00 100644
--- a/Master/texmf-dist/source/fonts/rosario/Rosario.dtx
+++ b/Master/texmf-dist/source/fonts/rosario/Rosario.dtx
@@ -15,7 +15,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{Rosario}
-%<package>  [2019/07/07 v2.0 Support for Rosario fonts (AE)]
+%<package>  [2019/07/19 v2.1 Support for Rosario fonts (AE)]
 %
 %<*driver>
 \documentclass[a4paper]{ltxdoc}
@@ -84,7 +84,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{253}
+% \CheckSum{247}
 %
 % \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
@@ -107,6 +107,7 @@
 %
 % \MakeShortVerb{\"}
 %
+% \changes{v2.1}{2019/07/20}{Fix a bug in handling of alias keys}
 % \changes{v2.0}{2019/07/07}{Remove `Rosario.fontspec' from the bundle
 % since the functionality is now provided by the package itself}
 % \changes{v2.0}{2019/07/07}{Add the `scaled' key as requested by FMi}
@@ -497,12 +498,22 @@
 \DeclareComplementaryOption{proportional}{tabular}
 %    \end{macrocode}
 %
-% Alias keys are defined as boolean keys as well:
+% Alias keys are defined with \cmd{\define@key}.  Given values to
+% these keys are passed to the original keys and they are set via
+% \cmd{\kvsetkeys}.
 %    \begin{macrocode}
-\DeclareBoolOption{lf}
-\DeclareComplementaryOption{osf}{lf}
-\DeclareBoolOption{tab}
-\DeclareComplementaryOption{prop}{tab}
+\define@key{Rosario}{lf}[true]{%
+  \kvsetkeys{Rosario}{lining=#1}%
+}
+\define@key{Rosario}{osf}[true]{%
+  \kvsetkeys{Rosario}{oldstyle=#1}%
+}
+\define@key{Rosario}{tab}[true]{%
+  \kvsetkeys{Rosario}{tabular=#1}%
+}
+\define@key{Rosario}{prop}[true]{%
+  \kvsetkeys{Rosario}{proportional=#1}%
+}
 %    \end{macrocode}
 %
 % "scale" and "scaled" keys are special: With (pdf)LaTeX, "scale" is a
@@ -545,20 +556,6 @@
 \ProcessKeyvalOptions{Rosario}
 %    \end{macrocode}
 %
-% Process the alias keys and set the real one with \cmd{\kvsetkeys}:
-%    \begin{macrocode}
-\ifRosario@lf
-  \kvsetkeys{Rosario}{lining=true}
-\else
-  \kvsetkeys{Rosario}{lining=false}
-\fi
-\ifRosario@tab
-  \kvsetkeys{Rosario}{tabular=true}
-\else
-  \kvsetkeys{Rosario}{tabular=false}
-\fi
-%    \end{macrocode}
-%
 % We need some macros to store the figure alignment and style and font
 % defintions:
 %    \begin{macrocode}