CTAN sync 202007260302

1 files changed, 9 insertions, 61 deletions

diff --git a/fonts/merriweather/latex/merriweather.sty b/fonts/merriweather/latex/merriweather.sty
index 6f2f5e07e6..0fd1696f61 100644
--- a/fonts/merriweather/latex/merriweather.sty
+++ b/fonts/merriweather/latex/merriweather.sty
@@ -1,16 +1,14 @@
 \ProvidesPackage{merriweather}[%
-   2019/10/13 (Bob Tennent)  Supports Merriweather(Sans) fonts for all LaTeX engines. ] 
+   2020/07/24 (Bob Tennent)  Supports Merriweather(Sans) fonts for use with xeLaTeX and luaLaTeX. ] 
 
-\RequirePackage{ifxetex,ifluatex,textcomp}
+\RequirePackage{iftex}
 
-\newif\ifmerriweather@ttf
-\ifxetex
-  \merriweather@ttftrue
-\else\ifluatex
-  \merriweather@ttftrue
-\else  % [pdf]LaTeX
-  \merriweather@ttffalse
-\fi\fi
+\ifpdftex
+\PackageError{merriweather}{%
+ *****************************************\MessageBreak
+  Please process using XeLaTeX or luaLaTeX\MessageBreak
+ *****************************************}
+\fi  
 
 \newcommand*{\Merriweather@scale}{1}  % not adjustable
 \newcommand*{\MerriweatherSans@scale}{1}
@@ -29,7 +27,6 @@
 \DeclareOptionX{sf}{\merriweather@sftrue}
 \DeclareOptionX{rm}{\merriweather@rmtrue}
 \DeclareOptionX{sfdefault}{\merriweather@sftrue\merriweather@sfdefaulttrue}
-\DeclareOptionX{type1}{\merriweather@ttffalse}
 \DeclareOptionX{light}{\merriweather@rmlighttrue\merriweather@sflighttrue}
 \DeclareOptionX{rmlight}{\merriweather@rmlighttrue}
 \DeclareOptionX{sflight}{\merriweather@sflighttrue}
@@ -39,11 +36,7 @@
 
 \ProcessOptionsX\relax
 
-\ifmerriweather@ttf
-  \RequirePackage{fontspec}
-\else
-  \RequirePackage{fontenc,fontaxes,mweights}
-\fi
+\RequirePackage{fontspec}
 
 \ifmerriweather@rm\else\ifmerriweather@sf\else
   \merriweather@rmtrue\merriweather@sftrue  % both false -> both true
@@ -51,7 +44,6 @@
 
 
 % Set main and/or sans fonts:
-\ifmerriweather@ttf
 
   \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
@@ -216,53 +208,9 @@
         BoldItalicFont = *-ExBoldIt ]  
       {MerriweatherSans}
 
-\else % type1
-
-  \ifmerriweather@rm
-    \ifmerriweather@rmlight\def\mdseries@rm{l}\else\def\mdseries@rm{m}\fi
-    \ifmerriweather@rmblack\def\bfseries@rm{ub}\else\def\bfseries@rm{b}\fi
-  \else
-    \def\mdseries@rm{m}\def\bfseries@rm{b}
-  \fi
-  \ifmerriweather@sf
-    \ifmerriweather@sflight\def\mdseries@sf{l}\else\def\mdseries@sf{m}\fi
-    \ifmerriweather@sfblack\def\bfseries@sf{eb}\else\def\bfseries@sf{b}\fi
-  \else
-    \def\mdseries@sf{m}\def\bfseries@sf{b}
-  \fi
-
-
-
-  \def\merriweatherfamily{Merriweather-OsF}
-  \def\merriweathersffamily{MerriweatherSans-OsF}
-
-  \ifmerriweather@rm
-    \renewcommand*\rmdefault{\merriweatherfamily}
-  \fi
-
-  \ifmerriweather@sf
-    \renewcommand*\sfdefault{\merriweathersffamily}
-  \fi
-
-  \ifmerriweather@sfdefault
-    \renewcommand*\familydefault{\merriweathersffamily}
-  \fi
-  
-  \renewcommand*\seriesdefault{\mdseries@rm}
-
-  \newcommand*\merriweather{\fontfamily{\merriweatherfamily}\selectfont}
-  \newcommand*\merriweathersans{\fontfamily{\merriweathersffamily}\selectfont}
-  \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{l}\selectfont}
-  \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{l}\selectfont}
-  \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ub}\selectfont}
-  \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{eb}\selectfont}
-
-\fi
 
 % turn off defaults in case other fonts are selected:
-\ifmerriweather@ttf
   \defaultfontfeatures{}
-\fi
 
 \endinput