From fe7d1a006c1798e5444f4172db3a6777970d9d14 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 16 Nov 2013 23:50:36 +0000 Subject: merriweather (16nov13) git-svn-id: svn://tug.org/texlive/trunk@32161 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/merriweather/README | 10 +++--- .../fonts/merriweather/merriweather-samples.pdf | Bin 131881 -> 133918 bytes .../fonts/merriweather/merriweather-samples.tex | 36 +++++++++++++++++++++ .../tex/latex/merriweather/merriweather.sty | 30 +++++++++++++++++ 4 files changed, 72 insertions(+), 4 deletions(-) diff --git a/Master/texmf-dist/doc/fonts/merriweather/README b/Master/texmf-dist/doc/fonts/merriweather/README index 3ad8a9aa00c..d7a676ef516 100644 --- a/Master/texmf-dist/doc/fonts/merriweather/README +++ b/Master/texmf-dist/doc/fonts/merriweather/README @@ -1,4 +1,4 @@ -This is the README for the merriweather package, version 2013-11-10. +This is the README for the merriweather package, version 2013-11-14. This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for the Merriweather and MerriweatherSans families of fonts, designed by @@ -46,12 +46,14 @@ to avoid fontspec may use the type1 option. Options scaled= or scale= may be used to scale the MerriweatherSans fonts; the serifed variants are not affected. +Commands \merriweather and \merriweathersans select the Merriweather +and MerriweatherSans families, respectively. Commands \merriweatherlight, +\merriweatherblack, \merriweathersanslight, and \merriweathersansblack +allow for localized use of light or black variants. + The only figure style supported is proportional-oldstyle. Font encodings supported are OT1, T1, LY1 and TS1. -Commands \merriweather and \merriweathersans select the Merriweather -and MerriweatherSans families, respectively. - The original fonts are available at http://www.google.com/webfonts and are licensed under the SIL Open Font License, (version 1.1); the text may be found in the doc directory. The type1 versions diff --git a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf index 9afacd88d61..41f50672224 100644 Binary files a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf and b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf differ diff --git a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex index 34d887cb69a..454003f1165 100644 --- a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex +++ b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex @@ -19,10 +19,29 @@ \textbf{\textit{\lipsum[4]}} +\subsection*{Light} + +{\merriweatherlight\lipsum[5]} + + +\subsection*{Light Italic} + +\textit{\merriweatherlight\lipsum[6]} + +\subsection*{Black} + +{\merriweatherblack\lipsum[7]} + + +\subsection*{Black Italic} + +\textit{\merriweatherblack\lipsum[8]} + \subsection*{Numbers} 1234567890 + \section{Merriweather Sans}\sf \subsection*{Regular} @@ -38,6 +57,23 @@ \textbf{\textit{\lipsum[4]}} +\subsection*{Light} + +{\merriweathersanslight\lipsum[5]} + +\subsection*{Light Italic} + +\textit{\merriweathersanslight\lipsum[6]} + +\subsection*{Black} + +{\merriweathersansblack\lipsum[7]} + +\subsection*{Black Italic} + +\textit{\merriweathersansblack\lipsum[8]} + + \subsection*{Numbers} 1234567890 diff --git a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty index 2f354427424..db74160f0f3 100644 --- a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty +++ b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty @@ -136,6 +136,32 @@ BoldItalicFont = *-\merriweather@sfboldstyle Italic ] {MerriweatherSans} \fi + \newfontfamily\merriweatherlight + [ UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-\merriweather@rmboldstyle , + BoldItalicFont = *-\merriweather@rmboldstyle Italic ] + {Merriweather} + \newfontfamily\merriweathersanslight + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-Light , + BoldItalicFont = *-LightItalic ] + {MerriweatherSans} + \newfontfamily\merriweatherblack + [ UprightFont = *-Heavy , + ItalicFont = *-HeavyItalic , + BoldFont = *-Heavy , + BoldItalicFont = *-HeavyItalic ] + {Merriweather} + \newfontfamily\merriweathersansblack + [ Scale = \MerriweatherSans@scale , + UprightFont = *-ExtraBold , + ItalicFont = *-ExtraBoldItalic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExtraBoldItalic ] + {MerriweatherSans} \else % type1 @@ -173,6 +199,10 @@ \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{h}\selectfont} + \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{eb}\selectfont} \fi -- cgit v1.2.3