From d9346aef7f27482484e35ada722ac1625a11cce1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 6 Mar 2019 22:15:23 +0000 Subject: roboto (6mar19) git-svn-id: svn://tug.org/texlive/trunk@50263 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/fonts/roboto/ChangeLogLaTeX.txt | 6 -- Master/texmf-dist/doc/fonts/roboto/README | 11 +-- Master/texmf-dist/tex/latex/roboto/roboto-mono.sty | 14 +-- Master/texmf-dist/tex/latex/roboto/roboto.sty | 108 ++------------------- 4 files changed, 18 insertions(+), 121 deletions(-) delete mode 100644 Master/texmf-dist/doc/fonts/roboto/ChangeLogLaTeX.txt (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/fonts/roboto/ChangeLogLaTeX.txt b/Master/texmf-dist/doc/fonts/roboto/ChangeLogLaTeX.txt deleted file mode 100644 index 46d0c9adb7a..00000000000 --- a/Master/texmf-dist/doc/fonts/roboto/ChangeLogLaTeX.txt +++ /dev/null @@ -1,6 +0,0 @@ -2019-03-01 and 2019-03-03: - - FontFace and NFSSFamily declarations provided by Mario - Haustein added to roboto.sty and roboto-mono.sty so that - \fontseries{...} and \fontfamily{...} commands work as - expected with xelatex and lualatex. diff --git a/Master/texmf-dist/doc/fonts/roboto/README b/Master/texmf-dist/doc/fonts/roboto/README index e0a96762d1d..e78fa65f646 100644 --- a/Master/texmf-dist/doc/fonts/roboto/README +++ b/Master/texmf-dist/doc/fonts/roboto/README @@ -1,5 +1,5 @@ This is the README for the roboto package, version -2019-03-03. +2019-03-01. This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for the Roboto, RobotoCondensed, RobotoMono and @@ -89,15 +89,6 @@ Commands \roboto, \robotocondensed, \robotoslab, and \robotomono select the Roboto, RobotoCondensed, RobotoSlab and RobotoMono font family, respectively. -Similarly, commands \robotoLF, \robotoTLF, \robotoOsF -and \robotoTOsF select figure styles proportional-lining, -tabular-lining, proportional-oldstyle and tabular-oldstyle, -respectively. - -Thanks to code contributed by Mario Haustein, commands -\fontfamily{...} and \fontseries{...} work as expected with -xelatex and lualatex. - The original fonts are available at http://www.google.com/webfonts and are licensed under the Apache License, (version 2); the text may be found in diff --git a/Master/texmf-dist/tex/latex/roboto/roboto-mono.sty b/Master/texmf-dist/tex/latex/roboto/roboto-mono.sty index a84818aa941..5e90a8f021c 100644 --- a/Master/texmf-dist/tex/latex/roboto/roboto-mono.sty +++ b/Master/texmf-dist/tex/latex/roboto/roboto-mono.sty @@ -1,10 +1,10 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{roboto-mono} - [2019/03/03 (Bob Tennent) Supports RobotoMono fonts for all LaTeX engines.] + [2019/02/28 (Bob Tennent) Supports RobotoMono fonts for all LaTeX engines.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} -\newif\ifrobotomono@otf +\newif\ifrobotomono@otf \ifxetex \robotomono@otftrue \else\ifluatex @@ -53,8 +53,6 @@ \fi -\def\robotomonofamily{RobotoMono-TLF} - \ifrobotomono@otf \RequirePackage{fontspec} \else @@ -69,7 +67,7 @@ Scale = \RobotoMono@scale , Extension = .ttf } \setmonofont - [ + [ UprightFont = *-\robotomono@regstyle , ItalicFont = *-\ifx\robotomono@regstyle\robotomono@regular Italic\else\robotomono@regstyle Italic\fi , BoldFont = *-\robotomono@boldstyle , @@ -95,13 +93,14 @@ FontFace = {b}{sl}{*-Bold}, FontFace = {b}{it}{*-BoldItalic} ] {RobotoMono} + % grab current family in case of subsequent change: + \let\robotomonofamily\ttdefault \newfontfamily\robotomono - [ + [ UprightFont = *-\robotomono@regstyle , ItalicFont = *-\ifx\robotomono@regstyle\robotomono@regular Italic\else\robotomono@regstyle Italic\fi , BoldFont = *-\robotomono@boldstyle , BoldItalicFont = *-\robotomono@boldstyle Italic , - NFSSFamily = \robotomonofamily, FontFace = {t}{n}{*-Thin}, FontFace = {t}{sc}{*-Thin}, FontFace = {t}{sl}{*-Thin}, @@ -124,6 +123,7 @@ FontFace = {b}{it}{*-BoldItalic} ] {RobotoMono} \else % type1 + \def\robotomonofamily{RobotoMono-TLF} \newcommand*\robotomono{\fontfamily{\robotomonofamily}\selectfont} \def\ttdefault{\robotomonofamily} \fi diff --git a/Master/texmf-dist/tex/latex/roboto/roboto.sty b/Master/texmf-dist/tex/latex/roboto/roboto.sty index 2094cc139ef..7cf03f8a798 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/03/03 (Bob Tennent) Supports Roboto fonts for all LaTeX engines.] + [2019/03/01 (Bob Tennent) Supports Roboto fonts for all LaTeX engines.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} @@ -76,21 +76,6 @@ \fi -\ifroboto@lining - \def\roboto@figurestyle{LF} -\else - \def\roboto@figurestyle{OsF} -\fi -\ifroboto@tabular - \def\roboto@figurealign{T} -\else - \def\roboto@figurealign{} -\fi - -\edef\robotofamily{Roboto-\roboto@figurealign\roboto@figurestyle} -\edef\robotocondensedfamily{RobotoCondensed-\roboto@figurealign\roboto@figurestyle} -\edef\robotoslabfamily{RobotoSlab-LF} - \ifroboto@otf \ifroboto@lining \def\roboto@figurestyle{Lining} @@ -209,7 +194,6 @@ ItalicFont = *-\ifx\roboto@regstyle\roboto@regular Italic\else\roboto@regstyle Italic\fi, BoldFont = *-\roboto@boldstyle , BoldItalicFont = *-\roboto@boldstyle Italic , - NFSSFamily = \robotofamily, FontFace = {t}{n}{*-Thin}, FontFace = {t}{sc}{*-Thin}, FontFace = {t}{sl}{*-Thin}, @@ -241,7 +225,6 @@ ItalicFont = *-\ifx\roboto@regstyle\roboto@regular Italic\else\roboto@regstyle Italic\fi, BoldFont = *-Bold , BoldItalicFont = *-BoldItalic , - NFSSFamily = \robotocondensedfamily, FontFace = {l}{n}{*-Light}, FontFace = {l}{sc}{*-Light}, FontFace = {l}{sl}{*-Light}, @@ -258,7 +241,6 @@ \newfontfamily\robotoslab [ UprightFont = *-\roboto@regstyle , BoldFont = *-Bold , - NFSSFamily = \robotoslabfamily, FontFace = {t}{n}{*-Thin}, FontFace = {t}{sc}{*-Thin}, FontFace = {t}{sl}{*-Thin}, @@ -273,12 +255,11 @@ FontFace = {b}{sl}{*-Bold} ] {RobotoSlab} \newfontfamily\robotoOsF - [ Numbers = {Proportional,OldStyle}, + [ Numbers = {\roboto@figurealign,OldStyle}, UprightFont = *-\roboto@regstyle , ItalicFont = *-\ifx\roboto@regstyle\roboto@regular Italic\else\roboto@regstyle Italic\fi, BoldFont = *-\roboto@boldstyle , BoldItalicFont = *-\roboto@boldstyle Italic , - NFSSFamily = Roboto-OsF, FontFace = {t}{n}{*-Thin}, FontFace = {t}{sc}{*-Thin}, FontFace = {t}{sl}{*-Thin}, @@ -305,76 +286,11 @@ FontFace = {k}{it}{*-BlackItalic} ] {Roboto} \newfontfamily\robotoLF - [ Numbers = {Proportional,Lining}, - UprightFont = *-\roboto@regstyle , - ItalicFont = *-\ifx\roboto@regstyle\roboto@regular Italic\else\roboto@regstyle Italic\fi, - BoldFont = *-\roboto@boldstyle , - BoldItalicFont = *-\roboto@boldstyle Italic , - NFSSFamily = Roboto-LF, - FontFace = {t}{n}{*-Thin}, - FontFace = {t}{sc}{*-Thin}, - FontFace = {t}{sl}{*-Thin}, - FontFace = {t}{it}{*-ThinItalic}, - FontFace = {l}{n}{*-Light}, - FontFace = {l}{sc}{*-Light}, - FontFace = {l}{sl}{*-Light}, - FontFace = {l}{it}{*-LightItalic}, - FontFace = {m}{n}{*-Regular}, - FontFace = {m}{sc}{*-Regular}, - FontFace = {m}{sl}{*-Regular}, - FontFace = {m}{it}{*-Italic}, - FontFace = {mb}{n}{*-Medium}, - FontFace = {mb}{sc}{*-Medium}, - FontFace = {mb}{sl}{*-Medium}, - FontFace = {mb}{it}{*-MediumItalic}, - FontFace = {b}{n}{*-Bold}, - FontFace = {b}{sc}{*-Bold}, - FontFace = {b}{sl}{*-Bold}, - FontFace = {b}{it}{*-BoldItalic}, - FontFace = {k}{n}{*-Black}, - FontFace = {k}{sc}{*-Black}, - FontFace = {k}{sl}{*-Black}, - FontFace = {k}{it}{*-BlackItalic} ] - {Roboto} - \newfontfamily\robotoTOsF - [ Numbers = {Monospaced,OldStyle}, + [ Numbers = {\roboto@figurealign,Lining}, UprightFont = *-\roboto@regstyle , ItalicFont = *-\ifx\roboto@regstyle\roboto@regular Italic\else\roboto@regstyle Italic\fi, BoldFont = *-\roboto@boldstyle , BoldItalicFont = *-\roboto@boldstyle Italic , - NFSSFamily = Roboto-TOsF, - FontFace = {t}{n}{*-Thin}, - FontFace = {t}{sc}{*-Thin}, - FontFace = {t}{sl}{*-Thin}, - FontFace = {t}{it}{*-ThinItalic}, - FontFace = {l}{n}{*-Light}, - FontFace = {l}{sc}{*-Light}, - FontFace = {l}{sl}{*-Light}, - FontFace = {l}{it}{*-LightItalic}, - FontFace = {m}{n}{*-Regular}, - FontFace = {m}{sc}{*-Regular}, - FontFace = {m}{sl}{*-Regular}, - FontFace = {m}{it}{*-Italic}, - FontFace = {mb}{n}{*-Medium}, - FontFace = {mb}{sc}{*-Medium}, - FontFace = {mb}{sl}{*-Medium}, - FontFace = {mb}{it}{*-MediumItalic}, - FontFace = {b}{n}{*-Bold}, - FontFace = {b}{sc}{*-Bold}, - FontFace = {b}{sl}{*-Bold}, - FontFace = {b}{it}{*-BoldItalic}, - FontFace = {k}{n}{*-Black}, - FontFace = {k}{sc}{*-Black}, - FontFace = {k}{sl}{*-Black}, - FontFace = {k}{it}{*-BlackItalic} ] - {Roboto} - \newfontfamily\robotoTLF - [ Numbers = {Monospaced,Lining}, - UprightFont = *-\roboto@regstyle , - ItalicFont = *-\ifx\roboto@regstyle\roboto@regular Italic\else\roboto@regstyle Italic\fi, - BoldFont = *-\roboto@boldstyle , - BoldItalicFont = *-\roboto@boldstyle Italic , - NFSSFamily = Roboto-TLF, FontFace = {t}{n}{*-Thin}, FontFace = {t}{sc}{*-Thin}, FontFace = {t}{sl}{*-Thin}, @@ -400,28 +316,24 @@ FontFace = {k}{sl}{*-Black}, FontFace = {k}{it}{*-BlackItalic} ] {Roboto} + \DeclareTextFontCommand{\oldstylenums}{\robotoOsF} + \DeclareTextFontCommand{\liningnums}{\robotoLF} \else % type1 + \def\robotofamily{Roboto-\roboto@figurealign\roboto@figurestyle} + \def\robotocondensedfamily{RobotoCondensed-\roboto@figurealign\roboto@figurestyle} + \def\robotoslabfamily{RobotoSlab-LF} \newcommand*\roboto{\fontfamily{\robotofamily}\selectfont} \newcommand*\robotocondensed{\fontfamily{\robotocondensedfamily}\selectfont} \newcommand*\robotoslab{\fontfamily{\robotoslabfamily}\selectfont} - \newcommand*\robotoLF{\fontfamily{Roboto-LF}\selectfont} - \newcommand*\robotoTLF{\fontfamily{Roboto-TLF}\selectfont} - \newcommand*\robotoOsF{\fontfamily{Roboto-OsF}\selectfont} - \newcommand*\robotoTOsF{\fontfamily{Roboto-TOsF}\selectfont} \def\sfdefault{\robotofamily} \ifroboto@condensed\def\sfdefault{\robotocondensedfamily}\fi \ifroboto@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi \ifroboto@slab\edef\rmdefault{\robotoslabfamily}\fi -\fi + \DeclareTextFontCommand{\oldstylenums}{\fontfamily{Roboto-\roboto@figurealign OsF}\selectfont} + \DeclareTextFontCommand{\liningnums}{\fontfamily{Roboto-\roboto@figurealign LF}\selectfont} -\ifroboto@tabular - \DeclareTextFontCommand{\oldstylenums}{\robotoTOsF} - \DeclareTextFontCommand{\liningnums}{\robotoTLF} -\else - \DeclareTextFontCommand{\oldstylenums}{\robotoOsF} - \DeclareTextFontCommand{\liningnums}{\robotoLF} \fi \ifroboto@otf -- cgit v1.2.3