From bb0e8e6fe6445006cd2fdada9711a733631a94fc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 15 Oct 2019 21:57:51 +0000 Subject: roboto (15oct19) git-svn-id: svn://tug.org/texlive/trunk@52395 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/roboto/roboto.sty | 57 ++++++++++++++------------- 1 file changed, 29 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/tex/latex/roboto/roboto.sty') diff --git a/Master/texmf-dist/tex/latex/roboto/roboto.sty b/Master/texmf-dist/tex/latex/roboto/roboto.sty index ac70a062c0a..068bd8ae0a4 100644 --- a/Master/texmf-dist/tex/latex/roboto/roboto.sty +++ b/Master/texmf-dist/tex/latex/roboto/roboto.sty @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{roboto} - [2019/04/19 (Bob Tennent) Supports Roboto fonts for all LaTeX engines.] + [2019/10/14 (Bob Tennent) Supports Roboto fonts for all LaTeX engines.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} @@ -28,8 +28,8 @@ \newif\ifroboto@condensed \roboto@condensedfalse \newif\ifroboto@slab \roboto@slabfalse -\DeclareOptionX{default}{\roboto@defaulttrue} -\DeclareOptionX{sfdefault}{\roboto@defaulttrue} +\DeclareOptionX{default}{\roboto@defaulttrue\roboto@slabfalse} +\DeclareOptionX{sfdefault}{\roboto@defaulttrue\roboto@slabfalse} \DeclareOptionX{type1}{\roboto@otffalse} \DeclareOptionX{medium}{\roboto@mediumtrue\roboto@blackfalse} \DeclareOptionX{bold}{\roboto@blackfalse\roboto@mediumfalse} @@ -38,7 +38,7 @@ \DeclareOptionX{light}{\roboto@lighttrue\roboto@thinfalse} \DeclareOptionX{regular}{\roboto@lightfalse\roboto@thinfalse} \DeclareOptionX{condensed}{\roboto@condensedtrue\roboto@slabfalse\roboto@thinfalse} -\DeclareOptionX{rm}{\roboto@slabtrue\roboto@condensedfalse} +\DeclareOptionX{rm}{\roboto@slabtrue\roboto@condensedfalse\roboto@defaultfalse} \DeclareOptionX{lining}{\roboto@liningtrue} \DeclareOptionX{nf}{\roboto@liningtrue} \DeclareOptionX{lf}{\roboto@liningtrue} @@ -64,23 +64,24 @@ \else % type1 \ifroboto@condensed - \def\bfseries@sf{boldcondensed} - \def\mdseries@sf{condensed} - \ifroboto@light\def\mdseries@sf{lightcondensed}\fi + \def\bfseries@sf{bc} + \def\mdseries@sf{c} + \ifroboto@light\def\mdseries@sf{lc}\fi \def\seriesdefault{\mdseries@sf} \else - \def\bfseries@sf{bold} - \ifroboto@medium\def\bfseries@sf{medium}\fi - \ifroboto@black\def\bfseries@sf{black}\fi \ifroboto@slab - \def\mdseries@rm{regular} + \def\mdseries@rm{m} + \def\bfseries@rm{b} \else - \def\mdseries@sf{regular} + \def\mdseries@sf{m} + \def\bfseries@sf{b} \fi - \ifroboto@thin\def\mdseries@sf{thin} - \ifroboto@slab\def\mdseries@rm{thin}\fi\fi - \ifroboto@light\def\mdseries@sf{light} - \ifroboto@slab\def\mdseries@rm{light}\fi\fi + \ifroboto@medium\def\bfseries@sf{sb}\fi + \ifroboto@black\def\bfseries@sf{eb}\fi + \ifroboto@thin\def\mdseries@sf{el} + \ifroboto@slab\def\mdseries@rm{el}\fi\fi + \ifroboto@light\def\mdseries@sf{l} + \ifroboto@slab\def\mdseries@rm{l}\fi\fi \ifroboto@slab \def\seriesdefault{\mdseries@rm} \else @@ -348,19 +349,19 @@ \ifroboto@slab\edef\rmdefault{\robotoslabfamily}\fi \ifroboto@slab - \def\robotoregular{\fontfamily{\rmdefault}\fontseries{regular}\selectfont} - \def\robotomedium{\fontfamily{\rmdefault}\fontseries{medium}\selectfont} - \def\robotothin{\fontfamily{\rmdefault}\fontseries{thin}\selectfont} - \def\robotolight{\fontfamily{\rmdefault}\fontseries{light}\selectfont} - \def\robotobold{\fontfamily{\rmdefault}\fontseries{bold}\selectfont} - \def\robotoblack{\fontfamily{\rmdefault}\fontseries{black}\selectfont} + \def\robotoregular{\fontfamily{\rmdefault}\fontseries{m}\selectfont} + \def\robotomedium{\fontfamily{\rmdefault}\fontseries{sb}\selectfont} + \def\robotothin{\fontfamily{\rmdefault}\fontseries{el}\selectfont} + \def\robotolight{\fontfamily{\rmdefault}\fontseries{l}\selectfont} + \def\robotobold{\fontfamily{\rmdefault}\fontseries{b}\selectfont} + \def\robotoblack{\fontfamily{\rmdefault}\fontseries{eb}\selectfont} \else - \def\robotoregular{\fontfamily{\sfdefault}\fontseries{regular}\selectfont} - \def\robotomedium{\fontfamily{\sfdefault}\fontseries{medium}\selectfont} - \def\robotothin{\fontfamily{\sfdefault}\fontseries{thin}\selectfont} - \def\robotolight{\fontfamily{\sfdefault}\fontseries{light}\selectfont} - \def\robotobold{\fontfamily{\sfdefault}\fontseries{bold}\selectfont} - \def\robotoblack{\fontfamily{\sfdefault}\fontseries{black}\selectfont} + \def\robotoregular{\fontfamily{\sfdefault}\fontseries{m}\selectfont} + \def\robotomedium{\fontfamily{\sfdefault}\fontseries{sb}\selectfont} + \def\robotothin{\fontfamily{\sfdefault}\fontseries{el}\selectfont} + \def\robotolight{\fontfamily{\sfdefault}\fontseries{l}\selectfont} + \def\robotobold{\fontfamily{\sfdefault}\fontseries{b}\selectfont} + \def\robotoblack{\fontfamily{\sfdefault}\fontseries{eb}\selectfont} \fi \ifroboto@condensed -- cgit v1.2.3