diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/merriweather/merriweather.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/merriweather/merriweather.sty | 205 |
1 files changed, 129 insertions, 76 deletions
diff --git a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty index db74160f0f3..cd4500fb662 100644 --- a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty +++ b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty @@ -1,5 +1,5 @@ \ProvidesPackage{merriweather}[% - 2013/11/10 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ] + 2014/01/22 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ] \RequirePackage{ifxetex,ifluatex,textcomp} @@ -53,11 +53,6 @@ % Set main and/or sans fonts: \ifmerriweather@ttf - \def\merriweather@rmboldstyle{Bold} - \def\merriweather@sfboldstyle{Bold} - \ifmerriweather@rmblack\def\merriweather@rmboldstyle{Heavy}\fi - \ifmerriweather@sfblack\def\merriweather@sfboldstyle{ExtraBold}\fi - \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ Ligatures = TeX , @@ -65,38 +60,128 @@ } \ifmerriweather@rm \ifmerriweather@rmlight - \setmainfont - [ UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] - {Merriweather} + \ifmerriweather@rmblack + \setmainfont + [ UprightFont = *-Light , + ItalicFont = *-LightIt , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] + {Merriweather} + \newfontfamily\merriweather + [ UprightFont = *-Light , + ItalicFont = *-LightIt , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] + {Merriweather} + \else + \setmainfont + [ UprightFont = *-Light , + ItalicFont = *-LightIt , + BoldFont = *-Bold , + BoldItalicFont = *-BoldIt ] + {Merriweather} + \newfontfamily\merriweather + [ UprightFont = *-Light , + ItalicFont = *-LightIt , + BoldFont = *-Bold , + BoldItalicFont = *-BoldIt ] + {Merriweather} + \fi \else - \setmainfont - [ UprightFont = * , - ItalicFont = *-Italic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] - {Merriweather} + \ifmerriweather@rmblack + \setmainfont + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] + {Merriweather} + \newfontfamily\merriweather + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] + {Merriweather} + \else + \setmainfont + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldIt ] + {Merriweather} + \newfontfamily\merriweather + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldIt ] + {Merriweather} + \fi \fi \fi \ifmerriweather@sf \ifmerriweather@sflight - \setsansfont - [ Scale = \MerriweatherSans@scale , - UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@sfboldstyle , - BoldItalicFont = *-\merriweather@sfboldstyle Italic ] - {MerriweatherSans} + \ifmerriweather@sfblack + \setsansfont + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExBoldIt ] + {MerriweatherSans} + \newfontfamily\merriweathersans + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExBoldIt ] + {MerriweatherSans} + \else + \setsansfont + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {MerriweatherSans} + \newfontfamily\merriweathersans + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {MerriweatherSans} + \fi \else - \setsansfont - [ Scale = \MerriweatherSans@scale , - UprightFont = *-Regular , - ItalicFont = *-Italic , - BoldFont = *-\merriweather@sfboldstyle , - BoldItalicFont = *-\merriweather@sfboldstyle Italic ] - {MerriweatherSans} + \ifmerriweather@sfblack + \setsansfont + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExBoldIt ] + {MerriweatherSans} + \newfontfamily\merriweathersans + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExBoldIt ] + {MerriweatherSans} + \else + \setsansfont + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {MerriweatherSans} + \newfontfamily\merriweathersans + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {MerriweatherSans} + \fi \fi \fi % grab the \sfdefault in case it changes subsequently: @@ -104,43 +189,11 @@ \ifmerriweather@sfdefault \renewcommand*\familydefault{\merriweathersffamily} \fi - \ifmerriweather@rmlight - \newfontfamily\merriweather - [ UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] - {Merriweather} - \else - \newfontfamily\merriweather - [ UprightFont = * , - ItalicFont = *-Italic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] - {Merriweather} - \fi - \ifmerriweather@sflight - \newfontfamily\merriweathersans - [ Scale = \MerriweatherSans@scale , - UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@sfboldstyle , - BoldItalicFont = *-\merriweather@sfboldstyle Italic ] - {MerriweatherSans} - \else - \newfontfamily\merriweathersans - [ Scale = \MerriweatherSans@scale , - UprightFont = *-Regular , - ItalicFont = *-Italic , - BoldFont = *-\merriweather@sfboldstyle , - BoldItalicFont = *-\merriweather@sfboldstyle Italic ] - {MerriweatherSans} - \fi \newfontfamily\merriweatherlight [ UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] + ItalicFont = *-LightIt , + BoldFont = *-Light , + BoldItalicFont = *-LightIt ] {Merriweather} \newfontfamily\merriweathersanslight [ Scale = \MerriweatherSans@scale , @@ -150,24 +203,24 @@ BoldItalicFont = *-LightItalic ] {MerriweatherSans} \newfontfamily\merriweatherblack - [ UprightFont = *-Heavy , - ItalicFont = *-HeavyItalic , - BoldFont = *-Heavy , - BoldItalicFont = *-HeavyItalic ] + [ UprightFont = *-UltraBold , + ItalicFont = *-UltraBdIt , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] {Merriweather} \newfontfamily\merriweathersansblack [ Scale = \MerriweatherSans@scale , UprightFont = *-ExtraBold , - ItalicFont = *-ExtraBoldItalic , + ItalicFont = *-ExBoldIt , BoldFont = *-ExtraBold , - BoldItalicFont = *-ExtraBoldItalic ] + BoldItalicFont = *-ExBoldIt ] {MerriweatherSans} \else % type1 \ifmerriweather@rm \ifmerriweather@rmlight\def\mdseries@rm{l}\else\def\mdseries@rm{m}\fi - \ifmerriweather@rmblack\def\bfseries@rm{h}\else\def\bfseries@rm{b}\fi + \ifmerriweather@rmblack\def\bfseries@rm{ub}\else\def\bfseries@rm{b}\fi \else \def\mdseries@rm{m}\def\bfseries@rm{b} \fi @@ -181,7 +234,7 @@ \def\merriweatherfamily{Merriweather-OsF} - \def\merriweathersffamily{MerriweatherSans-OsF} + \def\merriweathersffamily{MerriweatherSans-TLF} \ifmerriweather@rm \renewcommand*\rmdefault{\merriweatherfamily} @@ -201,7 +254,7 @@ \newcommand*\merriweathersans{\fontfamily{\merriweathersffamily}\selectfont} \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{l}\selectfont} \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{l}\selectfont} - \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{h}\selectfont} + \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ub}\selectfont} \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{eb}\selectfont} \fi |